xapor 0.1.4 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/lib/xapor/model_integration.rb

@@ -12,13 +12,18 @@ module Xapor::XapianFuIntegration
 
   module ClassMethods
     def xapor
+      class << self
+        attr_accessor :xapor_config
+        attr_accessor :xapor_db
+      end
+      
       include XapianFu
 
-      def search(query)
+      def self.search(query)
         xapor_db.search(query)
       end
 
-      def reset_index
+      def self.reset_index
         if @db
           @db.flush
           @db.ro.close
@@ -30,28 +35,26 @@ module Xapor::XapianFuIntegration
         end
       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
+      self.xapor_config = Xapor::Config.new
       if block_given?
-        yield @config
+        yield self.xapor_config
       end
+      self.xapor_db = ::XapianFu::XapianDb.new(self.xapor_config.xapian_fu_db.merge(:create => true))
 
-      @config.search_fields.each do |field|
-        class_eval("def self.search_by_#{field}(query)\nself.search(query)\nend")
+      eigenclass = class << self
+        self
       end
+      self.xapor_config.search_fields.each do |field|
+          eigenclass.send(:define_method, :"search_by_#{field}") do |query|
+            self.search(query)
+          end
+        end
 
       if defined? ActiveRecord && ancestors.includes(ActiveRecord::Base)
         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
+        all.each {|o| o.add_to_index} unless self.xapor_config.directory_config
       end
     end
   end

data/xapor.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{xapor}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Workman"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - David Workman