xapor 0.0.5 → 0.0.6

data/Rakefile

@@ -11,7 +11,6 @@ begin
     gem.homepage = "http://github.com/hedtekltd/xapor"
     gem.authors = ["David Workman"]
     gem.add_dependency "xapian-fu", ">= 1.1.0"
-    gem.add_dependency "delayed_job", ">= 2.0.3"
     gem.add_development_dependency "rspec", ">= 1.2.9"
     gem.add_development_dependency "cucumber", ">= 0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/generators/xapor_initializer/templates/xapor.rb

@@ -1,3 +0,0 @@
-Thread.new do
-  Delayed::Worker.new.start
-end

data/lib/xapor/model_integration.rb

@@ -16,16 +16,19 @@ module Xapor::XapianFuIntegration
         include XapianFu
 
         def search(query)
-          db = XapianDb.new(@config.xapian_fu_db)
-          db.search(query)
+          @db.search(query)
         end
 
         def xapor_config
           @config
         end
+
+        def xapor_db
+          @db ||= XapianDb.new(@config.xapian_fu_db, :create => true)
+        end
       end
-      if self.ancestors.include?(ActiveRecord::Base)
-        after_save :add_to_index
+      if defined?(ActiveRecord) && self.is_a?(ActiveRecord::Base)
+        self.send(:after_save, :add_to_index)
       end
       @config = Xapor::Config.new
       if block_given?
@@ -37,19 +40,13 @@ module Xapor::XapianFuIntegration
     end
   end
 
-  def perform
-    config = self.class.xapor_config
-    db = XapianDb.new(config.xapian_fu_db.merge(:create => true))
+  def add_to_index
     doc = {:id => self.id}
     config.search_fields.each do |field|
       doc[field] = self.send(field.to_sym)
     end
-    db << doc
-    db.flush
-  end
-
-  def add_to_index
-    Delayed::Job.enqueue self
+    self.class.xapor_db << doc
+    self.class.xapor_db.flush
   end
 end
 

data/spec/lib/xapor/model_integration_spec.rb

@@ -19,18 +19,4 @@ describe Xapor::ModelIntegration, "Search integration into a model class" do
     XaporTest.send(:xapor) {|idx| idx.search :name}
     XaporTest.respond_to?(:search_by_name).should be_true
   end
-
-  it "add a perform method for delayed job" do
-    XaporTest.send(:attr_accessor, :name)
-    XaporTest.send(:include, Xapor::ModelIntegration)
-    XaporTest.send(:xapor) {|idx|
-      idx.search :name
-      idx.directory "test.db"
-    }
-    XaporTest.new.respond_to?(:perform).should be_true
-    test = XaporTest.new
-    test.should_receive(:id).and_return(1)
-    test.should_receive(:name).and_return("Awesome")
-    test.perform
-  end
 end

data/xapor.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{xapor}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Workman"]
@@ -57,18 +57,15 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<xapian-fu>, [">= 1.1.0"])
-      s.add_runtime_dependency(%q<delayed_job>, [">= 2.0.3"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_development_dependency(%q<cucumber>, [">= 0"])
     else
       s.add_dependency(%q<xapian-fu>, [">= 1.1.0"])
-      s.add_dependency(%q<delayed_job>, [">= 2.0.3"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_dependency(%q<cucumber>, [">= 0"])
     end
   else
     s.add_dependency(%q<xapian-fu>, [">= 1.1.0"])
-    s.add_dependency(%q<delayed_job>, [">= 2.0.3"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
     s.add_dependency(%q<cucumber>, [">= 0"])
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - David Workman
@@ -31,24 +31,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: delayed_job
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 3
-        version: 2.0.3
-  type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -58,11 +44,11 @@ dependencies:
         - 9
         version: 1.2.9
   type: :development
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -70,7 +56,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id003
 description: Rails plugin for Xapian search, built on XapianFu and DelayedJob.
 email: workmad3@hedtek.com
 executables: []