xapian_db 0.5.13 → 0.5.14

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+##0.5.14 (July 7th, 2011)
+
+Fixes:
+
+  - fixed an issue in the beanstalk worker (delete task could not retrieve the xapian id from an already deleted object)
+
 ##0.5.13 (June 20th, 2011)
 
 Fixes:

data/lib/xapian_db/adapters/active_record_adapter.rb

@@ -43,13 +43,13 @@ module XapianDb
                if blueprint.should_index?(self)
                  XapianDb.index(self)
                else
-                 XapianDb.unindex(self)
+                 XapianDb.delete_doc_with(self.xapian_id)
                end
              end
 
              # add the after destroy logic
              after_destroy do
-               XapianDb.unindex(self)
+               XapianDb.delete_doc_with(self.xapian_id)
              end
 
              # Add a method to reindex all models of this class

data/lib/xapian_db/adapters/datamapper_adapter.rb

@@ -42,13 +42,13 @@ module XapianDb
                if blueprint.should_index?(self)
                  XapianDb.index(self)
                else
-                 XapianDb.unindex(self)
+                 XapianDb.delete_doc_with(self.xapian_id)
                end
              end
 
              # add the after destroy logic
              after :destroy do
-               XapianDb.unindex(self)
+               XapianDb.delete_doc_with(self.xapian_id)
              end
 
              # Add a method to reindex all models of this class

data/lib/xapian_db/index_writers/beanstalk_worker.rb

@@ -16,10 +16,8 @@ module XapianDb
         DirectWriter.index obj
       end
 
-      def unindex_task(options)
-        klass = constantize options[:class]
-        obj   = klass.respond_to?(:get) ? klass.get(options[:id].to_i) : klass.find(options[:id].to_i)
-        DirectWriter.unindex obj
+      def delete_doc_task(options)
+        DirectWriter.delete_doc_with options[:xapian_id]
       end
 
       def reindex_class_task(options)

data/lib/xapian_db/index_writers/beanstalk_writer.rb

@@ -18,19 +18,19 @@ module XapianDb
         # Update an object in the index
         # @param [Object] obj An instance of a class with a blueprint configuration
         def index(obj)
-          beanstalk.put({:task => "index_task", :class => obj.class.name, :id => obj.id}.to_yaml)
+          beanstalk.put( {:task => "index_task", :class => obj.class.name, :id => obj.id }.to_yaml )
         end
 
         # Remove an object from the index
-        # @param [Object] obj An instance of a class with a blueprint configuration
-        def unindex(obj)
-          beanstalk.put({:task => "unindex_task", :class => obj.class.name, :id => obj.id}.to_yaml)
+        # @param [String] xapian_id The document id
+        def delete_doc_with(xapian_id)
+          beanstalk.put( { :task => "delete_doc_task", :xapian_id => xapian_id }.to_yaml )
         end
 
         # Reindex all objects of a given class
         # @param [Class] klass The class to reindex
         def reindex_class(klass, options={})
-          beanstalk.put({:task => "reindex_class_task", :class => klass.name}.to_yaml)
+          beanstalk.put( { :task => "reindex_class_task", :class => klass.name }.to_yaml )
         end
 
         private

data/lib/xapian_db/index_writers/direct_writer.rb

@@ -25,9 +25,9 @@ module XapianDb
         end
 
         # Remove an object from the index
-        # @param [Object] obj An instance of a class with a blueprint configuration
-        def unindex(obj)
-          XapianDb.database.delete_doc_with_unique_term(obj.xapian_id)
+        # @param [String] xapian_id The document id of an object
+        def delete_doc_with(xapian_id)
+          XapianDb.database.delete_doc_with_unique_term xapian_id
           XapianDb.database.commit
         end
 

data/lib/xapian_db/index_writers/no_op_writer.rb

@@ -13,8 +13,8 @@ module XapianDb
       def index(obj); end
 
       # Remove an object from the index
-      # @param [Object] obj An instance of a class with a blueprint configuration
-      def unindex(obj); end
+      # @param [String] xapian_id The document id
+      def delete_doc_with(xapian_id); end
 
       # Reindex all objects of a given class
       # @param [Class] klass The class to reindex

data/lib/xapian_db/index_writers/transactional_writer.rb

@@ -10,12 +10,12 @@ module XapianDb
 
     class TransactionalWriter
 
-      attr_reader :index_requests, :unindex_requests
+      attr_reader :index_requests, :delete_requests
 
       # Constructor
       def initialize
-        @index_requests   = []
-        @unindex_requests = []
+        @index_requests  = []
+        @delete_requests = []
       end
 
       # Update an object in the index
@@ -24,10 +24,10 @@ module XapianDb
         @index_requests << obj
       end
 
-      # Remove an object from the index
-      # @param [Object] obj An instance of a class with a blueprint configuration
-      def unindex(obj)
-        @unindex_requests << obj
+      # Remove a document from the index
+      # @param [String] xapian_id The document id
+      def delete_doc_with(xapian_id)
+        @delete_requests << xapian_id
       end
 
       # Reindex all objects of a given class
@@ -42,7 +42,7 @@ module XapianDb
       # @param [DirectWriter, BeanstalkWriter] writer The writer to use
       def commit_using(writer)
         @index_requests.each { |obj| writer.index obj }
-        @unindex_requests.each { |obj| writer.unindex obj }
+        @delete_requests.each { |xapian_id| writer.delete_doc_with xapian_id }
       end
 
     end

data/lib/xapian_db.rb

@@ -92,11 +92,11 @@ module XapianDb
     writer.index obj
   end
 
-  # Remove an object from the index
-  # @param [Object] obj An instance of a class with a blueprint configuration
-  def self.unindex(obj)
+  # Remove a document from the index
+  # @param [String] xapian_id The document id
+  def self.delete_doc_with(xapian_id)
     writer = @block_writer || XapianDb::Config.writer
-    writer.unindex obj
+    writer.delete_doc_with xapian_id
   end
 
   # Reindex all objects of a given class

metadata

@@ -1,71 +1,69 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: xapian_db
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.5.14
   prerelease: 
-  version: 0.5.13
 platform: ruby
-authors: 
+authors:
 - Gernot Kogler
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-20 00:00:00 +02:00
+date: 2011-07-07 00:00:00.000000000 +02:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: daemons
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2153636500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.10
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2153636500
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2153627300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.1
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: simplecov
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2153627300
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: &2153626840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.3.7
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: beanstalk-client
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2153626840
+- !ruby/object:Gem::Dependency
+  name: beanstalk-client
+  requirement: &2153626180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.1.0
   type: :development
-  version_requirements: *id004
-description: XapianDb is a ruby gem that combines features of nosql databases and fulltext indexing. It is based on Xapian, an efficient and powerful indexing library
+  prerelease: false
+  version_requirements: *2153626180
+description: XapianDb is a ruby gem that combines features of nosql databases and
+  fulltext indexing. It is based on Xapian, an efficient and powerful indexing library
 email: gernot.kogler (at) garaio (dot) com
 executables: []
-
-extensions: 
+extensions:
 - Rakefile
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/generators/install_generator.rb
 - lib/generators/templates/beanstalk_worker
 - lib/xapian_db/adapters/active_record_adapter.rb
@@ -113,35 +111,33 @@ files:
 has_rdoc: true
 homepage: https://github.com/garaio/xapian_db
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --line-numbers
 - --inline-source
 - --title
 - Xapian-DB
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: Ruby library to use a Xapian db as a key/value store with high performance fulltext search
+summary: Ruby library to use a Xapian db as a key/value store with high performance
+  fulltext search
 test_files: []
-