xapian_db 1.2.4 → 1.2.4.1

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+##1.2.4.1 (April 5th, 2012)
+
+Fixes:
+
+  - better indexing for attributes containing arrays (index rebuild recommended)
+
 ##1.2.4 (March 6th, 2012)
 
 Features:

data/README.rdoc

@@ -151,7 +151,7 @@ If you use associations in your blueprints, it might be a good idea to specify a
 
   XapianDb::DocumentBlueprint.setup(:Person) do |blueprint|
     blueprint.index :addresses
-    blueprint.base_query Person.includes(:addresses)
+    blueprint.base_query { |p| p.includes(:addresses) }
   end
 
 You can specify a natural sort order for each class using a method symbol or a block. If you don't specify an order expression in your xapian query, the matches

data/lib/xapian_db/indexer.rb

@@ -97,12 +97,14 @@ module XapianDb
     # Get the values to index from an object
     def get_values_to_index_from(obj)
 
-      # if it's an array, that's fine
-      return obj if obj.is_a? Array
+      # if it's an array, we collect the values for its elements recursive
+      if obj.is_a? Array
+        return obj.map { |element| get_values_to_index_from element }.flatten.compact
+      end
 
       # if the object responds to attributes and attributes is a hash,
       # we use the attributes values (works well for active_record and datamapper objects)
-      return obj.attributes.values if obj.respond_to?(:attributes) && obj.attributes.is_a?(Hash)
+      return obj.attributes.values.compact if obj.respond_to?(:attributes) && obj.attributes.is_a?(Hash)
 
       # The object is unkown and will be indexed by its to_s method; if to_s retruns nil, we
       # will not index it

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xapian_db
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-06 00:00:00.000000000 Z
+date: 2012-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &70101802013500 !ruby/object:Gem::Requirement
+  requirement: &70190318295700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *70101802013500
+  version_requirements: *70190318295700
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70101802012640 !ruby/object:Gem::Requirement
+  requirement: &70190318295200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70101802012640
+  version_requirements: *70190318295200
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70101802011100 !ruby/object:Gem::Requirement
+  requirement: &70190318294580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.3.1
   type: :development
   prerelease: false
-  version_requirements: *70101802011100
+  version_requirements: *70190318294580
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70101802025080 !ruby/object:Gem::Requirement
+  requirement: &70190318294080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.3.7
   type: :development
   prerelease: false
-  version_requirements: *70101802025080
+  version_requirements: *70190318294080
 - !ruby/object:Gem::Dependency
   name: beanstalk-client
-  requirement: &70101802021980 !ruby/object:Gem::Requirement
+  requirement: &70190318293240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *70101802021980
+  version_requirements: *70190318293240
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70101802020280 !ruby/object:Gem::Requirement
+  requirement: &70190318292480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70101802020280
+  version_requirements: *70190318292480
 - !ruby/object:Gem::Dependency
   name: progressbar
-  requirement: &70101802019120 !ruby/object:Gem::Requirement
+  requirement: &70190318291520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70101802019120
+  version_requirements: *70190318291520
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &70101802032660 !ruby/object:Gem::Requirement
+  requirement: &70190318306740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 1.19.0
   type: :development
   prerelease: false
-  version_requirements: *70101802032660
+  version_requirements: *70190318306740
 - !ruby/object:Gem::Dependency
   name: xapian-ruby
-  requirement: &70101802028880 !ruby/object:Gem::Requirement
+  requirement: &70190318304660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: 1.2.7.1
   type: :development
   prerelease: false
-  version_requirements: *70101802028880
+  version_requirements: *70190318304660
 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