tire 0.1.13.5 → 0.1.14

data/examples/tire-dsl.rb

@@ -533,7 +533,6 @@ end
 #
 # * [terms](http://www.elasticsearch.org/guide/reference/api/search/facets/terms-facet.html)
 # * [date](http://www.elasticsearch.org/guide/reference/api/search/facets/date-histogram-facet.html)
-# * [query](http://www.elasticsearch.org/guide/reference/api/search/facets/query-facet.html)
 
 # We have seen that _ElasticSearch_ facets enable us to fetch complex aggregations from our data.
 #

data/lib/tire/index.rb

@@ -275,7 +275,11 @@ module Tire
 
         if Configuration.logger.level.to_s == 'debug'
           # FIXME: Depends on RestClient implementation
-          body = @response ? MultiJson.encode(@response.body, :pretty => true) : error.http_body rescue ''
+          body = if @response
+            defined?(Yajl) ? Yajl::Encoder.encode(@json, :pretty => true) : MultiJson.encode(@json)
+          else
+            error.http_body rescue ''
+          end
         else
           body = ''
         end

data/lib/tire/results/collection.rb

@@ -5,49 +5,56 @@ module Tire
       include Enumerable
       include Pagination
 
-      attr_reader :time, :total, :options, :results, :facets
+      attr_reader :time, :total, :options, :facets
 
       def initialize(response, options={})
-        @options = options
-        @time    = response['took'].to_i
-        @total   = response['hits']['total'].to_i
-        @results = response['hits']['hits'].map do |h|
-                     if Configuration.wrapper == Hash then h
-                     else
-                       document = {}
-
-                       # Update the document with content and ID
-                       document = h['_source'] ? document.update( h['_source'] || {} ) : document.update( h['fields'] || {} )
-                       document.update( {'id' => h['_id']} )
-
-                       # Update the document with meta information
-                       ['_score', '_type', '_index', '_version', 'sort', 'highlight'].each { |key| document.update( {key => h[key]} || {} ) }
-
-                       object = Configuration.wrapper.new(document)
-                       # TODO: Figure out how to circumvent mass assignment protection for id in ActiveRecord
-                       object.id = h['_id'] if object.respond_to?(:id=)
-                       # TODO: Figure out how mark record as "not new record" in ActiveRecord
-                       object.instance_variable_set(:@new_record, false) if object.respond_to?(:new_record?)
-                       object
-                     end
-                   end
-        @facets  = response['facets']
+        @response = response
+        @options  = options
+        @time     = response['took'].to_i
+        @total    = response['hits']['total'].to_i
+        @facets   = response['facets']
+        @wrapper  = Configuration.wrapper
+      end
+
+      def results
+        @results ||= begin
+          @response['hits']['hits'].map do |h|
+             if @wrapper == Hash then h
+             else
+               document = {}
+
+               # Update the document with content and ID
+               document = h['_source'] ? document.update( h['_source'] || {} ) : document.update( h['fields'] || {} )
+               document.update( {'id' => h['_id']} )
+
+               # Update the document with meta information
+               ['_score', '_type', '_index', '_version', 'sort', 'highlight'].each { |key| document.update( {key => h[key]} || {} ) }
+
+               # for instantiating ActiveRecord with arbitrary attributes and setting @new_record etc.
+               if @wrapper.respond_to?(:instantiate, true)
+                 @wrapper.send(:instantiate, document)
+               else
+                 @wrapper.new(document)
+               end
+             end
+           end
+        end
       end
 
       def each(&block)
-        @results.each(&block)
+        results.each(&block)
       end
 
       def empty?
-        @results.empty?
+        results.empty?
       end
 
       def size
-        @results.size
+        results.size
       end
 
       def [](index)
-        @results[index]
+        results[index]
       end
 
       def to_ary

data/lib/tire/search/facet.rb

@@ -31,10 +31,6 @@ module Tire
         @value = { :range => { :field => field, :ranges => ranges }.update(options) }
       end
 
-      def query(&block)
-        @value = { :query => Query.new(&block).to_hash }
-      end
-
       def to_json
         to_hash.to_json
       end

data/lib/tire/search.rb

@@ -107,7 +107,11 @@ module Tire
 
           if Configuration.logger.level.to_s == 'debug'
             # FIXME: Depends on RestClient implementation
-            body = @response ? MultiJson.encode(@json, :pretty => true) : body = error.http_body
+            body = if @response
+              defined?(Yajl) ? Yajl::Encoder.encode(@json, :pretty => true) : MultiJson.encode(@json)
+            else
+              error.http_body rescue ''
+            end
           else
             body = ''
           end

data/lib/tire/version.rb

@@ -1,9 +1,12 @@
 module Tire
-  VERSION          = "0.1.13.5"
+  VERSION          = "0.1.14"
 
   CHANGELOG =<<-END
     IMPORTANT CHANGES LATELY:
 
-    # Added a "query" facet
+    # Added `<after/before>_update_elastic_search_index` callbacks for models
+    # Added percolator support for DSL and ActiveModel
+    # Lazy loading of ResultsCollection into memory
+    # Fixes for debug logging
   END
 end

data/test/fixtures/articles/1.json

@@ -1 +1 @@
-{"title" : "One", "tags" : ["ruby"], "published_on" : "2011-01-01", "draft" : true}
+{"title" : "One", "tags" : ["ruby"], "published_on" : "2011-01-01"}

data/test/integration/facets_test.rb

@@ -76,63 +76,6 @@ module Tire
 
       end
 
-      context "query facets" do
-
-        should "return aggregated values for string query" do
-          s = Tire.search('articles-test') do
-            facet 'tees' do
-              query { string 'T*' }
-            end
-          end
-
-          count = s.results.facets['tees']['count']
-          assert_equal 2, count, s.results.facets['tees'].inspect
-        end
-
-        should "return aggregated values for a string query" do
-          s = Tire.search('articles-test') do
-            facet 'tees' do
-              query { string 'T*' }
-            end
-          end
-
-          count = s.results.facets['tees']['count']
-          assert_equal 2, count, s.results.facets['tees'].inspect
-        end
-
-        should "return aggregated values for _exists_ string query" do
-          s = Tire.search('articles-test') do
-            facet 'drafts' do
-              query { string '_exists_:draft' }
-            end
-          end
-
-          count = s.results.facets['drafts']['count']
-          assert_equal 1, count, s.results.facets['drafts'].inspect
-        end
-
-        should "return aggregated values for a terms query" do
-          s = Tire.search('articles-test') do
-            facet 'friends' do
-              query { terms :tags, ['ruby', 'python'] }
-            end
-          end
-
-          count = s.results.facets['friends']['count']
-          assert_equal 2, count, s.results.facets['friends'].inspect
-
-          s = Tire.search('articles-test') do
-            facet 'friends' do
-              query { terms :tags, ['ruby', 'python'], :minimum_match => 2 }
-            end
-          end
-
-          count = s.results.facets['friends']['count']
-          assert_equal 1, count, s.results.facets['friends'].inspect
-        end
-
-      end
-
     end
 
   end

data/test/integration/filters_test.rb

@@ -36,7 +36,7 @@ module Tire
         end
 
         assert_equal 1, s.results.count
-        assert_equal 3, s.results.facets['tags']['terms'].size
+        assert_equal 3, s.results.facets['tags'].size
       end
 
     end

data/test/unit/results_collection_test.rb

@@ -37,6 +37,11 @@ module Tire
         end
       end
 
+      should "be populated lazily" do
+        collection = Results::Collection.new(@default_response)
+        assert_nil collection.instance_variable_get(:@results)
+      end
+
       should "store passed options" do
         collection = Results::Collection.new( @default_response, :per_page => 20, :page => 2 )
         assert_equal 20, collection.options[:per_page]

data/test/unit/search_facet_test.rb

@@ -69,15 +69,6 @@ module Tire::Search
         end
       end
 
-      context "query facet" do
-        should "encode facet options" do
-          f = Facet.new('q_facet') do
-            query { string '_exists_:foo' }
-          end
-          assert_equal({ :q_facet => { :query => { :query_string => { :query => '_exists_:foo' } } } }.to_json, f.to_json)
-        end
-      end
-
     end
 
   end

metadata

@@ -1,196 +1,255 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: tire
-version: !ruby/object:Gem::Version
-  version: 0.1.13.5
+version: !ruby/object:Gem::Version 
+  hash: 7
   prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 14
+  version: 0.1.14
 platform: ruby
-authors:
+authors: 
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-06 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-06-27 00:00:00 +02:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &70327507052120 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 8
+        - 0
         version: 0.8.0
   type: :runtime
-  prerelease: false
-  version_requirements: *70327507052120
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rest-client
-  requirement: &70327507051660 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 6
+        - 0
         version: 1.6.0
   type: :runtime
-  prerelease: false
-  version_requirements: *70327507051660
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: multi_json
-  requirement: &70327507051120 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70327507051120
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: activemodel
-  requirement: &70327507050620 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70327507050620
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &70327507050160 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
   type: :development
-  prerelease: false
-  version_requirements: *70327507050160
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: yajl-ruby
-  requirement: &70327507049660 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 8
+        - 0
         version: 0.8.0
   type: :development
-  prerelease: false
-  version_requirements: *70327507049660
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: turn
-  requirement: &70327507049280 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70327507049280
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: shoulda
-  requirement: &70327507048800 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70327507048800
-- !ruby/object:Gem::Dependency
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: mocha
-  requirement: &70327507048380 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70327507048380
-- !ruby/object:Gem::Dependency
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   name: rdoc
-  requirement: &70327507047960 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70327507047960
-- !ruby/object:Gem::Dependency
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
   name: sdoc
-  requirement: &70327507047520 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70327507047520
-- !ruby/object:Gem::Dependency
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &70327507037100 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70327507037100
-- !ruby/object:Gem::Dependency
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
   name: activerecord
-  requirement: &70327507036600 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 3
+        - 0
+        - 7
         version: 3.0.7
   type: :development
-  prerelease: false
-  version_requirements: *70327507036600
-- !ruby/object:Gem::Dependency
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
   name: supermodel
-  requirement: &70327507036180 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70327507036180
-- !ruby/object:Gem::Dependency
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
   name: sqlite3
-  requirement: &70327507035720 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70327507035720
-description: ! "   Tire is a Ruby client for the ElasticSearch search engine/database.\n\n
-  \  It provides Ruby-like API for fluent communication with the ElasticSearch server\n
-  \  and blends with ActiveModel class for convenient usage in Rails applications.\n\n
-  \  It allows to delete and create indices, define mapping for them, supports\n   the
-  bulk API, and presents an easy-to-use DSL for constructing your queries.\n\n   It
-  has full ActiveRecord/ActiveModel compatibility, allowing you to index\n   your
-  models (incrementally upon saving, or in bulk), searching and\n   paginating the
-  results.\n\n   Please check the documentation at <http://karmi.github.com/tire/>.\n"
+  version_requirements: *id015
+description: "   Tire is a Ruby client for the ElasticSearch search engine/database.\n\n   It provides Ruby-like API for fluent communication with the ElasticSearch server\n   and blends with ActiveModel class for convenient usage in Rails applications.\n\n   It allows to delete and create indices, define mapping for them, supports\n   the bulk API, and presents an easy-to-use DSL for constructing your queries.\n\n   It has full ActiveRecord/ActiveModel compatibility, allowing you to index\n   your models (incrementally upon saving, or in bulk), searching and\n   paginating the results.\n\n   Please check the documentation at <http://karmi.github.com/tire/>.\n"
 email: karmi@karmi.cz
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.markdown
 - MIT-LICENSE
-files:
+files: 
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -277,35 +336,60 @@ files:
 - test/unit/search_test.rb
 - test/unit/tire_test.rb
 - tire.gemspec
+has_rdoc: true
 homepage: http://github.com/karmi/tire
 licenses: []
-post_install_message: ! "================================================================================\n\n
-  \ Please check the documentation at <http://karmi.github.com/tire/>.\n\n--------------------------------------------------------------------------------\n\n
-  \ IMPORTANT CHANGES LATELY:\n\n  # Added a \"query\" facet\n\n  See the full changelog
-  at <http://github.com/karmi/tire/commits/v0.1.13.5>.\n\n--------------------------------------------------------------------------------\n"
-rdoc_options:
+
+post_install_message: |
+  ================================================================================
+  
+    Please check the documentation at <http://karmi.github.com/tire/>.
+  
+  --------------------------------------------------------------------------------
+  
+    IMPORTANT CHANGES LATELY:
+  
+    # Added `<after/before>_update_elastic_search_index` callbacks for models
+    # Added percolator support for DSL and ActiveModel
+    # Lazy loading of ResultsCollection into memory
+    # Fixes for debug logging
+  
+    See the full changelog at <http://github.com/karmi/tire/commits/v0.1.14>.
+  
+  --------------------------------------------------------------------------------
+
+rdoc_options: 
 - --charset=UTF-8
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 23
+      segments: 
+      - 1
+      - 3
+      - 6
       version: 1.3.6
 requirements: []
+
 rubyforge_project: tire
-rubygems_version: 1.8.10
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Ruby client for ElasticSearch
-test_files:
+test_files: 
 - test/fixtures/articles/1.json
 - test/fixtures/articles/2.json
 - test/fixtures/articles/3.json