activesearch 0.0.5 → 0.0.6

data/lib/activesearch/base.rb

@@ -0,0 +1,29 @@
+module ActiveSearch
+  module Base
+    def search_by(*params)
+      @search_parameters = params
+      self.after_save    :reindex, self.search_conditions
+      self.after_destroy :deindex, self.search_conditions
+    end
+    
+    def search_options
+      search_parameters.last.is_a?(Hash) ? search_parameters.last : search_parameters
+    end
+    
+    def search_conditions
+      {}.tap do |conditions|
+        conditions.merge!(if: search_options[:if]) if search_options.has_key?(:if)
+        conditions.merge!(unless: search_options[:unless]) if search_options.has_key?(:unless)
+      end
+    end
+    
+    def search_fields
+      search_parameters.last.is_a?(Hash) ? search_parameters[0...-1] : search_parameters
+    end
+    
+    protected
+    def search_parameters
+      @search_parameters.first.respond_to?(:call) ? @search_parameters.first.call : @search_parameters
+    end
+  end
+end

data/lib/activesearch/elastic_search.rb

@@ -1,4 +1,6 @@
+require 'tire'
 require "active_support/core_ext"
+require "activesearch/base"
 require "activesearch/elastic_search/proxy"
 
 module ActiveSearch
@@ -9,34 +11,55 @@ module ActiveSearch
   
   module ElasticSearch
     def self.included(base)
+      base.extend Base
       base.extend ClassMethods
     end
-  end
-  
-  module ClassMethods
-    def search_by(*fields)
-      include Tire::Model::Search
-      
-      options = fields.last.is_a?(Hash) ? fields.pop : {}
-      conditions = { if: options.delete(:if), unless: options.delete(:unless) }
+    
+    def to_indexable
+      self.attributes.merge(_type: self.elastic_type)
+    end
+    
+    protected
+    def elastic_type
+      @elastic_type ||= self.type.gsub!(/(.)([A-Z])/,'\1_\2').downcase
+    end
+    
+    def elastic_index(&block)
+      Tire.index(elastic_type, &block)
+    end
+    
+    def reindex
+      doc = self.to_indexable
+      properties = self.class.elastic_properties
       
-      mapping do
-        indexes :type
-        indexes :id, as: :original_id
-        fields.each { |f| indexes f }
-        (Array(options[:store]) - fields).each { |f| indexes f, :index => :no }
+      elastic_index do
+        unless exists?
+          create({ mappings: { doc[:_type] => {properties: properties}}})
+        end
+        store doc
       end
-      
-      # Partially taken from Tire::Model::Callbacks
-      
-      if respond_to?(:after_save) && respond_to?(:after_destroy)
-        after_save    lambda { tire.update_index }, conditions
-        after_destroy lambda { tire.update_index }, conditions
+    end
+    
+    def deindex
+      doc = self.to_indexable
+      elastic_index do
+        remove doc
       end
-
-      if respond_to?(:before_destroy) && !instance_methods.map(&:to_sym).include?(:destroyed?)
-        before_destroy { @destroyed = true }
-        class_eval { def destroyed?; !!@destroyed; end; }
+    end
+    
+    module ClassMethods
+      def elastic_properties
+        props = {}
+        
+        search_fields.each_with_object(props) do |field,hash|
+          hash[field] = {type: 'string'}
+        end
+        
+        (Array(search_options[:store]) - search_fields).each_with_object(props) do |field,hash|
+          hash[field] = {type: 'string', :index => :no}
+        end
+        
+        props
       end
     end
   end

data/lib/activesearch/mongoid.rb

@@ -1,3 +1,4 @@
+require 'activesearch/base'
 require 'activesearch/mongoid/model'
 
 module ActiveSearch
@@ -10,7 +11,7 @@ module ActiveSearch
   
   module Mongoid
     def self.included(base)
-      base.extend ClassMethods
+      base.extend Base
     end
     
     protected
@@ -21,23 +22,5 @@ module ActiveSearch
     def deindex
       ActiveSearch::Mongoid::Model.deindex(self)
     end
-    
-    module ClassMethods
-      def search_options
-        @search_options
-      end
-      
-      def search_fields
-        @search_fields
-      end
-      
-      def search_by(*fields)
-        @search_options = fields.pop if fields.last.is_a?(Hash)
-        conditions = {if: @search_options.delete(:if), unless: @search_options.delete(:unless)}
-        @search_fields  = fields
-        self.after_save    :reindex, conditions
-        self.after_destroy :deindex, conditions
-      end
-    end
   end
 end

data/lib/activesearch/version.rb

@@ -1,3 +1,3 @@
 module ActiveSearch
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/models/elastic_search.rb

@@ -1,16 +1,13 @@
-require 'tire'
 require 'activesearch/elastic_search'
 
-Tire.configure { logger File.join(File.dirname(__FILE__), '..', '..', 'log', 'elasticsearch.log'), :level => 'debug' }
-
 module ElasticSearchRefresh
   
   def save
-    super.tap { tire.index.refresh }
+    super.tap { Tire.index('_all') { refresh }}
   end
   
   def destroy
-    super.tap { tire.index.refresh }
+    super.tap { Tire.index('_all') { refresh }}
   end
 end
 

data/spec/models/mongoid.rb

@@ -19,7 +19,7 @@ class AnotherMongoidModel
   include ActiveSearch::Mongoid
   
   field :title, type: String
-  search_by :title, :text, store: [:title]
+  search_by lambda { [:title, :text, store: [:title]] } # Simulating dynamic options
 end
 
 
@@ -28,5 +28,6 @@ class LocalizedMongoidModel
   include ActiveSearch::Mongoid
   
   field :title, localize: true
-  search_by :title, store: [:title]
+  field :special_type
+  search_by :title, store: [:title], type: :special_type
 end

data/spec/spec_helper.rb

@@ -9,6 +9,7 @@ class ActiveMimic
   include ActiveAttr::MassAssignment
   
   attribute :id
+  attribute :type
   
   define_model_callbacks :save
   define_model_callbacks :destroy
@@ -17,7 +18,12 @@ class ActiveMimic
     new(attrs).tap(&:save)
   end
   
+  def type
+    self.class.to_s
+  end
+  
   def save
+    self.id = self.class.next_id
     run_callbacks :save do
       true
     end
@@ -28,4 +34,9 @@ class ActiveMimic
       true
     end
   end
+  
+  def self.next_id
+    @next_id ||= 0
+    @next_id += 1
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activesearch
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-05 00:00:00.000000000 Z
+date: 2012-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -121,6 +121,7 @@ files:
 - Rakefile
 - activesearch.gemspec
 - lib/activesearch.rb
+- lib/activesearch/base.rb
 - lib/activesearch/elastic_search.rb
 - lib/activesearch/elastic_search/proxy.rb
 - lib/activesearch/mongoid.rb