tire 0.4.0.pre → 0.4.0.rc

data/test/integration/count_test.rb

@@ -0,0 +1,34 @@
+require 'test_helper'
+
+module Tire
+
+  class CountIntegrationTest < Test::Unit::TestCase
+    include Test::Integration
+
+    context "Count" do
+
+      should "return total number of hits for the query, but no hits" do
+        s = Tire.search 'articles-test', :search_type => 'count' do
+          query { term :tags, 'ruby' }
+        end
+
+        assert_equal 2, s.results.total
+        assert_equal 0, s.results.count
+        assert s.results.empty?
+      end
+
+      should "return facets in results" do
+        s = Tire.search 'articles-test', :search_type => 'count' do
+          query { term :tags, 'ruby' }
+          facet('tags') { terms :tags }
+        end
+
+        assert ! s.results.facets['tags'].empty?
+        assert_equal 2, s.results.facets['tags']['terms'].select { |t| t['term'] == 'ruby' }.  first['count']
+        assert_equal 1, s.results.facets['tags']['terms'].select { |t| t['term'] == 'python' }.first['count']
+      end
+
+    end
+
+  end
+end

data/test/integration/dsl_search_test.rb

@@ -0,0 +1,22 @@
+require 'test_helper'
+
+module Tire
+
+  class DSLSearchIntegrationTest < Test::Unit::TestCase
+    include Test::Integration
+
+    context "DSL" do
+
+      should "allow passing search payload as a Hash" do
+        s = Tire.search 'articles-test', :query  => { :query_string => { :query => 'ruby' } },
+                                         :facets => { 'tags' => { :filter => { :term => {:tags => 'ruby' } } } }
+        # p s.results
+        assert_equal 2, s.results.count
+        assert_equal 2, s.results.facets['tags']['count']
+      end
+
+    end
+
+  end
+
+end

data/test/integration/explanation_test.rb

@@ -0,0 +1,44 @@
+require 'test_helper'
+
+module Tire
+
+  class ExplanationIntegrationTest < Test::Unit::TestCase
+    include Test::Integration
+
+    context "Explanation" do
+      teardown { Tire.index('explanation-test').delete }
+
+      setup do
+        content = "A Fox one day fell into a deep well and could find no means of escape."
+
+        Tire.index 'explanation-test' do
+          delete
+          create
+          store   :id => 1, :content => content
+          refresh
+        end
+      end
+
+      should "add '_explanation' field to the result item" do
+        # Tire::Configuration.logger STDERR, :level => 'debug'
+        s = Tire.search 'explanation-test', :explain => true do
+          query do
+            boolean do
+              should   { string 'content:Fox' }
+            end
+          end
+        end
+
+        doc = s.results.first
+
+        explanation = doc._explanation
+
+        assert explanation.description.include?("product of:")
+        assert explanation.value < 0.6
+        assert_not_nil explanation.details
+        end
+
+      end
+
+    end
+  end

data/test/integration/facets_test.rb

@@ -210,6 +210,21 @@ module Tire
 
       end
 
+      context "filter" do
+        should "return a filtered facet" do
+          s = Tire.search('articles-test') do
+            query { all }
+            facet 'filtered' do
+              filter :tags, 'ruby'
+            end
+          end
+
+          assert_equal 5, s.results.size, s.results.inspect
+          facets = s.results.facets["filtered"]
+          assert_equal 2, facets["count"], facets.inspect
+        end
+      end
+
     end
 
   end

data/test/integration/fuzzy_queries_test.rb

@@ -0,0 +1,20 @@
+require 'test_helper'
+
+module Tire
+
+  class FuzzyQueryIntegrationTest < Test::Unit::TestCase
+    include Test::Integration
+
+    context "Fuzzy query" do
+      should "fuzzily find article by tag" do
+        results = Tire.search('articles-test') { query { fuzzy :tags, 'irlang' } }.results
+
+        assert_equal 1,        results.count
+        assert_equal ["erlang"], results.first[:tags]
+      end
+
+    end
+
+  end
+
+end

data/test/integration/mongoid_searchable_test.rb

@@ -1,4 +1,5 @@
 require 'test_helper'
+require File.expand_path('../../models/mongoid_models', __FILE__)
 
 begin
   require "mongo"

data/test/integration/persistent_model_test.rb

@@ -17,7 +17,6 @@ module Tire
     end
 
     context "PersistentModel" do
-
       should "search with simple query" do
         PersistentArticle.create :id => 1, :title => 'One'
         PersistentArticle.index.refresh
@@ -88,6 +87,28 @@ module Tire
           assert_equal 2, results.num_pages
           assert_equal 0, results.offset_value
         end
+
+      end
+
+      context "with namespaced models" do
+        setup do
+          MyNamespace::PersistentArticleInNamespace.create :title => 'Test'
+          MyNamespace::PersistentArticleInNamespace.index.refresh
+        end
+
+        teardown do
+          MyNamespace::PersistentArticleInNamespace.index.delete
+        end
+
+        should "find the document in the index" do
+          results = MyNamespace::PersistentArticleInNamespace.search 'test'
+
+          assert       results.any?, "No results returned: #{results.inspect}"
+          assert_equal 1, results.count
+
+          assert_instance_of MyNamespace::PersistentArticleInNamespace, results.first
+        end
+
       end
 
     end

data/test/integration/text_query_test.rb

@@ -7,17 +7,31 @@ module Tire
 
     context "Text query" do
       setup do
-        ::RestClient.put "#{URL}/articles-test/article/plus-one", {title: "+1 !!!"}.to_json
-        ::RestClient.post "#{URL}/articles-test/_refresh", ''
+        Tire.index('articles-test') do
+          store :type => 'article', :title => '+1 !!!'
+          store :type => 'article', :title => 'Furry Kitten'
+          refresh
+        end
       end
 
       should "find article by title" do
-        results = Tire.search('articles-test') { query { text :title, '+1' } }.results
+        results = Tire.search('articles-test') do
+          query { text :title, '+1' }
+        end.results
 
         assert_equal 1,        results.count
         assert_equal "+1 !!!", results.first[:title]
       end
 
+      should "allow to pass options (fuzziness)" do
+        results = Tire.search('articles-test') do
+          query { text :title, 'fuzzy mitten', :fuzziness => 0.5, :operator => 'and' }
+        end.results
+
+        assert_equal 1,        results.count
+        assert_equal "Furry Kitten", results.first[:title]
+      end
+
     end
 
   end

data/test/models/active_record_models.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'active_record'
 
 class ActiveRecordArticle < ActiveRecord::Base
@@ -78,3 +77,46 @@ class ActiveRecordClassWithDynamicIndexName < ActiveRecord::Base
     "dynamic" + '_' + "index"
   end
 end
+
+# Used in test for multiple class instances in one index,
+# and single table inheritance (STI) support.
+
+class ActiveRecordModelOne < ActiveRecord::Base
+  include Tire::Model::Search
+  include Tire::Model::Callbacks
+  self.table_name = 'active_record_model_one'
+  index_name 'active_record_model_one'
+end
+
+class ActiveRecordModelTwo < ActiveRecord::Base
+  include Tire::Model::Search
+  include Tire::Model::Callbacks
+  self.table_name = 'active_record_model_two'
+  index_name 'active_record_model_two'
+end
+
+class ActiveRecordAsset < ActiveRecord::Base
+  include Tire::Model::Search
+  include Tire::Model::Callbacks
+end
+
+class ActiveRecordVideo < ActiveRecordAsset
+  index_name 'active_record_assets'
+end
+
+class ActiveRecordPhoto < ActiveRecordAsset
+  index_name 'active_record_assets'
+end
+
+# Namespaced ActiveRecord models
+
+module ActiveRecordNamespace
+  def self.table_name_prefix
+    'active_record_namespace_'
+  end
+end
+
+class ActiveRecordNamespace::MyModel < ActiveRecord::Base
+  include Tire::Model::Search
+  include Tire::Model::Callbacks
+end

data/test/models/mongoid_models.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'mongoid'
 
 class MongoidArticle

data/test/models/persistent_article_in_namespace.rb

@@ -0,0 +1,12 @@
+# Example namespaced class with ElasticSearch persistence
+#
+# The `document_type` is `my_namespace/persistent_article_in_namespace`
+#
+
+module MyNamespace
+  class PersistentArticleInNamespace
+    include Tire::Model::Persistence
+
+    property :title
+  end
+end

data/test/models/supermodel_article.rb

@@ -1,22 +1,17 @@
 # Example ActiveModel class for testing :searchable mode
 
 require 'rubygems'
-require 'supermodel'
+require 'redis/persistence'
 
-class SupermodelArticle < SuperModel::Base
-  include SuperModel::RandomID
+class SupermodelArticle
+  include Redis::Persistence
 
   include Tire::Model::Search
   include Tire::Model::Callbacks
 
+  property :title
+
   mapping do
     indexes :title,      :type => 'string', :boost => 15, :analyzer => 'czech'
   end
-
-  alias :persisted? :exists?
-
-  def destroyed?
-    !self.class.find(self.id) rescue true
-  end
-
 end

data/test/test_helper.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'bundler/setup'
 
 require 'pathname'
 require 'test/unit'
@@ -7,14 +8,27 @@ require 'yajl/json_gem'
 require 'sqlite3'
 
 require 'shoulda'
-require 'turn/autorun' unless ENV["TM_FILEPATH"] || ENV["CI"]
+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'
 
-Dir[File.dirname(__FILE__) + '/models/**/*.rb'].each { |m| require m }
+# 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
 

data/test/unit/index_test.rb

@@ -14,6 +14,14 @@ module Tire
         assert_equal 'dummy', @index.name
       end
 
+      should "return HTTP response" do
+        assert_respond_to @index, :response
+
+        Configuration.client.expects(:head).returns(mock_response('OK'))
+        @index.exists?
+        assert_equal      'OK', @index.response.body
+      end
+
       should "return true when exists" do
         Configuration.client.expects(:head).returns(mock_response(''))
         assert @index.exists?
@@ -173,6 +181,21 @@ module Tire
           @index.store article
         end
 
+        should "properly encode namespaced document types" do
+          Configuration.client.expects(:post).with do |url,document|
+            url == "#{Configuration.url}/dummy/my_namespace%2Fmy_model/"
+          end.returns(mock_response('{"ok":true,"_id":"123"}'))
+
+          module MyNamespace
+            class MyModel
+              def document_type;   "my_namespace/my_model"; end
+              def to_indexed_json; "{}";                    end
+            end
+          end
+
+          @index.store MyNamespace::MyModel.new
+        end
+
         should "set default type" do
           Configuration.client.expects(:post).with("#{Configuration.url}/dummy/document/", '{"title":"Test"}').returns(mock_response('{"ok":true,"_id":"test"}'))
           @index.store :title => 'Test'
@@ -190,6 +213,11 @@ module Tire
           assert_raise(ArgumentError) { @index.store document }
         end
 
+        should "raise deprecation warning when trying to store a JSON string" do
+          Configuration.client.expects(:post).returns(mock_response('{"ok":true,"_id":"test"}'))
+          @index.store '{"foo" : "bar"}'
+        end
+
         context "document with ID" do
 
           should "store Hash it under its ID property" do
@@ -264,6 +292,12 @@ module Tire
           end
         end
 
+        should "properly encode document type" do
+          Configuration.client.expects(:get).with("#{Configuration.url}/dummy/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
+
       end
 
       context "when removing" do
@@ -275,6 +309,13 @@ module Tire
           @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").
+                                                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").
                                                 returns(mock_response('{"ok":true,"_id":"1"}'))
@@ -306,6 +347,12 @@ module Tire
           end
         end
 
+        should "properly encode document type" do
+          Configuration.client.expects(:delete).with("#{Configuration.url}/dummy/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
+
       end
 
       context "when storing in bulk" do
@@ -353,12 +400,40 @@ module Tire
 
         end
 
-        should "try again when an error response is received" do
+        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" &&
+              json =~ %r|"_index":"my_namespace_my_models"| &&
+              json =~ %r|"_type":"my_namespace/my_model"|
+            end.returns(mock_response('{}', 200))
+
+            module MyNamespace
+              class MyModel
+                def document_type;   "my_namespace/my_model"; end
+                def to_indexed_json; "{}";                    end
+              end
+            end
+
+            Tire.index('my_namespace_my_models').bulk_store [ MyNamespace::MyModel.new ]
+          end
+        end
+
+        should "try again when an exception occurs" do
           Configuration.client.expects(:post).returns(mock_response('Server error', 503)).at_least(2)
 
           assert !@index.bulk_store([ {:id => '1', :title => 'One'}, {:id => '2', :title => 'Two'} ])
         end
 
+        should "try again and the raise when an exception occurs" do
+          Configuration.client.expects(:post).returns(mock_response('Server error', 503)).at_least(2)
+
+          assert_raise(RuntimeError) do
+            @index.bulk_store([ {:id => '1', :title => 'One'}, {:id => '2', :title => 'Two'} ], {:raise => true})
+          end
+        end
+
         should "try again when a connection error occurs" do
           Configuration.client.expects(:post).raises(Errno::ECONNREFUSED, "Connection refused - connect(2)").at_least(2)
 
@@ -417,7 +492,7 @@ module Tire
 
           should "just store it in bulk" do
             collection = [{ :id => 1, :title => 'Article' }]
-            @index.expects(:bulk_store).with( collection ).returns(true)
+            @index.expects(:bulk_store).with(collection, {} ).returns(true)
 
             @index.import collection
           end
@@ -427,20 +502,20 @@ module Tire
         context "class" do
 
           should "call the passed method and bulk store the results" do
-            @index.expects(:bulk_store).with([1, 2, 3, 4]).returns(true)
+            @index.expects(:bulk_store).with { |c, o| c == [1, 2, 3, 4] }.returns(true)
 
-            @index.import ImportData, :paginate
+            @index.import ImportData, :method => 'paginate'
           end
 
           should "pass the params to the passed method and bulk store the results" do
-            @index.expects(:bulk_store).with([1, 2]).returns(true)
-            @index.expects(:bulk_store).with([3, 4]).returns(true)
+            @index.expects(:bulk_store).with { |c,o| c == [1, 2] }.returns(true)
+            @index.expects(:bulk_store).with { |c,o| c == [3, 4] }.returns(true)
 
-            @index.import ImportData, :paginate, :page => 1, :per_page => 2
+            @index.import ImportData, :method => 'paginate', :page => 1, :per_page => 2
           end
 
           should "pass the class when method not passed" do
-            @index.expects(:bulk_store).with(ImportData).returns(true)
+            @index.expects(:bulk_store).with { |c,o| c == ImportData }.returns(true)
 
             @index.import ImportData
           end
@@ -452,7 +527,7 @@ module Tire
           context "and plain collection" do
 
             should "allow to manipulate the collection in the block" do
-              Tire::Index.any_instance.expects(:bulk_store).with([{ :id => 1, :title => 'ARTICLE' }])
+              Tire::Index.any_instance.expects(:bulk_store).with([{ :id => 1, :title => 'ARTICLE' }], {})
 
 
               @index.import [{ :id => 1, :title => 'Article' }] do |articles|
@@ -465,11 +540,11 @@ module Tire
           context "and object" do
 
             should "call the passed block on every batch" do
-              Tire::Index.any_instance.expects(:bulk_store).with([1, 2])
-              Tire::Index.any_instance.expects(:bulk_store).with([3, 4])
+              Tire::Index.any_instance.expects(:bulk_store).with { |collection, options| collection == [1, 2] }
+              Tire::Index.any_instance.expects(:bulk_store).with { |collection, options| collection == [3, 4] }
 
               runs = 0
-              @index.import ImportData, :paginate, :per_page => 2 do |documents|
+              @index.import ImportData, :method => 'paginate', :per_page => 2 do |documents|
                 runs += 1
                 # Don't forget to return the documents at the end of the block
                 documents
@@ -479,11 +554,10 @@ module Tire
             end
 
             should "allow to manipulate the documents in passed block" do
-              Tire::Index.any_instance.expects(:bulk_store).with([2, 3])
-              Tire::Index.any_instance.expects(:bulk_store).with([4, 5])
-
+              Tire::Index.any_instance.expects(:bulk_store).with { |c,o| c == [2, 3] }
+              Tire::Index.any_instance.expects(:bulk_store).with { |c,o| c == [4, 5] }
 
-              @index.import ImportData, :paginate, :per_page => 2 do |documents|
+              @index.import ImportData, :method => :paginate, :per_page => 2 do |documents|
                 # Add 1 to every "document" and return them
                 documents.map { |d| d + 1 }
               end