tire 0.1.4 → 0.1.5

data/test/integration/boolean_queries_test.rb

@@ -0,0 +1,43 @@
+require 'test_helper'
+
+module Tire
+
+  class BooleanQueriesIntegrationTest < Test::Unit::TestCase
+    include Test::Integration
+
+    context "Boolean queries" do
+
+      should "allow to set multiple queries per condition" do
+        s = Tire.search('articles-test') do
+          query do
+            boolean do
+              must { term :tags, 'ruby' }
+              must { term :tags, 'python' }
+            end
+          end
+        end
+
+        assert_equal 1, s.results.size
+        assert_equal 'Two', s.results.first.title
+      end
+
+      should "allow to set multiple queries for multiple conditions" do
+        s = Tire.search('articles-test') do
+          query do
+            boolean do
+              must   { term :tags, 'ruby' }
+              should { term :tags, 'python' }
+            end
+          end
+        end
+
+        assert_equal 2, s.results.size
+        assert_equal 'Two', s.results[0].title
+        assert_equal 'One', s.results[1].title
+      end
+
+    end
+
+  end
+
+end

data/test/integration/facets_test.rb

@@ -58,6 +58,24 @@ module Tire
 
       end
 
+      context "date ranges" do
+
+        should "return aggregated values for all results" do
+          s = Tire.search('articles-test') do
+            query { all }
+            facet 'published_on' do
+              range :published_on, [{:to => '2010-12-31'}, {:from => '2011-01-01', :to => '2011-01-05'}]
+            end
+          end
+
+          facets = s.results.facets['published_on']['ranges']
+          assert_equal 2, facets.size, facets.inspect
+          assert_equal 0, facets.entries[0]["count"], facets.inspect
+          assert_equal 5, facets.entries[1]["count"], facets.inspect
+        end
+
+      end
+
     end
 
   end

data/test/models/active_model_article_with_custom_index_name.rb

@@ -1,5 +1,7 @@
 # Example ActiveModel class with custom index name
 
+require File.expand_path('../active_model_article', __FILE__)
+
 class ActiveModelArticleWithCustomIndexName < ActiveModelArticle
   index_name 'custom-index-name'
 end

data/test/test_helper.rb

@@ -1,9 +1,14 @@
 require 'rubygems'
+
+require 'pathname'
 require 'test/unit'
+
+require 'yajl/json_gem'
+require 'sqlite3'
+
 require 'shoulda'
-require 'mocha'
 require 'turn' unless ENV["TM_FILEPATH"]
-require 'pathname'
+require 'mocha'
 
 require 'tire'
 

data/test/unit/index_test.rb

@@ -51,6 +51,16 @@ module Tire
         assert_nothing_raised { assert @index.refresh }
       end
 
+      should "open the index" do
+        Configuration.client.expects(:post).returns(mock_response('{"ok":true,"_shards":{}}'))
+        assert_nothing_raised { assert @index.open }
+      end
+
+      should "close the index" do
+        Configuration.client.expects(:post).returns(mock_response('{"ok":true,"_shards":{}}'))
+        assert_nothing_raised { assert @index.close }
+      end
+
       context "mapping" do
 
         should "create index with mapping" do
@@ -118,7 +128,7 @@ module Tire
 
           should "store Hash it under its ID property" do
             Configuration.client.expects(:post).with("#{Configuration.url}/dummy/document/123",
-                                                     Yajl::Encoder.encode({:id => 123, :title => 'Test'})).
+                                                     MultiJson.encode({:id => 123, :title => 'Test'})).
                                                 returns(mock_response('{"ok":true,"_id":"123"}'))
             @index.store :id => 123, :title => 'Test'
           end

data/test/unit/logger_test.rb

@@ -66,7 +66,7 @@ module Tire
 
       should "log request in correct format" do
         log = (<<-"log;").gsub(/^ +/, '')
-          # 2011-03-19 11:00:00:L [_search] (["articles", "users"])
+          # 2011-03-19 11:00:00:#{RUBY_VERSION < "1.9" ? "L" : "000"} [_search] (["articles", "users"])
           #
           curl -X GET http://...
 
@@ -98,7 +98,7 @@ module Tire
         }
         json;
         log  = (<<-"log;").gsub(/^\s*/, '')
-          # 2011-03-19 11:00:00:L [200 OK] (4 msec)
+          # 2011-03-19 11:00:00:#{RUBY_VERSION < "1.9" ? "L" : "000"} [200 OK] (4 msec)
           #
         log;
         # log += json.split.map { |line| "# #{line}" }.join("\n")

data/test/unit/model_persistence_test.rb

@@ -39,9 +39,9 @@ module Tire
       context "Finders" do
 
         setup do
-          @first  = { '_id' => 1, '_source' => { :title => 'First'  } }
-          @second = { '_id' => 2, '_source' => { :title => 'Second' } }
-          @third  = { '_id' => 3, '_source' => { :title => 'Third'  } }
+          @first  = { '_id' => 1, '_version' => 1, '_index' => 'persistent_articles', '_type' => 'persistent_article', '_source' => { :title => 'First'  } }
+          @second = { '_id' => 2, '_index' => 'persistent_articles', '_type' => 'persistent_article', '_source' => { :title => 'Second' } }
+          @third  = { '_id' => 3, '_index' => 'persistent_articles', '_type' => 'persistent_article', '_source' => { :title => 'Third'  } }
           @find_all = { 'hits' => { 'hits' => [
             @first,
             @second,
@@ -62,6 +62,18 @@ module Tire
           assert_equal 'First', document.title
         end
 
+        should "have _type, _index, _id, _version attributes" do
+          Configuration.client.expects(:get).returns(mock_response(@first.to_json))
+          document = PersistentArticle.find 1
+
+          assert_instance_of PersistentArticle, document
+          assert_equal 1, document.id
+          assert_equal 1, document.attributes['id']
+          assert_equal 'persistent_articles', document._index
+          assert_equal 'persistent_article', document._type
+          assert_equal 1, document._version
+        end
+
         should "find document by string ID" do
           Configuration.client.expects(:get).returns(mock_response(@first.to_json))
           document = PersistentArticle.find '1'
@@ -184,7 +196,7 @@ module Tire
             assert_nothing_raised { article.published_on? }
             assert ! article.published_on?
           end
-      
+
           should "return true for respond_to? calls for set attributes" do
             article = PersistentArticle.new :title => 'Test'
             assert article.respond_to?(:title)
@@ -235,9 +247,15 @@ module Tire
 
         context "when creating" do
 
+          # TODO: Find a way to mock JSON paylod for Mocha with disregard to Hash entries ordering.
+          #       Ruby 1.9 brings ordered Hashes, so tests were failing.
+
           should "save the document with generated ID in the database" do
             Configuration.client.expects(:post).with("#{Configuration.url}/persistent_articles/persistent_article/",
-                                                     '{"title":"Test","tags":["one","two"],"published_on":null}').
+                                                     RUBY_VERSION < "1.9" ?
+                                                     '{"title":"Test","tags":["one","two"],"published_on":null}' :
+                                                     '{"published_on":null,"tags":["one","two"],"title":"Test"}'
+                                                     ).
                                                 returns(mock_response('{"ok":true,"_id":"abc123"}'))
             article = PersistentArticle.create :title => 'Test', :tags => [:one, :two]
 
@@ -247,7 +265,10 @@ module Tire
 
           should "save the document with custom ID in the database" do
             Configuration.client.expects(:post).with("#{Configuration.url}/persistent_articles/persistent_article/r2d2",
-                                                     '{"title":"Test","id":"r2d2","tags":null,"published_on":null}').
+                                                     RUBY_VERSION < "1.9" ?
+                                                     '{"title":"Test","id":"r2d2","tags":null,"published_on":null}' :
+                                                     '{"id":"r2d2","published_on":null,"tags":null,"title":"Test"}'
+                                                     ).
                                                 returns(mock_response('{"ok":true,"_id":"r2d2"}'))
             article = PersistentArticle.create :id => 'r2d2', :title => 'Test'
 
@@ -256,7 +277,7 @@ module Tire
 
           should "perform model validations" do
             Configuration.client.expects(:post).never
- 
+
             assert ! ValidatedModel.create(:name => nil)
           end
 
@@ -266,7 +287,10 @@ module Tire
 
           should "set the id property" do
             Configuration.client.expects(:post).with("#{Configuration.url}/persistent_articles/persistent_article/",
-                                                     {:title => 'Test', :tags => nil, :published_on => nil}.to_json).
+                                                     RUBY_VERSION < "1.9" ?
+                                                     {:title => 'Test', :tags => nil, :published_on => nil}.to_json :
+                                                     {:published_on => nil, :tags => nil, :title => 'Test'}.to_json
+                                                     ).
                                                 returns(mock_response('{"ok":true,"_id":"1"}'))
 
             article = PersistentArticle.create :title => 'Test'
@@ -275,7 +299,10 @@ module Tire
 
           should "not set the id property if already set" do
             Configuration.client.expects(:post).with("#{Configuration.url}/persistent_articles/persistent_article/123",
-                                                     '{"title":"Test","id":"123","tags":null,"published_on":null}').
+                                                     RUBY_VERSION < "1.9" ?
+                                                     '{"title":"Test","id":"123","tags":null,"published_on":null}' :
+                                                     '{"id":"123","published_on":null,"tags":null,"title":"Test"}'
+                                                     ).
                                                 returns(mock_response('{"ok":true, "_id":"XXX"}'))
 
             article = PersistentArticle.create :id => '123', :title => 'Test'
@@ -290,13 +317,19 @@ module Tire
             article = PersistentArticle.new :id => 1, :title => 'Test'
 
             Configuration.client.expects(:post).with("#{Configuration.url}/persistent_articles/persistent_article/1",
-                                                     '{"title":"Test","id":1,"tags":null,"published_on":null}').
+                                                     RUBY_VERSION < "1.9" ?
+                                                     '{"title":"Test","id":1,"tags":null,"published_on":null}' :
+                                                     '{"id":1,"published_on":null,"tags":null,"title":"Test"}'
+                                                     ).
                                                 returns(mock_response('{"ok":true,"_id":"1"}'))
             assert article.save
 
             article.title = 'Updated'
             Configuration.client.expects(:post).with("#{Configuration.url}/persistent_articles/persistent_article/1",
-                                                     '{"title":"Updated","id":1,"tags":null,"published_on":null}').
+                                                     RUBY_VERSION < "1.9" ?
+                                                     '{"title":"Updated","id":1,"tags":null,"published_on":null}' :
+                                                     '{"id":1,"published_on":null,"tags":null,"title":"Updated"}'
+                                                     ).
                                                 returns(mock_response('{"ok":true,"_id":"1"}'))
             assert article.save
           end
@@ -323,7 +356,10 @@ module Tire
             article.title = 'Test'
 
             Configuration.client.expects(:post).with("#{Configuration.url}/persistent_articles/persistent_article/123",
-                                                     '{"title":"Test","id":"123","tags":null,"published_on":null}').
+                                                     RUBY_VERSION < "1.9" ?
+                                                     '{"title":"Test","id":"123","tags":null,"published_on":null}' :
+                                                     '{"id":"123","published_on":null,"tags":null,"title":"Test"}'
+                                                     ).
                                                 returns(mock_response('{"ok":true,"_id":"XXX"}'))
              assert article.save
              assert_equal '123', article.id
@@ -335,7 +371,10 @@ module Tire
 
           should "delete the document from the database" do
             Configuration.client.expects(:post).with("#{Configuration.url}/persistent_articles/persistent_article/123",
-                                                     '{"title":"Test","id":"123","tags":null,"published_on":null}').
+                                                     RUBY_VERSION < "1.9" ?
+                                                     '{"title":"Test","id":"123","tags":null,"published_on":null}' :
+                                                     '{"id":"123","published_on":null,"tags":null,"title":"Test"}'
+                                                     ).
                                                 returns(mock_response('{"ok":true,"_id":"123"}'))
             Configuration.client.expects(:delete).with("#{Configuration.url}/persistent_articles/persistent_article/123")
 

data/test/unit/results_collection_test.rb

@@ -25,6 +25,11 @@ module Tire
         assert_equal 3, Results::Collection.new(@default_response).size
       end
 
+      should "allow access to items" do
+        assert_not_nil  Results::Collection.new(@default_response)[1]
+        assert_equal 2, Results::Collection.new(@default_response)[1][:id]
+      end
+
       should "be initialized with parsed json" do
         assert_nothing_raised do
           collection = Results::Collection.new( @default_response )

data/test/unit/results_item_test.rb

@@ -10,13 +10,18 @@ module Tire
         @document = Results::Item.new :title => 'Test', :author => { :name => 'Kafka' }
       end
 
-      should "be initialized with a Hash" do
+      should "be initialized with a Hash or Hash like object" do
         assert_raise(ArgumentError) { Results::Item.new('FUUUUUUU') }
 
         assert_nothing_raised do
           d = Results::Item.new(:id => 1)
           assert_instance_of Results::Item, d
         end
+
+        assert_nothing_raised do
+          class AlmostHash < Hash; end
+          d = Results::Item.new(AlmostHash.new(:id => 1))
+        end
       end
 
       should "respond to :to_indexed_json" do

data/test/unit/rubyext_hash_test.rb

@@ -6,12 +6,39 @@ module Tire
 
     context "Hash" do
 
-      should "have to_indexed_json doing the same as to_json" do
+      context "with no to_json method provided" do
+        setup do
+          @hash = { :one => 1}
+          # Undefine the `to_json` method...
+          class Hash; undef_method(:to_json); end
+          # ... and reload the extension, so it's added
+          load 'tire/rubyext/hash.rb'
+        end
+
+        should "have its own to_json method" do
+          assert_respond_to( @hash, :to_json )
+          assert_equal '{"one":1}', @hash.to_json
+        end
+
+      end
+
+      should "have a to_json method from Yajl" do
+        assert defined?(Yajl)
+        assert_respond_to( {}, :to_json )
+        assert_equal '{"one":1}', { :one => 1}.to_json
+      end
+
+      should "have to_indexed_json method doing the same as to_json" do
         [{}, { 1 => 2 }, { 3 => 4, 5 => 6 }, { nil => [7,8,9] }].each do |h|
-          assert_equal Yajl::Parser.parse(h.to_json), Yajl::Parser.parse(h.to_indexed_json)
+          assert_equal MultiJson.decode(h.to_json), MultiJson.decode(h.to_indexed_json)
         end
       end
 
+      should "properly serialize Time into JSON" do
+        json = { :time => Time.mktime(2011, 01, 01, 11, 00).to_json  }.to_json
+        assert_equal '"2011-01-01T11:00:00+01:00"', MultiJson.decode(json)['time']
+      end
+
     end
 
   end

data/test/unit/search_facet_test.rb

@@ -51,7 +51,7 @@ module Tire::Search
       context "date histogram" do
 
         should "encode the JSON with default values" do
-          f = Facet.new('date') { date :published_on, :interval => 'day' }
+          f = Facet.new('date') { date :published_on }
           assert_equal({ :date => { :date_histogram => { :field => 'published_on', :interval => 'day' } } }.to_json, f.to_json)
         end
 
@@ -62,6 +62,13 @@ module Tire::Search
 
       end
 
+      context "range facet" do
+        should "encode facet options" do
+          f = Facet.new('range') { range :published_on, [{:to => '2010-12-31'}, {:from => '2011-01-01', :to => '2011-05-27'}, {:from => '2011-05-28'}]}
+          assert_equal({ :range => { :range => { :field => 'published_on', :ranges => [{:to => '2010-12-31'}, {:from => '2011-01-01', :to => '2011-05-27'}, {:from => '2011-05-28'}] } } }.to_json, f.to_json)
+        end
+      end
+
     end
 
   end

data/test/unit/search_query_test.rb

@@ -10,6 +10,11 @@ module Tire::Search
         assert_respond_to Query.new, :to_json
       end
 
+      should "return itself as a Hash" do
+        assert_respond_to Query.new, :to_hash
+        assert_equal( { :term => { :foo => 'bar' } }, Query.new.term(:foo, 'bar').to_hash )
+      end
+
       should "allow a block to be given" do
         assert_equal( { :term => { :foo => 'bar' } }.to_json, Query.new do
           term(:foo, 'bar')
@@ -39,6 +44,16 @@ module Tire::Search
                       Query.new.string('foo', :default_field => 'title') )
       end
 
+      should "allow set default operator when searching with a query string" do
+        assert_equal( { :query_string => { :query => 'foo', :default_operator => 'AND' } },
+                      Query.new.string('foo', :default_operator => 'AND') )
+      end
+
+      should "allow to set options when searching with a query string" do
+        assert_equal( { :query_string => { :query => 'foo', :fields => ['title.*'], :use_dis_max => true } },
+                      Query.new.string('foo', :fields => ['title.*'], :use_dis_max => true) )
+      end
+
       should "search for all documents" do
         assert_equal( { :match_all => { } }, Query.new.all )
       end
@@ -50,6 +65,56 @@ module Tire::Search
 
     end
 
+    context "BooleanQuery" do
+
+      should "raise ArgumentError when no block given" do
+        assert_raise(ArgumentError) { Query.new.boolean }
+      end
+
+      should "encode options" do
+        query = Query.new.boolean(:minimum_number_should_match => 1) do
+          must { string 'foo' }
+        end
+
+        assert_equal 1, query[:bool][:minimum_number_should_match]
+      end
+
+      should "wrap single query" do
+        assert_equal( { :bool => {:must => [{ :query_string => { :query => 'foo' } }] }},
+                      Query.new.boolean { must { string 'foo' } } )
+      end
+
+      should "wrap multiple queries for the same condition" do
+        query = Query.new.boolean do
+          must { string 'foo' }
+          must { string 'bar' }
+        end
+
+        assert_equal( 2, query[:bool][:must].size, query[:bool][:must].inspect )
+        assert_equal( { :query_string => {:query => 'foo'} }, query[:bool][:must].first )
+        assert_equal( { :query_string => {:query => 'bar'} }, query[:bool][:must].last )
+      end
+
+      should "wrap queries for multiple conditions" do
+        query = Query.new.boolean do
+          should   { string 'foo' }
+          must     { string 'bar' }
+          must     { string 'baz' }
+          must_not { string 'fuu' }
+        end
+
+        assert_equal 2, query[:bool][:must].size
+        assert_equal 1, query[:bool][:should].size
+        assert_equal 1, query[:bool][:must_not].size
+
+        assert_equal( { :query_string => {:query => 'foo'} }, query[:bool][:should].first )
+        assert_equal( { :query_string => {:query => 'bar'} }, query[:bool][:must].first )
+        assert_equal( { :query_string => {:query => 'baz'} }, query[:bool][:must].last )
+        assert_equal( { :query_string => {:query => 'fuu'} }, query[:bool][:must_not].first )
+      end
+
+    end
+
   end
 
 end

data/test/unit/search_test.rb

@@ -100,7 +100,7 @@ module Tire
               _score
             end
           end
-          hash = JSON.load( s.to_json )
+          hash = MultiJson.decode( s.to_json )
           assert_equal [{'title' => 'desc'}, '_score'], hash['sort']
         end
         
@@ -182,7 +182,7 @@ module Tire
             size 5
             from 3
           end
-          hash = JSON.load( s.to_json )
+          hash = MultiJson.decode( s.to_json )
           assert_equal 5, hash['size']
           assert_equal 3, hash['from']
         end
@@ -213,12 +213,48 @@ module Tire
           s = Search::Search.new('index') do
             fields :title
           end
-          hash = JSON.load( s.to_json )
+          hash = MultiJson.decode( s.to_json )
           assert_equal 'title', hash['fields']
         end
 
       end
 
+      context "boolean queries" do
+
+        should "wrap other queries" do
+          # TODO: Try to get rid of the `boolean` method
+          #
+          # TODO: Try to get rid of multiple `should`, `must`, invocations, and wrap queries like this:
+          #       boolean do
+          #         should do
+          #           string 'foo'
+          #           string 'bar'
+          #         end
+          #       end
+          s = Search::Search.new('index') do
+            query do
+              boolean do
+                should { string 'foo' }
+                should { string 'moo' }
+                must   { string 'title:bar' }
+                must   { terms  :tags, ['baz']  }
+              end
+            end
+          end
+
+          hash  = MultiJson.decode(s.to_json)
+          query = hash['query']['bool']
+          # p hash
+
+          assert_equal 2, query['should'].size
+          assert_equal 2, query['must'].size
+
+          assert_equal( { 'query_string' => { 'query' => 'foo' } }, query['should'].first)
+          assert_equal( { 'terms' => { 'tags' => ['baz'] } }, query['must'].last)
+        end
+
+      end
+
     end
 
   end

data/tire.gemspec

@@ -27,16 +27,18 @@ Gem::Specification.new do |s|
   s.add_dependency "rake",        "~> 0.8.0"
   s.add_dependency "bundler",     "~> 1.0.0"
   s.add_dependency "rest-client", "~> 1.6.0"
-  s.add_dependency "yajl-ruby",   "> 0.8.0"
-  s.add_dependency "activemodel", "> 3.0.0"
+  s.add_dependency "multi_json",  "~> 1.0"
+  s.add_dependency "activemodel", "~> 3.0.7"
 
+  s.add_development_dependency "yajl-ruby",   "~> 0.8.0"
   s.add_development_dependency "turn"
   s.add_development_dependency "shoulda"
   s.add_development_dependency "mocha"
   s.add_development_dependency "sdoc"
   s.add_development_dependency "rcov"
-  s.add_development_dependency "activerecord"
+  s.add_development_dependency "activerecord", "~> 3.0.7"
   s.add_development_dependency "supermodel"
+  s.add_development_dependency "sqlite3"
 
   s.description = <<-DESC
    Tire is a Ruby client for the ElasticSearch search engine/database.