activesearch 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b24050eefed5b21eb1b0d085fa964effdc06c2d8
-  data.tar.gz: 780df5ddeb72407c972869ab11a9a6e015018554
+  metadata.gz: ad6a5304a892366c29fdaaac5d36acd68c01cccd
+  data.tar.gz: 390657dc4805e5404f5a05ddecd264e20283fb7a
 SHA512:
-  metadata.gz: c1e5576e03f3f0ae6a610ddef63bf3c661e68520ef8fdae55ca4e98c9676f14fb038de8088b416c59b085515ea4568aa5b58500085003bae87ee80c375e66cc7
-  data.tar.gz: f1caac8c129064500ec93a3f13f7854ab83f698ed7e27f8729ae9fc21cf2a2a999a23fd75663304590bb1490ef0e979e2f3a2fff4ff7abd71b4aa884eb7e23c1
+  metadata.gz: 241cd473dcb494c7267864e8976166da68e2a0f13b40a5c9b1b6759167d70ebfa570f8a4c0252d06fd6bca8044088dcca3368188a53aa18993a8c55100d5f0bc
+  data.tar.gz: ad669841f7ea28d1e1f337cdfd1192c945e50d7499e99ae39e18372fa96752e7157d41ef18f24c01e7626f8c6e9b440b2c6bf28e0a31ba8a60d456ee03337ef0

data/lib/activesearch/algolia.rb

@@ -10,7 +10,7 @@ module ActiveSearch
     conditions[:locale] ||= locale
 
     Proxy.new(text, conditions, options) do |text, conditions|
-      Algolia::Client.new.query(text, tags: conditions_to_tags(conditions))["hits"].map! do |hit|
+      Algolia::Client.new.query(text, { tags: conditions_to_tags(conditions) }, options)["hits"].map! do |hit|
         if hit["_tags"]
           hit["_tags"].each do |tag|
             # preserve other ":" characters
@@ -49,7 +49,7 @@ module ActiveSearch
       Worker.new.async.perform(task: :deindex, id: self.id, type: self.class.to_s)
     end
 
-    def to_indexable
+    def to_indexable(depth = 0)
       {}.tap do |doc|
         _locale = search_locale
 
@@ -57,6 +57,8 @@ module ActiveSearch
           if content = send(field)
             doc[field.to_s] = if content.is_a?(Hash) && content.has_key?(_locale)
               ActiveSearch.strip_tags(content[_locale])
+            elsif content && content.respond_to?(:to_indexable)
+              ActiveSearch.strip_tags(content.to_indexable(depth + 1))
             else
               ActiveSearch.strip_tags(content)
             end

data/lib/activesearch/algolia/client.rb

@@ -5,7 +5,7 @@ module ActiveSearch
   module Algolia
     class Client
       include HTTParty
-  
+
       def self.configure(api_key, app_id, index = "activesearch")
         base_uri "https://#{app_id}.algolia.io/1/indexes/#{index}"
         headers({
@@ -28,10 +28,16 @@ module ActiveSearch
         self.class.put("/#{id}", body: object.to_json)
       end
 
-      def query(text, extras = {})
-        self.class.get("", query: extras.merge!(query: text))
+      def query(text, extras = {}, options = {})
+        page, per_page = options[:page] || 0, options[:per_page] || 20
+
+        self.class.get('', query: extras.merge!(
+          query:        text,
+          page:         page,
+          hitsPerPage:  per_page
+        ))
       end
-      
+
       def get(id)
         self.class.get("/#{id}")
       end

data/lib/activesearch/mongoid.rb

@@ -1,5 +1,6 @@
 require 'activesearch/base'
 require 'activesearch/proxy'
+require 'activesearch/mongoid/full_text_search_query'
 require 'activesearch/mongoid/index'
 
 module ActiveSearch
@@ -9,7 +10,7 @@ module ActiveSearch
     conditions[:locale] ||= locale
 
     Proxy.new(text, conditions, options) do |text, conditions|
-      ActiveSearch::Mongoid::Index.search(text, conditions)
+      ActiveSearch::Mongoid::Index.search(text, conditions, options)
     end
   end
 
@@ -20,7 +21,7 @@ module ActiveSearch
       end
     end
 
-    def to_indexable
+    def to_indexable(depth = 0)
       {}.tap do |doc|
         _locale = search_locale
 
@@ -28,6 +29,8 @@ module ActiveSearch
           if content = send(field)
             doc[field.to_s] = if content.is_a?(Hash) && content.has_key?(_locale)
               ActiveSearch.strip_tags(content[_locale])
+            elsif content && content.respond_to?(:to_indexable)
+              ActiveSearch.strip_tags(content.to_indexable(depth + 1))
             else
               ActiveSearch.strip_tags(content)
             end

data/lib/activesearch/mongoid/full_text_search_query.rb

@@ -0,0 +1,86 @@
+module ActiveSearch
+  module Mongoid
+    class FullTextSearchQuery
+
+      attr_reader :results
+
+      def initialize(name, query, conditions, options)
+        @name     = name
+        @query    = query
+        @filter   = prepare_filter(conditions)
+        @options  = options
+        @language = self.class.locale_to_language(conditions[:locale] || I18n.locale)
+      end
+
+      def run
+        @results = session.command({
+          'text'      => @name,
+          'search'    => @query,
+          'language'  => @language,
+          'filter'    => @filter
+        })
+
+        if @results.has_key?('results')
+          sanitize_results
+        else
+          []
+        end
+      end
+
+      def session
+        ::Mongoid.session('default')
+      end
+
+      def self.locale_to_language(locale)
+        {
+          dk: 'danish',
+          nl: 'dutch',
+          en: 'english',
+          fi: 'finnish',
+          fr: 'french',
+          de: 'german',
+          hu: 'hungarian',
+          it: 'italian',
+          nb: 'norwegian',
+          br: 'portuguese',
+          pt: 'portuguese',
+          ro: 'romanian',
+          ru: 'russian',
+          es: 'spanish',
+          se: 'swedish',
+          tr: 'turkish'
+        }[locale.to_sym] || 'english'
+      end
+
+      protected
+
+      def prepare_filter(conditions)
+        {}.tap do |filter|
+          conditions.each do |key, value|
+            if key == :locale
+              filter['locale'] = value.to_s
+            else
+              filter["stored.#{key}"] = value
+            end
+          end
+        end
+      end
+
+      def sanitize_results
+        page, per_page = @options[:page] || 0, @options[:per_page] || 10
+        included  = ((page * per_page)..((page + 1) * per_page - 1))
+        _results  = []
+
+        # manual pagination since it is not natively supported by MongoDB
+        @results['results'].each_with_index do |result, index|
+          if included === index
+            _results << result['obj']['stored'].merge(result['obj'].slice('locale', 'original_type', 'original_id'))
+          end
+        end
+
+        @results = _results
+      end
+
+    end
+  end
+end

data/lib/activesearch/mongoid/index.rb

@@ -21,7 +21,7 @@ module ActiveSearch
 
       def store_language(original)
         self.locale   = original.search_locale
-        self.language = self.class.locale_to_language(self.locale)
+        self.language = FullTextSearchQuery.locale_to_language(self.locale)
       end
 
       def store_fields(original)
@@ -30,8 +30,11 @@ module ActiveSearch
         fields = (original.search_fields + (original.search_options[:store] || [])).uniq
 
         fields.each do |f|
-          if original.send(f).present?
-            self.stored[f] = ActiveSearch.strip_tags(original.send(f))
+          content = original.send(f)
+
+          if content.present?
+            content = content.to_indexable if content.respond_to?(:to_indexable)
+            self.stored[f] = ActiveSearch.strip_tags(content)
           end
         end
       end
@@ -42,32 +45,9 @@ module ActiveSearch
 
       ## class methods ##
 
-      def self.search(query, conditions = {})
-        language = self.locale_to_language(conditions[:locale] || I18n.locale)
-
-        filter = {}
-        conditions.each do |key, value|
-          if key == :locale
-            filter['locale'] = value.to_s
-          else
-            filter["stored.#{key}"] = value
-          end
-        end
-
-        session = ::Mongoid.session('default')
-        results = session.command({
-          'text'      => collection.name,
-          'search'    => query,
-          'language'  => language,
-          'filter'    => filter
-        })
-        if results.has_key?('results')
-          results['results'].map do |result|
-            result['obj']['stored'].merge(result['obj'].slice('locale', 'original_type', 'original_id'))
-          end
-        else
-          []
-        end
+      def self.search(query, conditions = {}, options = {})
+        query = FullTextSearchQuery.new(collection.name, query, conditions, options)
+        query.run
       end
 
       def self.deindex(original)
@@ -90,26 +70,6 @@ module ActiveSearch
         doc.save
       end
 
-      def self.locale_to_language(locale)
-        {
-          dk: 'danish',
-          nl: 'dutch',
-          en: 'english',
-          fi: 'finnish',
-          fr: 'french',
-          de: 'german',
-          hu: 'hungarian',
-          it: 'italian',
-          nb: 'norwegian',
-          br: 'portuguese',
-          pt: 'portuguese',
-          ro: 'romanian',
-          ru: 'russian',
-          es: 'spanish',
-          se: 'swedish',
-          tr: 'turkish'
-        }[locale.to_sym] || 'english'
-      end
     end
   end
 end

data/lib/activesearch/version.rb

@@ -1,3 +1,3 @@
 module ActiveSearch
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/spec/models/mongoid.rb

@@ -27,7 +27,7 @@ class AnotherMongoidModel
   end
 
   def virtual
-    "virtual"
+    Struct.new(:to_indexable).new('virtual')
   end
 end
 

data/spec/support/setup_engine.rb

@@ -41,6 +41,11 @@ module SetupEngine
 
     ActiveSearch::Mongoid::Index.create_indexes
 
+    if ENV['MONGOID_LOGS'].present?
+      Moped.logger = Logger.new($stdout)
+      Moped.logger.level = Logger::DEBUG
+    end
+
     DatabaseCleaner.clean
   end
 

data/spec/support/shared_examples_for_engines.rb

@@ -57,7 +57,20 @@ shared_examples 'an engine' do
     @model.create(title: <<-LIPSUM, junk: "Junk field", scope_id: 1)
       Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy findable text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.
     LIPSUM
-    ActiveSearch.search("dummy findable").first["highlighted"]["title"].should == "Lorem Ipsum is simply <em>dummy</em> text of the printing and typesetting industry. Lo..."
+    entry = ActiveSearch.search("dummy findable").first
+    entry["highlighted"]["title"].should == "Lorem Ipsum is simply <em>dummy</em> text of the printing and typesetting industry. Lo..."
+  end
+
+  it "should paginate docs" do
+    page = ActiveSearch.search("findable", {}, { page: 0, per_page: 2 })
+    first_page_titles = page.map { |e| e['title'] }
+    page.count.should == 2
+
+    page = ActiveSearch.search("findable", {}, { page: 1, per_page: 2 })
+    second_page_titles = page.map { |e| e['title'] }
+    page.count.should == 2
+
+    first_page_titles.should_not == second_page_titles
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activesearch
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Rodrigo Alvarez
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-01 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -203,6 +203,7 @@ files:
 - lib/activesearch/base.rb
 - lib/activesearch/elastic_search.rb
 - lib/activesearch/mongoid.rb
+- lib/activesearch/mongoid/full_text_search_query.rb
 - lib/activesearch/mongoid/index.rb
 - lib/activesearch/proxy.rb
 - lib/activesearch/result.rb