tire 0.3.8 → 0.3.9

data/examples/tire-dsl.rb

@@ -477,6 +477,7 @@ end
 # * [term](http://elasticsearch.org/guide/reference/query-dsl/term-query.html)
 # * [terms](http://elasticsearch.org/guide/reference/query-dsl/terms-query.html)
 # * [bool](http://www.elasticsearch.org/guide/reference/query-dsl/bool-query.html)
+# * [custom_score](http://www.elasticsearch.org/guide/reference/query-dsl/custom-score-query.html)
 # * [all](http://www.elasticsearch.org/guide/reference/query-dsl/match-all-query.html)
 # * [ids](http://www.elasticsearch.org/guide/reference/query-dsl/ids-query.html)
 

data/lib/tire/results/collection.rb

@@ -13,15 +13,17 @@ module Tire
         @time     = response['took'].to_i
         @total    = response['hits']['total'].to_i
         @facets   = response['facets']
-        @wrapper  = Configuration.wrapper
+        @wrapper  = options[:wrapper] || Configuration.wrapper
       end
 
       def results
         @results ||= begin
+          hits = @response['hits']['hits']
           unless @options[:load]
-            @response['hits']['hits'].map do |h|
-               if @wrapper == Hash then h
-               else
+            if @wrapper == Hash
+              hits
+            else
+              hits.map do |h|
                  document = {}
 
                  # Update the document with content and ID
@@ -33,10 +35,10 @@ module Tire
 
                  # Return an instance of the "wrapper" class
                  @wrapper.new(document)
-               end
+              end
             end
           else
-            return [] if @response['hits']['hits'].empty?
+            return [] if hits.empty?
 
             type  = @response['hits']['hits'].first['_type']
             raise NoMethodError, "You have tried to eager load the model instances, " +

data/lib/tire/search.rb

@@ -13,8 +13,6 @@ module Tire
 
         @url     = Configuration.url+['/', @indices.join(','), @type, '_search'].compact.join('/').squeeze('/')
 
-        # TODO: Do not allow changing the wrapper here or set it back after yield
-        Configuration.wrapper @options[:wrapper] if @options[:wrapper]
         block.arity < 1 ? instance_eval(&block) : block.call(self) if block_given?
       end
 

data/lib/tire/search/query.rb

@@ -28,6 +28,13 @@ module Tire
         @value
       end
 
+      def custom_score(options={}, &block)
+        @custom_score ||= Query.new(&block)
+        @value[:custom_score] = options
+        @value[:custom_score].update({:query => @custom_score.to_hash})
+        @value
+      end
+
       def boolean(options={}, &block)
         @boolean ||= BooleanQuery.new(options)
         block.arity < 1 ? @boolean.instance_eval(&block) : block.call(@boolean) if block_given?
@@ -35,6 +42,13 @@ module Tire
         @value
       end
 
+      def filtered(&block)
+        @filtered = FilteredQuery.new
+        block.arity < 1 ? @filtered.instance_eval(&block) : block.call(@filtered) if block_given?
+        @value[:filtered] = @filtered.to_hash
+        @value
+      end
+
       def all
         @value = { :match_all => {} }
         @value
@@ -94,5 +108,32 @@ module Tire
       end
     end
 
+
+    class FilteredQuery
+      def initialize(&block)
+        @value = {}
+        block.arity < 1 ? self.instance_eval(&block) : block.call(self) if block_given?
+      end
+
+      def query(options={}, &block)
+        @value[:query] = Query.new(&block).to_hash
+        @value
+      end
+
+      def filter(type, *options)
+        @value[:filter] ||= []
+        @value[:filter] << Filter.new(type, *options).to_hash
+        @value
+      end
+
+      def to_hash
+        @value
+      end
+
+      def to_json
+        to_hash.to_json
+      end
+    end
+
   end
 end

data/lib/tire/version.rb

@@ -1,13 +1,10 @@
 module Tire
-  VERSION   = "0.3.8"
+  VERSION   = "0.3.9"
 
   CHANGELOG =<<-END
     IMPORTANT CHANGES LATELY:
 
-    * Fixed a bug: `Results::Item` was referencing Ruby classes incorrectly within Rails
-    * Fixed `ZeroDivisionError` for empty result sets
-    * Display correct exception on request failure
-    * Added support for range queries
-    * Added support for mapping options
+    * Added support for filtered queries [#134]
+    * Added support for "custom_score" queries [#133]
   END
 end

data/test/integration/custom_score_queries_test.rb

@@ -0,0 +1,88 @@
+require 'test_helper'
+
+module Tire
+
+  class CustomScoreQueriesIntegrationTest < Test::Unit::TestCase
+    include Test::Integration
+
+    context "Custom score queries" do
+
+      should "allow to define custom score queries (base score on field value)" do
+        s = Tire.search('articles-test') do
+          query do
+            # Give longer documents higher score
+            #
+            custom_score :script => "1.0 / doc['words'].value" do
+              string "title:T*"
+            end
+          end
+        end
+
+        assert_equal 2, s.results.size
+        assert_equal ['Two', 'Three'], s.results.map(&:title)
+
+        assert s.results[0]._score > 0
+        assert s.results[1]._score > 0
+        assert s.results[0]._score > s.results[1]._score
+      end
+
+      should "allow to manipulate the default score (boost recent)" do
+        s = Tire.search('articles-test') do
+          query do
+            # Boost recent documents
+            #
+            custom_score :script => "_score + ( doc['published_on'].date.getMillis() / time() )" do
+              string 'title:F*'
+            end
+          end
+        end
+
+        assert_equal 2, s.results.size
+        assert_equal ['Five', 'Four'], s.results.map(&:title)
+
+        assert s.results[0]._score > 1
+        assert s.results[1]._score > 1
+      end
+
+      should "allow to define arbitrary custom scoring" do
+        s = Tire.search('articles-test') do
+          query do
+            # Replace documents score with the count of characters in their title
+            #
+            custom_score :script => "doc['title'].value.length()" do
+              string "title:T*"
+            end
+          end
+        end
+
+        assert_equal 2, s.results.size
+        assert_equal ['Three', 'Two'], s.results.map(&:title)
+
+        assert_equal 5.0, s.results[0]._score
+        assert_equal 3.0, s.results[1]._score
+      end
+
+      should "allow to pass parameters to the script" do
+        s = Tire.search('articles-test') do
+          query do
+            # Replace documents score with parameterized computation
+            #
+            custom_score :script => "doc['words'].doubleValue / max(a, b)",
+                         :params => { :a => 1, :b => 2 } do
+              string "title:T*"
+            end
+          end
+        end
+
+        assert_equal 2, s.results.size
+        assert_equal ['Three', 'Two'], s.results.map(&:title)
+
+        assert_equal 187.5, s.results[0]._score
+        assert_equal 125.0, s.results[1]._score
+      end
+
+    end
+
+  end
+
+end

data/test/integration/facets_test.rb

@@ -26,12 +26,8 @@ module Tire
         q = 'tags:ruby'
         s = Tire.search('articles-test') do
           query { string q }
-          facet 'scoped-tags' do
-            terms :tags
-          end
-          facet 'global-tags', :global => true do
-            terms :tags
-          end
+          facet('scoped-tags')                  { terms :tags }
+          facet('global-tags', :global => true) { terms :tags }
         end
 
         scoped_facets = s.results.facets['scoped-tags']['terms']
@@ -41,6 +37,28 @@ module Tire
         assert_equal 5, global_facets.count
       end
 
+      should "allow to define multiple facets" do
+        s = Tire.search('articles-test') do
+          facet('tags') { terms :tags }
+          facet('date') { date :published_on }
+        end
+
+        assert_equal 2, s.results.facets.size
+      end
+
+      should "allow to restrict facets with filters" do
+        s = Tire.search('articles-test') do
+          query { string 'tags:ruby' }
+          facet('tags', :facet_filter => { :range => { :published_on => { :from => '2011-01-01', :to => '2011-01-01' } }  }) do
+            terms :tags
+          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
+
       context "date histogram" do
 
         should "return aggregated values for all results" do

data/test/integration/filtered_queries_test.rb

@@ -0,0 +1,47 @@
+require 'test_helper'
+
+module Tire
+
+  class FilteredQueriesIntegrationTest < Test::Unit::TestCase
+    include Test::Integration
+
+    context "Filtered queries" do
+
+      should "restrict the results" do
+        # 2.json > Begins with "T" and is tagged "ruby"
+
+        s = Tire.search('articles-test') do
+          query do
+            filtered do
+              query { string 'title:T*' }
+              filter :terms, :tags => ['ruby']
+            end
+          end
+        end
+
+        assert_equal 1, s.results.count
+        assert_equal 'Two', s.results.first.title
+      end
+
+      should "restrict the results with multiple filters" do
+        # 2.json > Is tagged "ruby" and has 250 words
+
+        s = Tire.search('articles-test') do
+          query do
+            filtered do
+              query { all }
+              filter :and, { :terms => { :tags => ['ruby', 'python'] } },
+                           { :range => { :words => { :from => '250', :to => '250' } } }
+            end
+          end
+        end
+
+        assert_equal 1, s.results.count
+        assert_equal 'Two', s.results.first.title
+      end
+
+    end
+
+  end
+
+end

data/test/unit/search_facet_test.rb

@@ -22,6 +22,14 @@ module Tire::Search
                         Facet.new('foo', :global => true).terms(:bar).to_json )
         end
 
+        should "pass options to facets" do
+          payload = Facet.new('foo', :facet_filter => { :term => { :account_id => 'foo' } }).terms(:bar).to_hash
+
+          assert_not_nil payload['foo'][:facet_filter]
+          assert_equal( { :term => { :account_id => 'foo' } },
+                        payload['foo'][:facet_filter] )
+        end
+
         should "encode facet options" do
           assert_equal( { :foo => { :terms => {:field=>'bar',:size=>5,:all_terms=>false} } }.to_json,
                         Facet.new('foo').terms(:bar, :size => 5).to_json )

data/test/unit/search_query_test.rb

@@ -58,6 +58,24 @@ module Tire::Search
                       Query.new.string('foo', :fields => ['title.*'], :use_dis_max => true) )
       end
 
+      should "allow to set script for custom score queries" do
+        query = Query.new.custom_score(:script => "_score * doc['price'].value") do
+          string 'foo'
+        end
+
+        assert_equal "_score * doc['price'].value", query[:custom_score][:script]
+      end
+
+      should "allow to pass parameters for custom score queries" do
+        query = Query.new.custom_score(:script => "_score * doc['price'].value / max(a, b)",
+                                       :params => { :a => 1, :b => 2 }) do
+          string 'foo'
+        end
+
+        assert_equal 1, query[:custom_score][:params][:a]
+        assert_equal 2, query[:custom_score][:params][:b]
+      end
+
       should "search for all documents" do
         assert_equal( { :match_all => { } }, Query.new.all )
       end
@@ -118,11 +136,11 @@ module Tire::Search
       end
 
       should "allow passing variables from outer scope" do
-        q1 = 'foo'
-        q2 = 'bar'
+        @q1 = 'foo'
+        @q2 = 'bar'
         query = Query.new.boolean do |boolean|
-          boolean.must { |query| query.string q1 }
-          boolean.must { |query| query.string q2 }
+          boolean.must { |query| query.string @q1 }
+          boolean.must { |query| query.string @q2 }
         end
 
         assert_equal( 2, query[:bool][:must].size, query[:bool][:must].inspect )
@@ -132,6 +150,49 @@ module Tire::Search
 
     end
 
+
+    context "FilteredQuery" do
+
+      should "not raise an error when no block is given" do
+        assert_nothing_raised { Query.new.filtered }
+      end
+
+      should "properly encode filter" do
+        query = Query.new.filtered do
+          query { term :foo, 'bar' }
+          filter :terms, :tags => ['ruby']
+        end
+
+        assert_equal( { :term => { :foo => 'bar' } }, query[:filtered][:query].to_hash )
+        assert_equal( { :tags => ['ruby'] }, query[:filtered][:filter].first[:terms] )
+      end
+
+      should "properly encode multiple filters" do
+        query = Query.new.filtered do
+          query { term :foo, 'bar' }
+          filter :terms, :tags => ['ruby']
+          filter :terms, :tags => ['python']
+        end
+
+        assert_equal 2, query[:filtered][:filter].size
+        assert_equal( { :tags => ['ruby'] },   query[:filtered][:filter].first[:terms] )
+        assert_equal( { :tags => ['python'] }, query[:filtered][:filter].last[:terms] )
+      end
+
+      should "allow passing variables from outer scope" do
+        @my_query  = 'bar'
+        @my_filter = { :tags => ['ruby'] }
+
+        query = Query.new.filtered do |f|
+          f.query { |q| q.term :foo, @my_query }
+          f.filter :terms, @my_filter
+        end
+
+        assert_equal( { :term => { :foo => 'bar' } }, query[:filtered][:query].to_hash )
+        assert_equal( { :tags => ['ruby'] }, query[:filtered][:filter].first[:terms] )
+      end
+
+    end
   end
 
 end

metadata

@@ -1,257 +1,196 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: tire
-version: !ruby/object:Gem::Version 
-  hash: 3
+version: !ruby/object:Gem::Version
+  version: 0.3.9
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 8
-  version: 0.3.8
 platform: ruby
-authors: 
+authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-24 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70250440988100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.9.2
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rest-client
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70250440988100
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: &70250440987640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.6.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: multi_json
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70250440987640
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: &70250440987180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: activemodel
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70250440987180
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: &70250440986720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70250440986720
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70250440986260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: yajl-ruby
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70250440986260
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: &70250436367320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 8
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.8.0
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70250436367320
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: &70250436365820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70250436365820
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &70250436364080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *70250436364080
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &70250436362640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 3
-        - 0
-        - 7
+      - !ruby/object:Gem::Version
         version: 3.0.7
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: mongoid
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *70250436362640
+- !ruby/object:Gem::Dependency
+  name: mongoid
+  requirement: &70250436361060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 2
-        - 2
-        - 1
+      - !ruby/object:Gem::Version
         version: 2.2.1
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *70250436361060
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &70250441020080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: supermodel
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: *70250441020080
+- !ruby/object:Gem::Dependency
+  name: supermodel
+  requirement: &70250441019620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: *70250441019620
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &70250441019180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: rcov
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: *70250441019180
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: &70250441018760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id014
-- !ruby/object:Gem::Dependency 
-  name: turn
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  version_requirements: *70250441018760
+- !ruby/object:Gem::Dependency
+  name: turn
+  requirement: &70250441018340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id015
-description: "   Tire is a Ruby client for the ElasticSearch search engine/database.\n\n   It provides Ruby-like API for fluent communication with the ElasticSearch server\n   and blends with ActiveModel class for convenient usage in Rails applications.\n\n   It allows to delete and create indices, define mapping for them, supports\n   the bulk API, and presents an easy-to-use DSL for constructing your queries.\n\n   It has full ActiveRecord/ActiveModel compatibility, allowing you to index\n   your models (incrementally upon saving, or in bulk), searching and\n   paginating the results.\n\n   Please check the documentation at <http://karmi.github.com/tire/>.\n"
+  prerelease: false
+  version_requirements: *70250441018340
+description: ! "   Tire is a Ruby client for the ElasticSearch search engine/database.\n\n
+  \  It provides Ruby-like API for fluent communication with the ElasticSearch server\n
+  \  and blends with ActiveModel class for convenient usage in Rails applications.\n\n
+  \  It allows to delete and create indices, define mapping for them, supports\n   the
+  bulk API, and presents an easy-to-use DSL for constructing your queries.\n\n   It
+  has full ActiveRecord/ActiveModel compatibility, allowing you to index\n   your
+  models (incrementally upon saving, or in bulk), searching and\n   paginating the
+  results.\n\n   Please check the documentation at <http://karmi.github.com/tire/>.\n"
 email: karmi@karmi.cz
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.markdown
 - MIT-LICENSE
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -299,7 +238,9 @@ files:
 - test/integration/active_model_searchable_test.rb
 - test/integration/active_record_searchable_test.rb
 - test/integration/boolean_queries_test.rb
+- test/integration/custom_score_queries_test.rb
 - test/integration/facets_test.rb
+- test/integration/filtered_queries_test.rb
 - test/integration/filters_test.rb
 - test/integration/highlight_test.rb
 - test/integration/index_mapping_test.rb
@@ -344,61 +285,36 @@ files:
 - test/unit/search_test.rb
 - test/unit/tire_test.rb
 - tire.gemspec
-has_rdoc: true
 homepage: http://github.com/karmi/tire
 licenses: []
-
-post_install_message: |
-  ================================================================================
-  
-    Please check the documentation at <http://karmi.github.com/tire/>.
-  
-  --------------------------------------------------------------------------------
-  
-    IMPORTANT CHANGES LATELY:
-  
-    * Fixed a bug: `Results::Item` was referencing Ruby classes incorrectly within Rails
-    * Fixed `ZeroDivisionError` for empty result sets
-    * Display correct exception on request failure
-    * Added support for range queries
-    * Added support for mapping options
-  
-    See the full changelog at <http://github.com/karmi/tire/commits/v0.3.8>.
-  
-  --------------------------------------------------------------------------------
-
-rdoc_options: 
+post_install_message: ! "================================================================================\n\n
+  \ Please check the documentation at <http://karmi.github.com/tire/>.\n\n--------------------------------------------------------------------------------\n\n
+  \ IMPORTANT CHANGES LATELY:\n\n  * Added support for filtered queries [#134]\n  *
+  Added support for \"custom_score\" queries [#133]\n\n  See the full changelog at
+  <http://github.com/karmi/tire/commits/v0.3.9>.\n\n--------------------------------------------------------------------------------\n"
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: tire
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ruby client for ElasticSearch
-test_files: 
+test_files:
 - test/fixtures/articles/1.json
 - test/fixtures/articles/2.json
 - test/fixtures/articles/3.json
@@ -407,7 +323,9 @@ test_files:
 - test/integration/active_model_searchable_test.rb
 - test/integration/active_record_searchable_test.rb
 - test/integration/boolean_queries_test.rb
+- test/integration/custom_score_queries_test.rb
 - test/integration/facets_test.rb
+- test/integration/filtered_queries_test.rb
 - test/integration/filters_test.rb
 - test/integration/highlight_test.rb
 - test/integration/index_mapping_test.rb