tire 0.1.13 → 0.1.13.5

data/examples/tire-dsl.rb

@@ -533,6 +533,7 @@ 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/search/facet.rb

@@ -31,6 +31,10 @@ 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/version.rb

@@ -1,15 +1,9 @@
 module Tire
-  VERSION          = "0.1.13"
+  VERSION          = "0.1.13.5"
 
   CHANGELOG =<<-END
     IMPORTANT CHANGES LATELY:
 
-    # Added `<after/before>_update_elastic_search_index` callbacks for models
-    # Search performs GET instead of POST
-    # Added percolator support
-    # Added percolator support for models
-    # CHANGELOG support in gemspec
-    # [FIX] Do not redefine #to_hash in models
-    # [FIX] Added that MyModel#update_elastic_search_index sets _index, _type, _version properties
+    # Added a "query" facet
   END
 end

data/test/fixtures/articles/1.json

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

data/test/integration/facets_test.rb

@@ -76,6 +76,63 @@ 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'].size
+        assert_equal 3, s.results.facets['tags']['terms'].size
       end
 
     end

data/test/unit/search_facet_test.rb

@@ -69,6 +69,15 @@ 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,255 +1,196 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: tire
-version: !ruby/object:Gem::Version 
-  hash: 1
+version: !ruby/object:Gem::Version
+  version: 0.1.13.5
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 13
-  version: 0.1.13
 platform: ruby
-authors: 
+authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-20 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70327507052120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 8
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.8.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rest-client
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70327507052120
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: &70327507051660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.6.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: multi_json
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70327507051660
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: &70327507051120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: activemodel
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70327507051120
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: &70327507050620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70327507050620
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70327507050160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: yajl-ruby
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70327507050160
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: &70327507049660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 8
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.8.0
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: turn
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70327507049660
+- !ruby/object:Gem::Dependency
+  name: turn
+  requirement: &70327507049280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70327507049280
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: &70327507048800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *70327507048800
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &70327507048380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *70327507048380
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &70327507047960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: sdoc
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *70327507047960
+- !ruby/object:Gem::Dependency
+  name: sdoc
+  requirement: &70327507047520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: rcov
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: *70327507047520
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: &70327507037100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: *70327507037100
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &70327507036600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 3
-        - 0
-        - 7
+      - !ruby/object:Gem::Version
         version: 3.0.7
   type: :development
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: supermodel
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: *70327507036600
+- !ruby/object:Gem::Dependency
+  name: supermodel
+  requirement: &70327507036180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id014
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  version_requirements: *70327507036180
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &70327507035720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  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"
+  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"
 email: karmi@karmi.cz
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.markdown
 - MIT-LICENSE
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -336,63 +277,35 @@ 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: |
-  ================================================================================
-  
-    Please check the documentation at <http://karmi.github.com/tire/>.
-  
-  --------------------------------------------------------------------------------
-  
-    IMPORTANT CHANGES LATELY:
-  
-    # Added `<after/before>_update_elastic_search_index` callbacks for models
-    # Search performs GET instead of POST
-    # Added percolator support
-    # Added percolator support for models
-    # CHANGELOG support in gemspec
-    # [FIX] Do not redefine #to_hash in models
-    # [FIX] Added that MyModel#update_elastic_search_index sets _index, _type, _version properties
-  
-    See the full changelog at <http://github.com/karmi/tire/commits/v0.1.13>.
-  
-  --------------------------------------------------------------------------------
-
-rdoc_options: 
+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:
 - --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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: tire
-rubygems_version: 1.5.0
+rubygems_version: 1.8.10
 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