ssickles-tire 0.4.2.7 → 0.4.3

data/test/unit/results_collection_test.rb

@@ -214,6 +214,66 @@ module Tire
 
       end
 
+      context "with eager loading" do
+        setup do
+          @response = { 'hits' => { 'hits' => [ {'_id' => 1, '_type' => 'active_record_article'},
+                                                {'_id' => 2, '_type' => 'active_record_article'},
+                                                {'_id' => 3, '_type' => 'active_record_article'}] } }
+          ActiveRecordArticle.stubs(:inspect).returns("<ActiveRecordArticle>")
+        end
+
+        should "load the records via model find method from database" do
+          ActiveRecordArticle.expects(:find).with([1,2,3]).
+                              returns([ Results::Item.new(:id => 3),
+                                        Results::Item.new(:id => 1),
+                                        Results::Item.new(:id => 2)  ])
+          Results::Collection.new(@response, :load => true).results
+        end
+
+        should "pass the :load option Hash to model find metod" do
+          ActiveRecordArticle.expects(:find).with([1,2,3], :include => 'comments').
+                              returns([ Results::Item.new(:id => 3),
+                                        Results::Item.new(:id => 1),
+                                        Results::Item.new(:id => 2)  ])
+          Results::Collection.new(@response, :load => { :include => 'comments' }).results
+        end
+
+        should "preserve the order of records returned from search" do
+          ActiveRecordArticle.expects(:find).with([1,2,3]).
+                              returns([ Results::Item.new(:id => 3),
+                                        Results::Item.new(:id => 1),
+                                        Results::Item.new(:id => 2)  ])
+          assert_equal [1,2,3], Results::Collection.new(@response, :load => true).results.map(&:id)
+        end
+
+        should "raise error when model class cannot be inferred from _type" do
+          assert_raise(NameError) do
+            response = { 'hits' => { 'hits' => [ {'_id' => 1, '_type' => 'hic_sunt_leones'}] } }
+            Results::Collection.new(response, :load => true).results
+          end
+        end
+
+        should "raise error when _type is missing" do
+          assert_raise(NoMethodError) do
+            response = { 'hits' => { 'hits' => [ {'_id' => 1}] } }
+            Results::Collection.new(response, :load => true).results
+          end
+        end
+
+        should "return empty array for empty hits" do
+          response = { 'hits'  => {
+                         'hits' => [],
+                         'total' => 4
+                       },
+                       'took'  => 1 }
+          @collection = Results::Collection.new( response, :load => true )
+          assert @collection.empty?, 'Collection should be empty'
+          assert @collection.results.empty?, 'Collection results should be empty'
+          assert_equal 0, @collection.size
+        end
+
+      end
+
     end
 
   end

data/test/unit/results_item_test.rb

@@ -10,6 +10,7 @@ module Tire
       begin; Object.send(:remove_const, :Rails); rescue; end
       @model = Results::Item.new :title => 'Test'
     end
+    include ActiveModel::Lint::Tests
 
     context "Item" do
 
@@ -111,6 +112,42 @@ module Tire
         assert_match /<Item title|Item author/, @document.inspect
       end
 
+      context "within Rails" do
+
+        setup do
+          module ::Rails
+          end
+
+          class ::FakeRailsModel
+            extend  ActiveModel::Naming
+            include ActiveModel::Conversion
+            def self.find(id, options); new; end
+          end
+
+          @document = Results::Item.new :id => 1, :_type => 'fake_rails_model', :title => 'Test'
+        end
+
+        should "be an instance of model, based on _type" do
+          assert_equal FakeRailsModel, @document.class
+        end
+
+        should "be inspectable with masquerade" do
+          assert_match /<Item \(FakeRailsModel\)/, @document.inspect
+        end
+
+        should "return proper singular and plural forms" do
+          assert_equal 'fake_rails_model',  ActiveModel::Naming.singular(@document)
+          assert_equal 'fake_rails_models', ActiveModel::Naming.plural(@document)
+        end
+
+        should "instantiate itself for deep hashes, not a Ruby class corresponding to type" do
+          document = Results::Item.new :_type => 'my_model', :title => 'Test', :author => { :name => 'John' }
+
+          assert_equal Tire::Results::Item, document.class
+        end
+
+      end
+
     end
 
   end

data/test/unit/rubyext_test.rb

@@ -13,7 +13,7 @@ module Tire
           # Undefine the `to_json` method...
           ::Hash.class_eval { remove_method(:to_json) rescue nil }
           # ... and reload the extension, so it's added
-          load 'tire/rubyext/to_json.rb'
+          load 'tire/rubyext/hash.rb'
         end
 
         should "have its own to_json method" do
@@ -41,8 +41,8 @@ module Tire
       end
 
       should "properly serialize Time into JSON" do
-        json = { :time => Time.mktime(2011, 01, 01, 11, 00) }.to_json
-        assert_match %r/\{\s*"time"\s*:\s*"2011-01-01T11:00:00.*?"\}/, json
+        json = { :time => Time.mktime(2011, 01, 01, 11, 00).to_json  }.to_json
+        assert_match /"2011-01-01T11:00:00.*"/, MultiJson.decode(json)['time']
       end
 
     end

data/test/unit/search_test.rb

@@ -27,11 +27,6 @@ module Tire
         assert_match %r|localhost:9200/_search|, s.url
       end
 
-      should "be initialized with a base URL" do
-        s = Search::Search.new('index', :url => 'http://example.com:9200') { query { string 'foo' } }
-        assert_equal 'http://example.com:9200/index/_search', s.url
-      end
-
       should "allow to limit results with document type" do
         s = Search::Search.new('index', :type => 'bar') do
           query { string 'foo' }
@@ -203,7 +198,7 @@ module Tire
 
       should "allow to set the server url" do
         search = Search::Search.new('indexA')
-        search.url ='http://es1.example.com'
+        Configuration.url 'http://es1.example.com'
 
         Configuration.client.
           expects(:get).

data/test/unit/tire_test.rb

@@ -104,6 +104,21 @@ module Tire
 
       end
 
+      context "utils" do
+
+        should "encode a string for URL" do
+          assert_equal 'foo+bar',   Utils.escape('foo bar')
+          assert_equal 'foo%2Fbar', Utils.escape('foo/bar')
+          assert_equal 'foo%21',    Utils.escape('foo!')
+        end
+
+        should "encode a string from URL" do
+          assert_equal 'foo bar', Utils.unescape('foo+bar')
+          assert_equal 'foo/bar', Utils.unescape('foo%2Fbar')
+          assert_equal 'foo!',    Utils.unescape('foo%21')
+        end
+
+      end
     end
 
   end

data/tire.gemspec

@@ -1,21 +1,21 @@
 # -*- encoding: utf-8 -*-
-$:.unshift File.expand_path("../lib", __FILE__)
+$:.push File.expand_path("../lib", __FILE__)
 require "tire/version"
 
 Gem::Specification.new do |s|
   s.name        = "ssickles-tire"
   s.version     = Tire::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.summary     = "Ruby client for ElasticSearch"
-  s.homepage    = "http://github.com/karmi/tire"
-  s.authors     = [ 'Scott Sickles' ]
-  s.email       = 'scottsickles@gmail.com'
+  s.summary       = "Ruby client for ElasticSearch"
+  s.homepage      = "http://github.com/karmi/tire"
+  s.authors       = [ 'Scott Sickles' ]
+  s.email         = 'scottsickles@gmail.com'
 
   s.rubyforge_project = "tire"
 
-  s.files       = `git ls-files`.split("\n")
-  s.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
 
   s.require_paths = ["lib"]
 
@@ -27,11 +27,11 @@ Gem::Specification.new do |s|
   # = Library dependencies
   #
   s.add_dependency "rake"
-  s.add_dependency "rest-client",    "~> 1.6"
-  s.add_dependency "multi_json",     "~> 1.0"
-  s.add_dependency "hashr",          "~> 0.0.19"
-  s.add_dependency "activesupport",  ">= 2.3"
-  s.add_dependency "escape_utils",   "~> 0.3.1"
+  s.add_dependency "rest-client", "~> 1.6"
+  s.add_dependency "multi_json",  "~> 1.0"
+  #s.add_dependency "activemodel", ">= 3.0"
+  s.add_dependency "hashr",       "~> 0.0.19"
+  #s.add_dependency "rack",        ">= 1.4" if defined?(RUBY_VERSION) && RUBY_VERSION < '1.9'
 
   # = Development dependencies
   #
@@ -39,7 +39,11 @@ Gem::Specification.new do |s|
   s.add_development_dependency "yajl-ruby",   "~> 1.0"
   s.add_development_dependency "shoulda"
   s.add_development_dependency "mocha"
+  s.add_development_dependency "activerecord", ">= 3.0"
+  s.add_development_dependency "sqlite3"
+  s.add_development_dependency "mongoid",      "~> 2.2"
   s.add_development_dependency "bson_ext"
+  s.add_development_dependency "redis-persistence"
   s.add_development_dependency "curb"
   s.add_development_dependency "minitest"
 
@@ -65,4 +69,17 @@ Gem::Specification.new do |s|
 
    Please check the documentation at <http://karmi.github.com/tire/>.
   DESC
+
+  s.post_install_message =<<-CHANGELOG.gsub(/^  /, '')
+  ================================================================================
+
+    Please check the documentation at <http://karmi.github.com/tire/>.
+
+  --------------------------------------------------------------------------------
+
+#{Tire::CHANGELOG}
+    See the full changelog at <http://github.com/karmi/tire/commits/v#{Tire::VERSION}>.
+
+  --------------------------------------------------------------------------------
+  CHANGELOG
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ssickles-tire
 version: !ruby/object:Gem::Version 
-  hash: 105
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 4
-  - 2
-  - 7
-  version: 0.4.2.7
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Scott Sickles
@@ -79,82 +78,80 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: bundler
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 15
         segments: 
-        - 2
-        - 3
-        version: "2.3"
-  type: :runtime
+        - 1
+        - 0
+        version: "1.0"
+  type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: escape_utils
+  name: yajl-ruby
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 15
         segments: 
-        - 0
-        - 3
         - 1
-        version: 0.3.1
-  type: :runtime
+        - 0
+        version: "1.0"
+  type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: shoulda
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 3
         segments: 
-        - 1
         - 0
-        version: "1.0"
+        version: "0"
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: yajl-ruby
+  name: mocha
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 3
         segments: 
-        - 1
         - 0
-        version: "1.0"
+        version: "0"
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: activerecord
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
+        - 3
         - 0
-        version: "0"
+        version: "3.0"
   type: :development
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: sqlite3
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
@@ -168,21 +165,22 @@ dependencies:
   type: :development
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: bson_ext
+  name: mongoid
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 2
+        version: "2.2"
   type: :development
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: curb
+  name: bson_ext
   prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
@@ -196,7 +194,7 @@ dependencies:
   type: :development
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  name: minitest
+  name: redis-persistence
   prerelease: false
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
@@ -210,7 +208,7 @@ dependencies:
   type: :development
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  name: rdoc
+  name: curb
   prerelease: false
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
@@ -223,6 +221,34 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id014
+- !ruby/object:Gem::Dependency 
+  name: minitest
+  prerelease: false
+  requirement: &id015 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id015
+- !ruby/object:Gem::Dependency 
+  name: rdoc
+  prerelease: false
+  requirement: &id016 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id016
 description: "   Tire is a Ruby client for the ElasticSearch search engine/database.\n\n   It provides Ruby-like API for fluent communication with the ElasticSearch server\n   and blends with ActiveModel class for convenient usage in Rails applications.\n\n   It allows to delete and create indices, define mapping for them, supports\n   the bulk API, and presents an easy-to-use DSL for constructing your queries.\n\n   It has full ActiveRecord/ActiveModel compatibility, allowing you to index\n   your models (incrementally upon saving, or in bulk), searching and\n   paginating the results.\n\n   Please check the documentation at <http://karmi.github.com/tire/>.\n"
 email: scottsickles@gmail.com
 executables: []
@@ -250,10 +276,22 @@ files:
 - lib/tire/http/response.rb
 - lib/tire/index.rb
 - lib/tire/logger.rb
+- lib/tire/model/callbacks.rb
+- lib/tire/model/import.rb
+- lib/tire/model/indexing.rb
+- lib/tire/model/naming.rb
+- lib/tire/model/percolate.rb
+- lib/tire/model/persistence.rb
+- lib/tire/model/persistence/attributes.rb
+- lib/tire/model/persistence/finders.rb
+- lib/tire/model/persistence/storage.rb
+- lib/tire/model/search.rb
 - lib/tire/results/collection.rb
 - lib/tire/results/item.rb
 - lib/tire/results/pagination.rb
-- lib/tire/rubyext/to_json.rb
+- lib/tire/rubyext/hash.rb
+- lib/tire/rubyext/ruby_1_8.rb
+- lib/tire/rubyext/symbol.rb
 - lib/tire/search.rb
 - lib/tire/search/facet.rb
 - lib/tire/search/filter.rb
@@ -262,12 +300,16 @@ files:
 - lib/tire/search/scan.rb
 - lib/tire/search/sort.rb
 - lib/tire/tasks.rb
+- lib/tire/utils.rb
 - lib/tire/version.rb
 - test/fixtures/articles/1.json
 - test/fixtures/articles/2.json
 - test/fixtures/articles/3.json
 - test/fixtures/articles/4.json
 - test/fixtures/articles/5.json
+- test/integration/active_model_indexing_test.rb
+- test/integration/active_model_searchable_test.rb
+- test/integration/active_record_searchable_test.rb
 - test/integration/boolean_queries_test.rb
 - test/integration/count_test.rb
 - test/integration/custom_score_queries_test.rb
@@ -281,7 +323,9 @@ files:
 - test/integration/index_aliases_test.rb
 - test/integration/index_mapping_test.rb
 - test/integration/index_store_test.rb
+- test/integration/mongoid_searchable_test.rb
 - test/integration/percolator_test.rb
+- test/integration/persistent_model_test.rb
 - test/integration/query_return_version_test.rb
 - test/integration/query_string_test.rb
 - test/integration/range_queries_test.rb
@@ -290,14 +334,32 @@ files:
 - test/integration/scan_test.rb
 - test/integration/sort_test.rb
 - test/integration/text_query_test.rb
+- test/models/active_model_article.rb
+- test/models/active_model_article_with_callbacks.rb
+- test/models/active_model_article_with_custom_document_type.rb
+- test/models/active_model_article_with_custom_index_name.rb
+- test/models/active_record_models.rb
 - test/models/article.rb
+- test/models/mongoid_models.rb
+- test/models/persistent_article.rb
+- test/models/persistent_article_in_namespace.rb
+- test/models/persistent_article_with_casting.rb
+- test/models/persistent_article_with_defaults.rb
+- test/models/persistent_articles_with_custom_index_name.rb
+- test/models/supermodel_article.rb
+- test/models/validated_model.rb
 - test/test_helper.rb
+- test/unit/active_model_lint_test.rb
 - test/unit/configuration_test.rb
 - test/unit/http_client_test.rb
 - test/unit/http_response_test.rb
 - test/unit/index_alias_test.rb
 - test/unit/index_test.rb
 - test/unit/logger_test.rb
+- test/unit/model_callbacks_test.rb
+- test/unit/model_import_test.rb
+- test/unit/model_persistence_test.rb
+- test/unit/model_search_test.rb
 - test/unit/results_collection_test.rb
 - test/unit/results_item_test.rb
 - test/unit/rubyext_test.rb
@@ -313,7 +375,34 @@ files:
 homepage: http://github.com/karmi/tire
 licenses: []
 
-post_install_message: 
+post_install_message: |
+  ================================================================================
+  
+    Please check the documentation at <http://karmi.github.com/tire/>.
+  
+  --------------------------------------------------------------------------------
+  
+    IMPORTANT CHANGES LATELY:
+  
+    Version 0.4.1
+    -------------
+    * Added a Index#settings method to retrieve index settings as a Hash
+    * Added support for the "scan" search in the Ruby API
+    * Added support for reindexing the index documents into new index
+    * Added basic support for index aliases
+    * Changed, that Index#bulk_store runs against an index endpoint, not against `/_bulk`
+    * Refactorings, fixes, Ruby 1.8 compatibility
+  
+    Version 0.4.2
+    -------------
+    * Fixed incorrect handling of PUT requests in the Curb client
+    * Fixed, that blocks passed to `Tire::Index.new` or `Tire.index` losed the scope
+    * Added `Tire::Alias`, interface and DSL to manage aliases as resources
+  
+    See the full changelog at <http://github.com/karmi/tire/commits/v0.4.3>.
+  
+  --------------------------------------------------------------------------------
+
 rdoc_options: 
 - --charset=UTF-8
 require_paths: 
@@ -351,6 +440,9 @@ test_files:
 - test/fixtures/articles/3.json
 - test/fixtures/articles/4.json
 - test/fixtures/articles/5.json
+- test/integration/active_model_indexing_test.rb
+- test/integration/active_model_searchable_test.rb
+- test/integration/active_record_searchable_test.rb
 - test/integration/boolean_queries_test.rb
 - test/integration/count_test.rb
 - test/integration/custom_score_queries_test.rb
@@ -364,7 +456,9 @@ test_files:
 - test/integration/index_aliases_test.rb
 - test/integration/index_mapping_test.rb
 - test/integration/index_store_test.rb
+- test/integration/mongoid_searchable_test.rb
 - test/integration/percolator_test.rb
+- test/integration/persistent_model_test.rb
 - test/integration/query_return_version_test.rb
 - test/integration/query_string_test.rb
 - test/integration/range_queries_test.rb
@@ -373,14 +467,32 @@ test_files:
 - test/integration/scan_test.rb
 - test/integration/sort_test.rb
 - test/integration/text_query_test.rb
+- test/models/active_model_article.rb
+- test/models/active_model_article_with_callbacks.rb
+- test/models/active_model_article_with_custom_document_type.rb
+- test/models/active_model_article_with_custom_index_name.rb
+- test/models/active_record_models.rb
 - test/models/article.rb
+- test/models/mongoid_models.rb
+- test/models/persistent_article.rb
+- test/models/persistent_article_in_namespace.rb
+- test/models/persistent_article_with_casting.rb
+- test/models/persistent_article_with_defaults.rb
+- test/models/persistent_articles_with_custom_index_name.rb
+- test/models/supermodel_article.rb
+- test/models/validated_model.rb
 - test/test_helper.rb
+- test/unit/active_model_lint_test.rb
 - test/unit/configuration_test.rb
 - test/unit/http_client_test.rb
 - test/unit/http_response_test.rb
 - test/unit/index_alias_test.rb
 - test/unit/index_test.rb
 - test/unit/logger_test.rb
+- test/unit/model_callbacks_test.rb
+- test/unit/model_import_test.rb
+- test/unit/model_persistence_test.rb
+- test/unit/model_search_test.rb
 - test/unit/results_collection_test.rb
 - test/unit/results_item_test.rb
 - test/unit/rubyext_test.rb