xapor 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/xapor/model_integration.rb

@@ -12,52 +12,46 @@ module Xapor::XapianFuIntegration
 
   module ClassMethods
     def xapor
-      class << self
-        include XapianFu
+      include XapianFu
 
-        def search(query)
-          xapor_db.search(query)
-        end
+      def search(query)
+        xapor_db.search(query)
+      end
 
-        def reset_index
-          if @db
-            @db.flush
-            @db.ro.close
-            @db.rw.close
-          end
-          @db = XapianDb.new(@config.xapian_fu_db.merge(:overwrite => true))
-          if block_given?
-            yield @db
-          end
+      def reset_index
+        if @db
+          @db.flush
+          @db.ro.close
+          @db.rw.close
         end
-
-        def xapor_config
-          @config
+        @db = XapianDb.new(xapor_config.xapian_fu_db.merge(:overwrite => true))
+        if block_given?
+          yield @db
         end
+      end
 
-        def xapor_db
-          if !(@db || @config.directory_config)
-            reset_index do
-              all.each {|o| o.add_to_index}
-            end
-          end
-          @db ||= XapianDb.new(@config.xapian_fu_db.merge(:create => true))
-        end
+      def xapor_config
+        self.class.instance_variable_get(:@config)
       end
+
+      def xapor_db
+        @db ||= XapianDb.new(xapor_config.xapian_fu_db.merge(:create => true))
+      end
+
       @config = Xapor::Config.new
       if block_given?
         yield @config
       end
+
       @config.search_fields.each do |field|
         class_eval("def self.search_by_#{field}(query)\nself.search(query)\nend")
       end
+
       if defined? ActiveRecord && ancestors.includes(ActiveRecord::Base)
-        class_eval("after_save :add_to_index")
-        class_eval("after_destroy :remove_from_index")
-        unless @config.directory_config
-          #in-memory index, needs to be indexed on startup
-          class_eval("all.each {|o| o.add_to_index}")
-        end
+        after_save :add_to_index
+        after_destroy :remove_from_index
+        #in-memory index, needs to be indexed on startup
+        all.each {|o| o.add_to_index} unless @config.directory_config
       end
     end
   end

data/xapor.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{xapor}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Workman"]
-  s.date = %q{2010-04-22}
+  s.date = %q{2010-05-19}
   s.description = %q{Rails plugin for Xapian search, built on XapianFu and DelayedJob.}
   s.email = %q{workmad3@hedtek.com}
   s.extra_rdoc_files = [

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - David Workman
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-22 00:00:00 +01:00
+date: 2010-05-19 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency