tire 0.5.2 → 0.5.3

data/README.markdown

@@ -617,6 +617,18 @@ Instead of simple `true`, you can pass any options for the model's find method:
     end
 ```
 
+If you would like to access properties returned by Elasticsearch (such as `_score`),
+in addition to model instance, use the `each_with_hit` method:
+
+```ruby
+    results = Article.search 'One', :load => true
+    results.each_with_hit do |result, hit|
+      puts "#{result.title} (score: #{hit['_score']})"
+    end
+
+    # One (score: 0.300123)
+```
+
 Note that _Tire_ search results are fully compatible with [`will_paginate`](https://github.com/mislav/will_paginate),
 so you can pass all the usual parameters to the `search` method in the controller:
 

data/Rakefile

@@ -28,7 +28,11 @@ namespace :web do
 
   desc "Update the Github website"
   task :update => :generate do
-    current_branch = `git branch --no-color`.split("\n").select { |line| line =~ /^\* / }.to_s.gsub(/\* (.*)/, '\1')
+    current_branch = `git branch --no-color`.
+                       split("\n").
+                       select { |line| line =~ /^\* / }.
+                       first.to_s.
+                       gsub(/\* (.*)/, '\1')
     (puts "Unable to determine current branch"; exit(1) ) unless current_branch
     system "git checkout web"
     system "cp examples/tire-dsl.html index.html"

data/examples/tire-dsl.rb

@@ -121,6 +121,8 @@ end
 # for the index.
 
 Tire.index 'articles' do
+  delete
+
   # To do so, let's just pass a Hash containing the specified mapping to the `Index#create` method.
   #
   create :mappings => {
@@ -179,8 +181,6 @@ end
 # Of course, we can easily manipulate the documents before storing them in the index.
 #
 Tire.index 'articles' do
-  delete
-
   # ... by passing a block to the `import` method. The collection will
   # be available in the block argument.
   #
@@ -710,6 +710,7 @@ s = Tire.search 'articles' do
 end
 
 # The results:
+#
 #     * One         (Published on: 2011-01-01)
 #     * Two         (Published on: 2011-01-02)
 #     * Three       (Published on: 2011-01-02)
@@ -719,6 +720,60 @@ s.results.each do |document|
   puts "* #{ document.title.ljust(10) }  (Published on: #{ document.published_on })"
 end
 
+#### Nested Documents and Queries
+
+# Often, we want to store more complex entities in _Elasticsearch_;
+# for example, we may want to store the information about comments for each article,
+# and then search for articles where a certain person left a certain note.
+
+# In the simplest case, we can store the comments as an Array of JSON documents in the
+# article document. If we do that naively, our search results will be incorrect, though.
+# That's because a match in just one field will be enough to match a document.
+# We need to query parts of the document as if they were separate entities.
+
+# _Elasticsearch_ provides a specific `nested`
+# [field type](http://www.elasticsearch.org/guide/reference/mapping/nested-type.html) and
+# [query](http://www.elasticsearch.org/guide/reference/query-dsl/nested-query.html)
+# for working with "embedded" documents like these.
+
+# So, let's update the mapping for the index first, adding the `comments` property as a `nested` type:
+#
+Tire::Configuration.client.put Tire.index('articles').url+'/article/_mapping',
+                               { :article => { :properties => { :comments => { :type => 'nested' } } } }.to_json
+
+# And let's add comments to articles (notice that both articles contain a comment with the _Cool!_ message,
+# though by different authors):
+#
+Tire.index 'articles' do
+  update :article, 1,
+         :doc => { :comments => [ { :author => 'John', :message => 'Great!' }, { :author => 'Bob', :message => 'Cool!' } ]   }
+  update :article, 2,
+         :doc => { :comments => [ { :author => 'John', :message => 'Cool!' }, { :author => 'Mary', :message => 'Thanks!' } ] }
+  refresh
+end
+
+# We'll use the `nested` query to search for articles where _John_ left a _"Cool"_ message:
+#
+s = Tire.search 'articles' do
+  query do
+    nested :path => 'comments' do
+      query do
+        match 'comments.author',  'John'
+        match 'comments.message', 'cool'
+      end
+    end
+  end
+end
+
+# The results contain just the second document, correctly:
+#
+#     * Two (comments: 2)
+#
+s.results.each do |document|
+  puts "* #{ document.title } (comments: #{document.comments.size})"
+end
+
+
 #### Highlighting
 
 # Often, we want to highlight the snippets matching our query in the displayed results.
@@ -839,7 +894,8 @@ puts "Matching queries: " + matches.inspect
 
 # Let's store a document with some trigger words in the index, and mark it for percolation.
 #
-response = index.store :message => '[Warning] Severe floods expected after tsunami wave.', :percolate => true
+response = index.store( { :message => '[Warning] Severe floods expected after tsunami wave.' },
+                        { :percolate => true } )
 
 # We will get the names of all matching queries in response.
 #
@@ -849,9 +905,9 @@ puts "Matching queries: " + response['matches'].inspect
 
 # As with the _percolate_ example, we can filter the executed queries.
 #
-response = index.store :message => '[Warning] Severe floods expected after tsunami wave.',
-                       # Let's use a simple string query for the “tsunami” tag.
-                       :percolate => 'tags:tsunami'
+response = index.store( { :message => '[Warning] Severe floods expected after tsunami wave.' },
+                         # Let's use a simple string query for the “tsunami” tag.
+                        { :percolate => 'tags:tsunami' } )
 
 # Unsurprisingly, the response will contain just the name of the “tsunami” query.
 #

data/lib/tire/index.rb

@@ -276,7 +276,7 @@ module Tire
     def update(type, id, payload={}, options={})
       raise ArgumentError, "Please pass a document type" unless type
       raise ArgumentError, "Please pass a document ID"   unless id
-      raise ArgumentError, "Please pass a script in the payload hash" unless payload[:script]
+      raise ArgumentError, "Please pass a script or partial document in the payload hash" unless payload[:script] || payload[:doc]
 
       type      = Utils.escape(type)
       url       = "#{self.url}/#{type}/#{id}/_update"

data/lib/tire/results/collection.rb

@@ -29,10 +29,20 @@ module Tire
         end
       end
 
+      # Iterates over the `results` collection
+      #
       def each(&block)
         results.each(&block)
       end
 
+      # Iterates over the `results` collection and yields
+      # the `result` object (Item or model instance) and the
+      # `hit` -- raw Elasticsearch response parsed as a Hash
+      #
+      def each_with_hit(&block)
+        results.zip(@response['hits']['hits']).each(&block)
+      end
+
       def empty?
         results.empty?
       end
@@ -136,7 +146,6 @@ module Tire
       def __find_records_by_ids(klass, ids)
         @options[:load] === true ? klass.find(ids) : klass.find(ids, @options[:load])
       end
-
     end
 
   end

data/lib/tire/search/query.rb

@@ -82,6 +82,13 @@ module Tire
         @value
       end
 
+      def nested(options={}, &block)
+        @nested = NestedQuery.new(options)
+        block.arity < 1 ? @nested.instance_eval(&block) : block.call(@nested) if block_given?
+        @value[:nested] = @nested.to_hash
+        @value
+      end
+
       def all(options = {})
         @value = { :match_all => options }
         @value
@@ -196,6 +203,27 @@ module Tire
       end
     end
 
+    class NestedQuery
+      def initialize(options={}, &block)
+        @options = options
+        @value = {}
+        block.arity < 1 ? self.instance_eval(&block) : block.call(self) if block_given?
+      end
+
+      def query(&block)
+        @value[:query] = Query.new(&block).to_hash
+        @value
+      end
+
+      def to_hash
+        @value.update(@options)
+      end
+
+      def to_json
+        to_hash.to_json
+      end
+    end
+
     class BoostingQuery
       def initialize(options={}, &block)
         @options = options

data/lib/tire/version.rb

@@ -1,12 +1,11 @@
 module Tire
-  VERSION   = "0.5.2"
+  VERSION   = "0.5.3"
 
   CHANGELOG =<<-END
     IMPORTANT CHANGES LATELY:
 
-    * Fixed bugs in the `matches` Tire method in models
-    * Fixed JSON parser errors when logging empty bodies
-    * Allow arbitrary ordering of methods in the facet DSL block
-    * Fix issues with Mongoid gem (incorrect JSON serialization of Moped::BSON::ObjectId)
+    * Added `Tire::Results::Collection#each_with_hit`
+    * Added support for passing partial document to `Index#update`
+    * Added `nested` query support
   END
 end

data/test/integration/active_record_searchable_test.rb

@@ -145,6 +145,19 @@ module Tire
             assert ! results.any?
           end
         end
+
+        should "iterate results with hits" do
+          results = ActiveRecordArticle.search :load => true do
+            query { string '"Test 1" OR "Test 2"' }
+          end
+          results.each_with_hit do |result, hit|
+            assert_instance_of ActiveRecordArticle, result
+            assert_instance_of Hash, hit
+            assert_match /Test \d/, result.title
+            assert_match /Test \d/, hit['_source']['title']
+            assert hit['_score'] > 0
+          end
+        end
       end
 
       context "with pagination" do

data/test/integration/index_update_document_test.rb

@@ -79,6 +79,16 @@ module Tire
         assert_equal 3, document.tags.size, document.inspect
       end
 
+      should "update the document with a partial one" do
+        Tire.index('articles-with-tags') do
+          update( 'article', '1', :doc => { :title => 'One UPDATED' } )
+          refresh
+        end
+
+        document = Tire.search('articles-with-tags') { query { string 'title:one' } }.results.first
+        assert_equal 'One UPDATED', document.title, document.inspect
+      end
+
       should "access variables from the outer scope" do
         $t = self
 

data/test/integration/nested_query_test.rb

@@ -0,0 +1,135 @@
+require 'test_helper'
+
+module Tire
+
+  class NestedQueryTest < Test::Unit::TestCase
+    include Test::Integration
+
+    context 'Nested queries' do
+
+      setup do
+        @index = Tire.index('products-test') do
+          delete
+
+          create mappings: {
+                   product: {
+                      properties: {
+                        name:     { type: 'string' },
+                        variants: { type: 'nested', size: 'string', color: 'string' }
+                      }
+                    }
+                  }
+
+          store type: 'product',
+                name: 'Duck Shirt',
+                variants: [{ size: 'M', color: 'yellow'}, { size: 'L', color: 'silver'}]
+          store type: 'product',
+                name: 'Western Shirt',
+                variants: [{ size: 'S', color: 'yellow'}, { size: 'M', color: 'silver'}]
+
+          refresh
+        end
+      end
+
+      # teardown { @index.delete }
+
+      should "not return a results when properties match for different objects" do
+        s = Tire.search @index.name do
+          query do
+            nested path: 'variants' do
+              query do
+                boolean do
+                  # No product matches size "S" and color "silver"
+                  must { match 'variants.size',  'S' }
+                  must { match 'variants.color', 'silver'}
+                end
+              end
+            end
+          end
+        end
+
+        assert_equal 0, s.results.size
+      end
+
+      should "return all matching documents when nested documents meet criteria" do
+        s = Tire.search @index.name do
+          query do
+            nested path: 'variants' do
+              query do
+                match 'variants.size', 'M'
+              end
+            end
+          end
+        end
+
+        assert_equal 2, s.results.size
+      end
+
+      should "return matching document when a nested document meets all criteria" do
+        s = Tire.search @index.name do
+          query do
+            nested path: 'variants' do
+              query do
+                boolean do
+                  must { match 'variants.size',  'M' }
+                  must { match 'variants.color', 'silver'}
+                end
+              end
+            end
+          end
+        end
+
+        assert_equal 1, s.results.size
+        assert_equal 'Western Shirt', s.results.first.name
+      end
+
+      should "return matching document when both the query and nested document meet all criteria" do
+        s = Tire.search @index.name do
+          query do
+            boolean do
+              must do
+                match 'name', 'Western'
+              end
+              must do
+                nested path: 'variants' do
+                  query do
+                    match 'variants.size',  'M'
+                  end
+                end
+              end
+            end
+          end
+        end
+
+        assert_equal 1, s.results.size
+        assert_equal 'Western Shirt', s.results.first.name
+      end
+
+      should "not return results when the query and the nested document contradict" do
+        s = Tire.search @index.name do
+          query do
+            boolean do
+              must do
+                match 'name', 'Duck'
+              end
+              must do
+                nested path: 'variants' do
+                  query do
+                    boolean do
+                      must { match 'variants.size',  'M' }
+                      must { match 'variants.color', 'silver'}
+                    end
+                  end
+                end
+              end
+            end
+          end
+        end
+
+        assert_equal 0, s.results.size
+      end
+
+    end
+  end
+
+end

data/test/integration/results_test.rb

@@ -32,8 +32,20 @@ module Tire
         assert_nil s.results.first.published_on
       end
 
-    end
+      should "iterate results with hits" do
+        s = Tire.search('articles-test') { query { string 'title:one' } }
+
+        s.results.each_with_hit do |result, hit|
+          assert_instance_of Tire::Results::Item, result
+          assert_instance_of Hash, hit
+
+          assert_equal 'One', result.title
+          assert_equal 'One', hit['_source']['title']
+          assert_not_nil hit['_score']
+        end
+      end
 
+    end
   end
 
 end

data/test/unit/index_test.rb

@@ -469,7 +469,7 @@ module Tire
 
       context "when updating" do
 
-        should "send payload" do
+        should "send script payload" do
           Configuration.client.expects(:post).with do |url,payload|
                                 payload = MultiJson.decode(payload)
                                 # p [url, payload]
@@ -484,6 +484,20 @@ module Tire
           assert @index.update('document', '42', {:script => "ctx._source.foo = bar;", :params => { :bar => '21' }})
         end
 
+        should "send partial doc payload" do
+          Configuration.client.expects(:post).with do |url,payload|
+                                payload = MultiJson.decode(payload)
+                                # p [url, payload]
+                                assert_equal( "#{@index.url}/document/42/_update", url ) &&
+                                assert_not_nil( payload['doc'] ) &&
+                                assert_equal('bar', payload['doc']['foo'])
+                              end.
+                              returns(
+                                mock_response('{"ok":"true","_index":"dummy","_type":"document","_id":"42","_version":"2"}'))
+
+          assert @index.update('document', '42', {:doc => {:foo => 'bar'}})
+        end
+
         should "send options" do
           Configuration.client.expects(:post).with do |url,payload|
                                 payload = MultiJson.decode(payload)
@@ -501,11 +515,11 @@ module Tire
           assert_raise(ArgumentError) { @index.update(nil, '123', :script => 'foobar') }
         end
 
-        should "raise an error when no script is passed" do
-          assert_raise ArgumentError do
-            @index.update('article', "42", {:params => {"foo" => "bar"}})
-          end
-        end
+        should "raise an error when no script or partial document is passed" do
+           assert_raise ArgumentError do
+             @index.update('article', "42", {:foo => 'bar'})
+           end
+         end
 
       end
 

data/test/unit/results_collection_test.rb

@@ -198,6 +198,40 @@ module Tire
 
       end
 
+      context "returning results with hits" do
+        should "yield the Item result and the raw hit" do
+          response = { 'hits' => { 'hits' => [ { '_id' => 1, '_score' => 0.5, '_index' => 'testing', '_type' => 'article', '_source' => { :title => 'Test', :body => 'Lorem' } } ] } }
+
+          Results::Collection.new(response).each_with_hit do |result, hit|
+            assert_instance_of Tire::Results::Item, result
+            assert_instance_of Hash, hit
+            assert_equal 'Test',   result.title
+            assert_equal 0.5, hit['_score']
+          end
+        end
+
+        should "yield the model instance and the raw hit" do
+          response = { 'hits' => { 'hits' => [ {'_id' => 1, '_score' => 0.5, '_type' => 'active_record_article'} ] } }
+
+          ActiveRecord::Base.establish_connection( :adapter => 'sqlite3', :database => ":memory:" )
+          ActiveRecord::Migration.verbose = false
+          ActiveRecord::Schema.define(:version => 1) { create_table(:active_record_articles) { |t| t.string(:title) } }
+          model = ActiveRecordArticle.new(:title => 'Test'); model.id = 1
+
+          ActiveRecordArticle.expects(:find).with([1]).returns([ model] )
+
+          Results::Collection.new(response, :load => true).each_with_hit do |result, hit|
+            assert_instance_of ActiveRecordArticle, result
+            assert_instance_of Hash, hit
+            assert_equal 'Test',   result.title
+            assert_equal 0.5, hit['_score']
+          end
+
+        end
+
+
+      end
+
       context "while paginating results" do
 
         setup do

data/test/unit/search_query_test.rb

@@ -374,7 +374,7 @@ module Tire::Search
 
       should "allow searching in multiple fields with multi_match" do
         assert_equal( { :multi_match => { :query => 'bar', :fields => [:foo, :moo] } },
-                        Query.new.match([:foo, :moo], 'bar') )
+                      Query.new.match([:foo, :moo], 'bar') )
       end
 
       should "encode options" do
@@ -393,5 +393,27 @@ module Tire::Search
 
     end
 
+    context "NestedQuery" do
+
+      should "not raise an error when no block is given" do
+        assert_nothing_raised { Query.new.nested }
+      end
+
+      should "encode options" do
+        query = Query.new.nested(:path => 'articles', :score_mode => 'score_mode') do
+          query { string 'foo' }
+        end
+
+        assert_equal 'articles',   query[:nested][:path]
+        assert_equal 'score_mode', query[:nested][:score_mode]
+      end
+
+      should "wrap single query" do
+        assert_equal( { :nested => {:query => { :query_string => { :query => 'foo' } } }},
+                      Query.new.nested { query { string 'foo' } } )
+      end
+
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tire
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-12 00:00:00.000000000 Z
+date: 2013-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70285950165900 !ruby/object:Gem::Requirement
+  requirement: &70315094856180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70285950165900
+  version_requirements: *70315094856180
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70285950165360 !ruby/object:Gem::Requirement
+  requirement: &70315094855080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70285950165360
+  version_requirements: *70315094855080
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70285950164860 !ruby/object:Gem::Requirement
+  requirement: &70315094853880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70285950164860
+  version_requirements: *70315094853880
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70285950164400 !ruby/object:Gem::Requirement
+  requirement: &70315094851380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70285950164400
+  version_requirements: *70315094851380
 - !ruby/object:Gem::Dependency
   name: hashr
-  requirement: &70285950163940 !ruby/object:Gem::Requirement
+  requirement: &70315094850020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.0.19
   type: :runtime
   prerelease: false
-  version_requirements: *70285950163940
+  version_requirements: *70315094850020
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70285950163480 !ruby/object:Gem::Requirement
+  requirement: &70315094863680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70285950163480
+  version_requirements: *70315094863680
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70285950163020 !ruby/object:Gem::Requirement
+  requirement: &70315094860660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70285950163020
+  version_requirements: *70315094860660
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70285950162640 !ruby/object:Gem::Requirement
+  requirement: &70315094860020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70285950162640
+  version_requirements: *70315094860020
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70285950162180 !ruby/object:Gem::Requirement
+  requirement: &70315094859360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70285950162180
+  version_requirements: *70315094859360
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70285950161680 !ruby/object:Gem::Requirement
+  requirement: &70315094858240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: '2.12'
   type: :development
   prerelease: false
-  version_requirements: *70285950161680
+  version_requirements: *70315094858240
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70285950161180 !ruby/object:Gem::Requirement
+  requirement: &70315094857060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70285950161180
+  version_requirements: *70315094857060
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70285950160800 !ruby/object:Gem::Requirement
+  requirement: &70315095012780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70285950160800
+  version_requirements: *70315095012780
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70285950160260 !ruby/object:Gem::Requirement
+  requirement: &70315095007180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: '2.2'
   type: :development
   prerelease: false
-  version_requirements: *70285950160260
+  version_requirements: *70315095007180
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70285950159840 !ruby/object:Gem::Requirement
+  requirement: &70315095095540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70285950159840
+  version_requirements: *70315095095540
 - !ruby/object:Gem::Dependency
   name: redis-persistence
-  requirement: &70285959011600 !ruby/object:Gem::Requirement
+  requirement: &70315095094620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70285959011600
+  version_requirements: *70315095094620
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &70285959011180 !ruby/object:Gem::Requirement
+  requirement: &70315095088820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70285959011180
+  version_requirements: *70315095088820
 - !ruby/object:Gem::Dependency
   name: oj
-  requirement: &70285959010760 !ruby/object:Gem::Requirement
+  requirement: &70315095113580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70285959010760
+  version_requirements: *70315095113580
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70285959010220 !ruby/object:Gem::Requirement
+  requirement: &70315095112560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -208,7 +208,7 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70285959010220
+  version_requirements: *70315095112560
 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
@@ -301,6 +301,7 @@ files:
 - test/integration/match_query_test.rb
 - test/integration/mongoid_searchable_test.rb
 - test/integration/multi_search_test.rb
+- test/integration/nested_query_test.rb
 - test/integration/percolator_test.rb
 - test/integration/persistent_model_test.rb
 - test/integration/prefix_query_test.rb
@@ -359,10 +360,9 @@ homepage: http://github.com/karmi/tire
 licenses: []
 post_install_message: ! "================================================================================\n\n
   \ Please check the documentation at <http://karmi.github.com/tire/>.\n\n--------------------------------------------------------------------------------\n\n
-  \ IMPORTANT CHANGES LATELY:\n\n  * Fixed bugs in the `matches` Tire method in models\n
-  \ * Fixed JSON parser errors when logging empty bodies\n  * Allow arbitrary ordering
-  of methods in the facet DSL block\n  * Fix issues with Mongoid gem (incorrect JSON
-  serialization of Moped::BSON::ObjectId)\n\n  See the full changelog at <http://github.com/karmi/tire/commits/v0.5.2>.\n\n--------------------------------------------------------------------------------\n"
+  \ IMPORTANT CHANGES LATELY:\n\n  * Added `Tire::Results::Collection#each_with_hit`\n
+  \ * Added support for passing partial document to `Index#update`\n  * Added `nested`
+  query support\n\n  See the full changelog at <http://github.com/karmi/tire/commits/v0.5.3>.\n\n--------------------------------------------------------------------------------\n"
 rdoc_options:
 - --charset=UTF-8
 require_paths:
@@ -414,6 +414,7 @@ test_files:
 - test/integration/match_query_test.rb
 - test/integration/mongoid_searchable_test.rb
 - test/integration/multi_search_test.rb
+- test/integration/nested_query_test.rb
 - test/integration/percolator_test.rb
 - test/integration/persistent_model_test.rb
 - test/integration/prefix_query_test.rb