tire 0.4.0 → 0.4.1

data/test/integration/index_aliases_test.rb

@@ -0,0 +1,68 @@
+require 'test_helper'
+
+module Tire
+
+  class IndexAliasesIntegrationTest < Test::Unit::TestCase
+    include Test::Integration
+
+    context "With a filtered alias" do
+      setup do
+
+        @index = Tire.index 'index-original' do
+          delete
+          create
+        end
+        
+      end
+
+      teardown { Tire.index('index-original').delete }
+      
+       should "create the alias" do
+         @index.add_alias 'index-aliased'
+         assert_equal 1, @index.aliases.size
+       end
+      
+       should "find only portion of documents in the filtered alias" do
+         Tire.index 'index-original' do
+           add_alias 'index-aliased', :filter => { :term => { :user => 'anne' } }
+           store :title => 'Document 1', :user => 'anne'
+           store :title => 'Document 2', :user => 'mary'
+      
+           refresh
+         end
+      
+         assert_equal 2, Tire.search('index-original') { query { all } }.results.size
+         assert_equal 1, Tire.search('index-aliased')  { query { all } }.results.size
+       end
+      
+       should "remove the alias" do
+         @index.add_alias 'index-aliased'
+         assert_equal 1, @index.aliases.size
+      
+         @index.remove_alias 'index-aliased'
+         assert_equal 0, @index.aliases.size
+      
+         assert_raise Tire::Search::SearchRequestFailed do
+           Tire.search('index-aliased')  { query { all } }.results
+         end
+       end
+      
+       should "retrieve a list of aliases for an index" do
+         @index.add_alias 'index-aliased'
+      
+         assert_equal ['index-aliased'], @index.aliases
+       end
+ 
+      should "retrieve the properties of an alias" do
+        @index.add_alias 'index-aliased', :routing => '1'
+
+        assert_equal(
+          { 'index_routing'  => '1',
+            'search_routing' => '1' },
+          @index.aliases('index-aliased') )
+      end
+    end
+
+  end
+
+end

data/test/integration/reindex_test.rb

@@ -0,0 +1,46 @@
+require 'test_helper'
+
+module Tire
+
+  class ReindexIntegrationTest < Test::Unit::TestCase
+    include Test::Integration
+
+    context "Reindex" do
+      setup do
+        Tire.index('reindex-test-new').delete
+
+        documents = (1..100).map { |i| { id: i, type: 'test', title: "Document #{i}" } }
+
+        Tire.index 'reindex-test' do
+          delete
+          create :settings => { :number_of_shards => 1, :number_of_replicas => 0 }
+          import documents
+          refresh
+        end
+      end
+
+      teardown do
+        Index.new('reindex-test').delete
+        Index.new('reindex-test-new').delete
+      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-new').refresh
+        assert_equal 100, Tire.search('reindex-test-new').results.total
+        assert_equal '3', Tire.index('reindex-test-new').settings['index.number_of_shards']
+      end
+
+      should "reindex a portion of an index into a new index" do
+        Tire.index('reindex-test').reindex('reindex-test-new') { query { string '10*' } }
+        
+        Tire.index('reindex-test-new').refresh
+        assert_equal 2, Tire.search('reindex-test-new').results.total
+      end
+
+    end
+
+  end
+
+end

data/test/integration/scan_test.rb

@@ -0,0 +1,56 @@
+require 'test_helper'
+
+module Tire
+
+  class ScanIntegrationTest < Test::Unit::TestCase
+    include Test::Integration
+
+    context "Scan" do
+      setup do
+        documents = (1..100).map { |i| { id: i, type: 'test', title: "Document #{i}" } }
+
+        Tire.index 'scantest' do
+          delete
+          create :settings => { :number_of_shards => 1, :number_of_replicas => 0 }
+          import documents
+          refresh
+        end
+      end
+
+      teardown { Index.new('scantest').delete }
+
+      should "iterate over batches of documents" do
+        count = 0
+
+        s = Tire.scan 'scantest'
+        s.each { |results| count += 1 }
+
+        assert_equal 10, count
+      end
+
+      should "iterate over individual documents" do
+        count = 0
+
+        s = Tire.scan 'scantest'
+        s.each_document { |results| count += 1 }
+
+        assert_equal 100, count
+      end
+
+      should "limit the returned results by query" do
+        count = 0
+
+        s = Tire.scan('scantest') { query { string '10*' } }
+        s.each do |results|
+          count += 1
+          assert_equal ['Document 10', 'Document 100'], results.map(&:title)
+        end
+
+        assert_equal 1, count
+      end
+
+    end
+
+  end
+
+end

data/test/test_helper.rb

@@ -72,6 +72,17 @@ module Test::Integration
   end
 
   def teardown
-    ::RestClient.delete "#{URL}/articles-test"  rescue nil
+    %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|
+        ::RestClient.delete "#{URL}/#{index}" rescue nil
+    end
   end
 end

data/test/unit/index_test.rb

@@ -14,6 +14,10 @@ module Tire
         assert_equal 'dummy', @index.name
       end
 
+      should "have an URL endpoint" do
+        assert_equal "#{Configuration.url}/#{@index.name}", @index.url
+      end
+
       should "return HTTP response" do
         assert_respond_to @index, :response
 
@@ -52,6 +56,47 @@ module Tire
         assert_nothing_raised { assert ! @index.delete }
       end
 
+      should "add an index alias" do
+        Configuration.client.expects(:post).with do |url, payload|
+          url =~ /_aliases/ &&
+          MultiJson.decode(payload)['actions'][0]['add'] == {'index' => 'dummy', 'alias' => 'foo'}
+        end.returns(mock_response('{"ok":true}'))
+
+        @index.add_alias 'foo'
+      end
+
+      should "add an index alias with configuration" do
+        Configuration.client.expects(:post).with do |url, payload|
+          url =~ /_aliases/ &&
+          MultiJson.decode(payload)['actions'][0]['add'] == {'index' => 'dummy', 'alias' => 'foo', 'routing' => 1 }
+        end.returns(mock_response('{"ok":true}'))
+
+        @index.add_alias 'foo', :routing => 1
+      end
+
+      should "delete an index alias" do
+        Configuration.client.expects(:post).with do |url, payload|
+          url =~ /_aliases/ &&
+          MultiJson.decode(payload)['actions'][0]['remove'] == {'index' => 'dummy', 'alias' => 'foo'}
+        end.returns(mock_response('{"ok":true}'))
+
+        @index.remove_alias 'foo'
+      end
+
+      should "list aliases for an index" do
+        json = {'dummy' => {'aliases' => {'foo' => {}}}}.to_json
+        Configuration.client.expects(:get).returns(mock_response(json))
+
+        assert_equal ['foo'], @index.aliases
+      end
+
+      should "return properties of an alias" do
+        json = {'dummy' => { 'aliases' => {'foo' => { 'filter' => { 'term' => { 'user' => 'john' } }}} }}.to_json
+        Configuration.client.expects(:get).returns(mock_response(json))
+
+        assert_equal( { 'filter' => { 'term' => {'user' => 'john'} } }, @index.aliases('foo') )
+      end
+
       should "refresh the index" do
         Configuration.client.expects(:post).returns(mock_response('{"ok":true,"_shards":{}}'))
         assert_nothing_raised { assert @index.refresh }
@@ -74,7 +119,7 @@ module Tire
 
         should "send text to the Analyze API" do
           Configuration.client.expects(:get).
-                               with("#{Configuration.url}/dummy/_analyze?pretty=true", "foo bar").
+                               with("#{@index.url}/_analyze?pretty=true", "foo bar").
                                returns(mock_response(@mock_analyze_response))
 
           response = @index.analyze("foo bar")
@@ -83,19 +128,19 @@ module Tire
 
         should "properly encode parameters" do
           Configuration.client.expects(:get).with do |url, payload|
-                                url == "#{Configuration.url}/dummy/_analyze?analyzer=whitespace&pretty=true"
+                                url == "#{@index.url}/_analyze?analyzer=whitespace&pretty=true"
                                end.returns(mock_response(@mock_analyze_response))
 
           @index.analyze("foo bar", :analyzer => 'whitespace')
 
           Configuration.client.expects(:get).with do |url, payload|
-                                url == "#{Configuration.url}/dummy/_analyze?field=title&pretty=true"
+                                url == "#{@index.url}/_analyze?field=title&pretty=true"
                                end.returns(mock_response(@mock_analyze_response))
 
           @index.analyze("foo bar", :field => 'title')
 
           Configuration.client.expects(:get).with do |url, payload|
-                                url == "#{Configuration.url}/dummy/_analyze?analyzer=keyword&format=text&pretty=true"
+                                url == "#{@index.url}/_analyze?analyzer=keyword&format=text&pretty=true"
                                end.returns(mock_response(@mock_analyze_response))
 
           @index.analyze("foo bar", :analyzer => 'keyword', :format => 'text')
@@ -141,25 +186,45 @@ module Tire
 
       end
 
+      context "settings" do
+
+        should "return index settings" do
+          json =<<-JSON
+          {
+            "dummy" : {
+              "settings" : {
+                "index.number_of_shards" : "20",
+                "index.number_of_replicas" : "0"
+              }
+            }
+          }
+          JSON
+          Configuration.client.stubs(:get).returns(mock_response(json))
+
+          assert_equal '20', @index.settings['index.number_of_shards']
+        end
+
+      end
+
       context "when storing" do
 
         should "set type from Hash :type property" do
           Configuration.client.expects(:post).with do |url,document|
-            url == "#{Configuration.url}/dummy/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 == "#{Configuration.url}/dummy/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 == "#{Configuration.url}/dummy/article/"
+            url == "#{@index.url}/article/"
           end.returns(mock_response('{"ok":true,"_id":"test"}'))
 
           article = Class.new do
@@ -171,7 +236,7 @@ module Tire
 
         should "set type from Object type method" do
           Configuration.client.expects(:post).with do |url,document|
-            url == "#{Configuration.url}/dummy/article/"
+            url == "#{@index.url}/article/"
           end.returns(mock_response('{"ok":true,"_id":"test"}'))
 
           article = Class.new do
@@ -183,7 +248,7 @@ module Tire
 
         should "properly encode namespaced document types" do
           Configuration.client.expects(:post).with do |url,document|
-            url == "#{Configuration.url}/dummy/my_namespace%2Fmy_model/"
+            url == "#{@index.url}/my_namespace%2Fmy_model/"
           end.returns(mock_response('{"ok":true,"_id":"123"}'))
 
           module MyNamespace
@@ -197,7 +262,7 @@ module Tire
         end
 
         should "set default type" do
-          Configuration.client.expects(:post).with("#{Configuration.url}/dummy/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
 
@@ -221,14 +286,14 @@ module Tire
         context "document with ID" do
 
           should "store Hash it under its ID property" do
-            Configuration.client.expects(:post).with("#{Configuration.url}/dummy/document/123",
+            Configuration.client.expects(:post).with("#{@index.url}/document/123",
                                                      MultiJson.encode({:id => 123, :title => 'Test'})).
                                                 returns(mock_response('{"ok":true,"_id":"123"}'))
             @index.store :id => 123, :title => 'Test'
           end
 
           should "store a custom class under its ID property" do
-            Configuration.client.expects(:post).with("#{Configuration.url}/dummy/document/123",
+            Configuration.client.expects(:post).with("#{@index.url}/document/123",
                                                      {:id => 123, :title => 'Test', :body => 'Lorem'}.to_json).
                                                 returns(mock_response('{"ok":true,"_id":"123"}'))
             @index.store Article.new(:id => 123, :title => 'Test', :body => 'Lorem')
@@ -244,7 +309,7 @@ module Tire
           Configuration.reset :wrapper
 
           Configuration.client.stubs(:post).with do |url, payload|
-                                              url     == "#{Configuration.url}/dummy/article/" &&
+                                              url     == "#{@index.url}/article/" &&
                                               payload =~ /"title":"Test"/
                                             end.
                                             returns(mock_response('{"ok":true,"_id":"id-1"}'))
@@ -252,7 +317,7 @@ module Tire
         end
 
         should "return document in default wrapper" do
-          Configuration.client.expects(:get).with("#{Configuration.url}/dummy/article/id-1").
+          Configuration.client.expects(:get).with("#{@index.url}/article/id-1").
                                              returns(mock_response('{"_id":"id-1","_version":1, "_source" : {"title":"Test"}}'))
           article = @index.retrieve :article, 'id-1'
           assert_instance_of Results::Item, article
@@ -263,7 +328,7 @@ module Tire
         should "return document as a hash" do
           Configuration.wrapper Hash
 
-          Configuration.client.expects(:get).with("#{Configuration.url}/dummy/article/id-1").
+          Configuration.client.expects(:get).with("#{@index.url}/article/id-1").
                                              returns(mock_response('{"_id":"id-1","_version":1, "_source" : {"title":"Test"}}'))
           article = @index.retrieve :article, 'id-1'
           assert_instance_of Hash, article
@@ -272,7 +337,7 @@ module Tire
         should "return document in custom wrapper" do
           Configuration.wrapper Article
 
-          Configuration.client.expects(:get).with("#{Configuration.url}/dummy/article/id-1").
+          Configuration.client.expects(:get).with("#{@index.url}/article/id-1").
                                              returns(mock_response('{"_id":"id-1","_version":1, "_source" : {"title":"Test"}}'))
           article = @index.retrieve :article, 'id-1'
           assert_instance_of Article, article
@@ -280,7 +345,7 @@ module Tire
         end
 
         should "return nil for missing document" do
-          Configuration.client.expects(:get).with("#{Configuration.url}/dummy/article/id-1").
+          Configuration.client.expects(:get).with("#{@index.url}/article/id-1").
                                              returns(mock_response('{"_id":"id-1","exists":false}'))
           article = @index.retrieve :article, 'id-1'
           assert_equal nil, article
@@ -293,7 +358,7 @@ module Tire
         end
 
         should "properly encode document type" do
-          Configuration.client.expects(:get).with("#{Configuration.url}/dummy/my_namespace%2Fmy_model/id-1").
+          Configuration.client.expects(:get).with("#{@index.url}/my_namespace%2Fmy_model/id-1").
                                              returns(mock_response('{"_id":"id-1","_version":1, "_source" : {"title":"Test"}}'))
           article = @index.retrieve 'my_namespace/my_model', 'id-1'
         end
@@ -303,40 +368,40 @@ module Tire
       context "when removing" do
 
         should "get type from document" do
-          Configuration.client.expects(:delete).with("#{Configuration.url}/dummy/article/1").
+          Configuration.client.expects(:delete).with("#{@index.url}/article/1").
                                                 returns(mock_response('{"ok":true,"_id":"1"}')).twice
           @index.remove :id => 1, :type => 'article', :title => 'Test'
           @index.remove :id => 1, :type => 'article', :title => 'Test'
         end
 
         should "get namespaced type from document" do
-          Configuration.client.expects(:delete).with("#{Configuration.url}/dummy/articles%2Farticle/1").
+          Configuration.client.expects(:delete).with("#{@index.url}/articles%2Farticle/1").
                                                 returns(mock_response('{"ok":true,"_id":"1"}')).twice
           @index.remove :id => 1, :type => 'articles/article', :title => 'Test'
           @index.remove :id => 1, :type => 'articles/article', :title => 'Test'
         end
 
         should "set default type" do
-          Configuration.client.expects(:delete).with("#{Configuration.url}/dummy/document/1").
+          Configuration.client.expects(:delete).with("#{@index.url}/document/1").
                                                 returns(mock_response('{"ok":true,"_id":"1"}'))
           @index.remove :id => 1, :title => 'Test'
         end
 
         should "get ID from hash" do
-          Configuration.client.expects(:delete).with("#{Configuration.url}/dummy/document/1").
+          Configuration.client.expects(:delete).with("#{@index.url}/document/1").
                                                 returns(mock_response('{"ok":true,"_id":"1"}'))
           @index.remove :id => 1
         end
 
         should "get ID from method" do
           document = stub('document', :id => 1)
-          Configuration.client.expects(:delete).with("#{Configuration.url}/dummy/document/1").
+          Configuration.client.expects(:delete).with("#{@index.url}/document/1").
                                                 returns(mock_response('{"ok":true,"_id":"1"}'))
           @index.remove document
         end
 
         should "get type and ID from arguments" do
-          Configuration.client.expects(:delete).with("#{Configuration.url}/dummy/article/1").
+          Configuration.client.expects(:delete).with("#{@index.url}/article/1").
                                                 returns(mock_response('{"ok":true,"_id":"1"}'))
           @index.remove :article, 1
         end
@@ -348,7 +413,7 @@ module Tire
         end
 
         should "properly encode document type" do
-          Configuration.client.expects(:delete).with("#{Configuration.url}/dummy/my_namespace%2Fmy_model/id-1").
+          Configuration.client.expects(:delete).with("#{@index.url}/my_namespace%2Fmy_model/id-1").
                                              returns(mock_response('{"_id":"id-1","_version":1, "_source" : {"title":"Test"}}'))
           article = @index.remove 'my_namespace/my_model', 'id-1'
         end
@@ -367,7 +432,7 @@ module Tire
 
         should "serialize Hashes" do
           Configuration.client.expects(:post).with do |url, json|
-            url  == "#{Configuration.url}/_bulk" &&
+            url  == "#{@index.url}/_bulk" &&
             json =~ /"_index":"dummy"/ &&
             json =~ /"_type":"document"/ &&
             json =~ /"_id":"1"/ &&
@@ -379,12 +444,11 @@ module Tire
           end.returns(mock_response('{}'), 200)
 
           @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  == "#{Configuration.url}/_bulk" &&
+            url  == "#{ActiveModelArticle.index.url}/_bulk" &&
             json =~ /"_index":"active_model_articles"/ &&
             json =~ /"_type":"active_model_article"/ &&
             json =~ /"_id":"1"/ &&
@@ -397,14 +461,13 @@ module Tire
           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|
               puts url, json
-              url  == "#{Configuration.url}/_bulk" &&
+              url  == "#{Configuration.url}/my_namespace_my_models/_bulk" &&
               json =~ %r|"_index":"my_namespace_my_models"| &&
               json =~ %r|"_type":"my_namespace/my_model"|
             end.returns(mock_response('{}', 200))
@@ -449,7 +512,10 @@ module Tire
         end
 
         should "display error message when collection item does not have ID" do
-          Configuration.client.expects(:post).with{ |url, json| url  == "#{Configuration.url}/_bulk" }.returns(mock_response('success', 200))
+          Configuration.client.expects(:post).with do |url, json|
+            url  == "#{ActiveModelArticle.index.url}/_bulk"
+          end.returns(mock_response('success', 200))
+
           STDERR.expects(:puts).once
 
           documents = [ { :title => 'Bogus' }, { :title => 'Real', :id => 1 } ]
@@ -638,7 +704,7 @@ module Tire
         should "percolate document against all registered queries" do
           Configuration.client.expects(:get).with do |url,payload|
                                                payload = MultiJson.decode(payload)
-                                               url == "#{Configuration.url}/dummy/document/_percolate" &&
+                                               url == "#{@index.url}/document/_percolate" &&
                                                payload['doc']['title'] == 'Test'
                                               end.
                                returns(mock_response('{"ok":true,"_id":"test","matches":["alerts"]}'))
@@ -650,7 +716,7 @@ module Tire
         should "percolate a typed document against all registered queries" do
           Configuration.client.expects(:get).with do |url,payload|
                                                payload = MultiJson.decode(payload)
-                                               url == "#{Configuration.url}/dummy/article/_percolate" &&
+                                               url == "#{@index.url}/article/_percolate" &&
                                                payload['doc']['title'] == 'Test'
                                               end.
                                returns(mock_response('{"ok":true,"_id":"test","matches":["alerts"]}'))
@@ -663,7 +729,7 @@ module Tire
           Configuration.client.expects(:get).with do |url,payload|
                                                payload = MultiJson.decode(payload)
                                                # p [url, payload]
-                                               url == "#{Configuration.url}/dummy/document/_percolate" &&
+                                               url == "#{@index.url}/document/_percolate" &&
                                                payload['doc']['title']                   == 'Test' &&
                                                payload['query']['query_string']['query'] == 'tag:alerts'
                                               end.
@@ -678,7 +744,7 @@ module Tire
           should "percolate document against all registered queries" do
             Configuration.client.expects(:post).
                                  with do |url, payload|
-                                   url     == "#{Configuration.url}/dummy/article/?percolate=*" &&
+                                   url     == "#{@index.url}/article/?percolate=*" &&
                                    payload =~ /"title":"Test"/
                                  end.
                                  returns(mock_response('{"ok":true,"_id":"test","matches":["alerts"]}'))
@@ -688,7 +754,7 @@ module Tire
           should "percolate document against specific queries" do
             Configuration.client.expects(:post).
                                  with do |url, payload|
-                                   url     == "#{Configuration.url}/dummy/article/?percolate=tag:alerts" &&
+                                   url     == "#{@index.url}/article/?percolate=tag:alerts" &&
                                    payload =~ /"title":"Test"/
                                  end.
                                  returns(mock_response('{"ok":true,"_id":"test","matches":["alerts"]}'))
@@ -700,6 +766,53 @@ module Tire
 
       end
 
+      context "reindexing" do
+        setup do
+          @results = {
+            "_scroll_id" => "abc123",
+            "took" => 3,
+            "hits" => {
+              "total" => 10,
+              "hits" => [
+                { "_id" => "1", "_source" => { "title" => "Test" } }
+              ]
+            }
+          }
+        end
+
+        should "perform bulk store in the new index" do
+          Index.any_instance.stubs(:exists?).returns(true)
+          Search::Scan.any_instance.stubs(:__perform)
+          Search::Scan.any_instance.
+                       expects(:results).
+                       returns(Results::Collection.new(@results)).
+                       then.
+                       returns(Results::Collection.new(@results.merge('hits' => {'hits' => []}))).
+                       at_least_once
+
+          Index.any_instance.expects(:bulk_store).once
+
+          @index.reindex 'whammy'
+        end
+
+        should "create the new index if it does not exist" do
+          options = { :settings => { :number_of_shards => 1 } }
+
+          Index.any_instance.stubs(:exists?).returns(false)
+          Search::Scan.any_instance.stubs(:__perform)
+          Search::Scan.any_instance.
+                       expects(:results).
+                       returns(Results::Collection.new(@results)).
+                       then.
+                       returns(Results::Collection.new(@results.merge('hits' => {'hits' => []}))).
+                       at_least_once
+
+          Index.any_instance.expects(:create).with(options).once
+
+          @index.reindex 'whammy', options
+        end
+
+      end
     end
 
   end