tire 0.5.0 → 0.5.1

data/Rakefile

@@ -24,37 +24,6 @@ namespace :test do
   end
 end
 
-# Generate documentation
-begin
-  require 'rdoc'
-  require 'rdoc/task'
-  Rake::RDocTask.new do |rdoc|
-    rdoc.rdoc_dir = 'rdoc'
-    rdoc.title = "Tire"
-    rdoc.rdoc_files.include('README.markdown')
-    rdoc.rdoc_files.include('lib/**/*.rb')
-  end
-rescue LoadError
-  task :rdoc do
-    abort "[!] RDoc gem is not available."
-  end
-end
-
-# Generate coverage reports
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.rcov_opts = ['--exclude', 'gems/*']
-    test.pattern = 'test/**/*_test.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "[!] RCov gem is not available."
-  end
-end
-
 namespace :web do
 
   desc "Update the Github website"

data/lib/tire.rb

@@ -11,6 +11,7 @@ require 'active_support/core_ext/hash/except.rb'
 # Ruby 1.8 compatibility
 require 'tire/rubyext/ruby_1_8' if defined?(RUBY_VERSION) && RUBY_VERSION < '1.9'
 
+require 'tire/version'
 require 'tire/rubyext/hash'
 require 'tire/rubyext/symbol'
 require 'tire/utils'

data/lib/tire/index.rb

@@ -90,16 +90,50 @@ module Tire
       logged([type, id].join('/'), curl)
     end
 
-    def bulk_store(documents, options={})
+    # Performs a [multi-search](http://www.elasticsearch.org/guide/reference/api/bulk.html) request
+    #
+    #     @myindex.bulk :index, [ {id: 1, title: 'One'}, { id: 2, title: 'Two', _version: 3 } ], refresh: true
+    #
+    # Pass the action (`index`, `create`, `delete`) as the first argument, the collection of documents as
+    # the second argument, and URL parameters as the last option.
+    #
+    # Any _meta_ information contained in documents (such as `_routing` or `_parent`) is extracted
+    # and added to the "header" line.
+    #
+    # Shortcut methods `bulk_store`, `bulk_delete` and `bulk_create` are available.
+    #
+    def bulk(action, documents, options={})
+      # TODO: A more Ruby-like DSL notation should be supported:
+      #
+      #     Tire.index('myindex').bulk do
+      #       create id: 1, title: 'bar', _routing: 'abc'
+      #       delete id: 1
+      #       # ...
+      #     end
+      #
       payload = documents.map do |document|
         type = get_type_from_document(document, :escape => false) # Do not URL-escape the _type
         id   = get_id_from_document(document)
 
         STDERR.puts "[ERROR] Document #{document.inspect} does not have ID" unless id
 
+        header = { action.to_sym => { :_index => name, :_type => type, :_id => id } }
+
+        if document.respond_to?(:to_hash) && hash = document.to_hash
+          meta = {}
+          meta[:_version]   = hash.delete(:_version)
+          meta[:_routing]   = hash.delete(:_routing)
+          meta[:_percolate] = hash.delete(:_percolate)
+          meta[:_parent]    = hash.delete(:_parent)
+          meta[:_timestamp] = hash.delete(:_timestamp)
+          meta[:_ttl]       = hash.delete(:_ttl)
+          meta              = meta.reject { |name,value| !value || value.empty? }
+          header[action.to_sym].update(meta)
+        end
+
         output = []
-        output << %Q|{"index":{"_index":"#{@name}","_type":"#{type}","_id":"#{id}"}}|
-        output << convert_document_to_json(document)
+        output << MultiJson.encode(header)
+        output << convert_document_to_json(document) unless action.to_s == 'delete'
         output.join("\n")
       end
       payload << ""
@@ -108,7 +142,13 @@ module Tire
       count = 0
 
       begin
-        @response = Configuration.client.post("#{url}/_bulk", payload.join("\n"))
+        params = {}
+        params[:consistency] = options.delete(:consistency)
+        params[:refresh]     = options.delete(:refresh)
+        params               = params.reject { |name,value| !value }
+        params_encoded       = params.empty? ? '' : "?#{params.to_param}"
+
+        @response = Configuration.client.post("#{url}/_bulk#{params_encoded}", payload.join("\n"))
         raise RuntimeError, "#{@response.code} > #{@response.body}" if @response && @response.failure?
         @response
       rescue StandardError => error
@@ -123,8 +163,21 @@ module Tire
 
       ensure
         curl = %Q|curl -X POST "#{url}/_bulk" --data-binary '{... data omitted ...}'|
-        logged('BULK', curl)
+        logged('_bulk', curl)
       end
+
+    end
+
+    def bulk_create(documents, options={})
+      bulk :create, documents, options
+    end
+
+    def bulk_store(documents, options={})
+      bulk :index, documents, options
+    end
+
+    def bulk_delete(documents, options={})
+      bulk :delete, documents, options
     end
 
     def import(klass_or_collection, options={})

data/lib/tire/version.rb

@@ -1,5 +1,5 @@
 module Tire
-  VERSION   = "0.5.0"
+  VERSION   = "0.5.1"
 
   CHANGELOG =<<-END
     IMPORTANT CHANGES LATELY:
@@ -29,5 +29,8 @@ module Tire
     * Added a `match` query type
     * Added support for multisearch (_msearch) and the `Tire.multi_search` DSL method
     * Added support for multi-search in the ActiveModel integration and in Tire::Model::Persistence
+    * Added support for create and delete actions for Index#bulk
+    * Added support for meta information (`_routing`, `_parent`, etc) in Index#bulk
+    * Added support for URL parameters (`refresh`, `consistency`) in Index#bulk
   END
 end

data/test/integration/bulk_test.rb

@@ -0,0 +1,81 @@
+require 'test_helper'
+
+module Tire
+
+  class BulkIntegrationTest < Test::Unit::TestCase
+    include Test::Integration
+
+    context "Bulk" do
+      setup do
+        @index    = Tire.index('bulk-test') { delete; create }
+        @articles = [
+          { id: '1', type: 'article', title: 'one',   tags: ['ruby']           },
+          { id: '2', type: 'article', title: 'two',   tags: ['ruby', 'python'] },
+          { id: '3', type: 'article', title: 'three', tags: ['java']           }
+        ]
+      end
+
+      teardown do
+        @index.delete
+        Tire.index('bulk-test-fresh').delete
+      end
+
+      should "store a collection of documents and refresh the index" do
+        @index.bulk_store @articles, refresh: true
+        assert_equal 3, Tire.search('bulk-test/article').query { all }.results.size
+      end
+
+      should "extract the routing value from documents" do
+        @index.bulk_store [ { id: '1', title: 'A', _routing: 'a'}, { id: '2', title: 'B', _routing: 'b'} ]
+        @index.refresh
+
+        assert_equal 2, Tire.search('bulk-test') { query {all} }.results.size
+        assert_equal 1, Tire.search('bulk-test', routing: 'a') { query {all} }.results.size
+        assert_equal 1, Tire.search('bulk-test', routing: 'b') { query {all} }.results.size
+      end
+
+      should "delete documents in bulk" do
+        (1..10).to_a.each { |i| @index.store id: i }
+        @index.refresh
+        assert_equal 10, Tire.search('bulk-test') { query {all} }.results.size
+
+        documents = (1..10).to_a.map { |i| { id: i } }
+        @index.bulk_delete documents, refresh: true
+        assert_equal 0, Tire.search('bulk-test') { query {all} }.results.size
+      end
+
+      should "allow to feed search results to bulk API" do
+        (1..10).to_a.each { |i| @index.store id: i }
+        @index.refresh
+        assert_equal 10, Tire.search('bulk-test') { query {all} }.results.size
+
+        documents = Tire.search('bulk-test') { query {all} }.results.to_a
+
+        @index.bulk_delete documents, refresh: true
+        assert_equal 0, Tire.search('bulk-test') { query {all} }.results.size
+
+        Tire.index('bulk-test-fresh').bulk_create documents, refresh: true
+        assert_equal 10, Tire.search('bulk-test-fresh') { query {all} }.results.size
+      end
+
+      should "timeout when consistency factor is not met" do
+        # Tire.configure { logger STDERR, level: 'debug' }
+
+        Tire.index 'bulk-test' do
+          delete
+          create index: { number_of_shards: 1, number_of_replicas: 15 }
+        end
+
+        assert_raise Timeout::Error do
+          Timeout::timeout(3) do
+            Tire.index('bulk-test').bulk_store [ {id: '1', title: 'One' } ],
+                                               consistency: 'all',
+                                               raise: true
+          end
+        end
+      end
+    end
+
+  end
+
+end

data/test/models/mongoid_models.rb

@@ -8,14 +8,6 @@ class MongoidArticle
   has_many :comments, :class_name => "MongoidComment", :foreign_key => "article_id"
   has_many :stats,    :class_name => "MongoidStat",    :foreign_key => "article_id"
 
-  # def index
-  #   "KEEP OFF MY INDEX!!!"
-  # end
-  #
-  # def self.settings
-  #   "KEEP OFF MY SETTINGS!!!"
-  # end
-
   include Tire::Model::Search
   include Tire::Model::Callbacks
 
@@ -31,10 +23,6 @@ class MongoidArticle
     end
   end
 
-  # tire.mapping do
-  #   indexes :title,      :type => 'string', :boost => 10, :analyzer => 'snowball'
-  # end
-
   def to_indexed_json
     {
       :title        => title,

data/test/test_helper.rb

@@ -4,7 +4,12 @@ require 'bundler/setup'
 require 'pathname'
 require 'test/unit'
 
-require 'yajl/json_gem'
+if ENV['JSON_LIBRARY']
+  puts "Using '#{ENV['JSON_LIBRARY']}' JSON library"
+  require ENV['JSON_LIBRARY']
+else
+  require 'yajl/json_gem'
+end
 require 'sqlite3'
 
 require 'shoulda'
@@ -14,6 +19,11 @@ require 'mocha'
 require 'active_support/core_ext/hash/indifferent_access'
 
 require 'tire'
+if ENV['CURB']
+  puts "Using 'curb' as the HTTP library"
+  require 'tire/http/clients/curb'
+  Tire.configure { client Tire::HTTP::Client::Curb }
+end
 
 # Require basic model files
 #

data/test/unit/index_test.rb

@@ -370,7 +370,7 @@ module Tire
 
         should "allow to set routing" do
           Configuration.client.expects(:get).with("#{@index.url}/article/id-1?routing=foo").
-                                             returns(mock_response('{"_id":"id-1"'))
+                                             returns(mock_response('{"_id":"id-1"}'))
           article = @index.retrieve :article, 'id-1', :routing => 'foo'
         end
 
@@ -378,7 +378,7 @@ module Tire
           Configuration.client.expects(:get).with do |url|
             assert url.include?('routing=foo'), url
             assert url.include?('fields=name'), url
-          end.returns(mock_response('{"_id":"id-1"'))
+          end.returns(mock_response('{"_id":"id-1"}'))
 
           article = @index.retrieve :article, 'id-1', :routing => 'foo', :fields => 'name'
         end
@@ -386,7 +386,7 @@ module Tire
         should "allow to set preference" do
           Configuration.client.expects(:get).with do |url|
             assert url.include?('preference=foo'), url
-          end.returns(mock_response('{"_id":"id-1"'))
+          end.returns(mock_response('{"_id":"id-1"}'))
 
           article = @index.retrieve :article, 'id-1', :preference => 'foo'
         end
@@ -490,56 +490,159 @@ module Tire
 
       end
 
-      context "when storing in bulk" do
+      context "when performing a bulk api action" do
+        # Possible Bulk API actions are `index`, `create`, `delete`
+        #
         # The expected JSON looks like this:
         #
         # {"index":{"_index":"dummy","_type":"document","_id":"1"}}
         # {"id":"1","title":"One"}
-        # {"index":{"_index":"dummy","_type":"document","_id":"2"}}
+        # {"create":{"_index":"dummy","_type":"document","_id":"2"}}
         # {"id":"2","title":"Two"}
+        # {"delete":{"_index":"dummy","_type":"document","_id":"2"}}
         #
         # See http://www.elasticsearch.org/guide/reference/api/bulk.html
 
-        should "serialize Hashes" do
-          Configuration.client.expects(:post).with do |url, json|
-            url  == "#{@index.url}/_bulk" &&
-            json =~ /"_index":"dummy"/ &&
-            json =~ /"_type":"document"/ &&
-            json =~ /"_id":"1"/ &&
-            json =~ /"_id":"2"/ &&
-            json =~ /"id":"1"/ &&
-            json =~ /"id":"2"/ &&
-            json =~ /"title":"One"/ &&
-            json =~ /"title":"Two"/
-          end.returns(mock_response('{}'), 200)
+        should "serialize payload for index action" do
+          Configuration.client.
+            expects(:post).
+            with do |url, payload|
+              assert_equal "#{@index.url}/_bulk", url
+              assert_match /"index"/, payload
+              assert_match /"_index":"dummy"/, payload
+              assert_match /"_type":"document"/, payload
+              assert_match /"_id":"1"/, payload
+              assert_match /"_id":"2"/, payload
+              assert_match /"title":"One"/, payload
+              assert_match /"title":"Two"/, payload
+            end.
+            returns(mock_response('{}'), 200)
 
-          @index.bulk_store [ {:id => '1', :title => 'One'}, {:id => '2', :title => 'Two'} ]
+          @index.bulk :index, [ {:id => '1', :title => 'One'}, {:id => '2', :title => 'Two'} ]
         end
 
-        should "serialize ActiveModel instances" do
-          Configuration.client.expects(:post).with do |url, json|
-            url  == "#{ActiveModelArticle.index.url}/_bulk" &&
-            json =~ /"_index":"active_model_articles"/ &&
-            json =~ /"_type":"active_model_article"/ &&
-            json =~ /"_id":"1"/ &&
-            json =~ /"_id":"2"/ &&
-            json =~ /"title":"One"/ &&
-            json =~ /"title":"Two"/
-          end.returns(mock_response('{}', 200))
+        should "serialize payload for create action" do
+          Configuration.client.
+            expects(:post).
+            with do |url, payload|
+              assert_equal "#{@index.url}/_bulk", url
+              assert_match /"create"/, payload
+              assert_match /"_index":"dummy"/, payload
+              assert_match /"_type":"document"/, payload
+              assert_match /"_id":"1"/, payload
+              assert_match /"_id":"2"/, payload
+              assert_match /"title":"One"/, payload
+              assert_match /"title":"Two"/, payload
+            end.
+            returns(mock_response('{}'), 200)
+
+          @index.bulk :create, [ {:id => '1', :title => 'One'}, {:id => '2', :title => 'Two'} ]
+        end
+
+        should "serialize payload for delete action" do
+          Configuration.client.
+            expects(:post).
+            with do |url, payload|
+              assert_equal "#{@index.url}/_bulk", url
+              assert_match /"delete"/, payload
+              assert_match /"_index":"dummy"/, payload
+              assert_match /"_type":"document"/, payload
+              assert_match /"_id":"1"/, payload
+              assert_match /"_id":"2"/, payload
+              assert ! payload.include?('"title"')
+            end.
+            returns(mock_response('{}'), 200)
+
+          @index.bulk :delete, [ {:id => '1', :title => 'One'}, {:id => '2', :title => 'Two'} ]
+        end
+
+        should "serialize meta parameters such as routing into payload header" do
+          Configuration.client.
+            expects(:post).
+            with do |url, payload|
+              # print payload
+              lines = payload.split("\n")
+              assert_match /"_routing":"A"/, lines[0]
+              assert_match /"_routing":"B"/, lines[2]
+              assert_match /"_ttl":"1d"/,    lines[2]
+              assert ! lines[4].include?('"_routing"')
+            end.
+            returns(mock_response('{}'), 200)
+
+          @index.bulk :index,
+                      [
+                        {:id => '1', :title => 'One', :_routing => 'A'},
+                        {:id => '2', :title => 'Two', :_routing => 'B', :_ttl => '1d'},
+                        {:id => '3', :title => 'Three'}
+                      ]
+
+        end
+
+        should "pass URL parameters such as refresh or consistency" do
+          Configuration.client.
+            expects(:post).
+            with do |url, payload|
+              # p url
+              assert_match /\?consistency=one/, url
+              assert_match /&refresh=true/, url
+            end.
+            returns(mock_response('{}'), 200)
+
+          @index.bulk :index,
+                      [ {:id => '1', :title => 'One' } ],
+                      :consistency => 'one',
+                      :refresh => true
+
+        end
+
+        should "serialize ActiveModel instances as payload" do
+          Configuration.client.
+            expects(:post).
+            with do |url, payload|
+              assert_equal "#{ActiveModelArticle.index.url}/_bulk", url
+              assert_match /"index"/, payload
+              assert_match /"_index":"active_model_articles"/, payload
+              assert_match /"_type":"active_model_article"/, payload
+              assert_match /"_id":"1"/, payload
+              assert_match /"_id":"2"/, payload
+              assert_match /"title":"One"/, payload
+              assert_match /"title":"Two"/, payload
+            end.
+            returns(mock_response('{}'), 200)
 
           one = ActiveModelArticle.new 'title' => 'One'; one.id = '1'
           two = ActiveModelArticle.new 'title' => 'Two'; two.id = '2'
 
-          ActiveModelArticle.index.bulk_store [ one, two ]
+          ActiveModelArticle.index.bulk :index, [ one, two ]
         end
 
-        context "namespaced models" do
+        should "extract meta information from document objects" do
+          Configuration.client.
+            expects(:post).
+            with do |url, payload|
+              print payload
+              lines = payload.split("\n")
+              assert_match /"_routing":"A"/, lines[0]
+            end.
+            returns(mock_response('{}'), 200)
+
+          class MyModel
+            def document_type;   "my_model";                                      end
+            def to_hash;         { :id => 1, :title => 'Foo', :_routing => 'A' }; end
+            def to_indexed_json; MultiJson.encode(to_hash);                       end
+          end
+
+          Tire.index('my_models').bulk_store [ MyModel.new ]
+        end
+
+        context "with namespaced models" do
+
           should "not URL-escape the document_type" do
-            Configuration.client.expects(:post).with do |url, json|
-              # puts url, json
-              url  == "#{Configuration.url}/my_namespace_my_models/_bulk" &&
-              json =~ %r|"_index":"my_namespace_my_models"| &&
-              json =~ %r|"_type":"my_namespace/my_model"|
+            Configuration.client.expects(:post).with do |url, payload|
+              # puts url, payload
+              assert_equal "#{Configuration.url}/my_namespace_my_models/_bulk", url
+              assert_match %r|"_index":"my_namespace_my_models"|, payload
+              assert_match %r|"_type":"my_namespace/my_model"|, payload
             end.returns(mock_response('{}', 200))
 
             module MyNamespace
@@ -549,35 +652,37 @@ module Tire
               end
             end
 
-            Tire.index('my_namespace_my_models').bulk_store [ MyNamespace::MyModel.new ]
+            Tire.index('my_namespace_my_models').bulk :index, [ MyNamespace::MyModel.new ]
           end
         end
 
         should "try again when an exception occurs" do
           Configuration.client.expects(:post).returns(mock_response('Server error', 503)).at_least(2)
 
-          assert !@index.bulk_store([ {:id => '1', :title => 'One'}, {:id => '2', :title => 'Two'} ])
+          assert !@index.bulk(:index, [ {:id => '1', :title => 'One'}, {:id => '2', :title => 'Two'} ])
         end
 
         should "try again and the raise when an exception occurs" do
           Configuration.client.expects(:post).returns(mock_response('Server error', 503)).at_least(2)
 
           assert_raise(RuntimeError) do
-            @index.bulk_store([ {:id => '1', :title => 'One'}, {:id => '2', :title => 'Two'} ], {:raise => true})
+            @index.bulk :index,
+                        [ {:id => '1', :title => 'One'}, {:id => '2', :title => 'Two'} ],
+                        :raise => true
           end
         end
 
         should "try again when a connection error occurs" do
           Configuration.client.expects(:post).raises(Errno::ECONNREFUSED, "Connection refused - connect(2)").at_least(2)
 
-          assert !@index.bulk_store([ {:id => '1', :title => 'One'}, {:id => '2', :title => 'Two'} ])
+          assert !@index.bulk(:index, [ {:id => '1', :title => 'One'} ])
         end
 
-        should "signal exceptions should not be caught" do
+        should "retry on SIGINT type of exceptions" do
           Configuration.client.expects(:post).raises(Interrupt, "abort then interrupt!")
 
           assert_raise Interrupt do
-            @index.bulk_store([ {:id => '1', :title => 'One'}, {:id => '2', :title => 'Two'} ])
+            @index.bulk :index, [ {:id => '1', :title => 'One'} ]
           end
         end
 
@@ -589,7 +694,7 @@ module Tire
           STDERR.expects(:puts).once
 
           documents = [ { :title => 'Bogus' }, { :title => 'Real', :id => 1 } ]
-          ActiveModelArticle.index.bulk_store documents
+          ActiveModelArticle.index.bulk :index, documents
         end
 
         should "log the response code" do
@@ -600,7 +705,7 @@ module Tire
             status == 200
           end
 
-          @index.bulk_store [ {:id => '1', :title => 'One'}, {:id => '2', :title => 'Two'} ]
+          @index.bulk :index,  [ {:id => '1', :title => 'One'} ]
         end
 
       end

data/test/unit/rubyext_test.rb

@@ -35,7 +35,7 @@ module Tire
       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|
+        [{}, { :foo => 2 }, { :foo => 4, :bar => 6 }, { :foo => [7,8,9] }].each do |h|
           assert_equal MultiJson.decode(h.to_json), MultiJson.decode(h.to_indexed_json)
         end
       end

data/tire.gemspec

@@ -38,21 +38,16 @@ Gem::Specification.new do |s|
   s.add_development_dependency "yajl-ruby",   "~> 1.0"
   s.add_development_dependency "shoulda"
   s.add_development_dependency "mocha"
+  s.add_development_dependency "minitest",     "~> 2.12"
   s.add_development_dependency "activerecord", ">= 3.0"
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "mongoid",      "~> 2.2"
   s.add_development_dependency "bson_ext"
   s.add_development_dependency "redis-persistence"
   s.add_development_dependency "curb"
-  s.add_development_dependency "minitest"
+  s.add_development_dependency "oj"
   s.add_development_dependency "turn", "~> 0.9" if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
 
-  # These gems are not needed for CI at <http://travis-ci.org/#!/karmi/tire>
-  #
-  unless ENV["CI"]
-    s.add_development_dependency "rdoc"
-  end
-
   s.description = <<-DESC
    Tire is a Ruby client for the ElasticSearch search engine/database.
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tire
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-08 00:00:00.000000000 Z
+date: 2012-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70223214921740 !ruby/object:Gem::Requirement
+  requirement: &70241536312360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70223214921740
+  version_requirements: *70241536312360
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70223214920520 !ruby/object:Gem::Requirement
+  requirement: &70241536310740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70223214920520
+  version_requirements: *70241536310740
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70223214919080 !ruby/object:Gem::Requirement
+  requirement: &70241536309980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70223214919080
+  version_requirements: *70241536309980
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70223214918580 !ruby/object:Gem::Requirement
+  requirement: &70241536309040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70223214918580
+  version_requirements: *70241536309040
 - !ruby/object:Gem::Dependency
   name: hashr
-  requirement: &70223214917880 !ruby/object:Gem::Requirement
+  requirement: &70241536306480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.0.19
   type: :runtime
   prerelease: false
-  version_requirements: *70223214917880
+  version_requirements: *70241536306480
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70223214917060 !ruby/object:Gem::Requirement
+  requirement: &70241536322700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70223214917060
+  version_requirements: *70241536322700
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70223214915540 !ruby/object:Gem::Requirement
+  requirement: &70241536322000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70223214915540
+  version_requirements: *70241536322000
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70223214914780 !ruby/object:Gem::Requirement
+  requirement: &70241536321420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70223214914780
+  version_requirements: *70241536321420
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70223214930040 !ruby/object:Gem::Requirement
+  requirement: &70241536320760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70223214930040
+  version_requirements: *70241536320760
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &70241536320180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.12'
+  type: :development
+  prerelease: false
+  version_requirements: *70241536320180
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70223214928700 !ruby/object:Gem::Requirement
+  requirement: &70241536319540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +131,10 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70223214928700
+  version_requirements: *70241536319540
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70223214927400 !ruby/object:Gem::Requirement
+  requirement: &70241536319060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70223214927400
+  version_requirements: *70241536319060
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70223214926580 !ruby/object:Gem::Requirement
+  requirement: &70241536318220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +153,10 @@ dependencies:
         version: '2.2'
   type: :development
   prerelease: false
-  version_requirements: *70223214926580
+  version_requirements: *70241536318220
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70223214925540 !ruby/object:Gem::Requirement
+  requirement: &70241536317400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70223214925540
+  version_requirements: *70241536317400
 - !ruby/object:Gem::Dependency
   name: redis-persistence
-  requirement: &70223214924920 !ruby/object:Gem::Requirement
+  requirement: &70241536316820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70223214924920
+  version_requirements: *70241536316820
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &70223214923980 !ruby/object:Gem::Requirement
+  requirement: &70241536316100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +186,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70223214923980
+  version_requirements: *70241536316100
 - !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: &70223214923120 !ruby/object:Gem::Requirement
+  name: oj
+  requirement: &70241536339520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +197,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70223214923120
+  version_requirements: *70241536339520
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70223214922420 !ruby/object:Gem::Requirement
+  requirement: &70241536336900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,18 +208,7 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70223214922420
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: &70223215704680 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70223215704680
+  version_requirements: *70241536336900
 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
@@ -283,6 +283,7 @@ files:
 - test/integration/active_record_searchable_test.rb
 - test/integration/boolean_queries_test.rb
 - test/integration/boosting_queries_test.rb
+- test/integration/bulk_test.rb
 - test/integration/count_test.rb
 - test/integration/custom_score_queries_test.rb
 - test/integration/dis_max_queries_test.rb
@@ -377,8 +378,10 @@ post_install_message: ! "=======================================================
   to Index#retrieve\n  * Allow building the search request step-by-step in Tire's
   DSL [#496]\n  * Added a `match` query type\n  * Added support for multisearch (_msearch)
   and the `Tire.multi_search` DSL method\n  * Added support for multi-search in the
-  ActiveModel integration and in Tire::Model::Persistence\n\n  See the full changelog
-  at <http://github.com/karmi/tire/commits/v0.5.0>.\n\n--------------------------------------------------------------------------------\n"
+  ActiveModel integration and in Tire::Model::Persistence\n  * Added support for create
+  and delete actions for Index#bulk\n  * Added support for meta information (`_routing`,
+  `_parent`, etc) in Index#bulk\n  * Added support for URL parameters (`refresh`,
+  `consistency`) in Index#bulk\n\n  See the full changelog at <http://github.com/karmi/tire/commits/v0.5.1>.\n\n--------------------------------------------------------------------------------\n"
 rdoc_options:
 - --charset=UTF-8
 require_paths:
@@ -412,6 +415,7 @@ test_files:
 - test/integration/active_record_searchable_test.rb
 - test/integration/boolean_queries_test.rb
 - test/integration/boosting_queries_test.rb
+- test/integration/bulk_test.rb
 - test/integration/count_test.rb
 - test/integration/custom_score_queries_test.rb
 - test/integration/dis_max_queries_test.rb