xapian_db 0.5.6 → 0.5.7

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+##0.5.7 (March 7th, 2011)
+
+Fixes:
+
+  - limit_value on the resultset is calculated again when the resultset is empty (thanks, Javi)
+  - added an order by id for rebuild_xapian_index to ensure that limit and offset work as expected
+
+Features:
+
+  - option to specify a specific adapter for a blueprint overriding the global configuration
+
 ##0.5.6 (February 28th, 2011)
 
 Features:
@@ -18,7 +29,7 @@ Features:
   - configure only those environments in xapian_db.yml where you want to override the defaults
   - XapianDb.rebuild_xapian_index rebuilds the index for all blueprints
 
-##0.5.4 (February 22th, 2011)
+##0.5.4 (February 22nd, 2011)
 
 Fixes:
 

data/lib/xapian_db/adapters/active_record_adapter.rb

@@ -54,6 +54,7 @@ module XapianDb
 
              # Add a method to reindex all models of this class
              define_singleton_method(:rebuild_xapian_index) do |options={}|
+               options[:primary_key] = klass.primary_key
                XapianDb::Config.writer.reindex_class(klass, options)
              end
            end

data/lib/xapian_db/adapters/datamapper_adapter.rb

@@ -53,6 +53,7 @@ module XapianDb
 
              # Add a method to reindex all models of this class
              define_singleton_method(:rebuild_xapian_index) do |options={}|
+               options[:primary_key] = klass.serial.name
                XapianDb::Config.writer.reindex_class(self, options)
              end
            end

data/lib/xapian_db/database.rb

@@ -46,8 +46,8 @@ module XapianDb
     # @option options [Integer] :per_page How many docs per page?
     # @option options [Array<Integer>] :sort_indices (nil) An array of attribute indices to sort by. This
     #   option is used internally by the search method implemented on configured classes. Do not use it
-    #   directly unless
-    #   you know what you do
+    #   directly unless you know what you do
+    # @option options [Boolean] :sort_decending (false) Reverse the sort order?
     # @example Simple Query
     #   resultset = db.search("foo")
     # @example Wildcard Query
@@ -76,7 +76,7 @@ module XapianDb
         raise ArgumentError.new("Sorting is available for class scoped searches only") unless expression =~ /^indexed_class:/
         sorter = Xapian::MultiValueSorter.new
 
-        options[:sort_indices].each do |index|
+        sort_indices.each do |index|
           sorter.add(index, sort_decending)
         end
         enquiry.set_sort_by_key_then_relevance(sorter)

data/lib/xapian_db/document_blueprint.rb

@@ -6,18 +6,12 @@ module XapianDb
   # for a given class.
   # @example A simple document blueprint configuration for the class Person
   #   XapianDb::DocumentBlueprint.setup(Person) do |blueprint|
-  #     # Our Person class has a method lang_cd. We use this method to
-  #     # index each person with its language
-  #     blueprint.language_method :lang_cd
   #     blueprint.attribute       :name, :weight => 10
   #     blueprint.attribute       :first_name
   #     blueprint.index           :remarks
   #   end
   # @example A document blueprint configuration with a complex attribute for the class Person
   #   XapianDb::DocumentBlueprint.setup(Person) do |blueprint|
-  #     # Our Person class has a method lang_cd. We use this method to
-  #     # index each person with its language
-  #     blueprint.language_method :lang_cd
   #     blueprint.attribute       :complex, :weight => 10 do
   #       # add some logic here to evaluate the value of 'complex'
   #     end
@@ -40,8 +34,8 @@ module XapianDb
         blueprint = DocumentBlueprint.new
         yield blueprint if block_given? # configure the blueprint through the block
         @blueprints[klass] = blueprint
-        @adapter = blueprint.adapter || XapianDb::Config.adapter || Adapters::GenericAdapter
-        @adapter.add_class_helper_methods_to klass
+        @_adapter = blueprint._adapter || XapianDb::Config.adapter || Adapters::GenericAdapter
+        @_adapter.add_class_helper_methods_to klass
         @searchable_prefixes = nil # force rebuild of the searchable prefixes
       end
 
@@ -166,7 +160,7 @@ module XapianDb
       end
 
       # Let the adapter add its document helper methods (if any)
-      adapter = @adapter || XapianDb::Config.adapter || XapianDb::Adapters::GenericAdapter
+      adapter = @_adapter || XapianDb::Config.adapter || XapianDb::Adapters::GenericAdapter
       adapter.add_doc_helper_methods_to(@accessors_module)
       @accessors_module
     end
@@ -175,14 +169,8 @@ module XapianDb
     # Blueprint DSL methods
     # ---------------------------------------------------------------------------------
 
-    # The name of the method that returns an iso language code. The
-    # configured class must implement this method.
-    attr_reader :lang_method
-
-    # Set / read a custom adapter.
-    # Use this configuration option if you need a specific adapter for an indexed class.
-    # If set, it overrides the globally configured adapter (see also {Config#adapter})
-    attr_accessor :adapter
+    # An optional custom adapter
+    attr_accessor :_adapter
 
     # Construct the blueprint
     def initialize
@@ -190,6 +178,16 @@ module XapianDb
       @indexed_methods_hash = {}
     end
 
+    # Set the adapter
+    # @param [Symbol] type The adapter type; the following adapters are available:
+    #   - :generic ({XapianDb::Adapters::GenericAdapter})
+    #   - :active_record ({XapianDb::Adapters::ActiveRecordAdapter})
+    #   - :datamapper ({XapianDb::Adapters::DatamapperAdapter})
+    def adapter(type)
+      # We try to guess the adapter name
+      @_adapter = XapianDb::Adapters.const_get("#{camelize(type.to_s)}Adapter")
+    end
+
     # Add an attribute to the blueprint. Attributes will be stored in the xapian documents an can be
     # accessed from a search result.
     # @param [String] name The name of the method that delivers the value for the attribute
@@ -296,6 +294,14 @@ module XapianDb
       @reserved_method_names ||= Xapian::Document.instance_methods
       @reserved_method_names.include?(attr_name.to_sym)
     end
+
+    private
+
+    # TODO: move this to a helper module
+    def camelize(string)
+      string.split(/[^a-z0-9]/i).map{|w| w.capitalize}.join
+    end
+
   end
 
 end

data/lib/xapian_db/index_writers/direct_writer.rb

@@ -54,7 +54,7 @@ module XapianDb
           # Process the objects in batches to reduce the memory footprint
           nr_of_batches = (obj_count / 1000) + 1
           nr_of_batches.times do |batch|
-            klass.all(:offset => batch * 1000, :limit => 1000) .each do |obj|
+            klass.all(:offset => batch * 1000, :limit => 1000, :order => options[:primary_key]).each do |obj|
               if blueprint.should_index? obj
                 doc = indexer.build_document_for(obj)
                 XapianDb.database.store_doc(doc)

data/lib/xapian_db/resultset.rb

@@ -95,6 +95,7 @@ module XapianDb
       @hits         = 0
       @total_pages  = 0
       @current_page = 0
+      @limit_value  = 0
       self
     end
 

data/lib/xapian_db.rb

@@ -92,7 +92,7 @@ module XapianDb
     configured_classes = XapianDb::DocumentBlueprint.configured_classes
     return false unless configured_classes.size > 0
     configured_classes.each do |klass|
-      XapianDb::Config.writer.reindex_class(klass, options)
+      XapianDb::Config.writer.reindex_class(klass, options) if klass.respond_to?(:rebuild_xapian_index)
     end
     true
   end

metadata

@@ -2,7 +2,7 @@
 name: xapian_db
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors: 
 - Gernot Kogler
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-28 00:00:00 +01:00
+date: 2011-03-07 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency