activesearch 0.0.10 → 0.0.11

data/README.md

@@ -30,7 +30,7 @@ The second parameter must be a conditions hash.**
 
 the :store option allows you to store that value in the index but it won't be used for search.
 You can also add :if or :unless conditions in the same way you would do with ActiveModel callbacks.
-If you need dynamic options, pass a symbol instead:
+If you need virtual options, pass a symbol instead:
 
     search_by :options_for_search
     

data/lib/activesearch/elastic_search.rb

@@ -17,7 +17,9 @@ module ActiveSearch
     end
     
     def to_indexable
-      self.attributes.merge(_type: self.elastic_type)
+      elastic_properties.keys.inject({_type: self.elastic_type}) do |memo,field|
+        memo.merge(field => self.send(field))
+      end
     end
     
     protected
@@ -49,7 +51,7 @@ module ActiveSearch
     end
     
     def elastic_properties
-      props = {}
+      props = {id: {type: 'string'}}
       
       search_fields.each_with_object(props) do |field,hash|
         hash[field] = {type: 'string'}

data/lib/activesearch/mongoid/model.rb

@@ -19,7 +19,12 @@ module ActiveSearch
         if options && options[:store]
           self._stored = {}
           options[:store].each do |f|
-            self._stored[f] = original[f] if original[f].present?
+            
+            if original.fields[f.to_s] && original.fields[f.to_s].localized?
+              self._stored[f] = original.send("#{f}_translations")
+            else
+              self._stored[f] = original.send(f) if original.send(f).present?
+            end
           end
         end
       end

data/lib/activesearch/version.rb

@@ -1,3 +1,3 @@
 module ActiveSearch
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/spec/base_spec.rb

@@ -44,7 +44,7 @@ describe ActiveSearch::Base do
     end
   end
   
-  context "search_by with dynamic parameters" do
+  context "search_by with virtual parameters" do
     before do
       @klass.class_eval do
         def options_for_search

data/spec/engines_spec.rb

@@ -30,10 +30,11 @@ Dir[File.join(File.dirname(__FILE__), 'models', '*.rb')].map { |f| File.basename
     end
     
     it "should find the expected documents" do
-      results = ActiveSearch.search("findable").map { |doc| doc.to_hash.select { |k,v| %w[title junk].include?(k.to_s) } }
+      results = ActiveSearch.search("findable").map { |doc| doc.to_hash.select { |k,v| %w[title junk virtual].include?(k.to_s) } }
       results.sort_by { |result| result["title"] }.should == [
           {
-            "title"  => "Another findable title"
+            "title"   => "Another findable title",
+            "virtual" =>  "virtual"
           },
           {
             "title"  => "Findable Findable",

data/spec/models/elastic_search.rb

@@ -29,5 +29,9 @@ class AnotherElasticSearchModel < ActiveMimic
   include ElasticSearchRefresh
   
   attribute :title, type: String
-  search_by [:title, store: [:title]]
+  search_by [:title, store: [:title, :virtual]]
+  
+  def virtual
+    "virtual"
+  end
 end

data/spec/models/mongoid.rb

@@ -22,7 +22,11 @@ class AnotherMongoidModel
   search_by :options_for_search
   
   def options_for_search
-    [:title, :text, store: [:title]]
+    [:title, :text, store: [:title, :virtual]]
+  end
+  
+  def virtual
+    "virtual"
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activesearch
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors: