mongoid-xapian 0.0.2 → 0.0.3

data/README.md

@@ -1,8 +1,8 @@
-= mongoid-xapian
+# mongoid-xapian
 
 Xapian for mongoid
 
-== Usage
+## Usage
 
 Include MongoidXapian in your model and define what fields need to be
 indexed.
@@ -15,16 +15,21 @@ indexed.
     end
 
 now you have to run `MongoidXapian.index!` to index the changes into
-xapian.
-A rake task called `xapian:index` is also provided.
+xapian. if you have a background job processor like delayed job you can
+do something like:
 
-once you configure your model and index it you can search it using:
+    MongoidXapian.delay.index!
+
+A rake task called `xapian:index` is also provided so you can setup a
+cron task to run it periodically.
+
+Once you configure your model and index the changes you can perform searches using:
 
     YourModel.search(query)
 
 
 
-== Contributing to mongoid-xapian
+## Contributing to mongoid-xapian
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
@@ -34,7 +39,7 @@ once you configure your model and index it you can search it using:
 * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
 * Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
-== Copyright
+## Copyright
 
 Copyright (c) 2012 David A. Cuadrado. See LICENSE.txt for
 further details.

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/mongoid-xapian.rb

@@ -17,6 +17,8 @@ module MongoidXapian
       attr_accessor :xapian_options, :xapian_fields
     end
 
+    MongoidXapian.indexable_models << self.to_s
+
     field :xapian_id, :type => Integer
 
     after_create do |doc|
@@ -26,9 +28,20 @@ module MongoidXapian
     end
 
     after_update do |doc|
-      MongoidXapian::Trail.create(:action => :update,
-                                  :doc_type => doc.class.to_s,
-                                  :doc_id => doc.id)
+      needs_indexing = false
+      # see if at least one changed field is indexable
+      doc.changes.each do |key, value|
+        if doc.class.xapian_fields.include?(key.to_sym)
+          needs_indexing = true
+          break
+        end
+      end
+
+      if needs_indexing
+        MongoidXapian::Trail.create(:action => :update,
+                                    :doc_type => doc.class.to_s,
+                                    :doc_id => doc.id)
+      end
     end
 
     after_destroy do |doc|
@@ -57,6 +70,11 @@ module MongoidXapian
     MongoidXapian::Trail.index_all!
   end
 
+  # List of indexable models
+  def self.indexable_models
+    @indexable_models ||= Set.new
+  end
+
   module ClassMethods
     def fti(*args)
       # make sure id is not in the list

data/lib/mongoid-xapian/tasks.rb

@@ -8,14 +8,20 @@ namespace :xapian do
     MongoidXapian::Trail.index_all!
   end
 
-  desc "Reindex all documents in the given model. pass MODEL=ModelName to this task"
+  desc "Reindex all documents in the given model"
   task :reindex do
-    model = ENV['MODEL'].constantize
-    model.all.each do |doc|
-      MongoidXapian::Trail.create!(:action => :update,
-                                   :doc_id => doc.id,
-                                   :doc_type => doc.class.to_s)
-      MongoidXapian::Trail.index_all!
+    MongoidXapian.indexable_models.each do |mod|
+      model_class = mod.constantize rescue nil
+      if model_class
+        puts ">> Indexing #{model_class}..."
+
+        model_class.all.each do |doc|
+          MongoidXapian::Trail.create!(:action => :update,
+                                       :doc_id => doc.id,
+                                       :doc_type => doc.class.to_s)
+          MongoidXapian::Trail.index_all!
+        end
+      end
     end
   end
 end

data/lib/mongoid-xapian/trail.rb

@@ -56,13 +56,15 @@ module MongoidXapian
 
     def update_document
       with_xapian_database do |db|
-        if indexable.xapian_id.to_i > 0
-          xapian_doc = XapianFu::XapianDoc.new(indexable.to_xapian.merge(:id => indexable.xapian_id), :xapian_db => db)
-          xapian_doc.save
-        else
-          xapian_doc = db.add_doc(indexable.to_xapian)
-          indexable.set(:xapian_id, xapian_doc.id)
-          indexable.xapian_id = xapian_doc.id
+        if indexable.present?
+          if indexable.xapian_id.to_i > 0
+            xapian_doc = XapianFu::XapianDoc.new(indexable.to_xapian.merge(:id => indexable.xapian_id), :xapian_db => db)
+            xapian_doc.save
+          else
+            xapian_doc = db.add_doc(indexable.to_xapian)
+            indexable.set(:xapian_id, xapian_doc.id)
+            indexable.xapian_id = xapian_doc.id
+          end
         end
       end
     end

data/spec/mongoid-xapian_spec.rb

@@ -33,6 +33,7 @@ describe "MongoidXapian" do
     before do
       @blogpost = BlogPost.create(:title => "this is the title", :body => "this is body")
       MongoidXapian.index!
+      @blogpost.reload
     end
 
     it "should update the index" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-xapian
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -211,7 +211,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4374857612297856311
+      hash: -758691094896525050
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: