ssickles-tire 0.4.2 → 0.4.2.7

data/lib/tire/search.rb

@@ -4,18 +4,23 @@ module Tire
 
     class Search
 
-      attr_reader :indices, :json, :query, :facets, :filters, :options, :explain
+      attr_reader :indices, :json, :query, :facets, :filters, :options, :explain, :url
 
       def initialize(indices=nil, options={}, &block)
         @indices = Array(indices)
-        @types   = Array(options.delete(:type)).map { |type| Utils.escape(type) }
+        @types   = Array(options.delete(:type)).map { |type| EscapeUtils.escape_url(type.to_s) }
         @options = options
-
         @path    = ['/', @indices.join(','), @types.join(','), '_search'].compact.join('/').squeeze('/')
 
+        self.url = options.delete(:url) || Configuration.url
+
         block.arity < 1 ? instance_eval(&block) : block.call(self) if block_given?
       end
 
+      def url=( url )
+        @url = url + @path
+      end
+
       def results
         @results  || (perform; @results)
       end
@@ -24,10 +29,6 @@ module Tire
         @response || (perform; @response)
       end
 
-      def url
-        Configuration.url + @path
-      end
-
       def params
         @options.empty? ? '' : '?' + @options.to_param
       end

data/lib/tire/search/scan.rb

@@ -42,22 +42,22 @@ module Tire
     class Scan
       include Enumerable
 
-      attr_reader :indices, :options, :search
+      attr_reader :indices, :options, :search, :url
 
       def initialize(indices=nil, options={}, &block)
         @indices = Array(indices)
         @options = options.update(:search_type => 'scan', :scroll => '10m')
         @seen    = 0
+        @url     = options.fetch(:url, Configuration.url) + '/_search/scroll'
         @search  = Search.new(@indices, @options, &block)
       end
 
-      def url;                Configuration.url + "/_search/scroll";                           end
-      def params;             @options.empty? ? '' : '?' + @options.to_param;                  end
-      def results;            @results  || (__perform; @results);                              end
-      def response;           @response || (__perform; @response);                             end
-      def json;               @json     || (__perform; @json);                                 end
-      def total;              @total    || (__perform; @total);                                end
-      def seen;               @seen     || (__perform; @seen);                                 end
+      def params()   @options.empty? ? '' : '?' + @options.to_param; end
+      def results()  @results  || (__perform; @results);             end
+      def response() @response || (__perform; @response);            end
+      def json()     @json     || (__perform; @json);                end
+      def total()    @total    || (__perform; @total);               end
+      def seen()     @seen     || (__perform; @seen);                end
 
       def scroll_id
         @scroll_id ||= @search.perform.json['_scroll_id']

data/lib/tire/search/sort.rb

@@ -17,7 +17,7 @@ module Tire
       end
 
       def to_json
-        @value.to_json
+        MultiJson.encode(@value)
       end
     end
 

data/lib/tire/version.rb

@@ -1,9 +1,46 @@
 module Tire
-  VERSION   = "0.4.2"
+  VERSION = "0.4.2.7"
 
   CHANGELOG =<<-END
     IMPORTANT CHANGES LATELY:
 
+    Version 0.4.2.7
+    ---------------
+    * Bumped escape_utils dependency to ~> 0.3.x
+
+    Version 0.4.2.6
+    ---------------
+    * Add support for parent / child documents.
+
+    Version 0.4.2.4
+    ---------------
+    * Add routing support.
+
+    Version 0.4.2.4
+    ---------------
+    * Fixing url routing for index alais commands.
+
+    Version 0.4.2.3
+    ---------------
+    * Making the library multi-cluster capable
+
+    Version 0.4.2.2
+    ---------------
+    * Tire::Index now removes _id/_type keys from document hashes.
+
+    Version 0.4.2.1
+    ---------------
+    * Removed all depedence on ActiveModel
+    * Fixed tests to work with any version of ActiveSupport
+    * Removed wonky 1.9 backports for URL encoding
+    * Fixed tests to work under 1.8.7
+
+    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
+
     Version 0.4.1
     -------------
     * Added a Index#settings method to retrieve index settings as a Hash
@@ -12,11 +49,5 @@ module Tire
     * 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
   END
 end

data/test/integration/reindex_test.rb

@@ -9,7 +9,7 @@ module Tire
       setup do
         Tire.index('reindex-test-new').delete
 
-        documents = (1..100).map { |i| { id: i, type: 'test', title: "Document #{i}" } }
+        documents = (1..100).map { |i| { :id => i, :type => 'test', :title => "Document #{i}" } }
 
         Tire.index 'reindex-test' do
           delete
@@ -25,7 +25,7 @@ module Tire
       end
 
       should "reindex the index into a new index with different settings" do
-        Tire.index('reindex-test').reindex 'reindex-test-new', settings: { number_of_shards: 3 }
+        Tire.index('reindex-test').reindex 'reindex-test-new', :settings => { :number_of_shards => 3 }
 
         Tire.index('reindex-test-new').refresh
         assert_equal 100, Tire.search('reindex-test-new').results.total

data/test/integration/scan_test.rb

@@ -7,7 +7,7 @@ module Tire
 
     context "Scan" do
       setup do
-        documents = (1..100).map { |i| { id: i, type: 'test', title: "Document #{i}" } }
+        documents = (1..100).map { |i| { :id => i, :type => 'test', :title => "Document #{i}" } }
 
         Tire.index 'scantest' do
           delete

data/test/test_helper.rb

@@ -4,32 +4,15 @@ require 'bundler/setup'
 require 'pathname'
 require 'test/unit'
 
-require 'yajl/json_gem'
-require 'sqlite3'
+require 'yajl'
+#require 'yajl/json_gem'
 
 require 'shoulda'
 require 'turn/autorun' unless ENV["TM_FILEPATH"] || ENV["CI"] || defined?(RUBY_VERSION) && RUBY_VERSION < '1.9'
 require 'mocha'
 
-require 'active_support/core_ext/hash/indifferent_access'
-
 require 'tire'
 
-# Require basic model files
-#
-require File.dirname(__FILE__) + '/models/active_model_article'
-require File.dirname(__FILE__) + '/models/active_model_article_with_callbacks'
-require File.dirname(__FILE__) + '/models/active_model_article_with_custom_document_type'
-require File.dirname(__FILE__) + '/models/active_model_article_with_custom_index_name'
-require File.dirname(__FILE__) + '/models/active_record_models'
-require File.dirname(__FILE__) + '/models/article'
-require File.dirname(__FILE__) + '/models/persistent_article'
-require File.dirname(__FILE__) + '/models/persistent_article_in_namespace'
-require File.dirname(__FILE__) + '/models/persistent_article_with_casting'
-require File.dirname(__FILE__) + '/models/persistent_article_with_defaults'
-require File.dirname(__FILE__) + '/models/persistent_articles_with_custom_index_name'
-require File.dirname(__FILE__) + '/models/validated_model'
-
 class Test::Unit::TestCase
 
   def mock_response(body, code=200, headers={})
@@ -74,14 +57,7 @@ module Test::Integration
   def teardown
     %w[
       articles-test
-      active_record_articles
-      active_model_article_with_custom_as_serializations
-      active_record_class_with_tire_methods
-      mongoid_articles
-      mongoid_class_with_tire_methods
-      supermodel_articles
-      dynamic_index
-      model_with_nested_documents ].each do |index|
+      dynamic_index ].each do |index|
         ::RestClient.delete "#{URL}/#{index}" rescue nil
     end
   end

data/test/unit/index_alias_test.rb

@@ -12,9 +12,15 @@ module Tire
         should "have a name and defaults" do
           @alias = Alias.new :name => 'dummy'
           assert_equal 'dummy', @alias.name
+          assert_equal Configuration.url, @alias.url
           assert @alias.indices.empty?
         end
 
+        should "have a configurable base URL" do
+          @alias = Alias.new :url => 'http://example.com:9200'
+          assert_equal 'http://example.com:9200', @alias.url
+        end
+
         should "have indices" do
           @alias = Alias.new :indices => ['index_A', 'index_B']
           assert_equal ['index_A', 'index_B'], @alias.indices.to_a
@@ -94,7 +100,7 @@ module Tire
               a['add']['alias'] == 'alias_martha'
               end
           end.returns(mock_response('{}'), 200)
-          
+
           a = Alias.find('alias_martha')
           a.indices.push 'index_A'
           a.save
@@ -109,7 +115,7 @@ module Tire
                 a['remove']['alias'] == 'alias_martha'
               end
           end.returns(mock_response('{}'), 200)
-          
+
           a = Alias.find('alias_martha')
           a.indices.delete 'index_A'
           a.save
@@ -120,7 +126,7 @@ module Tire
             # puts json
             MultiJson.decode(json)['actions'].all? { |a| a['add']['routing'] == 'martha' }
           end.returns(mock_response('{}'), 200)
-          
+
           a = Alias.find('alias_martha')
           a.routing('martha')
           a.save
@@ -181,6 +187,14 @@ module Tire
           a = Alias.find('alias_martha')
           assert_instance_of Alias, a
           assert_equal ['index_B', 'index_C'], a.indices.to_a.sort
+
+          Configuration.client.expects(:get).with do |url, json|
+              url  == "http://example.com:9200/_aliases"
+            end.returns( mock_response(                               %q|{"index_A":{"aliases":{}},"index_B":{"aliases":{"alias_john":{"filter":{"term":{"user":"john"}}},"alias_martha":{"filter":{"term":{"user":"martha"}}}}},"index_C":{"aliases":{"alias_martha":{"filter":{"term":{"user":"martha"}}}}}}|), 200 )
+
+          a = Alias.find('http://example.com:9200', 'alias_martha')
+          assert_instance_of Alias, a
+          assert_equal ['index_B', 'index_C'], a.indices.to_a.sort
         end
 
         should "find an alias and configure it with a block" do

data/test/unit/index_test.rb

@@ -18,6 +18,11 @@ module Tire
         assert_equal "#{Configuration.url}/#{@index.name}", @index.url
       end
 
+      should "have a configurable URL endpoint" do
+        @index.url = 'http://example.com'
+        assert_equal "http://example.com/#{@index.name}", @index.url
+      end
+
       should "return HTTP response" do
         assert_respond_to @index, :response
 
@@ -211,21 +216,21 @@ module Tire
 
         should "set type from Hash :type property" do
           Configuration.client.expects(:post).with do |url,document|
-            url == "#{@index.url}/article/"
+            url == "#{@index.url}/article"
           end.returns(mock_response('{"ok":true,"_id":"test"}'))
           @index.store :type => 'article', :title => 'Test'
         end
 
         should "set type from Hash :_type property" do
           Configuration.client.expects(:post).with do |url,document|
-            url == "#{@index.url}/article/"
+            url == "#{@index.url}/article"
           end.returns(mock_response('{"ok":true,"_id":"test"}'))
           @index.store :_type => 'article', :title => 'Test'
         end
 
         should "set type from Object _type method" do
           Configuration.client.expects(:post).with do |url,document|
-            url == "#{@index.url}/article/"
+            url == "#{@index.url}/article"
           end.returns(mock_response('{"ok":true,"_id":"test"}'))
 
           article = Class.new do
@@ -237,7 +242,7 @@ module Tire
 
         should "set type from Object type method" do
           Configuration.client.expects(:post).with do |url,document|
-            url == "#{@index.url}/article/"
+            url == "#{@index.url}/article"
           end.returns(mock_response('{"ok":true,"_id":"test"}'))
 
           article = Class.new do
@@ -249,7 +254,7 @@ module Tire
 
         should "properly encode namespaced document types" do
           Configuration.client.expects(:post).with do |url,document|
-            url == "#{@index.url}/my_namespace%2Fmy_model/"
+            url == "#{@index.url}/my_namespace%2Fmy_model"
           end.returns(mock_response('{"ok":true,"_id":"123"}'))
 
           module MyNamespace
@@ -263,7 +268,7 @@ module Tire
         end
 
         should "set default type" do
-          Configuration.client.expects(:post).with("#{@index.url}/document/", '{"title":"Test"}').returns(mock_response('{"ok":true,"_id":"test"}'))
+          Configuration.client.expects(:post).with("#{@index.url}/document", '{"title":"Test"}').returns(mock_response('{"ok":true,"_id":"test"}'))
           @index.store :title => 'Test'
         end
 
@@ -310,7 +315,7 @@ module Tire
           Configuration.reset :wrapper
 
           Configuration.client.stubs(:post).with do |url, payload|
-                                              url     == "#{@index.url}/article/" &&
+                                              url     == "#{@index.url}/article" &&
                                               payload =~ /"title":"Test"/
                                             end.
                                             returns(mock_response('{"ok":true,"_id":"id-1"}'))
@@ -447,23 +452,6 @@ module Tire
           @index.bulk_store [ {:id => '1', :title => 'One'}, {:id => '2', :title => 'Two'} ]
         end
 
-        should "serialize ActiveModel instances" do
-          Configuration.client.expects(:post).with do |url, json|
-            url  == "#{ActiveModelArticle.index.url}/_bulk" &&
-            json =~ /"_index":"active_model_articles"/ &&
-            json =~ /"_type":"active_model_article"/ &&
-            json =~ /"_id":"1"/ &&
-            json =~ /"_id":"2"/ &&
-            json =~ /"title":"One"/ &&
-            json =~ /"title":"Two"/
-          end.returns(mock_response('{}', 200))
-
-          one = ActiveModelArticle.new 'title' => 'One'; one.id = '1'
-          two = ActiveModelArticle.new 'title' => 'Two'; two.id = '2'
-
-          ActiveModelArticle.index.bulk_store [ one, two ]
-        end
-
         context "namespaced models" do
           should "not URL-escape the document_type" do
             Configuration.client.expects(:post).with do |url, json|
@@ -514,13 +502,13 @@ module Tire
 
         should "display error message when collection item does not have ID" do
           Configuration.client.expects(:post).with do |url, json|
-            url  == "#{ActiveModelArticle.index.url}/_bulk"
+            url  == "#{@index.url}/_bulk"
           end.returns(mock_response('success', 200))
 
           STDERR.expects(:puts).once
 
           documents = [ { :title => 'Bogus' }, { :title => 'Real', :id => 1 } ]
-          ActiveModelArticle.index.bulk_store documents
+          @index.bulk_store documents
         end
 
       end
@@ -745,7 +733,7 @@ module Tire
           should "percolate document against all registered queries" do
             Configuration.client.expects(:post).
                                  with do |url, payload|
-                                   url     == "#{@index.url}/article/?percolate=*" &&
+                                   url     == "#{@index.url}/article?percolate=%2A" &&
                                    payload =~ /"title":"Test"/
                                  end.
                                  returns(mock_response('{"ok":true,"_id":"test","matches":["alerts"]}'))
@@ -755,7 +743,7 @@ module Tire
           should "percolate document against specific queries" do
             Configuration.client.expects(:post).
                                  with do |url, payload|
-                                   url     == "#{@index.url}/article/?percolate=tag:alerts" &&
+                                   url     == "#{@index.url}/article?percolate=tag%3Aalerts" &&
                                    payload =~ /"title":"Test"/
                                  end.
                                  returns(mock_response('{"ok":true,"_id":"test","matches":["alerts"]}'))
@@ -823,10 +811,10 @@ module Tire
           def index_something
             @tags = ['block', 'scope', 'revenge']
 
-            Index.any_instance.expects(:store).with(title: 'Title From Outer Space', tags: ['block', 'scope', 'revenge'])
+            Index.any_instance.expects(:store).with(:title => 'Title From Outer Space', :tags => ['block', 'scope', 'revenge'])
 
             Tire::Index.new 'outer-space' do |index|
-              index.store title: @my_title, tags: @tags
+              index.store(:title => @my_title, :tags => @tags)
             end
           end
 

data/test/unit/results_collection_test.rb

@@ -214,66 +214,6 @@ 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