tire 0.4.3 → 0.5.0

data/test/integration/boosting_queries_test.rb

@@ -0,0 +1,32 @@
+require 'test_helper'
+
+module Tire
+
+  class BoostingQueriesIntegrationTest < Test::Unit::TestCase
+    include Test::Integration
+
+    context "Boosting queries" do
+
+      should "allow to set multiple queries per condition" do
+        s = Tire.search('articles-test') do
+          query do
+            boosting(:negative_boost => 0.2) do
+              positive do
+                string "Two One"
+              end
+              negative do
+                term :tags, 'python'
+              end
+            end
+          end
+        end
+
+        assert_equal 'One', s.results[0].title
+        assert_equal 'Two', s.results[1].title
+      end
+
+    end
+
+  end
+
+end

data/test/integration/custom_score_queries_test.rb

@@ -58,6 +58,7 @@ module Tire
         assert_equal 2, s.results.size
         assert_equal ['Three', 'Two'], s.results.map(&:title)
 
+        assert_equal 5.0, s.results.max_score
         assert_equal 5.0, s.results[0]._score
         assert_equal 3.0, s.results[1]._score
       end

data/test/integration/dsl_search_test.rb

@@ -10,11 +10,19 @@ module Tire
       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
 
+      should "allow building search query iteratively" do
+        s = Tire.search 'articles-test'
+        s.query { string 'T*' }
+        s.filter :terms, :tags => ['java']
+
+        assert_equal 1, s.results.count
+      end
+
     end
 
   end

data/test/integration/facets_test.rb

@@ -59,6 +59,21 @@ module Tire
         assert_equal 1,      s.results.facets['tags']['terms'].first['count'].to_i
       end
 
+      should "allow to define the facet filter with DSL" do
+          s = Tire.search('articles-test', :search_type => 'count') do
+            facet 'tags' do
+              terms :tags
+              facet_filter :range, { :published_on => { :from => '2011-01-01', :to => '2011-01-01' } }
+            end
+          end
+
+          assert_equal 1,      s.results.facets.size
+          assert_equal 'ruby', s.results.facets['tags']['terms'].first['term']
+          assert_equal 1,      s.results.facets['tags']['terms'].first['count'].to_i
+        end
+
+      end
+
       context "terms" do
         setup do
           @s = Tire.search('articles-test') do
@@ -238,19 +253,17 @@ module Tire
       end
 
       context "filter" do
-        should "return a filtered facet" do
-          s = Tire.search('articles-test') do
-            query { all }
+
+        should "return a filter facet" do
+          s = Tire.search('articles-test', :search_type => 'count') do
             facet 'filtered' do
-              filter :tags, 'ruby'
+              filter :range, :words => { :from => 100, :to => 200 }
             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
 

data/test/integration/match_query_test.rb

@@ -0,0 +1,79 @@
+require 'test_helper'
+
+module Tire
+
+  class MatchQueryIntegrationTest < Test::Unit::TestCase
+    include Test::Integration
+
+    context "Match query" do
+      setup do
+        Tire.index 'match-query-test' do
+          delete
+          create settings: { index: { number_of_shards: 1, number_of_replicas: 0 } },
+                 mappings: {
+                  document: { properties: {
+                    last_name: { type: 'string', analyzer: 'english' },
+                    age:       { type: 'integer' }
+                  } }
+                 }
+
+          store first_name: 'John', last_name: 'Smith',    age: 30, gender: 'male'
+          store first_name: 'John', last_name: 'Smithson', age: 25, gender: 'male'
+          store first_name: 'Adam', last_name: 'Smith',    age: 75, gender: 'male'
+          store first_name: 'Mary', last_name: 'John',     age: 30, gender: 'female'
+          refresh
+        end
+      end
+
+      teardown do
+        Tire.index('match-query-test').delete
+      end
+
+      should "find documents by single field" do
+        s = Tire.search 'match-query-test' do
+          query do
+            match :last_name, 'Smith'
+          end
+        end
+
+        assert_equal 2, s.results.count
+      end
+
+      should "find document by multiple fields with multi_match" do
+        s = Tire.search 'match-query-test' do
+          query do
+            match [:first_name, :last_name], 'John'
+          end
+        end
+
+        assert_equal 3, s.results.count
+      end
+
+      should "find documents by prefix" do
+        s = Tire.search 'match-query-test' do
+          query do
+            match :last_name, 'Smi', type: 'phrase_prefix'
+          end
+        end
+
+        assert_equal 3, s.results.count
+      end
+
+      should "automatically create a boolean query when called repeatedly" do
+        s = Tire.search 'match-query-test' do
+          query do
+            match [:first_name, :last_name], 'John'
+            match :age, 30
+            match :gender, 'male'
+          end
+          # puts to_curl
+        end
+
+        assert_equal 1, s.results.count
+      end
+
+    end
+
+  end
+
+end

data/test/integration/multi_search_test.rb

@@ -0,0 +1,114 @@
+require 'test_helper'
+
+module Tire
+
+  class MultiSearchIntegrationTest < Test::Unit::TestCase
+    include Test::Integration
+
+    context "Multi search" do
+      # Tire.configure { logger STDERR }
+      setup do
+        Tire.index 'multi-search-test-1' do
+          delete
+          create
+          store first_name: 'John', last_name: 'Smith',    age: 30, gender: 'male'
+          store first_name: 'John', last_name: 'Smithson', age: 25, gender: 'male'
+          store first_name: 'Mary', last_name: 'Smith',    age: 20, gender: 'female'
+          refresh
+        end
+        Tire.index 'multi-search-test-2' do
+          delete
+          create
+          store first_name: 'John', last_name: 'Milton', age: 35, gender: 'male'
+          store first_name: 'Mary', last_name: 'Milson', age: 44, gender: 'female'
+          store first_name: 'Mary', last_name: 'Reilly', age: 55, gender: 'female'
+          refresh
+        end
+      end
+
+      teardown do
+        Tire.index('multi-search-test-1').delete
+        Tire.index('multi-search-test-2').delete
+      end
+
+      should "return multiple results" do
+        s = Tire.multi_search 'multi-search-test-1' do
+          search :johns do
+            query { match :_all, 'john' }
+          end
+          search :males do
+            query { match :gender, 'male' }
+          end
+          search :facets, search_type: 'count' do
+            facet('age') { statistical :age }
+          end
+        end
+
+        assert_equal 3,    s.results.size
+
+        assert_equal 2,    s.results[:johns].size
+        assert_equal 2,    s.results[:males].size
+
+        assert s.results[:facets].results.empty?, "Results not empty? #{s.results[:facets].results}"
+        assert_equal 75.0, s.results[:facets].facets['age']['total']
+      end
+
+      should "mix named and numbered searches" do
+        s = Tire.multi_search 'multi-search-test-1' do
+          search(:johns) { query { match :_all, 'john' }  }
+          search         { query { match :_all, 'mary' }  }
+        end
+
+        assert_equal 2, s.results.size
+
+        assert_equal 2, s.results[:johns].size
+        assert_equal 1, s.results[1].size
+      end
+
+      should "iterate over mixed searches" do
+        s = Tire.multi_search 'multi-search-test-1' do
+          search(:johns) { query { match :_all, 'john' }  }
+          search         { query { match :_all, 'mary' }  }
+        end
+
+        assert_equal [:johns, 1], s.searches.names
+        assert_equal [:johns, 1], s.results.to_hash.keys
+
+        s.results.each_with_index do |results, i|
+          assert_equal 2, results.size if i == 0
+          assert_equal 1, results.size if i == 1
+        end
+
+        s.results.each_pair do |name, results|
+          assert_equal 2, results.size if name == :johns
+          assert_equal 1, results.size if name == 1
+        end
+      end
+
+      should "return results from different indices" do
+        s = Tire.multi_search do
+          search( index: 'multi-search-test-1' ) { query { match :_all, 'john' }  }
+          search( index: 'multi-search-test-2' ) { query { match :_all, 'john' }  }
+        end
+
+        assert_equal 2, s.results[0].size
+        assert_equal 1, s.results[1].size
+      end
+
+      should "return error for failed searches" do
+        s = Tire.multi_search 'multi-search-test-1' do
+          search() { query { match :_all, 'john' }  }
+          search() { query { string '[x' }  }
+        end
+
+        assert_equal 2, s.results[0].size
+        assert          s.results[0].success?
+
+        assert_equal 0, s.results[1].size
+        assert          s.results[1].failure?
+      end
+    end
+
+  end
+
+end

data/test/integration/persistent_model_test.rb

@@ -124,6 +124,64 @@ module Tire
 
       end
 
+      context "multi search" do
+        setup do
+          # Tire.configure { logger STDERR }
+          PersistentArticle.create :title => 'Test'
+          PersistentArticle.create :title => 'Pest'
+          PersistentArticle.index.refresh
+        end
+
+        should "return multiple result sets" do
+          results = PersistentArticle.multi_search do
+            search do
+              query { match :title, 'test' }
+            end
+            search search_type: 'count' do
+              query { match :title, 'pest' }
+            end
+          end
+
+          assert_equal 2, results.size
+
+          assert_equal 1, results[0].size
+          assert_equal 1, results[0].total
+
+          assert_equal 0, results[1].size
+          assert_equal 1, results[1].total
+        end
+      end
+
+      context "with multiple types within single index" do
+
+        setup do
+          # Create documents of two types within single index
+          PersistentArticleInIndex.create :title => "TestInIndex", :tags => ['in_index']
+          PersistentArticle.create :title => "Test", :tags => []
+          PersistentArticle.index.refresh
+        end
+
+        should "returns all documents with proper type" do
+          results = PersistentArticle.all
+
+          assert_equal 1, results.size
+          assert results.all? { |r| r.tags == [] }, "Incorrect results? " + results.to_a.inspect
+
+          results = PersistentArticleInIndex.all
+
+          assert_equal 1, results.size
+          assert results.all? { |r| r.tags == ['in_index'] }, "Incorrect results? " + results.to_a.inspect
+        end
+
+        should "returns first document with proper type" do
+          assert_instance_of PersistentArticle, PersistentArticle.first
+          assert_instance_of PersistentArticleInIndex, PersistentArticleInIndex.first
+
+          assert_equal [], PersistentArticle.first.tags
+          assert_equal ['in_index'], PersistentArticleInIndex.first.tags
+        end
+      end
+
     end
 
   end

data/test/models/article.rb

@@ -7,7 +7,7 @@ class Article
     attributes.each { |k,v| instance_variable_set(:"@#{k}", v) }
   end
 
-  def to_json
+  def to_json(options={})
     { :id => @id, :title => @title, :body => @body }.to_json
   end
 

data/test/models/persistent_article_in_index.rb

@@ -0,0 +1,16 @@
+# Example class with ElasticSearch persistence in index `persistent_articles`
+#
+# The `index` is `persistent_articles`
+#
+
+class PersistentArticleInIndex
+
+  include Tire::Model::Persistence
+
+  property :title
+  property :published_on
+  property :tags
+
+  index_name "persistent_articles"
+
+end

data/test/models/persistent_article_with_defaults.rb

@@ -4,8 +4,9 @@ class PersistentArticleWithDefaults
 
   property :title
   property :published_on
-  property :tags,   :default => []
-  property :hidden, :default => false
-  property :options,  :default => {:switches => []}
+  property :tags,       :default => []
+  property :hidden,     :default => false
+  property :options,    :default => {:switches => []}
+  property :created_at, :default => lambda { Time.now }
 
 end

data/test/test_helper.rb

@@ -24,6 +24,7 @@ require File.dirname(__FILE__) + '/models/active_model_article_with_custom_index
 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_index'
 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'
@@ -86,7 +87,8 @@ module Test::Integration
       mongoid_class_with_tire_methods
       supermodel_articles
       dynamic_index
-      model_with_nested_documents ].each do |index|
+      model_with_nested_documents
+      model_with_incorrect_mappings ].each do |index|
         ::RestClient.delete "#{URL}/#{index}" rescue nil
     end
   end

data/test/unit/configuration_test.rb

@@ -52,6 +52,16 @@ module Tire
         assert_instance_of Tire::Logger, Configuration.logger
       end
 
+      should "set pretty option to true by default" do
+        assert_not_nil Configuration.pretty
+        assert Configuration.pretty, "Should be true, but is: #{Configuration.pretty.inspect}"
+      end
+
+      should "set the pretty option to false" do
+        Configuration.pretty(false)
+        assert ! Configuration.pretty, "Should be falsy, but is: #{Configuration.pretty.inspect}"
+      end
+
       should "allow to reset the configuration for specific property" do
         Configuration.url 'http://example.com'
         assert_equal      'http://example.com', Configuration.url