tire 0.6.0 → 0.6.1

data/README.markdown

@@ -1,6 +1,17 @@
 Tire
 =========
 
+---------------------------------------------------------------------------------------------------
+
+  NOTICE: This library has been renamed and retired in September 2013
+          ([read the explanation](https://github.com/karmi/retire/wiki/Tire-Retire)).
+
+  Have a look at the **<http://github.com/elasticsearch/elasticsearch-ruby>**
+  suite of gems, which will contain similar set of features for
+  ActiveRecord and Rails integration as Tire.
+
+---------------------------------------------------------------------------------------------------
+
 _Tire_ is a Ruby (1.8 or 1.9) client for the [Elasticsearch](http://www.elasticsearch.org/)
 search engine/database.
 
@@ -9,7 +20,7 @@ full-text search engine and database with
 [powerful aggregation features](http://www.elasticsearch.org/guide/reference/api/search/facets/),
 communicating by JSON over RESTful HTTP, based on [Lucene](http://lucene.apache.org/), written in Java.
 
-This Readme provides a brief overview of _Tire's_ features. The more detailed documentation is at <http://karmi.github.com/tire/>.
+This Readme provides a brief overview of _Tire's_ features. The more detailed documentation is at <http://karmi.github.com/retire/>.
 
 Both of these documents contain a lot of information. Please set aside some time to read them thoroughly, before you blindly dive into „somehow making it work“. Just skimming through it **won't work** for you. For more information, please see the project [Wiki](https://github.com/karmi/tire/wiki/_pages), search the [issues](https://github.com/karmi/tire/issues), and refer to the [integration test suite](https://github.com/karmi/tire/tree/master/test/integration).
 
@@ -52,7 +63,7 @@ To test-drive the core _Elasticsearch_ functionality, let's require the gem:
 ```
 
 Please note that you can copy these snippets from the much more extensive and heavily annotated file
-in [examples/tire-dsl.rb](http://karmi.github.com/tire/).
+in [examples/tire-dsl.rb](http://karmi.github.com/retire/).
 
 Also, note that we're doing some heavy JSON lifting here. _Tire_ uses the
 [_multi_json_](https://github.com/intridea/multi_json) gem as a generic JSON wrapper,
@@ -595,6 +606,20 @@ just drop down one layer and use the `Tire::Index#store` and `Tire::Index#remove
     end
 ```
 
+Of course, in this way, you're still performing an HTTP request during your database transaction,
+which is not optimal for large-scale applications. In these situations, a better option would be processing
+the index operations in background, with something like [Resque](https://github.com/resque/resque) or
+[Sidekiq](https://github.com/mperham/sidekiq):
+
+```ruby
+    class Article < ActiveRecord::Base
+      include Tire::Model::Search
+
+      after_save    { Indexer::Index.perform_async(document) }
+      after_destroy { Indexer::Remove.perform_async(document) }
+    end
+```
+
 When you're integrating _Tire_ with ActiveRecord models, you should use the `after_commit`
 and `after_rollback` hooks to keep the index in sync with your database.
 

data/examples/rails-application-template.rb

@@ -13,8 +13,8 @@
 # * Git
 # * Ruby >= 1.8.7
 # * Rubygems
-# * Rails >= 3.0.7
-# * Sun Java 6 (for Elasticsearch)
+# * Rails >= 3
+# * Java 6 or 7 (for Elasticsearch)
 #
 #
 # Usage
@@ -181,14 +181,13 @@ file 'app/models/article.rb', <<-CODE
 class Article < ActiveRecord::Base
   include Tire::Model::Search
   include Tire::Model::Callbacks
-
-  attr_accessible :title, :content, :published_on
 end
 CODE
 
 initializer 'tire.rb', <<-CODE
 Tire.configure do
-  logger STDERR
+  # url    'http://localhost:9200'
+  # logger STDERR
 end
 CODE
 
@@ -201,7 +200,7 @@ puts        '-'*80, ''; sleep 1
 gsub_file 'app/controllers/articles_controller.rb', %r{# GET /articles/1$}, <<-CODE
   # GET /articles/search
   def search
-    @articles = Article.search params[:q]
+    @articles = Article.tire.search params[:q]
 
     render :action => "index"
   end
@@ -238,7 +237,7 @@ puts
 say_status  "Index", "Indexing the database...", :yellow
 puts        '-'*80, ''; sleep 0.5
 
-rake "environment tire:import CLASS='Article' FORCE=true"
+rake "environment tire:import:model CLASS='Article' FORCE=true"
 
 puts
 say_status  "Git", "Details about the application:", :yellow

data/lib/tire.rb

@@ -30,6 +30,7 @@ require 'tire/search/filter'
 require 'tire/search/highlight'
 require 'tire/search/scan'
 require 'tire/search/script_field'
+require 'tire/delete_by_query'
 require 'tire/multi_search'
 require 'tire/count'
 require 'tire/results/pagination'

data/lib/tire/delete_by_query.rb

@@ -0,0 +1,76 @@
+module Tire
+  class DeleteByQuery
+    class DeleteByQueryRequestFailed < StandardError; end
+
+    attr_reader :indices, :types, :query, :response, :json
+
+    def initialize(indices=nil, options={}, &block)
+      @indices = Array(indices)
+      @types   = Array(options[:type]).flatten
+      @options = options
+
+      if block_given?
+        @query = Search::Query.new
+        block.arity < 1 ? @query.instance_eval(&block) : block.call(@query)
+      else
+        raise "no query given for #{self.class}"
+      end
+    end
+
+    def perform
+      @response = Configuration.client.delete url
+      if @response.failure?
+        STDERR.puts "[REQUEST FAILED] #{self.to_curl}\n"
+        raise DeleteByQueryRequestFailed, @response.to_s
+      end
+      @json = MultiJson.decode(@response.body)
+      true
+    ensure
+      logged
+    end
+
+    private
+
+    def path
+      [
+        '/',
+        indices.join(','),
+        types.map { |type| Utils.escape(type) }.join(','),
+        '_query',
+      ].compact.join('/')
+    end
+
+    def url
+      "#{Configuration.url}#{path}/?source=#{Utils.escape(to_json)}"
+    end
+
+    def to_json(options={})
+      query.to_json
+    end
+
+    def to_curl
+      %Q|curl -X DELETE '#{url}'|
+    end
+
+    def logged(endpoint='_query')
+      if Configuration.logger
+
+        Configuration.logger.log_request endpoint, indices, to_curl
+
+        code = response.code rescue nil
+
+        if Configuration.logger.level.to_s == 'debug'
+          body = if json
+            MultiJson.encode(json, :pretty => Configuration.pretty)
+          else
+            MultiJson.encode(MultiJson.load(response.body), :pretty => Configuration.pretty) rescue ''
+          end
+        else
+          body = ''
+        end
+
+        Configuration.logger.log_response code || 'N/A', 'N/A', body || 'N/A'
+      end
+    end
+  end
+end

data/lib/tire/dsl.rb

@@ -105,6 +105,10 @@ module Tire
       Search::Count.new(indices, options, &block).value
     end
 
+    def delete(indices=nil, options={}, &block)
+      DeleteByQuery.new(indices, options, &block).perform
+    end
+
     def index(name, &block)
       Index.new(name, &block)
     end

data/lib/tire/http/client.rb

@@ -48,7 +48,7 @@ module Tire
         end
 
         def self.__host_unreachable_exceptions
-          [Errno::ECONNREFUSED, ::RestClient::ServerBrokeConnection, ::RestClient::RequestTimeout]
+          [Errno::ECONNREFUSED, Errno::ETIMEDOUT, ::RestClient::ServerBrokeConnection, ::RestClient::RequestTimeout, SocketError]
         end
 
         private

data/lib/tire/http/clients/curb.rb

@@ -38,9 +38,13 @@ module Tire
           Response.new client.body_str, client.response_code
         end
 
+        # NOTE: newrelic_rpm breaks Curl::Easy#http_put
+        #       https://github.com/newrelic/rpm/blob/master/lib/new_relic/agent/instrumentation/curb.rb#L49
+        #
         def self.put(url, data)
+          method = client.respond_to?(:http_put_without_newrelic) ? :http_put_without_newrelic : :http_put
           client.url = url
-          client.http_put data
+          client.send method, data
           Response.new client.body_str, client.response_code
         end
 

data/lib/tire/index.rb

@@ -154,13 +154,13 @@ module Tire
     #
     #     @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
+    # Pass the action (`index`, `create`, `delete`, `update`) 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.
+    # Shortcut methods `bulk_store`, `bulk_delete`, `bulk_create`, and `bulk_update` are available.
     #
     def bulk(action, documents, options={})
       return false if documents.empty?
@@ -181,12 +181,22 @@ module Tire
           STDERR.puts "[ERROR] Document #{document.inspect} does not have ID" unless id
         end
 
+        if action.to_sym == :update
+          raise ArgumentError, "Cannot update without document type" unless type
+          raise ArgumentError, "Cannot update without document ID" unless id
+          raise ArgumentError, "Update requires a hash document" unless document.respond_to?(:to_hash)
+          document = document.to_hash
+          raise ArgumentError, "Update requires either a script or a partial document" unless document[:script] || document[:doc]
+        end
+
         header = { action.to_sym => { :_index => name, :_type => type, :_id => id } }
+        header[action.to_sym].update({:_retry_on_conflict => options[:retry_on_conflict]}) if options[:retry_on_conflict]
 
         if document.respond_to?(:to_hash) && doc_hash = document.to_hash
           meta = doc_hash.select do |k,v|
             [ :_parent,
               :_percolate,
+              :_retry_on_conflict,
               :_routing,
               :_timestamp,
               :_ttl,
@@ -204,6 +214,19 @@ module Tire
           header[action.to_sym].update(meta)
         end
 
+        if action.to_sym == :update
+          document.keep_if do |k,_|
+            [
+              :doc,
+              :upsert,
+              :doc_as_upsert,
+              :script,
+              :params,
+              :lang
+            ].include?(k)
+          end
+        end
+
         output = []
         output << MultiJson.encode(header)
         output << convert_document_to_json(document) unless action.to_s == 'delete'
@@ -254,6 +277,10 @@ module Tire
       bulk :delete, documents, options
     end
 
+    def bulk_update(documents, options={})
+      bulk :update, documents, options
+    end
+
     def import(klass_or_collection, options={})
       case
         when method = options.delete(:method)
@@ -487,7 +514,7 @@ module Tire
         when document.is_a?(Hash)
           document[:_id] || document['_id'] || document[:id] || document['id']
         when document.respond_to?(:id) && document.id != document.object_id
-          document.id.as_json
+          document.id.to_s
       end
       $VERBOSE = old_verbose
       id

data/lib/tire/model/persistence/attributes.rb

@@ -46,7 +46,7 @@ module Tire
 
             # Save property default value (when relevant):
             unless (default_value = options.delete(:default)).nil?
-              property_defaults[name.to_sym] = default_value.respond_to?(:call) ? default_value.call : default_value
+              property_defaults[name.to_sym] = default_value
             end
 
             # Save property casting (when relevant):
@@ -92,7 +92,15 @@ module Tire
             #
             property_defaults = self.class.property_defaults.inject({}) do |hash, item|
               key, value = item
-              hash[key.to_sym] = value.class.respond_to?(:new) ? value.clone : value
+
+              hash[key.to_sym] = if value.respond_to?(:call)
+                value.call
+              elsif value.class.respond_to?(:new)
+                value.clone
+              else
+                value
+              end
+
               hash
             end
             __update_attributes(property_defaults.merge(attributes))

data/lib/tire/model/persistence/storage.rb

@@ -23,6 +23,10 @@ module Tire
               result
             end
           end
+
+          def delete(&block)
+            DeleteByQuery.new(index_name, {:type => document_type}, &block).perform
+          end
         end
 
         module InstanceMethods

data/lib/tire/results/pagination.rb

@@ -52,6 +52,7 @@ module Tire
       alias :total_count  :total_entries
       alias :num_pages    :total_pages
       alias :offset_value :offset
+      alias :out_of_range? :out_of_bounds?
 
       def first_page?
         current_page == 1

data/lib/tire/search.rb

@@ -48,7 +48,7 @@ module Tire
       end
 
       def params
-        options = @options.except(:wrapper, :payload)
+        options = @options.except(:wrapper, :payload, :load)
         options.empty? ? '' : '?' + options.to_param
       end
 

data/lib/tire/tasks.rb

@@ -121,11 +121,18 @@ namespace :tire do
 
       puts "[IMPORT] Loading models from: #{dir}"
       Dir.glob(File.join("#{dir}/**/*.rb")).each do |path|
-        require path
-
         model_filename = path[/#{Regexp.escape(dir.to_s)}\/([^\.]+).rb/, 1]
+
+        next if model_filename.match(/^concerns\//i) # Skip concerns/ folder
+
         klass          = model_filename.camelize.constantize
 
+        begin
+          klass = model_filename.camelize.constantize
+        rescue NameError
+          require(path) ? retry : raise
+        end
+
         # Skip if the class doesn't have Tire integration
         next unless klass.respond_to?(:tire)
 

data/lib/tire/version.rb

@@ -1,20 +1,15 @@
 module Tire
-  VERSION   = "0.6.0"
+  VERSION   = "0.6.1"
 
   CHANGELOG =<<-END
     IMPORTANT CHANGES LATELY:
 
-    * Fixed incorrect inflection in the Rake import tasks
-    * Added support for `geo_distance` facets
-    * Added support for the `custom_filters_score` query
-    * Added a custom strategy option to <Model.import>
-    * Allow the `:wrapper` option to be passed to Tire.search consistently
-    * Improved the Mongoid importing strategy
-    * Merge returned `fields` with `_source` if both are returned
-    * Removed the deprecated `text` query
-    * [FIX] Rescue HTTP client specific connection errors in MyModel#create_elasticsearch_index
-    * Added support for passing `version` in Tire::Index#store
-    * Added support for `_version_type` in Tire::Index#bulk
-    * Added ActiveModel::Serializers compatibility
+    * Added support for bulk update
+    * Improved Kaminari support
+    * Improved the behaviour of `default` properties in Tire::Persistence
+    * Added the information about the gem "retirement" and other documentation improvements
+    * Fixed errors due to NewRelic's patching of Curl
+    * [ACTIVEMODEL] Use Object#id#to_s in `get_id_from_document`
+    * Added support for "Delete By Query" API
   END
 end

data/test/integration/active_model_searchable_test.rb

@@ -86,6 +86,21 @@ module Tire
         assert_equal 'abc123', results.first.id
       end
 
+      should "return facets" do
+        a = SupermodelArticle.new :title => 'Test'
+        a.save
+        a.index.refresh
+
+        s = SupermodelArticle.search do
+          query { match :title, 'test' }
+          facet 'title' do
+            terms :title
+          end
+        end
+
+        assert_equal 1, s.facets['title']['terms'][0]['count']
+      end
+
       context "within Rails" do
 
         setup do

data/test/integration/bulk_test.rb

@@ -49,6 +49,24 @@ module Tire
         assert_equal 0, Tire.search('bulk-test') { query {all} }.results.size
       end
 
+      should 'update documents in bulk' do
+        @index.bulk_store @articles, refresh: true
+
+        documents = @articles.map do |a|
+          {
+            id: a[:id],
+            type: a[:type],
+            doc: { title: "#{a[:title]}-updated" }
+          }
+        end
+        @index.bulk_update documents, refresh: true
+
+        documents = Tire.search('bulk-test') { query {all} }.results.to_a
+        assert_equal 'one-updated', documents[0][:title]
+        assert_equal 'two-updated', documents[1][:title]
+        assert_equal 'three-updated', documents[2][:title]
+      end
+
       should "allow to feed search results to bulk API" do
         (1..10).to_a.each { |i| @index.store id: i }
         @index.refresh

data/test/integration/custom_score_queries_test.rb

@@ -68,7 +68,7 @@ module Tire
           query do
             # Replace documents score with parameterized computation
             #
-            custom_score :script => "doc['words'].doubleValue / max(a, b)",
+            custom_score :script => "doc['words'].value.doubleValue() / max(a, b)",
                          :params => { :a => 1, :b => 2 } do
               string "title:T*"
             end

data/test/integration/delete_by_query_test.rb

@@ -0,0 +1,47 @@
+require 'test_helper'
+
+module Tire
+  class DeleteByQueryIntegrationTest < Test::Unit::TestCase
+    include Test::Integration
+
+    should "delete documents matching a query" do
+      assert_python_size(1)
+      delete_by_query
+      assert_python_size(0)
+    end
+
+    should "leave documents not matching a query" do
+      assert_python_size(1)
+      delete_by_query('article', 'go')
+      assert_python_size(1)
+    end
+
+    should "not delete documents with different types" do
+      assert_python_size(1)
+      delete_by_query('different_type')
+      assert_python_size(1)
+    end
+
+    context "DSL" do
+      should "delete documents matching a query" do
+        assert_python_size(1)
+        Tire.delete('articles-test') { term :tags, 'python' }
+        assert_python_size(0)
+      end
+    end
+
+    private
+
+    def delete_by_query(type='article', token='python')
+      Tire::DeleteByQuery.new('articles-test', :type => type) do
+        term :tags, token
+      end.perform
+    end
+
+    def assert_python_size(size)
+      Tire.index('articles-test').refresh
+      search = Tire.search('articles-test') { query { term :tags, 'python' } }
+      assert_equal size, search.results.size
+    end
+  end
+end

data/test/integration/explanation_test.rb

@@ -20,7 +20,6 @@ module Tire
       end
 
       should "add '_explanation' field to the result item" do
-        # Tire::Configuration.logger STDERR, :level => 'debug'
         s = Tire.search 'explanation-test', :explain => true do
           query do
             boolean do
@@ -30,15 +29,11 @@ module Tire
         end
 
         doc = s.results.first
+        d = doc._explanation.details.first
 
-        explanation = doc._explanation
-
-        assert explanation.description.include?("product of:")
-        assert explanation.value < 0.6
-        assert_not_nil explanation.details
-        end
-
+        assert d.description.include?("product of:")
+        assert_not_nil d.details
       end
-
     end
   end
+end

data/test/integration/index_update_document_test.rb

@@ -23,12 +23,12 @@ module Tire
       teardown { Tire.index('articles-with-tags').delete }
 
       should "increment a counter" do
-        Tire.index('articles-with-tags') { update( 'article', '1', :script => "ctx._source.views += 1" ) and refresh }
+        Tire.index('articles-with-tags') { update( 'article', '1', {:script => "ctx._source.views += 1"}, :refresh => true) }
 
         document = Tire.search('articles-with-tags') { query { string 'title:one' } }.results.first
         assert_equal 1, document.views, document.inspect
 
-        Tire.index('articles-with-tags') { update( 'article', '2', :script => "ctx._source.views += 1" ) and refresh }
+        Tire.index('articles-with-tags') { update( 'article', '2', {:script => "ctx._source.views += 1"}, :refresh => true) }
 
         document = Tire.search('articles-with-tags') { query { string 'title:two' } }.results.first
         assert_equal 11, document.views, document.inspect
@@ -36,9 +36,13 @@ module Tire
 
       should "add a tag to document" do
         Tire.index('articles-with-tags') do
-          update 'article', '1', :script => "ctx._source.tags += tag",
-                                 :params => { :tag => 'new' }
-          refresh
+          update 'article', '1', {
+              :script => "ctx._source.tags += tag",
+              :params => { :tag => 'new' }
+            },
+            {
+              :refresh => true
+            }
         end
 
         document = Tire.search('articles-with-tags') { query { string 'title:one' } }.results.first
@@ -47,9 +51,12 @@ module Tire
 
       should "remove a tag from document" do
         Tire.index('articles-with-tags') do
-          update 'article', '1', :script => "ctx._source.tags = tags",
-                                 :params => { :tags => [] }
-          refresh
+          update 'article', '1', {
+              :script => "ctx._source.tags = tags",
+              :params => { :tags => [] }
+            }, {
+              :refresh => true
+            }
         end
 
         document = Tire.index('articles-with-tags').retrieve 'article', '1'
@@ -59,9 +66,12 @@ module Tire
       should "remove the entire document if specific condition is met" do
         Tire.index('articles-with-tags') do
           # Remove document when it contains tag 'foobar'
-          update 'article', '3', :script => "ctx._source.tags.contains(tag) ? ctx.op = 'delete' : 'none'",
-                                 :params => { :tag => 'foobar' }
-          refresh
+          update 'article', '3', {
+              :script => "ctx._source.tags.contains(tag) ? ctx.op = 'delete' : 'none'",
+              :params => { :tag => 'foobar' }
+            }, {
+              :refresh => true
+            }
         end
 
         assert_nil Tire.index('articles-with-tags').retrieve 'article', '3'
@@ -81,8 +91,7 @@ module Tire
 
       should "update the document with a partial one" do
         Tire.index('articles-with-tags') do
-          update( 'article', '1', :doc => { :title => 'One UPDATED' } )
-          refresh
+          update( 'article', '1', {:doc => { :title => 'One UPDATED' }}, :refresh => true )
         end
 
         document = Tire.search('articles-with-tags') { query { string 'title:one' } }.results.first
@@ -101,9 +110,12 @@ module Tire
             Tire.index('articles-with-tags') do |index|
               $t.assert_not_nil @tags
 
-              index.update 'article', '3', :script => "ctx._source.tags = tags",
-                                     :params => { :tags => @tags }
-              index.refresh
+              index.update 'article', '3', {
+                  :script => "ctx._source.tags = tags",
+                  :params => { :tags => @tags }
+                }, {
+                  :refresh => true
+                }
             end
           end
         end
@@ -115,7 +127,5 @@ module Tire
       end
 
     end
-
   end
-
 end

data/test/integration/percolator_test.rb

@@ -8,13 +8,13 @@ module Tire
     context "Percolator" do
       setup do
         delete_registered_queries
-        delete_percolator_index if ENV['TRAVIS']
+        delete_percolator_index
         @index = Tire.index('percolator-test')
         @index.create
       end
       teardown do
         delete_registered_queries
-        delete_percolator_index if ENV['TRAVIS']
+        delete_percolator_index
         @index.delete
       end
 
@@ -98,7 +98,7 @@ module Tire
         end
       end
 
-    end
+    end if ENV['TRAVIS']
 
     private
 

data/test/integration/persistent_model_test.rb

@@ -78,6 +78,23 @@ module Tire
         assert_equal [], results.first.tags
       end
 
+      context "with deleting" do
+        should "search with simple query" do
+          PersistentArticle.create :id => 1, :title => 'One'
+          PersistentArticle.index.refresh
+
+          results = PersistentArticle.search 'one'
+          assert_equal 1, results.size
+
+          PersistentArticle.delete do
+            term :title, 'one'
+          end
+
+          results = PersistentArticle.search 'one'
+          assert_equal 0, results.size
+        end
+      end
+
       context "with pagination" do
 
         setup do
@@ -188,7 +205,7 @@ module Tire
       context "percolated search" do
         setup do
           delete_registered_queries
-          delete_percolator_index if ENV['TRAVIS']
+          delete_percolator_index
           PersistentArticleWithPercolation.index.register_percolator_query('alert') { string 'warning' }
           Tire.index('_percolator').refresh
         end
@@ -206,7 +223,7 @@ module Tire
           a = PersistentArticleWithPercolation.create :title => 'Warning!'
           assert_contains a.matches, 'alert'
         end
-      end
+      end if ENV['TRAVIS']
 
       context "with strict mapping" do
         should "successfuly save valid model" do

data/test/unit/index_test.rb

@@ -363,13 +363,11 @@ module Tire
             @index.store Article.new(:id => 123, :title => 'Test', :body => 'Lorem')
           end
 
-          should "convert document ID to string or number" do
-            # This is related to issues #529, #535:
-            # When using Mongoid and the Yajl gem, document IDs from Mongo (Moped::BSON::ObjectId)
-            # are incorrectly serialized to JSON, and documents are stored with incorrect, auto-generated IDs.
+          should "convert document ID to string" do
+            # This is related to issues #529, #535, #775
             class Document1; def id; "one"; end; end
             class Document2; def id; 1;     end; end
-            class Document3; class ID; def as_json; 'c'; end; end
+            class Document3; class ID; def to_s; 'c'; end; end
                              def id;   ID.new; end
             end
 
@@ -378,7 +376,7 @@ module Tire
             document_3 = Document3.new
 
             assert_equal 'one', @index.get_id_from_document(document_1)
-            assert_equal 1,     @index.get_id_from_document(document_2)
+            assert_equal '1',   @index.get_id_from_document(document_2)
             assert_equal 'c',   @index.get_id_from_document(document_3)
           end
 
@@ -616,7 +614,7 @@ module Tire
       end
 
       context "when performing a bulk api action" do
-        # Possible Bulk API actions are `index`, `create`, `delete`
+        # Possible Bulk API actions are `index`, `create`, `delete`, `update`
         #
         # The expected JSON looks like this:
         #
@@ -625,6 +623,8 @@ module Tire
         # {"create":{"_index":"dummy","_type":"document","_id":"2"}}
         # {"id":"2","title":"Two"}
         # {"delete":{"_index":"dummy","_type":"document","_id":"2"}}
+        # {"update":{"_index":"dummy","_type":"document","_id":"1","_retry_on_conflict": 3}}
+        # {"doc":{"title":"Updated One"}}
         #
         # See http://www.elasticsearch.org/guide/reference/api/bulk.html
 
@@ -681,6 +681,39 @@ module Tire
           @index.bulk :delete, [ {:id => '1', :title => 'One'}, {:id => '2', :title => 'Two'} ]
         end
 
+        should "serialize payload for update action" do
+          Configuration.client.
+            expects(:post).
+            with do |url, payload|
+              assert_equal "#{@index.url}/_bulk", url
+              assert_match /"update"/, payload
+              assert_match /"_index":"dummy"/, payload
+              assert_match /"_type":"document"/, payload
+              assert_match /"_id":"1"/, payload
+              assert_match /"_id":"2"/, payload
+              lines = payload.split("\n")
+              assert_equal 'One', MultiJson.decode(lines[1])['doc']['title']
+              assert_equal 'Two', MultiJson.decode(lines[3])['doc']['title']
+              assert_equal true, MultiJson.decode(lines[3])['doc_as_upsert']
+            end.
+            returns(mock_response('{}'), 200)
+
+          @index.bulk :update, [ {:id => '1', :doc => {:title => 'One'}}, {:id => '2', :doc => {:title => 'Two'}, :doc_as_upsert => true} ]
+        end
+
+        should 'serialize _retry_on_conflict parameter into payload header' do
+          Configuration.client.
+            expects(:post).
+            with do |url, payload|
+              lines = payload.split("\n")
+              assert_equal 3, MultiJson.decode(lines[0])['update']['_retry_on_conflict']
+              assert_equal 3, MultiJson.decode(lines[2])['update']['_retry_on_conflict']
+            end.
+            returns(mock_response('{}'), 200)
+
+          @index.bulk :update, [ {:id => '1', :doc => {:title => 'One'}}, {:id => '2', :doc => {:title => 'Two'}} ], :retry_on_conflict => 3
+        end
+
         should "serialize meta parameters into payload header" do
           Configuration.client.
             expects(:post).

data/test/unit/model_persistence_test.rb

@@ -214,9 +214,11 @@ module Tire
             assert_equal false, article.hidden
           end
 
-          should "evaluate lambdas as default values" do
+          should "evaluate lambdas as default values at time of initialization" do
+            now = Time.now
+            Time.stubs(:now).returns(now)
             article = PersistentArticleWithDefaults.new
-            assert_equal Time.now.year, article.created_at.year
+            assert_equal now, article.created_at
           end
 
           should "not affect default value" do

data/test/unit/results_collection_test.rb

@@ -69,7 +69,7 @@ module Tire
 
       should "be kaminari compatible" do
         collection = Results::Collection.new(@default_response)
-        %w(limit_value total_count num_pages offset_value first_page? last_page?).each do |method|
+        %w(limit_value total_count num_pages offset_value first_page? last_page? out_of_range?).each do |method|
           assert_respond_to collection, method
         end
       end

data/test/unit/search_test.rb

@@ -128,6 +128,14 @@ module Tire
         assert_match /index_1,index_2/, s.to_curl
       end
 
+      should 'not include the load option in queries' do
+        s = Search::Search.new(:load => { :includes => [:author, {:nested => :relation}] }) do
+          query { string 'title:foo' }
+        end
+
+        assert_nil s.to_hash[:load], 'Make sure to ignore load in URL params'
+      end
+
       should "return itself as a Hash" do
         s = Search::Search.new('index') do
           query { string 'title:foo' }

data/tire.gemspec

@@ -68,13 +68,13 @@ Gem::Specification.new do |s|
    your models (incrementally upon saving, or in bulk), searching and
    paginating the results.
 
-   Please check the documentation at <http://karmi.github.com/tire/>.
+   Please check the documentation at <http://karmi.github.com/retire/>.
   DESC
 
   s.post_install_message =<<-CHANGELOG.gsub(/^  /, '')
   ================================================================================
 
-    Please check the documentation at <http://karmi.github.com/tire/>.
+    Please check the documentation at <http://karmi.github.com/retire/>.
 
   --------------------------------------------------------------------------------
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tire
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-08 00:00:00.000000000 Z
+date: 2013-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -370,7 +370,7 @@ description: ! "   Tire is a Ruby client for the Elasticsearch search engine/dat
   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"
+  results.\n\n   Please check the documentation at <http://karmi.github.com/retire/>.\n"
 email: karmi@karmi.cz
 executables: []
 extensions: []
@@ -391,6 +391,7 @@ files:
 - lib/tire/alias.rb
 - lib/tire/configuration.rb
 - lib/tire/count.rb
+- lib/tire/delete_by_query.rb
 - lib/tire/dsl.rb
 - lib/tire/http/client.rb
 - lib/tire/http/clients/curb.rb
@@ -444,6 +445,7 @@ files:
 - test/integration/count_test.rb
 - test/integration/custom_filters_score_queries_test.rb
 - test/integration/custom_score_queries_test.rb
+- test/integration/delete_by_query_test.rb
 - test/integration/dis_max_queries_test.rb
 - test/integration/dsl_search_test.rb
 - test/integration/explanation_test.rb
@@ -519,16 +521,13 @@ files:
 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 incorrect inflection in the Rake import
-  tasks\n  * Added support for `geo_distance` facets\n  * Added support for the `custom_filters_score`
-  query\n  * Added a custom strategy option to <Model.import>\n  * Allow the `:wrapper`
-  option to be passed to Tire.search consistently\n  * Improved the Mongoid importing
-  strategy\n  * Merge returned `fields` with `_source` if both are returned\n  * Removed
-  the deprecated `text` query\n  * [FIX] Rescue HTTP client specific connection errors
-  in MyModel#create_elasticsearch_index\n  * Added support for passing `version` in
-  Tire::Index#store\n  * Added support for `_version_type` in Tire::Index#bulk\n  *
-  Added ActiveModel::Serializers compatibility\n\n  See the full changelog at <http://github.com/karmi/tire/commits/v0.6.0>.\n\n--------------------------------------------------------------------------------\n"
+  \ Please check the documentation at <http://karmi.github.com/retire/>.\n\n--------------------------------------------------------------------------------\n\n
+  \ IMPORTANT CHANGES LATELY:\n\n  * Added support for bulk update\n  * Improved Kaminari
+  support\n  * Improved the behaviour of `default` properties in Tire::Persistence\n
+  \ * Added the information about the gem \"retirement\" and other documentation improvements\n
+  \ * Fixed errors due to NewRelic's patching of Curl\n  * [ACTIVEMODEL] Use Object#id#to_s
+  in `get_id_from_document`\n  * Added support for \"Delete By Query\" API\n\n  See
+  the full changelog at <http://github.com/karmi/tire/commits/v0.6.1>.\n\n--------------------------------------------------------------------------------\n"
 rdoc_options:
 - --charset=UTF-8
 require_paths:
@@ -567,6 +566,7 @@ test_files:
 - test/integration/count_test.rb
 - test/integration/custom_filters_score_queries_test.rb
 - test/integration/custom_score_queries_test.rb
+- test/integration/delete_by_query_test.rb
 - test/integration/dis_max_queries_test.rb
 - test/integration/dsl_search_test.rb
 - test/integration/explanation_test.rb