xapian_db 1.2.2 → 1.2.2.1

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+##1.2.2.1 (November 22th, 2011)
+
+Fixes:
+
+  - always use the correct table name for order clauses when indexing
+  - allow nil values for attributes declared :as => :date
+  - lazy load queue writers (beanstalk_writer, resque_writer) when needed
+
 ##1.2.2 (November 15th, 2011)
 
 Features:

data/lib/type_codec.rb

@@ -76,6 +76,7 @@ module XapianDb
       # @param [Date] date a date object to encode
       # @return [String] the encoded date
       def self.encode(date)
+        return '' unless date
         begin
           date.strftime "%Y%m%d"
         rescue NoMethodError

data/lib/xapian_db/adapters/active_record_adapter.rb

@@ -40,10 +40,12 @@ module XapianDb
                "#{self.class}-#{self.id}"
              end
 
+             def order_condition(primary_key)
+               '%s.%s' % [self.table_name, primary_key]
+             end
            end
 
            klass.class_eval do
-
              # add the after commit logic
              after_commit do
                XapianDb.reindex(self)

data/lib/xapian_db/adapters/datamapper_adapter.rb

@@ -39,6 +39,9 @@ module XapianDb
                "#{self.class}-#{self.id}"
              end
 
+             def order_condition(primary_key)
+               '%s.%s' % [self.name.parameterize.tableize, primary_key]
+             end
            end
 
            klass.class_eval do

data/lib/xapian_db/config.rb

@@ -93,9 +93,16 @@ module XapianDb
     # @param [Symbol] type The writer type; the following adapters are available:
     #   - :direct ({XapianDb::IndexWriters::DirectWriter})
     #   - :beanstalk ({XapianDb::IndexWriters::BeanstalkWriter})
+    #   - :resque ({XapianDb::IndexWriters::ResqueWriter})
     def writer(type)
       # We try to guess the writer name
-      @_writer = XapianDb::IndexWriters.const_get("#{camelize(type.to_s)}Writer")
+      begin
+        require File.dirname(__FILE__) + "/index_writers/#{type}_writer"
+        @_writer = XapianDb::IndexWriters.const_get("#{camelize(type.to_s)}Writer")
+      rescue LoadError
+        puts "XapianDb: cannot load #{type} writer; see README for supported writers and how to install neccessary queue infrastructure"
+        raise
+      end
     end
 
     # Set the url and port of the beanstalk daemon

data/lib/xapian_db/index_writers/direct_writer.rb

@@ -67,10 +67,8 @@ module XapianDb
 
           # Process the objects in batches to reduce the memory footprint
           nr_of_batches = (obj_count / BATCH_SIZE) + 1
-          order_expression = "#{klass.name.parameterize.tableize}.#{primary_key}"
-          # raise "vor loop"
           nr_of_batches.times do |batch|
-            base_query.all(:offset => batch * BATCH_SIZE, :limit => BATCH_SIZE, :order => order_expression).each do |obj|
+            base_query.all(:offset => batch * BATCH_SIZE, :limit => BATCH_SIZE, :order => klass.order_condition(primary_key)).each do |obj|
               reindex obj, false
               pbar.inc if show_progressbar
             end
@@ -78,7 +76,6 @@ module XapianDb
           XapianDb.database.commit
           true
         end
-
       end
     end
   end

data/lib/xapian_db.rb

@@ -19,18 +19,6 @@ files.each {|file| require file}
 # Configure XapianDB if we are in a Rails app
 require File.dirname(__FILE__) + '/xapian_db/railtie' if defined?(Rails)
 
-# Try to require the beanstalk writer (depends on beanstalk-client)
-begin
-  require File.dirname(__FILE__) + '/xapian_db/index_writers/beanstalk_writer'
-rescue LoadError
-end
-
-# Try to require the resque writer (depends on resque)
-begin
-  require File.dirname(__FILE__) + '/xapian_db/index_writers/resque_writer'
-rescue LoadError
-end
-
 module XapianDb
 
   # Supported languages

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xapian_db
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-15 00:00:00.000000000 +01:00
+date: 2011-11-21 00:00:00.000000000 +01:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &70092616807260 !ruby/object:Gem::Requirement
+  requirement: &70313010336720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 1.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *70092616807260
+  version_requirements: *70313010336720
 - !ruby/object:Gem::Dependency
   name: xapian-ruby
-  requirement: &70092616806800 !ruby/object:Gem::Requirement
+  requirement: &70313010336000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70092616806800
+  version_requirements: *70313010336000
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70092616806420 !ruby/object:Gem::Requirement
+  requirement: &70313010335340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70092616806420
+  version_requirements: *70313010335340
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70092616822240 !ruby/object:Gem::Requirement
+  requirement: &70313010334460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: 2.3.1
   type: :development
   prerelease: false
-  version_requirements: *70092616822240
+  version_requirements: *70313010334460
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70092616821640 !ruby/object:Gem::Requirement
+  requirement: &70313010333480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: 0.3.7
   type: :development
   prerelease: false
-  version_requirements: *70092616821640
+  version_requirements: *70313010333480
 - !ruby/object:Gem::Dependency
   name: beanstalk-client
-  requirement: &70092616821140 !ruby/object:Gem::Requirement
+  requirement: &70313010348960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *70092616821140
+  version_requirements: *70313010348960
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70092616820720 !ruby/object:Gem::Requirement
+  requirement: &70313010348120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70092616820720
+  version_requirements: *70313010348120
 - !ruby/object:Gem::Dependency
   name: progressbar
-  requirement: &70092616820240 !ruby/object:Gem::Requirement
+  requirement: &70313010347420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70092616820240
+  version_requirements: *70313010347420
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &70092616819740 !ruby/object:Gem::Requirement
+  requirement: &70313010346180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,7 +110,7 @@ dependencies:
         version: 1.19.0
   type: :development
   prerelease: false
-  version_requirements: *70092616819740
+  version_requirements: *70313010346180
 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