elastictastic 0.10.8 → 0.10.9

data/lib/elastictastic/basic_document.rb

@@ -110,9 +110,9 @@ module Elastictastic
       #   in the default index.
       #
 
-      delegate :find, :destroy_all, :sync_mapping, :inspect, :find_each,
-               :find_in_batches, :first, :count, :empty?, :any?, :all,
-               :query, :filter, :from, :size, :sort, :highlight, :fields,
+      delegate :find, :destroy, :destroy_all, :sync_mapping, :inspect,
+               :find_each, :find_in_batches, :first, :count, :empty?, :any?,
+               :all, :query, :filter, :from, :size, :sort, :highlight, :fields,
                :script_fields, :preference, :facets, :routing,
                :to => :current_scope
 

data/lib/elastictastic/bulk_persistence_strategy.rb

@@ -21,7 +21,7 @@ module Elastictastic
       add(
         instance.index,
         instance.id,
-        { 'create' => bulk_identifier(instance) },
+        { 'create' => bulk_identifier_for_instance(instance) },
         instance.elasticsearch_doc
       ) do |response|
         if response['create']['error']
@@ -41,7 +41,7 @@ module Elastictastic
       add(
         instance.index,
         instance.id,
-        { 'index' => bulk_identifier(instance) },
+        { 'index' => bulk_identifier_for_instance(instance) },
         instance.elasticsearch_doc
       ) do |response|
         if response['index']['error']
@@ -56,7 +56,7 @@ module Elastictastic
     def destroy(instance, &block)
       block ||= DEFAULT_HANDLER
       instance.pending_destroy!
-      add(instance.index, instance.id, :delete => bulk_identifier(instance)) do |response|
+      add(instance.index, instance.id, :delete => bulk_identifier_for_instance(instance)) do |response|
         if response['delete']['error']
           block.call(ServerError[response['delete']['error']])
         else
@@ -67,6 +67,13 @@ module Elastictastic
       end
     end
 
+    def destroy!(index, type, id, routing, parent)
+      add(
+        index, id,
+        :delete => bulk_identifier(index, type, id, routing, parent, nil)
+      )
+    end
+
     def flush
       return if @operations.empty?
 
@@ -92,13 +99,23 @@ module Elastictastic
 
     private
 
-    def bulk_identifier(instance)
-      identifier = { :_index => instance.index.name, :_type => instance.class.type }
-      identifier['_id'] = instance.id if instance.id
-      identifier['_version'] = instance.version if instance.version
-      routing = instance.class.route(instance)
+    def bulk_identifier_for_instance(instance)
+      bulk_identifier(
+        instance.index,
+        instance.class.type,
+        instance.id,
+        instance.class.route(instance),
+        instance._parent_id,
+        instance.version
+      )
+    end
+
+    def bulk_identifier(index, type, id, routing, parent_id, version)
+      identifier = { :_index => index.name, :_type => type }
+      identifier['_id'] = id if id
+      identifier['_version'] = version if version
       identifier['_routing'] = routing.to_s if routing
-      identifier['parent'] = instance._parent_id if instance._parent_id
+      identifier['parent'] = parent_id if parent_id
       identifier
     end
 

data/lib/elastictastic/configuration.rb

@@ -68,8 +68,9 @@ module Elastictastic
       if url_from_env
         url_from_env.class.build(
           :host => url_from_env.host,
-          :port => url_from_env.port
-        )
+          :port => url_from_env.port,
+          :path => url_from_env.path
+        ).to_s
       else
         'http://localhost:9200'
       end

data/lib/elastictastic/discrete_persistence_strategy.rb

@@ -16,7 +16,7 @@ module Elastictastic
           doc.class.type,
           doc.id,
           doc.elasticsearch_doc,
-          params_for(doc)
+          params_for_doc(doc)
         )
       rescue => e
         return block.call(e)
@@ -35,7 +35,7 @@ module Elastictastic
           doc.class.type,
           doc.id,
           doc.elasticsearch_doc,
-          params_for(doc)
+          params_for_doc(doc)
         )
       rescue => e
         return block.call(e)
@@ -52,7 +52,7 @@ module Elastictastic
           doc.index.name,
           doc.class.type,
           doc.id,
-          params_for(doc)
+          params_for_doc(doc)
         )
       rescue => e
         return block.call(e)
@@ -62,15 +62,32 @@ module Elastictastic
       response['found']
     end
 
+    def destroy!(index, type, id, routing, parent)
+      response = Elastictastic.client.delete(
+        index,
+        type,
+        id,
+        params_for(routing, parent, nil)
+      )
+      response['found']
+    end
+
     private
 
-    def params_for(doc)
+    def params_for_doc(doc)
+      params_for(
+        doc.class.route(doc),
+        doc._parent_id,
+        doc.version
+      )
+    end
+
+    def params_for(routing, parent_id, version)
       {}.tap do |params|
         params[:refresh] = true if Elastictastic.config.auto_refresh
-        params[:parent] = doc._parent_id if doc._parent_id
-        params[:version] = doc.version if doc.version
-        routing = doc.class.route(doc)
-        params[:routing] = routing if routing
+        params[:parent] = parent_id if parent_id
+        params[:version] = version if version
+        params[:routing] = routing.to_s if routing
       end
     end
   end

data/lib/elastictastic/persistence.rb

@@ -3,7 +3,7 @@ module Elastictastic
     def save(options = {}, &block)
       persisted? ? update(options, &block) : create(options, &block)
     end
-    
+
     def destroy(options = {}, &block)
       if persisted?
         Elastictastic.persister.destroy(self, &block)

data/lib/elastictastic/scope.rb

@@ -140,6 +140,21 @@ module Elastictastic
       )
     end
 
+    #
+    # Destroy one or more documents by ID, without reading them first
+    #
+    def destroy(*ids)
+      ids.each do |id|
+        ::Elastictastic.persister.destroy!(
+          @index,
+          @clazz.type,
+          id,
+          @routing,
+          (@parent.id if @parent)
+        )
+      end
+    end
+
     #
     # Destroy all documents in this index.
     #

data/lib/elastictastic/version.rb

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

data/spec/examples/bulk_persistence_strategy_spec.rb

@@ -200,6 +200,21 @@ describe Elastictastic::BulkPersistenceStrategy do
     end
   end
 
+  describe 'destroy!' do
+    before do
+      stub_es_bulk(
+        'delete' => { '_index' => 'default', '_type' => 'post', '_id' => '123', '_version' => 2, 'ok' => true }
+      )
+      Elastictastic.bulk { Post.in_index('my_index').destroy('123') }
+    end
+
+    it 'should send destroy' do
+      bulk_requests.should == [
+        { 'delete' => { '_index' => 'my_index', '_type' => 'post', '_id' => '123' }}
+      ]
+    end
+  end
+
   shared_examples_for 'block with error' do
     it 'should not run bulk operation' do
       error_proc.call rescue nil

data/spec/examples/document_spec.rb

@@ -194,6 +194,45 @@ describe Elastictastic::Document do
     end
   end # describe '#save'
 
+  describe '::destroy' do
+    context 'with default index and no routing' do
+      before do
+        stub_es_destroy('default', 'post', '123')
+        Post.destroy('123')
+      end
+
+      it 'should send DELETE request' do
+        last_request.method.should == 'DELETE'
+      end
+
+      it 'should send request to document resource path' do
+        last_request.path.should == '/default/post/123'
+      end
+    end # context 'existing persisted object'
+
+    context 'with routing' do
+      before do
+        stub_es_destroy('default', 'photo', 'abc')
+        Photo.routing('123').destroy('abc')
+      end
+
+      it 'should include routing param' do
+        last_request_uri.query.split('&').should include('routing=123')
+      end
+    end
+
+    context 'on specified index' do
+      before do
+        stub_es_destroy('my_index', 'post', '123')
+        Post.in_index('my_index').destroy('123')
+      end
+
+      it 'should send request to specified index resource' do
+        last_request.path.should == '/my_index/post/123'
+      end
+    end
+  end # describe '#destroy'
+
   describe '#destroy' do
     context 'existing persisted object' do
       let(:post) do

data/spec/examples/parent_child_spec.rb

@@ -81,6 +81,12 @@ describe Elastictastic::ParentChild do
         post.destroy
         URI.parse(FakeWeb.last_request.path).query.split('&').should include("parent=#{blog.id}")
       end
+
+      it 'should pass parent on ::delete' do
+        stub_es_destroy('default', 'post', '123')
+        blog.posts.destroy('123')
+        URI.parse(FakeWeb.last_request.path).query.split('&').should include("parent=#{blog.id}")
+      end
     end
 
     describe 'bulk persistence' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastictastic
 version: !ruby/object:Gem::Version
-  version: 0.10.8
+  version: 0.10.9
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-28 00:00:00.000000000 Z
+date: 2013-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &8804860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,15 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *8804860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &8804300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +39,15 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *8804300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &8803880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +55,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8803880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &8803320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +71,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8803320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &8802880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +87,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8802880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &8802260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +103,15 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *8802260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &8801580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -89,10 +119,15 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *8801580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &8800940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -100,7 +135,12 @@ dependencies:
         version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *8800940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.6'
 description: ! 'Elastictastic is an object-document mapper and lightweight API adapter
   for
 
@@ -117,74 +157,74 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- lib/elastictastic/multi_search.rb
-- lib/elastictastic/transport_methods.rb
-- lib/elastictastic/basic_document.rb
-- lib/elastictastic/observer.rb
-- lib/elastictastic/middleware.rb
-- lib/elastictastic/child_collection_proxy.rb
-- lib/elastictastic/dirty.rb
-- lib/elastictastic/rotor.rb
-- lib/elastictastic/errors.rb
-- lib/elastictastic/scope.rb
-- lib/elastictastic/discrete_persistence_strategy.rb
-- lib/elastictastic/parent_child.rb
-- lib/elastictastic/adapter.rb
-- lib/elastictastic/embedded_document.rb
-- lib/elastictastic/new_relic_instrumentation.rb
+- lib/elastictastic.rb
 - lib/elastictastic/optimistic_locking.rb
-- lib/elastictastic/callbacks.rb
-- lib/elastictastic/util.rb
-- lib/elastictastic/nested_document.rb
-- lib/elastictastic/association.rb
-- lib/elastictastic/client.rb
+- lib/elastictastic/server_error.rb
 - lib/elastictastic/document.rb
-- lib/elastictastic/properties.rb
-- lib/elastictastic/test_helpers.rb
-- lib/elastictastic/search.rb
-- lib/elastictastic/thrift/types.rb
-- lib/elastictastic/thrift/rest.rb
-- lib/elastictastic/thrift/constants.rb
-- lib/elastictastic/multi_get.rb
+- lib/elastictastic/nested_document.rb
+- lib/elastictastic/child_collection_proxy.rb
 - lib/elastictastic/mass_assignment_security.rb
-- lib/elastictastic/server_error.rb
-- lib/elastictastic/version.rb
 - lib/elastictastic/scope_builder.rb
-- lib/elastictastic/persistence.rb
-- lib/elastictastic/observing.rb
+- lib/elastictastic/util.rb
 - lib/elastictastic/index.rb
-- lib/elastictastic/validations.rb
 - lib/elastictastic/bulk_persistence_strategy.rb
-- lib/elastictastic/field.rb
-- lib/elastictastic/scoped.rb
+- lib/elastictastic/basic_document.rb
+- lib/elastictastic/thrift/rest.rb
+- lib/elastictastic/thrift/constants.rb
+- lib/elastictastic/thrift/types.rb
+- lib/elastictastic/multi_search.rb
+- lib/elastictastic/association.rb
+- lib/elastictastic/adapter.rb
+- lib/elastictastic/discrete_persistence_strategy.rb
+- lib/elastictastic/callbacks.rb
+- lib/elastictastic/observer.rb
+- lib/elastictastic/embedded_document.rb
+- lib/elastictastic/test_helpers.rb
 - lib/elastictastic/thrift_adapter.rb
+- lib/elastictastic/version.rb
+- lib/elastictastic/validations.rb
+- lib/elastictastic/persistence.rb
 - lib/elastictastic/railtie.rb
+- lib/elastictastic/client.rb
+- lib/elastictastic/properties.rb
+- lib/elastictastic/rotor.rb
+- lib/elastictastic/multi_get.rb
+- lib/elastictastic/parent_child.rb
+- lib/elastictastic/field.rb
+- lib/elastictastic/scope.rb
+- lib/elastictastic/scoped.rb
+- lib/elastictastic/new_relic_instrumentation.rb
+- lib/elastictastic/search.rb
+- lib/elastictastic/transport_methods.rb
+- lib/elastictastic/middleware.rb
 - lib/elastictastic/configuration.rb
-- lib/elastictastic.rb
-- spec/models/photo.rb
-- spec/models/post.rb
-- spec/models/blog.rb
-- spec/models/author.rb
-- spec/models/post_observer.rb
-- spec/models/comment.rb
+- lib/elastictastic/dirty.rb
+- lib/elastictastic/errors.rb
+- lib/elastictastic/observing.rb
 - spec/environment.rb
-- spec/examples/callbacks_spec.rb
-- spec/examples/mass_assignment_security_spec.rb
-- spec/examples/rotor_spec.rb
-- spec/examples/middleware_spec.rb
-- spec/examples/optimistic_locking_spec.rb
-- spec/examples/parent_child_spec.rb
-- spec/examples/scope_spec.rb
 - spec/examples/bulk_persistence_strategy_spec.rb
+- spec/examples/document_spec.rb
 - spec/examples/properties_spec.rb
+- spec/examples/validation_spec.rb
+- spec/examples/optimistic_locking_spec.rb
+- spec/examples/middleware_spec.rb
+- spec/examples/mass_assignment_security_spec.rb
+- spec/examples/dirty_spec.rb
+- spec/examples/spec_helper.rb
 - spec/examples/multi_search_spec.rb
+- spec/examples/rotor_spec.rb
+- spec/examples/callbacks_spec.rb
 - spec/examples/multi_get_spec.rb
-- spec/examples/search_spec.rb
-- spec/examples/document_spec.rb
-- spec/examples/dirty_spec.rb
-- spec/examples/validation_spec.rb
+- spec/examples/scope_spec.rb
+- spec/examples/parent_child_spec.rb
 - spec/examples/observing_spec.rb
-- spec/examples/spec_helper.rb
+- spec/examples/search_spec.rb
+- spec/models/post_observer.rb
+- spec/models/author.rb
+- spec/models/blog.rb
+- spec/models/post.rb
+- spec/models/photo.rb
+- spec/models/comment.rb
 - spec/support/fakeweb_request_history.rb
 - README.md
 - LICENSE
@@ -210,26 +250,26 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - ElasticSearch
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Object-document mapper for ElasticSearch
 test_files:
-- spec/examples/callbacks_spec.rb
-- spec/examples/mass_assignment_security_spec.rb
-- spec/examples/rotor_spec.rb
-- spec/examples/middleware_spec.rb
-- spec/examples/optimistic_locking_spec.rb
-- spec/examples/parent_child_spec.rb
-- spec/examples/scope_spec.rb
 - spec/examples/bulk_persistence_strategy_spec.rb
+- spec/examples/document_spec.rb
 - spec/examples/properties_spec.rb
+- spec/examples/validation_spec.rb
+- spec/examples/optimistic_locking_spec.rb
+- spec/examples/middleware_spec.rb
+- spec/examples/mass_assignment_security_spec.rb
+- spec/examples/dirty_spec.rb
+- spec/examples/spec_helper.rb
 - spec/examples/multi_search_spec.rb
+- spec/examples/rotor_spec.rb
+- spec/examples/callbacks_spec.rb
 - spec/examples/multi_get_spec.rb
-- spec/examples/search_spec.rb
-- spec/examples/document_spec.rb
-- spec/examples/dirty_spec.rb
-- spec/examples/validation_spec.rb
+- spec/examples/scope_spec.rb
+- spec/examples/parent_child_spec.rb
 - spec/examples/observing_spec.rb
-- spec/examples/spec_helper.rb
+- spec/examples/search_spec.rb
 has_rdoc: true