tire 0.1.5 → 0.1.6

data/lib/tire/search.rb

@@ -22,7 +22,7 @@ module Tire
       end
 
       def sort(&block)
-        @sort = Sort.new(&block)
+        @sort = Sort.new(&block).to_ary
         self
       end
 
@@ -91,7 +91,7 @@ module Tire
         request.update( { :size => @size } )       if @size
         request.update( { :from => @from } )       if @from
         request.update( { :fields => @fields } )   if @fields
-        MultiJson.encode(request)
+        request.to_json
       end
 
       def logged(error=nil)

data/lib/tire/search/sort.rb

@@ -20,6 +20,10 @@ module Tire
         self
       end
 
+      def to_ary
+        @value
+      end
+
       def to_json
         @value.to_json
       end

data/lib/tire/tasks.rb

@@ -52,8 +52,9 @@ namespace :tire do
     end
 
     unless index.exists?
-      puts "[IMPORT] Creating index '#{index.name}' with mapping:",
-           MultiJson.encode(klass.mapping_to_hash, :pretty => true)
+      mapping = defined?(Yajl) ? Yajl::Encoder.encode(klass.mapping_to_hash, :pretty => true) :
+                                 MultiJson.encode(klass.mapping_to_hash)
+      puts "[IMPORT] Creating index '#{index.name}' with mapping:", mapping
       index.create :mappings => klass.mapping_to_hash
     end
 

data/lib/tire/version.rb

@@ -1,3 +1,3 @@
 module Tire
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/test/unit/logger_test.rb

@@ -66,12 +66,16 @@ module Tire
 
       should "log request in correct format" do
         log = (<<-"log;").gsub(/^ +/, '')
-          # 2011-03-19 11:00:00:#{RUBY_VERSION < "1.9" ? "L" : "000"} [_search] (["articles", "users"])
+          # 2011-03-19 11:00:00:000 [_search] (["articles", "users"])
           #
           curl -X GET http://...
 
         log;
-        @logger.expects(:write).with(log)
+        @logger.expects(:write).with do |payload|
+          payload =~ Regexp.new( Regexp.escape('2011-03-19 11:00:00') )
+          payload =~ Regexp.new( Regexp.escape('_search') )
+          payload =~ Regexp.new( Regexp.escape('(["articles", "users"])') )
+        end
         @logger.log_request('_search', ["articles", "users"], 'curl -X GET http://...')
       end
 
@@ -98,13 +102,20 @@ module Tire
         }
         json;
         log  = (<<-"log;").gsub(/^\s*/, '')
-          # 2011-03-19 11:00:00:#{RUBY_VERSION < "1.9" ? "L" : "000"} [200 OK] (4 msec)
+          # 2011-03-19 11:00:00:000 [200 OK] (4 msec)
           #
         log;
         # log += json.split.map { |line| "# #{line}" }.join("\n")
         json.each_line { |line| log += "# #{line}" }
         log += "\n\n"
-        @logger.expects(:write).with(log)
+        @logger.expects(:write).with do |payload|
+          payload =~ Regexp.new( Regexp.escape('2011-03-19 11:00:00') )
+          payload =~ Regexp.new( Regexp.escape('[200 OK]') )
+          payload =~ Regexp.new( Regexp.escape('(4 msec)') )
+          payload =~ Regexp.new( Regexp.escape('took') )
+          payload =~ Regexp.new( Regexp.escape('hits') )
+          payload =~ Regexp.new( Regexp.escape('_score') )
+        end
         @logger.log_response('200 OK', 4, json)
       end
 

data/test/unit/{rubyext_hash_test.rb → rubyext_test.rb}

@@ -41,6 +41,14 @@ module Tire
 
     end
 
+    context "Array" do
+
+      should "encode itself to JSON" do
+        assert_equal '["one","two"]', ['one','two'].to_json
+      end
+
+    end
+
   end
 
 end

data/test/unit/search_filter_test.rb

@@ -24,12 +24,18 @@ module Tire::Search
                       Filter.new('geo_distance', { :distance => '12km', :location => [40, -70] }).to_json )
       end
 
-      should "encode 'or' filter declarations as JSON" do
+      should "encode 'or' filter with multiple other filters" do
         # See http://www.elasticsearch.org/guide/reference/query-dsl/or-filter.html
         assert_equal( { :or => [ {:terms => {:tags => ['foo']}}, {:terms => {:tags => ['bar']}} ] }.to_json,
                       Filter.new('or', {:terms => {:tags => ['foo']}}, {:terms => {:tags => ['bar']}}).to_json )
       end
 
+      should "encode 'bool' filter with multiple filters" do
+        # http://www.elasticsearch.org/guide/reference/query-dsl/bool-filter.html
+        assert_equal( { :bool => [ {:must => {:terms => {:tags => ['foo']}}}, {:should => {:terms => {:tags => ['bar']}}} ] }.to_json,
+                      Filter.new('bool', {:must => {:terms => {:tags => ['foo']}}}, { :should => {:terms => {:tags => ['bar']}}}).to_json )
+      end
+
     end
 
   end

data/tire.gemspec

@@ -24,11 +24,11 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = ">= 1.3.6"
 
-  s.add_dependency "rake",        "~> 0.8.0"
+  s.add_dependency "rake",        ">= 0.8.0"
   s.add_dependency "bundler",     "~> 1.0.0"
   s.add_dependency "rest-client", "~> 1.6.0"
   s.add_dependency "multi_json",  "~> 1.0"
-  s.add_dependency "activemodel", "~> 3.0.7"
+  s.add_dependency "activemodel", "~> 3.0"
 
   s.add_development_dependency "yajl-ruby",   "~> 0.8.0"
   s.add_development_dependency "turn"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tire
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Karel Minarik
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-04 00:00:00 +02:00
+date: 2011-06-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,7 +24,7 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 63
         segments: 
@@ -89,12 +89,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 7
         segments: 
         - 3
         - 0
-        - 7
-        version: 3.0.7
+        version: "3.0"
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -312,7 +311,7 @@ files:
 - test/unit/model_search_test.rb
 - test/unit/results_collection_test.rb
 - test/unit/results_item_test.rb
-- test/unit/rubyext_hash_test.rb
+- test/unit/rubyext_test.rb
 - test/unit/search_facet_test.rb
 - test/unit/search_filter_test.rb
 - test/unit/search_highlight_test.rb
@@ -396,7 +395,7 @@ test_files:
 - test/unit/model_search_test.rb
 - test/unit/results_collection_test.rb
 - test/unit/results_item_test.rb
-- test/unit/rubyext_hash_test.rb
+- test/unit/rubyext_test.rb
 - test/unit/search_facet_test.rb
 - test/unit/search_filter_test.rb
 - test/unit/search_highlight_test.rb