tire 0.3.6 → 0.3.7

data/Rakefile

@@ -26,7 +26,7 @@ end
 
 # Generate documentation
 begin
-  begin; require 'sdoc'; rescue LoadError; end
+  require 'rdoc'
   require 'rdoc/task'
   Rake::RDocTask.new do |rdoc|
     rdoc.rdoc_dir = 'rdoc'

data/lib/tire/model/search.rb

@@ -89,6 +89,9 @@ module Tire
             block.arity < 1 ? s.instance_eval(&block) : block.call(s)
           else
             s.query { string query }
+            # TODO: Actualy, allow passing all the valid options from
+            # <http://www.elasticsearch.org/guide/reference/api/search/uri-request.html>
+            s.fields Array(options[:fields]) if options[:fields]
           end
 
           s.perform.results

data/lib/tire/search/facet.rb

@@ -17,13 +17,13 @@ module Tire
       def terms(field, options={})
         size      = options.delete(:size) || 10
         all_terms = options.delete(:all_terms) || false
-        @value = { :terms => { :field => field, :size => size, :all_terms => all_terms } }.update(options)
+        @value = { :terms => { :field => field, :size => size, :all_terms => all_terms }.update(options) }
         self
       end
 
       def date(field, options={})
         interval = options.delete(:interval) || 'day'
-        @value = { :date_histogram => { :field => field, :interval => interval } }.update(options)
+        @value = { :date_histogram => { :field => field, :interval => interval }.update(options) }
         self
       end
 

data/lib/tire/version.rb

@@ -1,5 +1,5 @@
 module Tire
-  VERSION   = "0.3.6"
+  VERSION   = "0.3.7"
 
   CHANGELOG =<<-END
     IMPORTANT CHANGES LATELY:
@@ -7,6 +7,7 @@ module Tire
     * Fixed a bug: `Results::Item` was referencing Ruby classes incorrectly within Rails
     * Added support for the Analyze API (#124)
     * Added support for adding multiple filters (#122)
-
+    * Fixed incorrect passing of options in the `date` and `terms` facets
+    * Removed SDoc since it breaks with current RDoc
   END
 end

data/test/unit/model_search_test.rb

@@ -160,8 +160,8 @@ module Tire
           setup do
             @q = 'foo AND bar'
 
-            Tire::Search::Query.any_instance.expects(:string).with( @q ).returns(@stub)
-            Tire::Search::Search.any_instance.expects(:perform).returns(@stub)
+            Tire::Search::Query.any_instance.expects(:string).at_least_once.with(@q).returns(@stub)
+            Tire::Search::Search.any_instance.expects(:perform).at_least_once.returns(@stub)
           end
 
           should "search for query string" do
@@ -213,6 +213,14 @@ module Tire
             ActiveModelArticle.search @q, :per_page => 10, :page => 3
           end
 
+          should "allow to limit returned fields" do
+            Tire::Search::Search.any_instance.expects(:fields).with(["id"])
+            ActiveModelArticle.search @q, :fields => 'id'
+
+            Tire::Search::Search.any_instance.expects(:fields).with(["id", "title"])
+            ActiveModelArticle.search @q, :fields => ['id', 'title']
+          end
+
         end
 
         should "not set callback when hooks are missing" do

data/test/unit/search_facet_test.rb

@@ -46,6 +46,11 @@ module Tire::Search
           assert_equal true, Facet.new('foo') { terms :foo, :all_terms => true }.to_hash['foo'][:terms][:all_terms]
         end
 
+        should "encode custom options" do
+          assert_equal( { :foo => { :terms => {:field=>'bar',:size=>5,:all_terms=>false,:exclude=>['moo']} } }.to_json,
+                        Facet.new('foo').terms(:bar, :size => 5, :exclude => ['moo']).to_json )
+        end
+
       end
 
       context "date histogram" do
@@ -60,6 +65,12 @@ module Tire::Search
           assert_equal({ :date => { :date_histogram => { :field => 'published_on', :interval => 'month' } } }.to_json, f.to_json)
         end
 
+        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,
+                        f.to_json )
+        end
+
       end
 
       context "range facet" do

data/tire.gemspec

@@ -45,7 +45,6 @@ Gem::Specification.new do |s|
   # These gems are not needed for CI at <http://travis-ci.org/#!/karmi/tire>
   #
   unless ENV["CI"]
-    s.add_development_dependency "sdoc"
     s.add_development_dependency "rdoc"
     s.add_development_dependency "rcov"
     s.add_development_dependency "turn"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tire
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-18 00:00:00.000000000 Z
+date: 2011-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70265158105660 !ruby/object:Gem::Requirement
+  requirement: &70198841382160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *70265158105660
+  version_requirements: *70198841382160
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70265158105100 !ruby/object:Gem::Requirement
+  requirement: &70198841378280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70265158105100
+  version_requirements: *70198841378280
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70265158104600 !ruby/object:Gem::Requirement
+  requirement: &70198841370400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70265158104600
+  version_requirements: *70198841370400
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70265158103940 !ruby/object:Gem::Requirement
+  requirement: &70198847329580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70265158103940
+  version_requirements: *70198847329580
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70265158102840 !ruby/object:Gem::Requirement
+  requirement: &70198847328740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70265158102840
+  version_requirements: *70198847328740
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70265158097660 !ruby/object:Gem::Requirement
+  requirement: &70198847327820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.8.0
   type: :development
   prerelease: false
-  version_requirements: *70265158097660
+  version_requirements: *70198847327820
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70265158097280 !ruby/object:Gem::Requirement
+  requirement: &70198847327040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70265158097280
+  version_requirements: *70198847327040
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70265158096780 !ruby/object:Gem::Requirement
+  requirement: &70198847326380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70265158096780
+  version_requirements: *70198847326380
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70265158096280 !ruby/object:Gem::Requirement
+  requirement: &70198847325540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 3.0.7
   type: :development
   prerelease: false
-  version_requirements: *70265158096280
+  version_requirements: *70198847325540
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70265158095780 !ruby/object:Gem::Requirement
+  requirement: &70198847324900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 2.2.1
   type: :development
   prerelease: false
-  version_requirements: *70265158095780
+  version_requirements: *70198847324900
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70265158095380 !ruby/object:Gem::Requirement
+  requirement: &70198847324500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70265158095380
+  version_requirements: *70198847324500
 - !ruby/object:Gem::Dependency
   name: supermodel
-  requirement: &70265158094900 !ruby/object:Gem::Requirement
+  requirement: &70198847324040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,21 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70265158094900
-- !ruby/object:Gem::Dependency
-  name: sdoc
-  requirement: &70265158094460 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70265158094460
+  version_requirements: *70198847324040
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70265158094040 !ruby/object:Gem::Requirement
+  requirement: &70198847323580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70265158094040
+  version_requirements: *70198847323580
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70265158093620 !ruby/object:Gem::Requirement
+  requirement: &70198847322960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70265158093620
+  version_requirements: *70198847322960
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70265158093160 !ruby/object:Gem::Requirement
+  requirement: &70198847312220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,7 +175,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70265158093160
+  version_requirements: *70198847312220
 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
@@ -299,8 +288,9 @@ post_install_message: ! "=======================================================
   \ Please check the documentation at <http://karmi.github.com/tire/>.\n\n--------------------------------------------------------------------------------\n\n
   \ IMPORTANT CHANGES LATELY:\n\n  * Fixed a bug: `Results::Item` was referencing
   Ruby classes incorrectly within Rails\n  * Added support for the Analyze API (#124)\n
-  \ * Added support for adding multiple filters (#122)\n\n\n  See the full changelog
-  at <http://github.com/karmi/tire/commits/v0.3.6>.\n\n--------------------------------------------------------------------------------\n"
+  \ * Added support for adding multiple filters (#122)\n  * Fixed incorrect passing
+  of options in the `date` and `terms` facets\n  * Removed SDoc since it breaks with
+  current RDoc\n\n  See the full changelog at <http://github.com/karmi/tire/commits/v0.3.7>.\n\n--------------------------------------------------------------------------------\n"
 rdoc_options:
 - --charset=UTF-8
 require_paths: