tire 0.5.3 → 0.5.4

data/.travis.yml

@@ -8,6 +8,7 @@ rvm:
   - 1.9.3
   - 1.8.7
   - ree
+  - jruby-19mode
 
 env:
   - TEST_COMMAND="rake test:unit"
@@ -15,8 +16,10 @@ env:
 
 script: "bundle exec $TEST_COMMAND"
 
-before_install:
-  - sudo service elasticsearch start
+services:
+  - elasticsearch
+  - redis
+  - mongodb
 
 matrix:
   exclude:

data/Gemfile

@@ -2,3 +2,9 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in tire.gemspec
 gemspec
+
+platform :jruby do
+  gem "jdbc-sqlite3"
+  gem "activerecord-jdbcsqlite3-adapter"
+  gem "json" if defined?(RUBY_VERSION) && RUBY_VERSION < '1.9'
+end

data/lib/tire.rb

@@ -29,6 +29,7 @@ require 'tire/search/highlight'
 require 'tire/search/scan'
 require 'tire/search/script_field'
 require 'tire/multi_search'
+require 'tire/count'
 require 'tire/results/pagination'
 require 'tire/results/collection'
 require 'tire/results/item'

data/lib/tire/alias.rb

@@ -77,7 +77,7 @@ module Tire
       @attributes = { :indices => IndexCollection.new([]) }
 
       attributes.each_pair do |key, value|
-        if key.to_s =~ /index|indices/
+        if ['index','indices'].include? key.to_s
           @attributes[:indices] = IndexCollection.new(value)
         else
           @attributes[key.to_sym] = value

data/lib/tire/count.rb

@@ -0,0 +1,85 @@
+module Tire
+  module Search
+    class CountRequestFailed < StandardError; end
+
+    class Count
+
+      attr_reader :indices, :types, :query, :response, :json
+
+      def initialize(indices=nil, options={}, &block)
+        @indices = Array(indices)
+        @types   = Array(options.delete(:type)).map { |type| Utils.escape(type) }
+        @options = options
+
+        @path    = ['/', @indices.join(','), @types.join(','), '_count'].compact.join('/').squeeze('/')
+
+        if block_given?
+          @query = Query.new
+          block.arity < 1 ? @query.instance_eval(&block) : block.call(@query)
+        end
+      end
+
+      def url
+        Configuration.url + @path
+      end
+
+      def params
+        options = @options.except(:wrapper)
+        options.empty? ? '' : '?' + options.to_param
+      end
+
+      def perform
+        @response = Configuration.client.get self.url + self.params, self.to_json
+        if @response.failure?
+          STDERR.puts "[REQUEST FAILED] #{self.to_curl}\n"
+          raise CountRequestFailed, @response.to_s
+        end
+        @json     = MultiJson.decode(@response.body)
+        @value    = @json['count']
+        return self
+      ensure
+        logged
+      end
+
+      def value
+        @value || (perform and return @value)
+      end
+
+      def to_json(options={})
+        @query.to_json if @query
+      end
+
+      def to_curl
+        if to_json
+          to_json_escaped = to_json.gsub("'",'\u0027')
+          %Q|curl -X GET '#{url}#{params.empty? ? '?' : params.to_s + '&'}pretty' -d '#{to_json_escaped}'|
+        else
+          %Q|curl -X GET '#{url}#{params.empty? ? '?' : params.to_s + '&'}pretty'|
+        end
+      end
+
+      def logged(endpoint='_count')
+        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
+end

data/lib/tire/dsl.rb

@@ -94,6 +94,10 @@ module Tire
     alias :multisearch :multi_search
     alias :msearch     :multi_search
 
+    def count(indices=nil, options={}, &block)
+      Search::Count.new(indices, options, &block).value
+    end
+
     def index(name, &block)
       Index.new(name, &block)
     end

data/lib/tire/index.rb

@@ -77,7 +77,8 @@ module Tire
         params[:percolate] = "*" if params[:percolate] === true
       end
 
-      params[:parent] = options[:parent] if options[:parent]
+      params[:parent]  = options[:parent]  if options[:parent]
+      params[:routing] = options[:routing] if options[:routing]
 
       params_encoded = params.empty? ? '' : "?#{params.to_param}"
 

data/lib/tire/model/import.rb

@@ -15,6 +15,7 @@ module Tire
 
         def import options={}, &block
           options = { :method => 'paginate' }.update options
+          index   = options[:index] ? Tire::Index.new(options.delete(:index)) : self.index
           index.import klass, options, &block
         end
 

data/lib/tire/model/persistence.rb

@@ -36,15 +36,13 @@ module Tire
           extend  ActiveModel::Callbacks
           define_model_callbacks :save, :destroy
 
-          include Tire::Model::Search
-          include Tire::Model::Callbacks
-
           extend  Persistence::Finders::ClassMethods
           extend  Persistence::Attributes::ClassMethods
           include Persistence::Attributes::InstanceMethods
-
           include Persistence::Storage
 
+          include Tire::Model::Search
+
           ['_score', '_type', '_index', '_version', 'sort', 'highlight', '_explanation'].each do |attr|
             define_method("#{attr}=") { |value| @attributes ||= {}; @attributes[attr] = value }
             define_method("#{attr}")  { @attributes[attr] }

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

@@ -52,6 +52,11 @@ module Tire
             # Save property casting (when relevant):
             property_types[name.to_sym] = options[:class] if options[:class]
 
+            # Define default value for colletions:
+            if options[:class].is_a?(Array)
+              property_defaults[name.to_sym] ||= []
+            end
+
             # Store mapping for the property:
             mapping[name] = options
             self

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

@@ -6,29 +6,23 @@ module Tire
       # Provides infrastructure for storing records in _ElasticSearch_.
       #
       module Storage
-
         def self.included(base)
-
           base.class_eval do
             extend  ClassMethods
-            include InstanceMethods            
+            include InstanceMethods
           end
-
         end
 
         module ClassMethods
-
           def create(args={})
             document    = new(args)
             return false unless document.valid?
             document.save
             document
           end
-
         end
 
         module InstanceMethods
-
           def update_attribute(name, value)
             __update_attributes name => value
             save
@@ -39,11 +33,26 @@ module Tire
             save
           end
 
+          def update_index
+            send :_run_update_elasticsearch_index_callbacks do
+              if destroyed?
+                index.remove self
+              else
+                response  = index.store( self, {:percolate => percolator} )
+                self.id     ||= response['_id']
+                self._index   = response['_index']
+                self._type    = response['_type']
+                self._version = response['_version']
+                self.matches  = response['matches']
+                self
+              end
+            end
+          end
+
           def save
             return false unless valid?
             run_callbacks :save do
-              # Document#id is set in the +update_elasticsearch_index+ method,
-              # where we have access to the JSON response
+              update_index
             end
             self
           end
@@ -51,6 +60,7 @@ module Tire
           def destroy
             run_callbacks :destroy do
               @destroyed = true
+              update_index
             end
             self.freeze
           end
@@ -58,9 +68,7 @@ module Tire
           def destroyed?   ;  !!@destroyed;       end
           def persisted?   ;  !!id && !!_version; end
           def new_record?  ;  !persisted?;        end
-
         end
-
       end
 
     end

data/lib/tire/model/search.rb

@@ -145,11 +145,7 @@ module Tire
             if instance.destroyed?
               index.remove instance
             else
-              response  = index.store( instance, {:percolate => percolator} )
-              instance.id     ||= response['_id']      if instance.respond_to?(:id=)
-              instance._index   = response['_index']   if instance.respond_to?(:_index=)
-              instance._type    = response['_type']    if instance.respond_to?(:_type=)
-              instance._version = response['_version'] if instance.respond_to?(:_version=)
+              response = index.store( instance, {:percolate => percolator} )
               instance.tire.matches = response['matches'] if instance.tire.respond_to?(:matches=)
               self
             end

data/lib/tire/results/collection.rb

@@ -57,6 +57,14 @@ module Tire
       end
       alias :[] :slice
 
+      def to_ary
+        self
+      end
+
+      def as_json(options=nil)
+        to_a.map { |item| item.as_json(options) }
+      end
+
       def error
         @response['error']
       end
@@ -69,10 +77,6 @@ module Tire
         ! success?
       end
 
-      def to_ary
-        self
-      end
-
       # Handles _source prefixed fields properly: strips the prefix and converts fields to nested Hashes
       #
       def __parse_fields__(fields={})

data/lib/tire/results/item.rb

@@ -65,6 +65,16 @@ module Tire
         end
       end
 
+      def as_json(options=nil)
+        hash = to_hash
+        hash.respond_to?(:with_indifferent_access) ? hash.with_indifferent_access.as_json(options) : hash.as_json(options)
+      end
+
+      def to_json(options=nil)
+        as_json.to_json(options)
+      end
+      alias_method :to_indexed_json, :to_json
+
       # Let's pretend we're someone else in Rails
       #
       def class
@@ -78,11 +88,6 @@ module Tire
         %Q|<Item#{self.class.to_s == 'Tire::Results::Item' ? '' : " (#{self.class})"} #{s.join(', ')}>|
       end
 
-      def to_json(options=nil)
-        @attributes.to_json(options)
-      end
-      alias_method :to_indexed_json, :to_json
-
     end
 
   end

data/lib/tire/search.rb

@@ -146,7 +146,8 @@ module Tire
       end
 
       def to_curl
-        %Q|curl -X GET '#{url}#{params.empty? ? '?' : params.to_s + '&'}pretty' -d '#{to_json}'|
+        to_json_escaped = to_json.gsub("'",'\u0027')
+        %Q|curl -X GET '#{url}#{params.empty? ? '?' : params.to_s + '&'}pretty' -d '#{to_json_escaped}'|
       end
 
       def to_hash

data/lib/tire/search/facet.rb

@@ -27,8 +27,9 @@ module Tire
       end
 
       def date(field, options={})
-        interval = options.delete(:interval) || 'day'
-        @value[:date_histogram] = { :field => field, :interval => interval }.update(options)
+        interval = { :interval => options.delete(:interval) || 'day' }
+        fields   = options[:value_field] || options[:value_script] ? { :key_field => field } : { :field => field }
+        @value[:date_histogram] = {}.update(fields).update(interval).update(options)
         self
       end
 

data/lib/tire/version.rb

@@ -1,11 +1,18 @@
 module Tire
-  VERSION   = "0.5.3"
+  VERSION   = "0.5.4"
 
   CHANGELOG =<<-END
     IMPORTANT CHANGES LATELY:
 
-    * Added `Tire::Results::Collection#each_with_hit`
-    * Added support for passing partial document to `Index#update`
-    * Added `nested` query support
+    * Added the support for the Count API
+    * Escape single quotes in `to_curl` serialization
+    * Added JRuby compatibility
+    * Added proper `as_json` support for `Results::Collection` and `Results::Item` classes
+    * Added extracting the `routing` information in the `Index#store` method
+    * Refactored the `update_index` method for search and persistence integration
+    * Cast collection properties in Model::Persistence as empty Array by default
+    * Allow passing `:index` option to `MyModel.import`
+    * Update to Mocha ~> 0.13
+    * Update to MultiJson ~> 1.3
   END
 end

data/test/integration/count_test.rb

@@ -5,7 +5,7 @@ module Tire
   class CountIntegrationTest < Test::Unit::TestCase
     include Test::Integration
 
-    context "Count" do
+    context "Count with search type" do
 
       should "return total number of hits for the query, but no hits" do
         s = Tire.search 'articles-test', :search_type => 'count' do
@@ -30,5 +30,35 @@ module Tire
 
     end
 
+    context "Count with the count method" do
+      setup    { Tire.index('articles-test-count') { delete; create and store(title: 'Test') and refresh } }
+      teardown { Tire.index('articles-test-count') { delete } }
+
+      should "return number of documents in the index" do
+        assert_equal 5, Tire.count('articles-test')
+      end
+
+      should "return number of documents in the index for specific query" do
+        # Tire.configure { logger STDERR, level: 'debug' }
+        count = Tire.count('articles-test') do
+          term :tags, 'ruby'
+        end
+        assert_equal 2, count
+      end
+
+      should "return number of documents in multiple indices" do
+        assert_equal 6, Tire.count(['articles-test', 'articles-test-count'])
+      end
+
+      should "allow access to the JSON and response" do
+        c = Tire::Search::Count.new('articles-test')
+        c.perform
+        assert_equal 5, c.value
+        assert_equal 0, c.json['_shards']['failed']
+        assert c.response.success?, "Response should be successful: #{c.response.inspect}"
+      end
+
+    end
+
   end
 end

data/test/integration/facets_test.rb

@@ -114,7 +114,7 @@ module Tire
 
       context "date histogram" do
 
-        should "return aggregated values for all results" do
+        should "return aggregated counts for each bucket" do
           s = Tire.search('articles-test') do
             query { all }
             facet 'published_on' do
@@ -124,7 +124,35 @@ module Tire
 
           facets = s.results.facets['published_on']['entries']
           assert_equal 4, facets.size, facets.inspect
-          assert_equal 2, facets.entries[1]["count"], facets.inspect
+          assert_equal 2, facets.entries[1]['count'], facets.inspect
+        end
+
+        should "return value statistics for each bucket" do
+          s = Tire.search('articles-test', search_type: 'count') do
+            query { all }
+            facet 'published_on' do
+              date :published_on, value_field: 'words'
+            end
+          end
+
+          facets = s.results.facets['published_on']['entries']
+          assert_equal 4, facets.size, facets.inspect
+          assert_equal 2, facets.entries[1]['count'], facets.inspect
+          assert_equal 625.0, facets.entries[1]['total'], facets.inspect
+        end
+
+        should "return value statistics for each bucket by script" do
+          s = Tire.search('articles-test', search_type: 'count') do
+            query { all }
+            facet 'published_on' do
+              date :published_on, value_script: "doc.title.value.length()"
+            end
+          end
+
+          facets = s.results.facets['published_on']['entries']
+          assert_equal 4, facets.size, facets.inspect
+          assert_equal 2, facets.entries[1]['count'], facets.inspect
+          assert_equal 8.0, facets.entries[1]['total'], facets.inspect # Two + Three => 8 characters
         end
 
       end

data/test/integration/results_test.rb

@@ -45,6 +45,13 @@ module Tire
         end
       end
 
+      should "be serialized to JSON" do
+        s = Tire.search('articles-test') { query { string 'title:one' } }
+
+        assert_not_nil s.results.as_json(only: 'title').first['title']
+        assert_nil     s.results.as_json(only: 'title').first['published_on']
+      end
+
     end
   end
 

data/test/test_helper.rb

@@ -6,17 +6,28 @@ require 'bundler/setup'
 require 'pathname'
 require 'test/unit'
 
+JRUBY = defined?(JRUBY_VERSION)
+
 if ENV['JSON_LIBRARY']
   puts "Using '#{ENV['JSON_LIBRARY']}' JSON library"
   require ENV['JSON_LIBRARY']
+elsif JRUBY
+  require 'json'
 else
   require 'yajl/json_gem'
 end
-require 'sqlite3'
+
+if JRUBY
+  require 'jdbc/sqlite3'
+  require 'active_record'
+  require 'active_record/connection_adapters/jdbcsqlite3_adapter'
+else
+  require 'sqlite3'
+end
 
 require 'shoulda'
-require 'turn/autorun' unless ENV["TM_FILEPATH"] || defined?(RUBY_VERSION) && RUBY_VERSION < '1.9'
-require 'mocha'
+require 'turn/autorun' unless ENV["TM_FILEPATH"] || JRUBY
+require 'mocha/setup'
 
 require 'active_support/core_ext/hash/indifferent_access'
 

data/test/unit/count_test.rb

@@ -0,0 +1,67 @@
+require 'test_helper'
+
+module Tire
+  class CountTest < Test::Unit::TestCase
+
+    context "Count" do
+      setup { Configuration.reset }
+
+      should "be initialized with single index" do
+        c = Search::Count.new('index')
+        assert_equal ['index'], c.indices
+        assert_match %r|/index/_count|, c.url
+      end
+
+      should "count all documents by the leaving index empty" do
+        c = Search::Count.new
+        assert c.indices.empty?, "#{c.indices.inspect} should be empty"
+        assert_match %r|localhost:9200/_count|, c.url
+      end
+
+      should "limit count with document type" do
+        c = Search::Count.new('index', :type => 'bar')
+        assert_equal ['bar'], c.types
+        assert_match %r|index/bar/_count|, c.url
+      end
+
+      should "pass URL parameters" do
+        c = Search::Count.new('index', :routing => 123)
+        assert  ! c.params.empty?
+        assert_match %r|routing=123|, c.params
+      end
+
+      should "evaluate the query" do
+        Search::Query.any_instance.expects(:instance_eval)
+
+        c = Search::Count.new('index') { string 'foo' }
+        assert_not_nil c.query
+      end
+
+      should "allow access to the JSON and the response" do
+        Configuration.client.expects(:get).returns(mock_response( '{"count":1}', 200 ))
+        c = Search::Count.new('index')
+        c.perform
+        assert_equal 1, c.json['count']
+        assert_equal 200, c.response.code
+      end
+
+      should "return curl snippet for debugging" do
+        c = Search::Count.new('index') { term :title, 'foo' }
+        assert_match %r|curl \-X GET 'http://localhost:9200/index/_count\?pretty' -d |, c.to_curl
+        assert_match %r|"term"\s*:\s*"foo"|, c.to_curl
+      end
+
+      should "log the request when logger is set" do
+        Configuration.logger STDERR
+
+        Configuration.client.expects(:get).returns(mock_response( '{"count":1}', 200 ))
+        Configuration.logger.expects(:log_request).returns(true)
+        Configuration.logger.expects(:log_response).returns(true)
+
+        Search::Count.new('index').value
+      end
+
+    end
+
+  end
+end

data/test/unit/http_client_test.rb

@@ -1,5 +1,4 @@
 require 'test_helper'
-require 'tire/http/clients/curb'
 
 module Tire
   module HTTP
@@ -46,30 +45,34 @@ module Tire
 
       end
 
-      context "Curb" do
-        setup do
-          Configuration.client Client::Curb
-        end
+      if defined?(Curl)
+        require 'tire/http/clients/curb'
 
-        teardown do
-          Configuration.client Client::RestClient
-        end
+        context "Curb" do
+          setup do
+            Configuration.client Client::Curb
+          end
 
-        should "use POST method if request body passed" do
-          ::Curl::Easy.any_instance.expects(:http_post)
+          teardown do
+            Configuration.client Client::RestClient
+          end
 
-          response = Configuration.client.get "http://localhost:3000", '{ "query_string" : { "query" : "apple" }}'
-        end
+          should "use POST method if request body passed" do
+            ::Curl::Easy.any_instance.expects(:http_post)
 
-        should "use GET method if request body is nil" do
-          ::Curl::Easy.any_instance.expects(:http_get)
+            response = Configuration.client.get "http://localhost:3000", '{ "query_string" : { "query" : "apple" }}'
+          end
+
+          should "use GET method if request body is nil" do
+            ::Curl::Easy.any_instance.expects(:http_get)
+
+            response = Configuration.client.get "http://localhost:9200/articles/article/1"
+          end
 
-          response = Configuration.client.get "http://localhost:9200/articles/article/1"
         end
 
       end
 
-
     end
   end
 

data/test/unit/index_alias_test.rb

@@ -94,7 +94,7 @@ module Tire
               a['add']['alias'] == 'alias_martha'
               end
           end.returns(mock_response('{}'), 200)
-          
+
           a = Alias.find('alias_martha')
           a.indices.push 'index_A'
           a.save
@@ -109,7 +109,7 @@ module Tire
                 a['remove']['alias'] == 'alias_martha'
               end
           end.returns(mock_response('{}'), 200)
-          
+
           a = Alias.find('alias_martha')
           a.indices.delete 'index_A'
           a.save
@@ -120,7 +120,7 @@ module Tire
             # puts json
             MultiJson.decode(json)['actions'].all? { |a| a['add']['routing'] == 'martha' }
           end.returns(mock_response('{}'), 200)
-          
+
           a = Alias.find('alias_martha')
           a.routing('martha')
           a.save
@@ -271,5 +271,65 @@ module Tire
       end
 
     end
+
+    context "aliases with index and search routing values" do
+      setup do
+        json =<<-JSON
+{
+    "index_A": {
+        "aliases": {}
+    },
+    "index_B": {
+        "aliases": {
+            "alias_john": {
+                "filter": {
+                    "term": {
+                        "user": "john"
+                    }
+                }
+            },
+            "alias_martha": {
+                "filter": {
+                    "term": {
+                        "user": "martha"
+                    }
+                }
+            }
+        }
+    },
+    "index_C": {
+        "aliases": {
+            "alias_martha": {
+                "filter": {
+                    "term": {
+                        "user": "martha"
+                    }
+                },
+                "index_routing": "1",
+                "search_routing": "2"
+            }
+        }
+    }
+}
+        JSON
+          Configuration.client.expects(:get).
+                               returns( mock_response(json), 200).
+                               at_least_once
+      end
+
+        should "find all aliases" do
+          aliases = Alias.all
+          # p aliases
+          assert_equal 2, aliases.size
+          assert_equal ['index_B', 'index_C'], aliases.select { |a| a.name == 'alias_martha'}.first.indices.to_a.sort
+        end
+
+        should "find an alias" do
+          a = Alias.find('alias_martha')
+          assert_instance_of Alias, a
+          assert_equal ['index_B', 'index_C'], a.indices.to_a.sort
+        end
+    end
+
   end
 end

data/test/unit/index_test.rb

@@ -288,6 +288,14 @@ module Tire
           @index.store '{"foo" : "bar"}'
         end
 
+        should "extract the routing information from options" do
+          Configuration.client.expects(:post).with do |url, payload|
+            assert_match /routing=abc/, url
+          end.returns(mock_response('{"ok":true,"_id":"123"}'))
+
+          @index.store( {:id => 123, :title => 'Test'}, {:routing => 'abc'} )
+        end
+
         context "document with ID" do
 
           should "store Hash it under its ID property" do

data/test/unit/model_import_test.rb

@@ -60,7 +60,11 @@ module Tire
             # Add 1 to every "document" and return them
             documents.map { |d| d + 1 }
           end
+        end
 
+        should "store the documents in a different index" do
+          Tire::Index.expects(:new).with('new_index').returns( mock('index') { expects(:import) } )
+          ImportModel.import :index => 'new_index'
         end
 
       end

data/test/unit/model_persistence_test.rb

@@ -319,6 +319,12 @@ module Tire
             assert_equal 'A', article.stats.meta.tags
           end
 
+          should "create empty collection for missing value" do
+            article = PersistentArticleWithCastedCollection.new :title => 'Test'
+            assert_respond_to article.comments, :each
+            assert article.comments.empty?, "article.comments should be empty: " + article.inspect
+          end
+
         end
 
         context "when initializing" do

data/test/unit/results_collection_test.rb

@@ -8,7 +8,7 @@ module Tire
       setup do
         begin; Object.send(:remove_const, :Rails); rescue; end
         Configuration.reset
-        @default_response = { 'hits' => { 'hits' => [{'_id' => 1, '_score' => 1, '_source' => {:title => 'Test'}},
+        @default_response = { 'hits' => { 'hits' => [{'_id' => 1, '_score' => 1, '_source' => {:title => 'Test', :author => 'John'}},
                                                      {'_id' => 2},
                                                      {'_id' => 3}],
                                           'max_score' => 1.0 } }
@@ -38,7 +38,7 @@ module Tire
         assert_equal [3],   Results::Collection.new(@default_response)[-1,1].map {|res| res[:id]}
       end
 
-      should "be initialized with parsed json" do
+      should "be initialized with parsed JSON" do
         assert_nothing_raised do
           collection = Results::Collection.new( @default_response )
           assert_equal 3, collection.results.count
@@ -79,6 +79,23 @@ module Tire
         assert_equal 1.0, collection.max_score
       end
 
+      context "serialization" do
+
+        should "be serialized to JSON" do
+          collection = Results::Collection.new(@default_response)
+          assert_instance_of Array, collection.as_json
+          assert_equal 'Test', collection.as_json.first['title']
+          assert_equal 'John', collection.as_json.first['author']
+        end
+
+        should "pass options to as_json" do
+          collection = Results::Collection.new(@default_response)
+          assert_equal 'Test', collection.as_json(:only => 'title').first['title']
+          assert_nil           collection.as_json(:only => 'title').first['author']
+        end
+
+      end
+
       context "with error response" do
         setup do
           @collection = Results::Collection.new({'error' => 'SearchPhaseExecutionException...'})

data/test/unit/results_item_test.rb

@@ -120,6 +120,12 @@ module Tire
         assert_equal '1925',  @document.to_hash[:awards][:best_fiction][:year]
       end
 
+      should "be convertible to JSON" do
+        assert_instance_of Hash, @document.as_json
+        assert_equal 'Test', @document.as_json(:only => 'title')['title']
+        assert_nil           @document.as_json(:only => 'title')['author']
+      end
+
       should "be inspectable" do
         assert_match /<Item .* title|Item .* author/, @document.inspect
       end

data/test/unit/search_facet_test.rb

@@ -115,7 +115,7 @@ module Tire::Search
 
         should "encode custom options" do
           f = Facet.new('date') { date :published_on, :value_field => 'price'  }
-          assert_equal( {:date=>{:date_histogram=>{:field=>'published_on',:interval=>'day',:value_field=>'price' } } }.to_json,
+          assert_equal( {:date=>{:date_histogram=>{:key_field=>'published_on',:interval=>'day',:value_field=>'price' } } }.to_json,
                         f.to_json )
         end
 

data/test/unit/tire_test.rb

@@ -62,6 +62,10 @@ module Tire
           assert_respond_to Tire, :msearch
         end
 
+        should "count documents" do
+          assert_respond_to Tire, :count
+        end
+
         context "when retrieving results" do
 
           should "not call the #perform method immediately" do

data/tire.gemspec

@@ -28,25 +28,29 @@ Gem::Specification.new do |s|
   #
   s.add_dependency "rake"
   s.add_dependency "rest-client", "~> 1.6"
-  s.add_dependency "multi_json",  "~> 1.0"
+  s.add_dependency "multi_json",  "~> 1.3"
   s.add_dependency "activemodel", ">= 3.0"
   s.add_dependency "hashr",       "~> 0.0.19"
 
   # = Development dependencies
   #
-  s.add_development_dependency "bundler",     "~> 1.0"
-  s.add_development_dependency "yajl-ruby",   "~> 1.0"
+  s.add_development_dependency "bundler",      "~> 1.0"
   s.add_development_dependency "shoulda"
-  s.add_development_dependency "mocha"
+  s.add_development_dependency "mocha",        "~> 0.13"
   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 "oj"
-  s.add_development_dependency "turn", "~> 0.9" if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
+  s.add_development_dependency "faraday"
+
+  unless defined?(JRUBY_VERSION)
+    s.add_development_dependency "yajl-ruby",   "~> 1.0"
+    s.add_development_dependency "sqlite3"
+    s.add_development_dependency "bson_ext"
+    s.add_development_dependency "curb"
+    s.add_development_dependency "oj"
+    s.add_development_dependency "turn",        "~> 0.9"
+  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.3
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-03 00:00:00.000000000 Z
+date: 2013-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70315094856180 !ruby/object:Gem::Requirement
+  requirement: &70237728923180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70315094856180
+  version_requirements: *70237728923180
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70315094855080 !ruby/object:Gem::Requirement
+  requirement: &70237728922400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,21 +32,21 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70315094855080
+  version_requirements: *70237728922400
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70315094853880 !ruby/object:Gem::Requirement
+  requirement: &70237728921620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70315094853880
+  version_requirements: *70237728921620
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70315094851380 !ruby/object:Gem::Requirement
+  requirement: &70237728920960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70315094851380
+  version_requirements: *70237728920960
 - !ruby/object:Gem::Dependency
   name: hashr
-  requirement: &70315094850020 !ruby/object:Gem::Requirement
+  requirement: &70237728920260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,21 +65,10 @@ dependencies:
         version: 0.0.19
   type: :runtime
   prerelease: false
-  version_requirements: *70315094850020
+  version_requirements: *70237728920260
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70315094863680 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: *70315094863680
-- !ruby/object:Gem::Dependency
-  name: yajl-ruby
-  requirement: &70315094860660 !ruby/object:Gem::Requirement
+  requirement: &70237728919580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +76,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70315094860660
+  version_requirements: *70237728919580
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70315094860020 !ruby/object:Gem::Requirement
+  requirement: &70237728919000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,21 +87,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70315094860020
+  version_requirements: *70237728919000
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70315094859360 !ruby/object:Gem::Requirement
+  requirement: &70237728944780 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.13'
   type: :development
   prerelease: false
-  version_requirements: *70315094859360
+  version_requirements: *70237728944780
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70315094858240 !ruby/object:Gem::Requirement
+  requirement: &70237728944020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +109,10 @@ dependencies:
         version: '2.12'
   type: :development
   prerelease: false
-  version_requirements: *70315094858240
+  version_requirements: *70237728944020
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70315094857060 !ruby/object:Gem::Requirement
+  requirement: &70237728943340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +120,21 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70315094857060
+  version_requirements: *70237728943340
 - !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: &70315095012780 !ruby/object:Gem::Requirement
+  name: mongoid
+  requirement: &70237728942600 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :development
+  prerelease: false
+  version_requirements: *70237728942600
+- !ruby/object:Gem::Dependency
+  name: redis-persistence
+  requirement: &70237728942140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,21 +142,32 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70315095012780
+  version_requirements: *70237728942140
 - !ruby/object:Gem::Dependency
-  name: mongoid
-  requirement: &70315095007180 !ruby/object:Gem::Requirement
+  name: faraday
+  requirement: &70237728941680 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70237728941680
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: &70237728941160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70315095007180
+  version_requirements: *70237728941160
 - !ruby/object:Gem::Dependency
-  name: bson_ext
-  requirement: &70315095095540 !ruby/object:Gem::Requirement
+  name: sqlite3
+  requirement: &70237728940740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70315095095540
+  version_requirements: *70237728940740
 - !ruby/object:Gem::Dependency
-  name: redis-persistence
-  requirement: &70315095094620 !ruby/object:Gem::Requirement
+  name: bson_ext
+  requirement: &70237728940240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +186,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70315095094620
+  version_requirements: *70237728940240
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &70315095088820 !ruby/object:Gem::Requirement
+  requirement: &70237728939820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +197,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70315095088820
+  version_requirements: *70237728939820
 - !ruby/object:Gem::Dependency
   name: oj
-  requirement: &70315095113580 !ruby/object:Gem::Requirement
+  requirement: &70237728939400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +208,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70315095113580
+  version_requirements: *70237728939400
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70315095112560 !ruby/object:Gem::Requirement
+  requirement: &70237728938900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -208,7 +219,7 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70315095112560
+  version_requirements: *70237728938900
 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
@@ -236,6 +247,7 @@ files:
 - lib/tire.rb
 - lib/tire/alias.rb
 - lib/tire/configuration.rb
+- lib/tire/count.rb
 - lib/tire/dsl.rb
 - lib/tire/http/client.rb
 - lib/tire/http/clients/curb.rb
@@ -332,6 +344,7 @@ files:
 - test/test_helper.rb
 - test/unit/active_model_lint_test.rb
 - test/unit/configuration_test.rb
+- test/unit/count_test.rb
 - test/unit/http_client_test.rb
 - test/unit/http_response_test.rb
 - test/unit/index_alias_test.rb
@@ -360,9 +373,14 @@ 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  * 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"
+  \ IMPORTANT CHANGES LATELY:\n\n  * Added the support for the Count API\n  * Escape
+  single quotes in `to_curl` serialization\n  * Added JRuby compatibility\n  * Added
+  proper `as_json` support for `Results::Collection` and `Results::Item` classes\n
+  \ * Added extracting the `routing` information in the `Index#store` method\n  *
+  Refactored the `update_index` method for search and persistence integration\n  *
+  Cast collection properties in Model::Persistence as empty Array by default\n  *
+  Allow passing `:index` option to `MyModel.import`\n  * Update to Mocha ~> 0.13\n
+  \ * Update to MultiJson ~> 1.3\n\n  See the full changelog at <http://github.com/karmi/tire/commits/v0.5.4>.\n\n--------------------------------------------------------------------------------\n"
 rdoc_options:
 - --charset=UTF-8
 require_paths:
@@ -445,6 +463,7 @@ test_files:
 - test/test_helper.rb
 - test/unit/active_model_lint_test.rb
 - test/unit/configuration_test.rb
+- test/unit/count_test.rb
 - test/unit/http_client_test.rb
 - test/unit/http_response_test.rb
 - test/unit/index_alias_test.rb