[STORE] Fixed, that options have not been passed to gateway in MyModel#update

In the `Rails` module, the `update` method has been redefined to allow
converting dates coming in from the Rails' forms, but the `options`
argument has not been passed down to the `update` method in the `Store` module.

This patch fixes that and adds unit and integration tests to cover the beahviour.

Closes elastic#347

Author: karmi

elasticsearch-persistence/lib/elasticsearch/persistence/model/rails.rb

@@ -13,7 +13,7 @@ def initialize(attributes={})
             end
 
             def update(attributes={}, options={})
-              super(__convert_rails_dates(attributes))
+              super(__convert_rails_dates(attributes), options)
             end
           end
         end

elasticsearch-persistence/lib/elasticsearch/persistence/model/store.rb

@@ -99,6 +99,16 @@ def destroy(options={})
           #     p.update name: 'UPDATED'
           #     => {"_index"=>"people", ... "_version"=>2}
           #
+          # @example Pass a version for concurrency control
+          #
+          #     p.update( { name: 'UPDATED' }, { version: 2 } )
+          #     => {"_index"=>"people", ... "_version"=>3}
+          #
+          # @example An exception is raised when the version doesn't match
+          #
+          #     p.update( { name: 'UPDATED' }, { version: 2 } )
+          #     => Elasticsearch::Transport::Transport::Errors::Conflict: [409] {"error" ... }
+          #
           # @return [Hash] The Elasticsearch response as a Hash
           #
           def update(attributes={}, options={})
@@ -112,7 +122,6 @@ def update(attributes={}, options={})
               options.update type:  self._type  if self._type
 
               attributes.update( { updated_at: Time.now.utc } )
-
               response = self.class.gateway.update(self.id, { doc: attributes}.merge(options))
 
               self.attributes = self.attributes.merge(attributes)

elasticsearch-persistence/test/integration/model/model_basic_test.rb

@@ -144,6 +144,16 @@ class ::Person
           assert found.updated_at > updated_at, [found.updated_at, updated_at].inspect
         end
 
+        should "respect the version" do
+          person = Person.create name: 'John Smith'
+
+          person.update( { name: 'UPDATE 1' })
+
+          assert_raise Elasticsearch::Transport::Transport::Errors::Conflict do
+            person.update( { name: 'UPDATE 2' }, { version: 1 } )
+          end
+        end
+
         should "find all instances" do
           Person.create name: 'John Smith'
           Person.create name: 'Mary Smith'

elasticsearch-persistence/test/unit/model_rails_test.rb

@@ -91,5 +91,22 @@ class MyView; include ActionView::Helpers::UrlHelper; end
       assert_equal "2014-01-01", m.published_on.iso8601
     end
 
+    context "when updating," do
+      should "pass the options to gateway" do
+        model = MyRailsModel.new name: 'Test'
+        model.stubs(:persisted?).returns(true)
+
+        model.class.gateway
+          .expects(:update)
+          .with do |object, options|
+            assert_equal 'ABC', options[:routing]
+            true
+          end
+          .returns({'_id' => 'abc123'})
+
+        assert model.update( { title: 'UPDATED' }, { routing: 'ABC' } )
+      end
+    end
+
   end
 end