activesearch 0.0.13 → 0.0.14

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjhhY2NlMzY1NDJmZGU1YjdlNzk0NGIyOGFhOTM5M2RkNjA3YTM1MA==
+    MTU2NGJjNGExNDVjNjY5OTk4Njk0OTQwM2FhZjExZmM0Y2E2MmFkNg==
   data.tar.gz: !binary |-
-    YTdhYzQwM2NiNGI5NWFiYmY5ZjA3YzYyOGU4ZTJhMjU0ZTY5YTRjMQ==
+    Njg2Yzk2OTIxMzNkZjY4OTFlZjhmYWQ1OWU2NDVhN2M4NGNiN2Y4Mg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YzAxNTg0M2NkYzRiYmE2MzMzOThhZTI4MzkyMWU5N2Y2YjZmMGMyOGJhZmQy
-    ODk5MTBiNTczNTkwNjYwODdkM2JmM2Q0ODViNmE4NWYwNzg1OTU5NGZkMWUz
-    NGZmYzI4YjM0NzA5YTFlYjFiNWE1Y2IzOGQ5NDMwNDc3NTc3NmQ=
+    YzliZTAwNDgwMjQ5MGMxNTM0ZDM4Njc4MDE5NjI2MDFmNTBlMDQwZDY0ZGZk
+    NzE4ZTZlYWQyNGNiNDc1NGE0ZTNiYTE0MzcwNjMxODU2ODI4YTY5OGRmY2Jk
+    ZTVmNjFhYTE0YjY0MmU5ODYwNTdlYWU0YmQ2MjM5MzMzYmMyZjQ=
   data.tar.gz: !binary |-
-    YWM5Mzg0YjA5MDllZjhhZDllMzBkZDlkODU2YWRlZDQ0NjU2YTk0ZWQ4Yzg2
-    MGZlYmViMWNmNmY0MGYxYTdlYjNiYTY3NzNkNDA3MjlmZDY2YWRhYmQ4NTky
-    YmIzMzg5MzYyOGMwM2NlYzFhOWIyZDQxNTMzMWZmNTI5NzEyNmQ=
+    YTgzMTI3ZDAwMDJlYjJkZjRlY2VlMTE2ODdhOWEwZWY5NWIyMDE3M2RiNTUy
+    NmU2ZjUwNzQ2ODJkYjUyN2E2Mzg2NWZkOGJjZjU1ZmQ1MjFhODljZTlhYWRi
+    MzM5MDkyNWNjMmExZmUyMjczMjc1ZGJjNGQzZDk1NjlkMGE3OGY=

data/lib/activesearch/algolia/client.rb

@@ -27,8 +27,8 @@ module ActiveSearch::Algolia
       self.class.put("/#{id}", body: object.to_json)
     end
 
-    def query(text)
-      self.class.get("", query: {query: text})
+    def query(text, extras = {})
+      self.class.get("", query: extras.merge!(query: text))
     end
   end
 end

data/lib/activesearch/algolia.rb

@@ -3,9 +3,10 @@ require "activesearch/base"
 require "activesearch/proxy"
 
 module ActiveSearch
-  def self.search(text)
-    Proxy.new(text) do |text|
-      Algolia::Client.new.query(text)["hits"].map! do |hit|
+  def self.search(text, conditions = {})
+    Proxy.new(text, conditions) do |text, conditions|
+      
+      Algolia::Client.new.query(text, tags: conditions_to_tags(conditions))["hits"].map! do |hit|
         if hit["_tags"]
           hit["_tags"].each do |tag|
             k, v = tag.split(':')
@@ -18,6 +19,11 @@ module ActiveSearch
     end
   end
   
+  protected
+  def self.conditions_to_tags(conditions)
+    conditions.map { |c| c.join(':') }.join(',')
+  end
+  
   module Algolia
     def self.included(base)
       base.class_eval do

data/lib/activesearch/mongoid/model.rb

@@ -7,14 +7,11 @@ module ActiveSearch
       field :_original_id, type: BSON::ObjectId
       field :_keywords
       field :_stored, type: Hash, default: {}
+      alias_method :to_hash, :_stored
       
       index :_keywords
       index [:_original_type, :_original_id], unique: true
       
-      def to_hash
-        _stored
-      end
-      
       def store_fields(original, fields, options)
         if options && options[:store]
           self._stored = {}

data/lib/activesearch/mongoid.rb

@@ -1,12 +1,16 @@
 require 'activesearch/base'
+require 'activesearch/proxy'
 require 'activesearch/mongoid/model'
 
 module ActiveSearch
   
-  # TODO: Wrap this so all engines behave consistently
-  def self.search(text)
-    text = text.split(/\s+/)
-    Mongoid::Model.where(:_keywords.in => text + text.map { |word| "#{I18n.locale}:#{word}"})
+  def self.search(text, conditions = {})
+    Proxy.new(text, conditions) do |text, conditions|
+      text = text.split(/\s+/)
+      conditions.keys.each { |k| conditions["_stored.#{k}"] = conditions.delete(k) }
+      conditions.merge!(:_keywords.in => text + text.map { |word| "#{I18n.locale}:#{word}"})
+      Mongoid::Model.where(conditions)
+    end
   end
   
   module Mongoid

data/lib/activesearch/proxy.rb

@@ -4,13 +4,14 @@ module ActiveSearch
   class Proxy
     include Enumerable
     
-    def initialize(text, &implementation)
+    def initialize(text, conditions, &implementation)
       @text = text
+      @conditions = conditions
       @implementation = implementation
     end
     
     def each(&block)
-      @implementation.call(@text).each { |result| block.call(Result.new(result)) }
+      @implementation.call(@text, @conditions).each { |result| block.call(Result.new(result)) }
     end
   end
 end

data/lib/activesearch/result.rb

@@ -2,12 +2,10 @@ module ActiveSearch
   class Result < Hash
     def initialize(result)
       result.to_hash.each do |k,v|
-        self[k.to_s] = v unless v.nil?
+        unless v.nil?
+          self[k.to_s] = v.respond_to?(:has_key?) && v.has_key?(I18n.locale.to_s) ? v[I18n.locale.to_s] : v
+        end
       end
     end
-    
-    def attributes
-      self
-    end
   end
 end

data/lib/activesearch/version.rb

@@ -1,3 +1,3 @@
 module ActiveSearch
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

data/spec/engines_spec.rb

@@ -27,15 +27,16 @@ Dir[File.join(File.dirname(__FILE__), 'models', '*.rb')].map { |f| File.basename
     
     before do
       cleanup(engine)
-      @findable       = Object.const_get("#{engine}Model").create(title: "Findable Findable", junk: "Junk field")
-      @quite_findable = Object.const_get("#{engine}Model").create(title: "Some title", text: "Findable text")
-      @another        = Object.const_get("Another#{engine}Model").create(title: "Another <strong>findable</strong> title with tags")
-      @junk           = Object.const_get("#{engine}Model").create(title: "Junk", junk: "Not Findable junk")
-      @special        = Object.const_get("#{engine}Model").create(title: "Not findable because it's special", special: true)
+      @findable       = Object.const_get("#{engine}Model").create(title: "Findable Findable", junk: "Junk field", scope_id: 1)
+      @quite_findable = Object.const_get("#{engine}Model").create(title: "Some title", text: "Findable text", scope_id: 1)
+      @another        = Object.const_get("Another#{engine}Model").create(title: "Another <strong>findable</strong> title with tags", scope_id: 1)
+      @junk           = Object.const_get("#{engine}Model").create(title: "Junk", junk: "Not Findable junk", scope_id: 1)
+      @special        = Object.const_get("#{engine}Model").create(title: "Not findable because it's special", special: true, scope_id: 1)
+      @foreign        = Object.const_get("#{engine}Model").create(title: "Findable", scope_id: 2)
     end
     
     it "should find the expected documents" do
-      results = ActiveSearch.search("findable").map { |doc| doc.to_hash.select { |k,v| %w[title junk virtual].include?(k.to_s) } }
+      results = ActiveSearch.search("findable", scope_id: 1).map { |doc| doc.select { |k,v| %w[title junk virtual].include?(k.to_s) } }
       results.sort_by { |result| result["title"] }.should == [
           {
             "title"   => "Another <strong>findable</strong> title with tags",
@@ -55,7 +56,7 @@ Dir[File.join(File.dirname(__FILE__), 'models', '*.rb')].map { |f| File.basename
 
     it "should remove destroyed documents from index" do
       @findable.destroy
-      ActiveSearch.search("findable").count.should == 2
+      ActiveSearch.search("findable").count.should == 3
     end
   end
 end

data/spec/models/algolia.rb

@@ -7,8 +7,9 @@ class AlgoliaModel < ActiveMimic
   attribute :text
   attribute :junk
   attribute :special, default: false
+  attribute :scope_id, type: Integer
   
-  search_by [:title, :text, store: [:title, :junk]], if: lambda { !self.special }
+  search_by [:title, :text, store: [:title, :junk, :scope_id]], if: lambda { !self.special }
 
 end
 
@@ -16,7 +17,8 @@ class AnotherAlgoliaModel < ActiveMimic
   include ActiveSearch::Algolia
   
   attribute :title, type: String
-  search_by [:title, store: [:title, :virtual]]
+  attribute :scope_id, type: Integer
+  search_by [:title, store: [:title, :virtual, :scope_id]]
   
   def virtual
     "virtual"

data/spec/models/mongoid.rb

@@ -11,7 +11,8 @@ class MongoidModel
   field :text,  type: String
   field :junk,  type: String
   field :special, type: Boolean, default: false
-  search_by [:title, :text, store: [:title, :junk]], unless: :special
+  field :scope_id, type: Integer
+  search_by [:title, :text, store: [:title, :junk, :scope_id]], unless: :special
 end
 
 class AnotherMongoidModel
@@ -19,10 +20,11 @@ class AnotherMongoidModel
   include ActiveSearch::Mongoid
   
   field :title, type: String
+  field :scope_id, type: Integer
   search_by :options_for_search
   
   def options_for_search
-    [:title, :text, store: [:title, :virtual]]
+    [:title, :text, store: [:title, :virtual, :scope_id]]
   end
   
   def virtual

data/spec/mongoid_spec.rb

@@ -26,17 +26,13 @@ describe ActiveSearch::Mongoid do
   end
   
   it "should be able to find by different locales" do
-    ActiveSearch.search("english").first._stored["title"]["en"].should == "<strong>English</strong> English"
+    ActiveSearch.search("english").first["title"].should == "<strong>English</strong> English"
     I18n.with_locale(:es) do
-      ActiveSearch.search("español").first._stored["title"]["es"].should == "Español Español"
+      ActiveSearch.search("español").first["title"].should == "Español Español"
     end
   end
   
-  it "should store localized keywords" do
+  it "should store localized keywords with tags stripped" do
     ActiveSearch::Mongoid::Model.where(_original_type: "LocalizedMongoidModel", _original_id: @localized.id).first._keywords.should == ["en:english", "es:español"]
   end
-  
-  it "should strip tags" do
-    ActiveSearch.search("english").first._keywords.should == ['en:english', 'es:español']
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activesearch
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Rodrigo Alvarez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-19 00:00:00.000000000 Z
+date: 2013-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport