elastictastic 0.10.9 → 0.11.0

data/lib/elastictastic/optimistic_locking.rb

@@ -6,28 +6,54 @@ module Elastictastic
 
     module ClassMethods
 
-      def create_or_update(id, &block)
+      def create_or_update(*ids, &block)
         scope = current_scope
-        new.tap do |instance|
-          instance.id = id
-          yield instance
-        end.create do |e|
-          case e
-          when nil # chill
-          when Elastictastic::ServerError::DocumentAlreadyExistsEngineException,
-            Elastictastic::ServerError::DocumentAlreadyExistsException # 0.19+
-            scope.update(id, &block)
+        ids.each do |id|
+          begin
+            new.tap do |instance|
+              instance.id = id
+              yield instance
+            end.create do |e|
+              case e
+              when nil # chill
+              when Elastictastic::ServerError::DocumentAlreadyExistsEngineException,
+                Elastictastic::ServerError::DocumentAlreadyExistsException # 0.19+
+                scope.update(id, &block)
+              else
+                raise e
+              end
+            end
+          rescue Elastictastic::CancelSave
+            # Do Nothing
+          end
+        end
+      end
+
+      def update(*ids, &block)
+        [].tap do |found|
+          case ids.length
+          when 0 then return
+          when 1
+            id = ids.first
+            instance = scoped({}).find_one(id, :preference => '_primary_first')
+            return unless instance
+            found << id
+            instances = [instance]
           else
-            raise e
+            instances = scoped({}).
+              find_many(ids, :preference => '_primary_first')
+            found.concat(instances.map { |instance| instance.id })
+          end
+          instances.each do |instance|
+            instance.try_update(current_scope, &block)
           end
         end
-      rescue Elastictastic::CancelSave
-        # Do Nothing
       end
 
-      def update(id, &block)
-        instance = scoped({}).find_one(id, :preference => '_primary_first')
-        instance.try_update(current_scope, &block) if instance
+      def update_or_create(*ids, &block)
+        updated_ids = update(*ids, &block)
+        create_ids = ids - updated_ids
+        create_or_update(*create_ids, &block) if create_ids.any?
       end
 
       def update_each(&block)

data/lib/elastictastic/scope.rb

@@ -282,6 +282,19 @@ module Elastictastic
       end
     end
 
+    #
+    # @private
+    #
+    def find_many(ids, params = {})
+      docspec = ids.map do |id|
+        { '_id' => id }.merge!(params_for_find_many).
+          merge!(params.stringify_keys)
+      end
+      materialize_hits(
+        ::Elastictastic.client.mget(docspec, index, type)['docs']
+      ).map { |result, hit| result }
+    end
+
     def multi_get_params
       {
         '_type' => type,
@@ -380,16 +393,6 @@ module Elastictastic
       self.counts = search(params)
     end
 
-    def find_many(ids, params = {})
-      docspec = ids.map do |id|
-        { '_id' => id }.merge!(params_for_find_many).
-          merge!(params.stringify_keys)
-      end
-      materialize_hits(
-        ::Elastictastic.client.mget(docspec, index, type)['docs']
-      ).map { |result, hit| result }
-    end
-
     def params_for_find_one
       params_for_find.tap do |params|
         params['fields'] &&= params['fields'].join(',')

data/lib/elastictastic/version.rb

@@ -1,3 +1,3 @@
 module Elastictastic
-  VERSION = '0.10.9'
+  VERSION = '0.11.0'
 end

data/spec/examples/optimistic_locking_spec.rb

@@ -113,6 +113,52 @@ describe Elastictastic::OptimisticLocking do
         end
       end # describe '::update'
 
+      describe '::update with multiple arguments' do
+        let(:last_update_request) do
+          FakeWeb.requests.reverse.find { |req| req.method == 'PUT' }
+        end
+
+        before do
+          stub_es_mget(
+            index,
+            'post',
+            '1' => {},
+            '2' => {}
+          )
+          stub_es_get(index, 'post', '2', { :title => 'Hey' }, 2)
+          stub_es_update(index, 'post', '1')
+          stub_request_json(
+            :put,
+            match_es_resource(index, 'post', '2'),
+            version_conflict,
+            generate_es_hit('post', :id => '2', :index => index, :version => 3)
+          )
+          scope.update('1', '2') do |post|
+            post.comments_count = 2
+          end
+        end
+
+        it 'should retry unsuccessful updates' do
+          FakeWeb.should have(5).requests # mget, update '1', update '2' (fail), get '2', update '2'
+        end
+
+        it 'should re-perform update on failed document' do
+          URI.parse(last_update_request.path).path.should == "/#{index}/post/2"
+        end
+
+        it 'should send data from latest version in persistence' do
+          Elastictastic.json_decode(last_update_request.body)['title'].should == 'Hey'
+        end
+
+        it 'should send data from update block' do
+          Elastictastic.json_decode(last_update_request.body)['comments_count'].should == 2
+        end
+
+        it 'should update with latest version' do
+          URI.parse(last_update_request.path).query.split('&').should include('version=2')
+        end
+      end # describe '::update with multiple requests'
+
       describe '::update_each' do
         let(:last_update_request) do
           FakeWeb.requests.reverse.find { |req| req.method == 'PUT' }
@@ -383,6 +429,46 @@ describe Elastictastic::OptimisticLocking do
           last_request_json['title'].should == 'hey'
         end
       end
+
+      context "with multiple arguments some of which exist" do
+        before do
+          stub_es_create('my_index', 'post', '1')
+          stub_request_json(
+            :put,
+            match_es_path('/my_index/post/2/_create'),
+            already_exists
+          )
+          stub_es_get('my_index', 'post', '2', :comments_count => 2)
+          stub_es_update('my_index', 'post', '2')
+          Post.in_index('my_index').create_or_update('1', '2') do |post|
+            post.title = "hey #{post.id}"
+          end
+        end
+
+        it 'should post to create endpoint for both documents' do
+          FakeWeb.requests.
+            should be_any { |request| request.path == '/my_index/post/1/_create' }
+          FakeWeb.requests.
+            should be_any { |request| request.path == '/my_index/post/2/_create' }
+        end
+
+        it 'should not send update request for successful create' do
+          FakeWeb.requests.
+            should_not be_any { |request| request.path == '/my_index/post/1?version=1' }
+        end
+
+        it 'should re-update existing data with correct version' do
+          last_request.path.should == '/my_index/post/2?version=1'
+        end
+
+        it 'should include data from storage' do
+          last_request_json['comments_count'].should == 2
+        end
+
+        it 'should include updated data from block' do
+          last_request_json['title'].should == 'hey 2'
+        end
+      end
     end
 
     context 'with bulk persistence' do
@@ -413,4 +499,44 @@ describe Elastictastic::OptimisticLocking do
       end
     end
   end
+
+  describe '::update_or_create' do
+    let(:scope) { Post }
+
+    before do
+      stub_es_mget(
+        'default', 'post',
+        '1' => {title: 'Post 1'},
+        '2' => nil
+      )
+      stub_es_update('default', 'post', '1')
+      stub_es_create('default', 'post', '2')
+      scope.update_or_create('1', '2') do |post|
+        post.comments_count = 1
+      end
+    end
+
+    let :create_request do
+      FakeWeb.requests.
+        find { |request| request.path == "/default/post/2/_create" }
+    end
+
+    let :update_request do
+      FakeWeb.requests.
+        find { |request| request.path =~ %r(^/default/post/1\??) }
+    end
+
+    it 'should not send any extraneous requests' do
+      FakeWeb.should have(3).requests # multiget, create, update
+    end
+
+    it 'should send create request for nonexistent document' do
+      create_request.should be
+    end
+
+    it 'should send update request for existent document' do
+      update_request.should be
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastictastic
 version: !ruby/object:Gem::Version
-  version: 0.10.9
+  version: 0.11.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-09 00:00:00.000000000 Z
+date: 2013-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -250,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - ElasticSearch
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Object-document mapper for ElasticSearch