xapian_db 0.5.11 → 0.5.12

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+##0.5.12 (April 28th, 2011)
+
+Fixes:
+
+  - avoid stale blueprint setups when an indexed class is reloaded
+
 ##0.5.11 (April 21st, 2011)
 
 Features:

data/README.rdoc

@@ -284,7 +284,8 @@ The easiest way is to use macports or homebrew:
   sudo apt-get -t lenny-backports install libevent-1.4-2
   sudo apt-get -t lenny-backports install libevent-dev
   cd /tmp
-  curl http://xph.us/dist/beanstalkd/beanstalkd-1.4.6.tar.gz | tar zx
+  wget --no-check-certificate https://github.com/downloads/kr/beanstalkd/beanstalkd-1.4.6.tar.gz
+  tar xvf beanstalkd-1.4.6.tar.gz
   cd beanstalkd-1.4.6/
   ./configure
   make
@@ -297,7 +298,7 @@ The easiest way is to use macports or homebrew:
 
 === 3. Install the beanstalk worker script
 
-  rails generate xapian:db install
+  rails generate xapian_db:install
 
 === 4. Configure your production environment in config/xapian_db.yml
 

data/lib/xapian_db/document_blueprint.rb

@@ -35,6 +35,8 @@ module XapianDb
         @blueprints ||= {}
         blueprint = DocumentBlueprint.new
         yield blueprint if block_given? # configure the blueprint through the block
+        # Remove a previously loaded blueprint for this class to avoid stale blueprint definitions
+        @blueprints.delete_if { |key, blueprint| key.name == klass.name }
         @blueprints[klass] = blueprint
         @_adapter = blueprint._adapter || XapianDb::Config.adapter || Adapters::GenericAdapter
         @_adapter.add_class_helper_methods_to klass
@@ -65,14 +67,10 @@ module XapianDb
       # @return [Array<String>] All searchable prefixes
       def searchable_prefixes
         return [] unless @blueprints
-        return @searchable_prefixes unless @searchable_prefixes.nil?
-        prefixes = []
-        @blueprints.values.each do |blueprint|
-          prefixes << blueprint.searchable_prefixes
-        end
-        @searchable_prefixes = prefixes.flatten.compact.uniq
+        @searchable_prefixes ||= @blueprints.values.map { |blueprint| blueprint.searchable_prefixes }.flatten.compact.uniq
         # We can always do a field search on the name of the indexed class
         @searchable_prefixes << "indexed_class"
+        @searchable_prefixes
       end
 
     end
@@ -206,7 +204,6 @@ module XapianDb
     #       end
     #     end
     #   end
-    # @todo Make sure the name does not collide with a method name of Xapian::Document
     def attribute(name, options={}, &block)
       raise ArgumentError.new("You cannot use #{name} as an attribute name since it is a reserved method name of Xapian::Document") if reserved_method_name?(name)
       opts = {:index => true}.merge(options)
@@ -221,7 +218,6 @@ module XapianDb
     # Add a list of attributes to the blueprint. Attributes will be stored in the xapian documents ans
     # can be accessed from a search result.
     # @param [Array] attributes An array of method names that deliver the values for the attributes
-    # @todo Make sure the name does not collide with a method name of Xapian::Document
     def attributes(*attributes)
       attributes.each do |attr|
         raise ArgumentError.new("You cannot use #{attr} as an attribute name since it is a reserved method name of Xapian::Document") if reserved_method_name?(attr)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 11
-  version: 0.5.11
+  - 12
+  version: 0.5.12
 platform: ruby
 authors: 
 - Gernot Kogler
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-21 00:00:00 +02:00
+date: 2011-05-02 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency