activesearch 0.0.2 → 0.0.3

data/README.md

@@ -35,7 +35,7 @@ You won't get original documents though.
     end
     
     # Access the stored fields so you don't need to fetch the real document
-    SomeModel.search("some words").first.stored["title"]
+    ActiveSearch.search("some words").first.stored["title"]
 
 
 ## Contributing

data/lib/activesearch/mongoid/model.rb

@@ -13,16 +13,24 @@ module ActiveSearch
       
       def store_fields(original, fields, options)
         if options && options[:store]
-          (fields & options[:store]).each do |f|
+          options[:store].each do |f|
             self.stored[f] = original[f] if original.send("#{f}_changed?")
           end
         end
       end
       
       def refresh_keywords(original, fields)
-        self.keywords = fields.inject([]) do |memo,f|
-          original[f] ? memo | original[f].downcase.split : memo
+        self.keywords = fields.select { |f| original.fields[f.to_s]  }.inject([]) do |memo,f|
+          
+          if original.fields[f.to_s].localized?
+            memo += original.send("#{f}_translations").map do |locale,translation|
+              translation.downcase.split.map { |word| "#{locale}:#{word}"}
+            end.flatten
+          else
+            original[f] ? memo += original[f].downcase.split : memo
+          end
         end
+        self.keywords.uniq!
       end
       
       def self.reindex(original, fields, options)

data/lib/activesearch/mongoid.rb

@@ -4,7 +4,7 @@ module ActiveSearch
   
   # TODO: Wrap this so all engines behave consistently
   def self.search(text)
-    Mongoid::Model.all_in(keywords: text.split)
+    Mongoid::Model.where(:keywords.in => text.split + text.split.map { |word| "#{I18n.locale}:#{word}"})
   end
   
   module Mongoid

data/lib/activesearch/version.rb

@@ -1,3 +1,3 @@
 module ActiveSearch
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/mongoid_spec.rb

@@ -1,3 +1,4 @@
+#encoding: utf-8
 require 'mongoid'
 require 'activesearch/mongoid'
 
@@ -10,7 +11,7 @@ class MongoidModel
   field :title, type: String
   field :text,  type: String
   field :junk,  type: String
-  search_on :title, :text, store: [:title]
+  search_on :title, :text, store: [:title, :junk]
 end
 
 class AnotherMongoidModel
@@ -21,18 +22,33 @@ class AnotherMongoidModel
   search_on :title, :text, store: [:title]
 end
 
+
+class LocalizedMongoidModel
+  include Mongoid::Document
+  include ActiveSearch::Mongoid
+  
+  field :title, localize: true
+  search_on :title, store: [:title]
+end
+
+
 describe ActiveSearch::Mongoid do
   before do
     Mongoid.master.collections.select { |c| c.name != 'system.indexes' }.each(&:drop)
-    
-    @findable = MongoidModel.create!(title: "Findable")
+    I18n.locale = :en
+    @findable       = MongoidModel.create!(title: "Findable Findable", junk: "Junk field")
     @quite_findable = MongoidModel.create!(title: "Some title", text: "Findable text")
-    @another = AnotherMongoidModel.create!(title: "Another findable title")
-    @junk = MongoidModel.create!(title: "Junk", junk: "Findable junk")
+    @another        = AnotherMongoidModel.create!(title: "Another findable title")
+    @junk           = MongoidModel.create!(title: "Junk", junk: "Not Findable junk")
+    @localized      = LocalizedMongoidModel.create!(title: "English English")
+    I18n.with_locale(:es) do
+      @localized.title = "Español Español"
+      @localized.save
+    end
   end
   
   it "should find the expected documents" do
-    ActiveSearch.search("findable").map { |r| r.stored["title"] }.should == ["Findable", "Some title", "Another findable title"]
+    ActiveSearch.search("findable").map { |r| r.stored["title"] }.should == ["Findable Findable", "Some title", "Another findable title"]
   end
   
   it "should store the proper keywords" do
@@ -44,6 +60,17 @@ describe ActiveSearch::Mongoid do
   end
   
   it "should store the specified fields" do
-    ActiveSearch::Mongoid::Model.where(type: "MongoidModel", original_id: @findable.id).first.stored.should == {"title" => "Findable"}
+    ActiveSearch::Mongoid::Model.where(type: "MongoidModel", original_id: @findable.id).first.stored.should == {"title" => "Findable Findable", "junk" => "Junk field"}
+  end
+  
+  it "should be able to find by different locales" do
+    ActiveSearch.search("english").first.stored["title"]["en"].should == "English English"
+    I18n.with_locale(:es) do
+      ActiveSearch.search("español").first.stored["title"]["es"].should == "Español Español"
+    end
+  end
+  
+  it "should store localized keywords" do
+    ActiveSearch::Mongoid::Model.where(type: "LocalizedMongoidModel", original_id: @localized.id).first.keywords.should == ["en:english", "es:español"]
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activesearch
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-26 00:00:00.000000000 Z
+date: 2012-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec