activesearch 0.1.1 → 0.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWQyZDE0NTc4MTEyZWVlNmQ4ZmYyZDRlNWM3ZDE2N2Y2ZGQ0NDJmMg==
+    NDUxNjIzNjY2NmQxYjIzYmQ4NzA0NjRmYThjNThmY2ZhNjk4N2VlNw==
   data.tar.gz: !binary |-
-    OTFmMWY4NTdjZDYzZTZhZTgzYjA1OTc3ODcwMDQzZGZhMDI5MzU4Nw==
+    ZjZmZDhkODU0NzI4MDU0ZjU5YWUzODcyMGFlZDhlNGMyNDk1NjRhMw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZDU1YjU3NjhjYjlmMTkyNTVhNzY0NzBjYjdiZmQwZTkyZjM0MjJiMzg2MmI3
-    NThjMWM2MzlmZTBjZTlmNTA4YmM1MGMxNzBiN2ZlZDRlMjBjMWZjZGZjZmEw
-    ZDI0OTNlNmU2MjlhMTZjNTIyYjM5MDU3Y2U1MzljNjRlNjJlOGE=
+    MTA2OTEwMzMxYWE2ZTI4MTg3MzcyNTE2MmE4ZGU1ZDc4YjZjMmU2MjBjOTJm
+    ODc2MTNiNmUzZjhkM2E2ZTNlOGQ0OGYzOWJhYTdiNTUxMTYzNzA1N2JmZjcz
+    YTc3YTM5Nzc1OWYxYzU1YzZmZGUyYTliZmE1NDllY2YxNDYzZGY=
   data.tar.gz: !binary |-
-    OWIwYTFmOTUwMDE4ZWRmN2IxMWEwZmQ2MGZlZmZhZmNkMGMyMmY4ZjdhOGFi
-    ODBhYjcyNzMxZDlmNGM4MjUzOTdhMGZjZmMwZTM4MDJjNmFhYWI5NjVhNTYw
-    MWYwYjA4MTdmNDE3NmM4MWMzYTVkYTYyYzNjNDQ1YzU3OTFhMmU=
+    MzM2NGFkNWZhZmZmMjY1MDNmZjJmMzI4MzBhNTI0OGJlMWRhOTg0YmJlNDRh
+    MjI3OWFiYzIxYjU2NTM4OWRlMTFlZGFmYjkyNzYwYzAzMjdkM2FhN2U5Zjg4
+    NjFlYTBmZTFjNjJkMDRiYTA4MDFjYTkxOTI3YWQzZWVmZjQ5MjU=

data/config/mongoid.yml

@@ -0,0 +1,6 @@
+test:
+  sessions:
+    default:
+      database: activesearch_test
+      hosts:
+        - localhost:27017

data/lib/activesearch/algolia/client.rb

@@ -7,7 +7,7 @@ module ActiveSearch
       include HTTParty
   
       def self.configure(api_key, app_id, index = "activesearch")
-        base_uri "https://apieu1.algolia.com/1/indexes/#{index}"
+        base_uri "https://#{app_id}.algolia.io/1/indexes/#{index}"
         headers({
           "X-Algolia-API-Key" => api_key,
           "X-Algolia-Application-Id" => app_id,

data/lib/activesearch/algolia.rb

@@ -5,8 +5,10 @@ require "activesearch/proxy"
 module ActiveSearch
   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|
+      options = {}
+      tags = conditions_to_tags(conditions)
+      options.merge!(tags: tags) if tags != ""
+      Algolia::Client.new.query(text, options)["hits"].map! do |hit|
         if hit["_tags"]
           hit["_tags"].each do |tag|
             k, v = tag.split(':')
@@ -34,6 +36,9 @@ module ActiveSearch
     protected
     def reindex
       algolia_client.save(indexable_id, self.to_indexable)
+    rescue
+      self.touch
+      false
     end
     
     def deindex

data/lib/activesearch/mongoid/model.rb

@@ -31,12 +31,13 @@ module ActiveSearch
           
           if original.fields[f.to_s].localized?
             memo += original.send("#{f}_translations").map do |locale,translation|
+              next if translation.nil?
               translation.downcase.split.map { |word| "#{locale}:#{word}"}
             end.flatten
           else
             if original[f]
               memo += if original[f].is_a?(Array)
-                original[f].map(&:downcase)
+                original[f].map { |value| value.nil? ? nil : value.downcase }
               else
                 original[f].downcase.split
               end

data/lib/activesearch/version.rb

@@ -1,3 +1,3 @@
 module ActiveSearch
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/algolia_spec.rb

@@ -0,0 +1,26 @@
+#encoding: utf-8
+require File.join(File.dirname(__FILE__), 'spec_helper')
+require 'activesearch/algolia'
+require_relative 'models/algolia'
+
+YAML.load_file(File.dirname(__FILE__) + '/../config/algolia.yml').tap do |config|
+  ActiveSearch::Algolia::Client.configure(config["api_key"], config["app_id"])
+end
+
+describe ActiveSearch::Algolia do
+  before do
+    ActiveSearch::Algolia::Client.new.delete_index
+  end
+  
+  context "errors on save" do
+    before do
+      @instance = AlgoliaModel.new(title: "Example")
+      @instance.should_receive(:touch).once
+      ActiveSearch::Algolia::Client.any_instance.stub(:save).and_raise(Errno::ECONNRESET)
+    end
+    
+    subject { -> { @instance.save } }
+    
+    it { should_not raise_error }
+  end
+end

data/spec/mongoid_spec.rb

@@ -3,20 +3,22 @@ require File.join(File.dirname(__FILE__), 'spec_helper')
 require 'mongoid'
 require 'activesearch/mongoid'
 
-Mongoid.database = Mongo::Connection.new("localhost").db("activesearch_test")
+Mongoid.load!("config/mongoid.yml", :test)
 
 class LocalizedMongoidModel
   include Mongoid::Document
   include ActiveSearch::Mongoid
   
   field :title, localize: true
-  search_by [:title, store: [:title]]
+  field :not_localized
+  field :array, type: Array
+  search_by [:title, :not_localized, :array, store: [:title]]
 end
 
 
 describe ActiveSearch::Mongoid do
   before do
-    Mongoid.master.collections.select { |c| c.name != 'system.indexes' }.each(&:drop)
+    Mongoid.purge!
     I18n.locale = :en
     @localized  = LocalizedMongoidModel.create!(title: "<strong>English</strong> English")
     I18n.with_locale(:es) do
@@ -35,4 +37,16 @@ describe ActiveSearch::Mongoid 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 "handles empty translations" do
+    lambda { LocalizedMongoidModel.create!(title: nil, not_localized: "example") }.should_not raise_error
+  end
+  
+  it "handles empty fields" do
+    lambda { LocalizedMongoidModel.create!(title: "Example", not_localized: nil) }.should_not raise_error
+  end
+  
+  it "handles nil values in arrays" do
+    lambda { LocalizedMongoidModel.create!(title: "Example", not_localized: "example", array: [nil]) }.should_not raise_error
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activesearch
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Rodrigo Alvarez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000 Z
+date: 2013-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -149,6 +149,7 @@ files:
 - README.md
 - Rakefile
 - activesearch.gemspec
+- config/mongoid.yml
 - config/sample.algolia.yml
 - lib/activesearch.rb
 - lib/activesearch/algolia.rb
@@ -160,6 +161,7 @@ files:
 - lib/activesearch/proxy.rb
 - lib/activesearch/result.rb
 - lib/activesearch/version.rb
+- spec/algolia_spec.rb
 - spec/base_spec.rb
 - spec/config/mongoid.yml
 - spec/engines_spec.rb
@@ -187,12 +189,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
 summary: ActiveSearch lets you plug in a ruby module in any class that will allow
   you to do full text searches.
 test_files:
+- spec/algolia_spec.rb
 - spec/base_spec.rb
 - spec/config/mongoid.yml
 - spec/engines_spec.rb