xapian_db 1.2.2.2 → 1.2.3

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+##1.2.3 (December 12th, 2011)
+
+Changes:
+
+- avoid eager loading of model classes in a rails app. The blueprint configuration file (xapian_blueprints.rb) caused all referenced classes
+  to get loaded and parsed on every request. While not a problem in production environments, it could be a huge performance hit in development
+  (especially when using the asset pipleline with many assets).
+  The solution is based on the proof of concept by [Yves Senn](http://github.com/senny). Simply use symbols or strings instead of the classes in
+  your xapian_blueprints.rb and wrap base_queries inside a block. See the README for updated informations on how to configure blueprints.
+- added a rails example app using datamapper
+- added a rake task to rebuild the index
+- internal refactorings / optimizations
+
 ##1.2.2.2 (November 29th, 2011)
 
 Changes:

data/README.rdoc

@@ -84,9 +84,10 @@ If you do not configure settings for an environment in this file, xapian_db appl
 
 === Configure an index blueprint
 
-In order to get your models indexed, you must configure a document blueprint for each class you want to index:
+In order to get your models indexed, you must configure a document blueprint for each class you want to index. You can pass the class name as a
+symbol or as a string (if the class is namespaced):
 
-  XapianDb::DocumentBlueprint.setup(Person) do |blueprint|
+  XapianDb::DocumentBlueprint.setup(:Person) do |blueprint|
     blueprint.attribute :name, :weight => 10
     blueprint.attribute :first_name
   end
@@ -100,7 +101,7 @@ If you want to index additional data but do not need access to it from a search
 
 If you want to declare multiple attributes or indexes with default options, you can do this in one statement:
 
-  XapianDb::DocumentBlueprint.setup(Person) do |blueprint|
+  XapianDb::DocumentBlueprint.setup(:Person) do |blueprint|
     blueprint.attributes :name, :first_name, :profession
     blueprint.index      :notes, :remarks, :cv
   end
@@ -109,7 +110,7 @@ Note that you cannot add options using this mass declaration syntax (e.g. <code>
 
 Use blocks for complex evaluations of attributes or indexed values:
 
-  XapianDb::DocumentBlueprint.setup(IndexedObject) do |blueprint|
+  XapianDb::DocumentBlueprint.setup(:IndexedObject) do |blueprint|
     blueprint.attribute :complex do
       if @id == 1
         "One"
@@ -121,7 +122,7 @@ Use blocks for complex evaluations of attributes or indexed values:
 
 You may add a filter expression to exclude objects from the index. This is handy to skip objects that are not active, for example:
 
-    XapianDb::DocumentBlueprint.setup(Person) do |blueprint|
+    XapianDb::DocumentBlueprint.setup(:Person) do |blueprint|
       blueprint.attributes :name, :first_name, :profession
       blueprint.index      :notes, :remarks, :cv
       blueprint.ignore_if {active == false}
@@ -129,7 +130,7 @@ You may add a filter expression to exclude objects from the index. This is handy
 
 You can add a type information to an attribute. As of now the special types :string, :date and :number are supported (and required for range queries):
 
-    XapianDb::DocumentBlueprint.setup(Person) do |blueprint|
+    XapianDb::DocumentBlueprint.setup(:Person) do |blueprint|
       blueprint.attribute :age,           :as => :number
       blueprint.attribute :date_of_birth, :as => :date
       blueprint.attribute :name,          :as => :string
@@ -138,14 +139,14 @@ You can add a type information to an attribute. As of now the special types :str
 You can override the global adapter configuration in a specific blueprint. Let's say you use ActiveRecord, but you have
 one more class that is not stored in the database, but you want it to be indexed:
 
-  XapianDb::DocumentBlueprint.setup(SpecialClass) do |blueprint|
+  XapianDb::DocumentBlueprint.setup(:SpecialClass) do |blueprint|
     blueprint.adapter :generic
     blueprint.index   :some_stuff
   end
 
 If you use associations in your blueprints, it might be a good idea to specify a base query to speed up rebuild_xapian_index calls (avoiding 1+n queries):
 
-  XapianDb::DocumentBlueprint.setup(Person) do |blueprint|
+  XapianDb::DocumentBlueprint.setup(:Person) do |blueprint|
     blueprint.index :addresses
     blueprint.base_query Person.includes(:addresses)
   end
@@ -153,11 +154,11 @@ If you use associations in your blueprints, it might be a good idea to specify a
 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
 are ordered by relevance and - within the same relevance - by the natural sort order. If you don't specify the natural sort order, it defaults to id. Examples:
 
-  XapianDb::DocumentBlueprint.setup(House) do |blueprint|
+  XapianDb::DocumentBlueprint.setup(:House) do |blueprint|
     blueprint.natural_sort_order :number
   end
 
-  XapianDb::DocumentBlueprint.setup(Person) do |blueprint|
+  XapianDb::DocumentBlueprint.setup(:Person) do |blueprint|
     blueprint.natural_sort_order do
       "#{surname} #{name}"
     end
@@ -227,7 +228,7 @@ On class queries you can specifiy order options:
 
 If you define an attribute with a supported type, you can do range searches:
 
-  XapianDb::DocumentBlueprint.setup(Person) do |blueprint|
+  XapianDb::DocumentBlueprint.setup(:Person) do |blueprint|
     blueprint.attribute :age,           :as => :number
     blueprint.attribute :date_of_birth, :as => :date
     blueprint.attribute :name,          :as => :string

data/lib/xapian_db/adapters/datamapper_adapter.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require "#{File.dirname(__FILE__)}/../model_extenders/datamapper"
+
 module XapianDb
   module Adapters
 
@@ -40,7 +42,7 @@ module XapianDb
              end
 
              def order_condition(primary_key)
-               '%s.%s' % [self.name.parameterize.tableize, primary_key]
+               primary_key.to_sym
              end
            end
 
@@ -48,7 +50,7 @@ module XapianDb
 
              # add the after save logic
              after :save do
-               blueprint = XapianDb::DocumentBlueprint.blueprint_for klass
+               blueprint = XapianDb::DocumentBlueprint.blueprint_for klass.to_s
                if blueprint.should_index?(self)
                  XapianDb.index(self)
                else

data/lib/xapian_db/config.rb

@@ -85,8 +85,12 @@ module XapianDb
     #   - :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")
+      begin
+        @_adapter = XapianDb::Adapters.const_get("#{camelize(type.to_s)}Adapter")
+      rescue NameError
+        require File.dirname(__FILE__) + "/adapters/#{type}_adapter"
+        @_adapter = XapianDb::Adapters.const_get("#{camelize(type.to_s)}Adapter")
+      end
     end
 
     # Set the index writer

data/lib/xapian_db/database.rb

@@ -130,13 +130,13 @@ module XapianDb
      # return an empty hash if no search expression is given
       return {} if expression.nil? || expression.strip.empty?
       value_number         = XapianDb::DocumentBlueprint.value_number_for(attribute)
-      query_parser         = QueryParser.new(XapianDb.database)
-      query                = query_parser.parse(expression)
-      enquiry              = Xapian::Enquire.new(XapianDb.database.reader)
+      @query_parser        ||= QueryParser.new(self)
+      query                = @query_parser.parse(expression)
+      enquiry              = Xapian::Enquire.new(reader)
       enquiry.query        = query
       enquiry.collapse_key = value_number
       facets = {}
-      enquiry.mset(0, XapianDb.database.size).matches.each do |match|
+      enquiry.mset(0, size).matches.each do |match|
         facet_value = YAML::load match.document.value(value_number)
         # We must add 1 to the collapse_count since collapse_count means
         # "how many other matches are there?"

data/lib/xapian_db/document_blueprint.rb

@@ -5,13 +5,13 @@ module XapianDb
   # A document blueprint describes the mapping of an object to a Xapian document
   # for a given class.
   # @example A simple document blueprint configuration for the class Person
-  #   XapianDb::DocumentBlueprint.setup(Person) do |blueprint|
+  #   XapianDb::DocumentBlueprint.setup(:Person) do |blueprint|
   #     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|
+  #   XapianDb::DocumentBlueprint.setup(:Person) do |blueprint|
   #     blueprint.attribute       :complex, :weight => 10 do
   #       # add some logic here to evaluate the value of 'complex'
   #     end
@@ -31,41 +31,76 @@ module XapianDb
       # - adapter (see {#adapter} for details)
       # - attribute (see {#attribute} for details)
       # - index (see {#index} for details)
-      def setup(klass, &block)
+      def setup(klass_or_name, &block)
+        if klass_or_name.is_a?(Class)
+          warn "xapian_db: XapianDb::DocumentBlueprint.setup(Class) is deprecated; use XapianDb::DocumentBlueprint.setup(Symbol) or XapianDb::DocumentBlueprint.setup(String) instead"
+          name = klass_or_name.name
+        else
+          name = klass_or_name.to_s
+        end
         @blueprints ||= {}
         blueprint = DocumentBlueprint.new
         yield blueprint if block_given? # configure the blueprint through the block
         validate_type_consistency_on blueprint
+
         # Remove a previously loaded blueprint for this class to avoid stale blueprint definitions
-        @blueprints.delete_if { |indexed_class, blueprint| indexed_class.name == klass.name }
-        @blueprints[klass] = blueprint
-        @_adapter = blueprint._adapter || XapianDb::Config.adapter || Adapters::GenericAdapter
-        @_adapter.add_class_helper_methods_to klass
+        @blueprints.delete_if { |indexed_class, blueprint| indexed_class == name }
+        @blueprints[name] = blueprint
+
+        # lazy load the adapter
+        unless defined? blueprint._adapter
+          adapter_file = blueprint._adapter.name.split("::").last.downcase + "_adapter"
+          require File.dirname(__FILE__) + "../adapters/#{adapter_file}"
+        end
+
+        # Needed to add class helper methods to indexed pure ruby classes
+        if eval("defined?(#{name}) && #{name}.is_a?(Class)")
+          blueprint._adapter.add_class_helper_methods_to XapianDb::Utilities.constantize(name)
+        end
 
         @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"
         @attributes = @blueprints.values.map { |blueprint| blueprint.attribute_names}.flatten.compact.uniq.sort || []
       end
 
+      # is a blueprint configured for the given name?
+      # @return [Boolean]
+      def configured?(name)
+        @blueprints && @blueprints.has_key?(name.to_s)
+      end
+
       # Get all configured classes
       # @return [Array<Class>]
       def configured_classes
-        @blueprints ? @blueprints.keys : []
+       if @blueprints
+         @blueprints.keys.map {|class_name| XapianDb::Utilities.constantize(class_name) }
+       else
+         []
+       end
       end
 
       # Get the blueprint for a class
       # @return [DocumentBlueprint]
-      def blueprint_for(klass)
+      def blueprint_for(klass_or_name)
         if @blueprints
-          key = klass
-          while key != Object
-            return @blueprints[key] unless @blueprints[key].nil?
-            key = key.superclass
+          if klass_or_name.is_a?(Class)
+            warn "xapian_db: blueprint_for(Class) is deprecated; use blueprint_for(Symbol) or blueprint_for(String) instead"
+            key = klass_or_name.name
+          else
+            key = klass_or_name.to_s
+          end
+          while key != "Object" && key != "BasicObject"
+            if @blueprints.has_key? key
+              return @blueprints[key]
+            else
+              klass = XapianDb::Utilities.constantize key
+              key = klass.superclass.name
+            end
           end
-          raise "Blueprint for class #{klass} is not defined"
         end
-        raise "Blueprint for class #{klass} is not defined"
+        return nil
       end
 
       # Get the value number for an attribute. Please note that this is not the index in the values
@@ -197,8 +232,7 @@ module XapianDb
       end
 
       # Let the adapter add its document helper methods (if any)
-      adapter = @_adapter || XapianDb::Config.adapter || XapianDb::Adapters::GenericAdapter
-      adapter.add_doc_helper_methods_to(@accessors_module)
+      _adapter.add_doc_helper_methods_to(@accessors_module)
       @accessors_module
     end
 
@@ -206,8 +240,7 @@ module XapianDb
     # Blueprint DSL methods
     # ---------------------------------------------------------------------------------
 
-    attr_accessor :_adapter
-    attr_reader :_base_query, :_natural_sort_order
+    attr_reader :lazy_base_query, :_natural_sort_order
 
     # Construct the blueprint
     def initialize
@@ -227,6 +260,11 @@ module XapianDb
       @_adapter = XapianDb::Adapters.const_get("#{camelize(type.to_s)}Adapter")
     end
 
+    # return the adpater to use for this blueprint
+    def _adapter
+      @_adapter || XapianDb::Config.adapter || XapianDb::Adapters::GenericAdapter
+    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
@@ -235,7 +273,7 @@ module XapianDb
     # @option options [Boolean] :index (true) Should the attribute be indexed?
     # @option options [Symbol] :as should add type info for range queries (:date, :numeric)
     # @example For complex attribute configurations you may pass a block:
-    #   XapianDb::DocumentBlueprint.setup(IndexedObject) do |blueprint|
+    #   XapianDb::DocumentBlueprint.setup(:IndexedObject) do |blueprint|
     #     blueprint.attribute :complex do
     #       if @id == 1
     #         "One"
@@ -308,14 +346,18 @@ module XapianDb
       @ignore_expression = block
     end
 
-    # Define a base query to select one or all objects of the indexed class. The reason for a
+# Define a base query to select one or all objects of the indexed class. The reason for a
     # base query is to optimize the query avoiding th 1+n problematic. The base query should only
     # include joins(...) and includes(...) calls.
     # @param [expression] a base query expression
     # @example Include the adresses
     #   blueprint.base_query Person.includes(:addresses)
-    def base_query(expression)
-      @_base_query = expression
+    def base_query(expression = nil, &block)
+      if expression
+        warn "xapian_db: directly passing a base query in a blueprint configuration is deprecated, wrap them in a block"
+        block = lambda { expression }
+      end
+      @lazy_base_query = block
     end
 
     # Define the natural sort order.

data/lib/xapian_db/index_writers/beanstalk_writer.rb

@@ -33,15 +33,10 @@ module XapianDb
           beanstalk.put( { :task => "reindex_class_task", :class => klass.name }.to_yaml )
         end
 
-        private
-
         def beanstalk
           @beanstalk ||= Beanstalk::Pool.new([XapianDb::Config.beanstalk_daemon_url])
         end
-
       end
-
     end
-
   end
-end
+end

data/lib/xapian_db/index_writers/direct_writer.rb

@@ -19,7 +19,7 @@ module XapianDb
         # Update an object in the index
         # @param [Object] obj An instance of a class with a blueprint configuration
         def index(obj, commit=true)
-          blueprint = XapianDb::DocumentBlueprint.blueprint_for(obj.class)
+          blueprint = XapianDb::DocumentBlueprint.blueprint_for(obj.class.name)
           indexer   = XapianDb::Indexer.new(XapianDb.database, blueprint)
           doc       = indexer.build_document_for(obj)
           XapianDb.database.store_doc(doc)
@@ -36,7 +36,7 @@ module XapianDb
         # Update or delete a xapian document belonging to an object depending on the ignore_if logic(if present)
         # @param [Object] object An instance of a class with a blueprint configuration
         def reindex(object, commit=true)
-          blueprint = XapianDb::DocumentBlueprint.blueprint_for object.class
+          blueprint = XapianDb::DocumentBlueprint.blueprint_for object.class.name
           if blueprint.should_index?(object)
             index object, commit
           else
@@ -50,13 +50,15 @@ module XapianDb
         # @option options [Boolean] :verbose (false) Should the reindexing give status informations?
         def reindex_class(klass, options={})
           opts = {:verbose => false}.merge(options)
-          blueprint = XapianDb::DocumentBlueprint.blueprint_for klass
-          adapter = blueprint._adapter || XapianDb::Config.adapter || Adapters::GenericAdapter
-          primary_key = adapter.primary_key_for(klass)
+          blueprint = XapianDb::DocumentBlueprint.blueprint_for klass.name
+          primary_key = blueprint._adapter.primary_key_for(klass)
           XapianDb.database.delete_docs_of_class(klass)
-          blueprint  = XapianDb::DocumentBlueprint.blueprint_for(klass)
           indexer    = XapianDb::Indexer.new(XapianDb.database, blueprint)
-          base_query = blueprint._base_query || klass
+          if blueprint.lazy_base_query
+            base_query = blueprint.lazy_base_query.call
+          else
+            base_query = klass
+          end
           show_progressbar = false
           obj_count = base_query.count
           if opts[:verbose]

data/lib/xapian_db/indexer.rb

@@ -19,7 +19,7 @@ module XapianDb
     # @return [Xapian::Document] The xapian document (see http://xapian.org/docs/sourcedoc/html/classXapian_1_1Document.html)
     def build_document_for(obj)
       @obj = obj
-      @blueprint = DocumentBlueprint.blueprint_for(@obj.class)
+      @blueprint = DocumentBlueprint.blueprint_for(@obj.class.name)
       @xapian_doc = Xapian::Document.new
       @xapian_doc.data = @obj.xapian_id
       store_fields

data/lib/xapian_db/model_extenders/active_record.rb

@@ -0,0 +1,13 @@
+module XapianDb
+  module ModelExtenders
+    module ActiveRecord
+      def inherited(klass)
+        super
+        if XapianDb::DocumentBlueprint.configured? klass.name
+          blueprint = XapianDb::DocumentBlueprint.blueprint_for klass.name
+          blueprint._adapter.add_class_helper_methods_to klass
+        end
+      end
+    end
+  end
+end

data/lib/xapian_db/model_extenders/datamapper.rb

@@ -0,0 +1,16 @@
+module DataMapper
+  module Resource
+
+    class << self
+      alias_method :included_dm, :included
+    end
+
+    def self.included(model)
+      included_dm model
+      if XapianDb::DocumentBlueprint.configured? model.name
+        blueprint = XapianDb::DocumentBlueprint.blueprint_for model.name
+        blueprint._adapter.add_class_helper_methods_to model
+      end
+    end
+  end
+end

data/lib/xapian_db/railtie.rb

@@ -9,11 +9,22 @@ module XapianDb
   # @author Gernot Kogler
   class Railtie < ::Rails::Railtie
 
+    # require our rake tasks
+    rake_tasks do
+      load "#{File.dirname(__FILE__)}/../../tasks/xapian_rebuild_index.rake"
+    end
+
     # require our generators
     generators do
       require "#{File.dirname(__FILE__)}/../generators/install_generator.rb"
     end
 
+    initializer "xapian_db.active_record" do |app|
+      ActiveSupport.on_load :active_record do
+        ActiveRecord::Base.extend XapianDb::ModelExtenders::ActiveRecord
+      end
+    end
+
     config.before_configuration do
 
       # Read the database configuration file if there is one

data/lib/xapian_db/resultset.rb

@@ -103,7 +103,7 @@ module XapianDb
     # @return [Xapian::Match] the decorated match
     def decorate(match)
       klass_name = match.document.values[0].value
-      blueprint  = XapianDb::DocumentBlueprint.blueprint_for(constantize klass_name)
+      blueprint  = XapianDb::DocumentBlueprint.blueprint_for klass_name
       match.document.extend blueprint.accessors_module
       match.document.instance_variable_set :@score, match.percent
       match

data/lib/xapian_db/utilities.rb

@@ -5,6 +5,8 @@
 module XapianDb
   module Utilities
 
+    extend self
+
     # Convert a string to camel case
     # @param [String] The string to camelize
     # @return [String] The camelized string

data/lib/xapian_db.rb

@@ -9,8 +9,9 @@
 require 'xapian'
 require 'yaml'
 
-do_not_require = %w(update_stopwords.rb railtie.rb base_adapter.rb beanstalk_writer.rb resque_writer.rb utilities.rb install_generator.rb)
-files = Dir.glob("#{File.dirname(__FILE__)}/**/*.rb").reject{|path| do_not_require.include?(File.basename(path))}
+do_not_require = %w(update_stopwords railtie base_adapter generic_adapter active_record_adapter datamapper_adapter
+                    beanstalk_writer resque_writer utilities install_generator datamapper)
+files = Dir.glob("#{File.dirname(__FILE__)}/**/*.rb").reject{|path| do_not_require.include?(File.basename(path, ".rb"))}
 # Require these first
 require "#{File.dirname(__FILE__)}/xapian_db/utilities"
 require "#{File.dirname(__FILE__)}/xapian_db/adapters/base_adapter"
@@ -120,7 +121,7 @@ module XapianDb
   # @param [Object] object An instance of a class with a blueprint configuration
   def self.reindex(object, commit=true)
     writer = @block_writer || XapianDb::Config.writer
-    blueprint = XapianDb::DocumentBlueprint.blueprint_for object.class
+    blueprint = XapianDb::DocumentBlueprint.blueprint_for object.class.name
     if blueprint.should_index?(object)
       writer.index object, commit
     else

data/tasks/xapian_rebuild_index.rake

@@ -0,0 +1,11 @@
+# encoding: utf-8
+
+require "#{Rails.root}/config/environment"
+require "xapian_db"
+
+namespace :xapian do
+  desc "rebuild the xapian index"
+  task :rebuild_index do
+    XapianDb.rebuild_xapian_index :verbose => true
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xapian_db
 version: !ruby/object:Gem::Version
-  version: 1.2.2.2
+  version: 1.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-29 00:00:00.000000000 +01:00
-default_executable: 
+date: 2011-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &70359034445480 !ruby/object:Gem::Requirement
+  requirement: &70136488601320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,10 @@ dependencies:
         version: 1.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *70359034445480
+  version_requirements: *70136488601320
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70359034444800 !ruby/object:Gem::Requirement
+  requirement: &70136488600860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70359034444800
+  version_requirements: *70136488600860
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70359034444020 !ruby/object:Gem::Requirement
+  requirement: &70136488600080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +43,10 @@ dependencies:
         version: 2.3.1
   type: :development
   prerelease: false
-  version_requirements: *70359034444020
+  version_requirements: *70136488600080
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70359034443160 !ruby/object:Gem::Requirement
+  requirement: &70136488599340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +54,10 @@ dependencies:
         version: 0.3.7
   type: :development
   prerelease: false
-  version_requirements: *70359034443160
+  version_requirements: *70136488599340
 - !ruby/object:Gem::Dependency
   name: beanstalk-client
-  requirement: &70359034442600 !ruby/object:Gem::Requirement
+  requirement: &70136488615000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +65,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *70359034442600
+  version_requirements: *70136488615000
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70359034441960 !ruby/object:Gem::Requirement
+  requirement: &70136488614460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70359034441960
+  version_requirements: *70136488614460
 - !ruby/object:Gem::Dependency
   name: progressbar
-  requirement: &70359034441340 !ruby/object:Gem::Requirement
+  requirement: &70136488613860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70359034441340
+  version_requirements: *70136488613860
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &70359034440600 !ruby/object:Gem::Requirement
+  requirement: &70136488613340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,7 +98,7 @@ dependencies:
         version: 1.19.0
   type: :development
   prerelease: false
-  version_requirements: *70359034440600
+  version_requirements: *70136488613340
 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
@@ -125,6 +124,8 @@ files:
 - lib/xapian_db/index_writers/resque_writer.rb
 - lib/xapian_db/index_writers/transactional_writer.rb
 - lib/xapian_db/indexer.rb
+- lib/xapian_db/model_extenders/active_record.rb
+- lib/xapian_db/model_extenders/datamapper.rb
 - lib/xapian_db/query_parser.rb
 - lib/xapian_db/railtie.rb
 - lib/xapian_db/repositories/stemmer.rb
@@ -147,11 +148,11 @@ files:
 - lib/xapian_db/stopwords/update_stopwords.rb
 - lib/xapian_db/utilities.rb
 - lib/xapian_db.rb
+- tasks/xapian_rebuild_index.rake
 - LICENSE
 - README.rdoc
 - CHANGELOG.md
 - Rakefile
-has_rdoc: true
 homepage: https://github.com/garaio/xapian_db
 licenses: []
 post_install_message: 
@@ -178,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.3.9.3
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: Ruby library to use a Xapian db as a key/value store with high performance