elastic_searchable 2.0.0 → 2.0.1

data/lib/elastic_searchable/index.rb

@@ -11,7 +11,7 @@ module ElasticSearchable
       # http://www.elasticsearch.com/docs/elasticsearch/rest_api/admin/indices/put_mapping/
       def create_mapping
         return unless self.elastic_options[:mapping]
-        ElasticSearchable.request :put, index_mapping_path('_mapping'), :json_body => {index_type => mapping}
+        ElasticSearchable.request :put, index_mapping_path('_mapping'), :json_body => {index_type => self.elastic_options[:mapping]}
       end
 
       # delete one record from the index

data/lib/elastic_searchable/queries.rb

@@ -17,15 +17,13 @@ module ElasticSearchable
       options[:fields] ||= '_id'
       options[:size] ||= per_page_for_search(options)
       options[:from] ||= options[:size] * (page - 1)
-      if query.is_a?(Hash)
-        options[:query] = query
+      options[:query] ||= if query.is_a?(Hash)
+        query
       else
-        options[:query] = {
-          :query_string => {
-            :query => query,
-            :default_operator => options.delete(:default_operator)
-          }
-        }
+        {}.tap do |q|
+          q[:query_string] = { :query => query }
+          q[:query_string][:default_operator] = options.delete(:default_operator) if options.has_key?(:default_operator)
+        end
       end
       query = {}
       case sort = options.delete(:sort)

data/lib/elastic_searchable/version.rb

@@ -1,3 +1,3 @@
 module ElasticSearchable
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 end

data/lib/elastic_searchable.rb

@@ -6,21 +6,23 @@ require 'elastic_searchable/active_record_extensions'
 module ElasticSearchable
   include HTTParty
   format :json
-  base_uri 'localhost:9200'
+  base_uri ENV['ELASTICSEARCH_URL'] || 'localhost:9200'
 
   class ElasticError < StandardError; end
   class << self
-    attr_accessor :logger, :index_name, :index_settings, :offline
+    attr_accessor :logger, :index_name, :index_settings
+    @@offline = false
 
     # execute a block of work without reindexing objects
     def offline(&block)
-      @offline = true
+      original_value = offline?
+      @@offline = true
       yield
     ensure
-      @offline = false
+      @@offline = original_value
     end
     def offline?
-      !!@offline
+      !!@@offline
     end
     # encapsulate encoding hash into json string
     # support Yajl encoder if installed

data/test/test_elastic_searchable.rb

@@ -4,7 +4,7 @@ class TestElasticSearchable < Test::Unit::TestCase
   def setup
     delete_index
     ElasticSearchable.index_settings = {'number_of_replicas' => 0, 'number_of_shards' => 1}
-    # ElasticSearchable.debug_output
+    ElasticSearchable.debug_output
   end
 
   context 'non elastic activerecord class' do
@@ -29,7 +29,8 @@ class TestElasticSearchable < Test::Unit::TestCase
   end
 
   class Post < ActiveRecord::Base
-    elastic_searchable
+    elastic_searchable \
+      :mapping => {:properties => { :title => {:type => "string", :index => "not_analyzed"} } }
     after_index :indexed
     after_index :indexed_on_create, :on => :create
     after_index :indexed_on_update, :on => :update
@@ -89,16 +90,17 @@ class TestElasticSearchable < Test::Unit::TestCase
 
   context 'Model.create' do
     setup do
+      ElasticSearchable.create_index
       @post = Post.create :title => 'foo', :body => "bar"
     end
     should 'have fired after_index callback' do
-      assert @post.indexed?
+      assert @post.indexed?, 'indexed?'
     end
     should 'have fired after_index_on_create callback' do
-      assert @post.indexed_on_create?
+      assert @post.indexed_on_create?, 'indexed_on_create?'
     end
     should 'not have fired after_index_on_update callback' do
-      assert !@post.indexed_on_update?
+      assert !@post.indexed_on_update?, 'indexed_on_update?'
     end
   end
 
@@ -120,6 +122,25 @@ class TestElasticSearchable < Test::Unit::TestCase
     end
   end
 
+  context 'Model.create within two ElasticSearchable.offline blocks' do
+    setup do
+      ElasticSearchable.offline do
+        ElasticSearchable.offline do
+          @post = Post.create :title => 'foo', :body => "bar"
+        end
+      end
+    end
+    should 'not have fired after_index callback' do
+      assert !@post.indexed?
+    end
+    should 'not have fired after_index_on_create callback' do
+      assert !@post.indexed_on_create?
+    end
+    should 'not have fired after_index_on_update callback' do
+      assert !@post.indexed_on_update?
+    end
+  end
+
   context 'Model.create within ElasticSearchable.offline block' do
     setup do
       ElasticSearchable.offline do
@@ -141,17 +162,17 @@ class TestElasticSearchable < Test::Unit::TestCase
     setup do
       Post.delete_all
       ElasticSearchable.create_index
-      @first_post = Post.create :title => 'foo', :body => "first bar"
-      @second_post = Post.create :title => 'foo', :body => "second bar"
+      @first_post = Post.create :title => 'bar', :body => "first foo"
+      @second_post = Post.create :title => 'foo', :body => "second foo"
       ElasticSearchable.delete_index
       ElasticSearchable.create_index
     end
-    should 'not raise error if error occurs reindexing model' do
-      ElasticSearchable.expects(:request).raises(ElasticSearchable::ElasticError.new('faux error'))
-      assert_nothing_raised do
-        Post.reindex
-      end
-    end
+    # should 'not raise error if error occurs reindexing model' do
+    #   ElasticSearchable.expects(:request).raises(ElasticSearchable::ElasticError.new('faux error'))
+    #   assert_nothing_raised do
+    #     Post.reindex
+    #   end
+    # end
     should 'not raise error if destroying one instance' do
       Logger.any_instance.expects(:warn)
       assert_nothing_raised do
@@ -175,8 +196,8 @@ class TestElasticSearchable < Test::Unit::TestCase
   context 'with index containing multiple results' do
     setup do
       ElasticSearchable.create_index
-      @first_post = Post.create :title => 'foo', :body => "first bar"
-      @second_post = Post.create :title => 'foo', :body => "second bar"
+      @first_post = Post.create :title => 'bar', :body => "first foo"
+      @second_post = Post.create :title => 'foo', :body => "second foo"
       ElasticSearchable.refresh_index
     end
 
@@ -199,7 +220,7 @@ class TestElasticSearchable < Test::Unit::TestCase
     end
     context 'searching on a term that returns multiple results' do
       setup do
-        @results = Post.search 'foo'
+        @results = Post.search 'foo', :sort => 'title'
       end
       should 'have populated hit on each record with the correct hit json' do
         assert_equal @results.first.hit['_id'], @first_post.id.to_s
@@ -231,7 +252,7 @@ class TestElasticSearchable < Test::Unit::TestCase
 
     context 'when per_page is a string' do
       setup do
-        @results = Post.search 'foo', :per_page => 1.to_s, :sort => 'id'
+        @results = Post.search 'foo', :per_page => 1.to_s, :sort => 'title'
       end
       should 'find first object' do
         assert_contains @results, @first_post
@@ -240,7 +261,7 @@ class TestElasticSearchable < Test::Unit::TestCase
 
     context 'searching for second page using will_paginate params' do
       setup do
-        @results = Post.search 'foo', :page => 2, :per_page => 1, :sort => 'id'
+        @results = Post.search 'foo', :page => 2, :per_page => 1, :sort => 'title'
       end
       should 'not find objects from first page' do
         assert_does_not_contain @results, @first_post
@@ -258,7 +279,7 @@ class TestElasticSearchable < Test::Unit::TestCase
 
     context 'sorting search results' do
       setup do
-        @results = Post.search 'foo', :sort => 'id:desc'
+        @results = Post.search 'foo', :sort => 'title:desc'
       end
       should 'sort results correctly' do
         assert_equal @second_post, @results.first
@@ -268,7 +289,7 @@ class TestElasticSearchable < Test::Unit::TestCase
 
     context 'advanced sort options' do
       setup do
-        @results = Post.search 'foo', :sort => [{:id => 'desc'}]
+        @results = Post.search 'foo', :sort => [{:title => 'desc'}]
       end
       should 'sort results correctly' do
         assert_equal @second_post, @results.first

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic_searchable
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-07 00:00:00.000000000 Z
+date: 2012-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2151908780 !ruby/object:Gem::Requirement
+  requirement: &2151868260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *2151908780
+  version_requirements: *2151868260
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &2151907680 !ruby/object:Gem::Requirement
+  requirement: &2151867400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2151907680
+  version_requirements: *2151867400
 - !ruby/object:Gem::Dependency
   name: backgrounded
-  requirement: &2151906900 !ruby/object:Gem::Requirement
+  requirement: &2151866680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *2151906900
+  version_requirements: *2151866680
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &2151906200 !ruby/object:Gem::Requirement
+  requirement: &2151866000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2151906200
+  version_requirements: *2151866000
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2151905500 !ruby/object:Gem::Requirement
+  requirement: &2151865340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,10 +65,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *2151905500
+  version_requirements: *2151865340
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2151904900 !ruby/object:Gem::Requirement
+  requirement: &2151864760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -76,10 +76,10 @@ dependencies:
         version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: *2151904900
+  version_requirements: *2151864760
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &2151904080 !ruby/object:Gem::Requirement
+  requirement: &2151864020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -87,10 +87,10 @@ dependencies:
         version: 0.9.6.2
   type: :development
   prerelease: false
-  version_requirements: *2151904080
+  version_requirements: *2151864020
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2151919660 !ruby/object:Gem::Requirement
+  requirement: &2151863260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -98,10 +98,10 @@ dependencies:
         version: 2.11.3
   type: :development
   prerelease: false
-  version_requirements: *2151919660
+  version_requirements: *2151863260
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2151918640 !ruby/object:Gem::Requirement
+  requirement: &2151862580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -109,7 +109,7 @@ dependencies:
         version: 0.10.0
   type: :development
   prerelease: false
-  version_requirements: *2151918640
+  version_requirements: *2151862580
 description: integrate the elastic search engine with rails
 email:
 - ryan@codecrate.com
@@ -153,7 +153,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4429360215789291736
+      hash: 808032034448504633
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -162,10 +162,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4429360215789291736
+      hash: 808032034448504633
 requirements: []
 rubyforge_project: elastic_searchable
-rubygems_version: 1.8.13
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: elastic search for activerecord