Merge pull request #743 from estolfo/RUBY-1081-write-concern-opts

RUBY-1081 Represent write concern options keys as symbols and values as ints or strings

Author: estolfo

lib/mongo/grid/stream/write.rb

@@ -160,7 +160,7 @@ def with_write_concern(collection)
                 collection.write_concern.options == write_concern.options)
               collection
             else
-              collection.client.with(write: write_concern.options)[collection.name]
+              collection.with(write: write_concern.options)
             end
           end
 

lib/mongo/options/mapper.rb

@@ -81,6 +81,23 @@ def transform_keys_to_strings(options)
         end
       end
 
+      # Coverts all the keys of the options to symbols.
+      #
+      # @example Convert all option keys to symbols.
+      #   Mapper.transform({ 'name' => 1 })
+      #
+      # @param [ Hash ] options The options to transform.
+      #
+      # @return [ Hash ] The transformed options.
+      #
+      # @since 2.2.2
+      def transform_keys_to_symbols(options)
+        options.reduce({}) do |transformed, (key, value)|
+          transformed[key.to_sym] = value
+          transformed
+        end
+      end
+
       # Coverts all the symbol values to strings.
       #
       # @example Convert all option symbol values to strings.

lib/mongo/write_concern/normalizable.rb

@@ -44,7 +44,8 @@ module Normalizable
       #
       # @since 2.0.0
       def initialize(options)
-        @options = options.freeze
+        opts =  Options::Mapper.transform_keys_to_symbols(options)
+        @options = Options::Mapper.transform_values_to_strings(opts).freeze
       end
     end
   end

spec/mongo/client_spec.rb

@@ -688,7 +688,7 @@
         end
 
         it 'returns a acknowledged write concern' do
-          expect(concern.get_last_error).to eq(:getlasterror => 1, 'j' => true)
+          expect(concern.get_last_error).to eq(:getlasterror => 1, :j => true)
         end
       end
 

spec/mongo/write_concern_spec.rb

@@ -122,5 +122,20 @@
         expect(Mongo::WriteConcern.get(options).options).to eq(options)
       end
     end
+
+    context 'when w is a symbol' do
+
+      let(:options) do
+        { w: :majority, journal: true }
+      end
+
+      it 'returns an Acknowledged write concern object' do
+        expect(Mongo::WriteConcern.get(options)).to be_a(Mongo::WriteConcern::Acknowledged)
+      end
+
+      it 'sets w to a string' do
+        expect(Mongo::WriteConcern.get(options).options[:w]).to eq('majority')
+      end
+    end
   end
 end

spec/support/command_monitoring.rb

@@ -129,6 +129,9 @@ def data_matches?(actual, expected)
       #
       # @since 2.1.0
       def hash_matches?(actual, expected)
+        if expected['writeConcern']
+          expected['writeConcern'] = Options::Mapper.transform_keys_to_symbols(expected['writeConcern'])
+        end
         if expected.keys.first == '$numberLong'
           converted = expected.values.first.to_i
           (actual == converted) || actual >= 0