tire 0.3.9 → 0.3.10

data/lib/tire/dsl.rb

@@ -16,11 +16,12 @@ module Tire
         end
 
         response = Configuration.client.post( "#{Configuration.url}/#{indices}/_search", payload)
+        raise Tire::Search::SearchRequestFailed, response.to_s if response.failure?
         json     = MultiJson.decode(response.body)
         results  = Results::Collection.new(json, options)
       end
     rescue Exception => error
-      STDERR.puts "[REQUEST FAILED] #{error.class} #{error.http_body rescue nil}\n"
+      STDERR.puts "[REQUEST FAILED] #{error.class} #{error.message rescue nil}\n"
       raise
     ensure
     end

data/lib/tire/http/response.rb

@@ -16,6 +16,10 @@ module Tire
       def failure?
         ! success?
       end
+
+      def to_s
+        [code, body].join(' : ')
+      end
     end
 
   end

data/lib/tire/index.rb

@@ -11,26 +11,29 @@ module Tire
     def exists?
       @response = Configuration.client.head("#{Configuration.url}/#{@name}")
       @response.success?
+
     ensure
       curl = %Q|curl -I "#{Configuration.url}/#{@name}"|
-      logged(@response.body, 'HEAD', curl) if @response
+      logged('HEAD', curl)
     end
 
     def delete
       @response = Configuration.client.delete "#{Configuration.url}/#{@name}"
-      return @response.success?
+      @response.success?
+
     ensure
       curl = %Q|curl -X DELETE "#{Configuration.url}/#{@name}"|
-      logged(@response.body, 'DELETE', curl)
+      logged('DELETE', curl)
     end
 
     def create(options={})
       @options = options
       @response = Configuration.client.post "#{Configuration.url}/#{@name}", MultiJson.encode(options)
       @response.success? ? @response : false
+
     ensure
       curl = %Q|curl -X POST "#{Configuration.url}/#{@name}" -d '#{MultiJson.encode(options)}'|
-      logged(@response.body, 'CREATE', curl) if @response
+      logged('CREATE', curl)
     end
 
     def mapping
@@ -56,11 +59,9 @@ module Tire
       @response = Configuration.client.post url, document
       MultiJson.decode(@response.body)
 
-    rescue Exception => error
-      raise
     ensure
       curl = %Q|curl -X POST "#{url}" -d '#{document}'|
-      logged(error, "/#{@name}/#{type}/", curl)
+      logged([type, id].join('/'), curl)
     end
 
     def bulk_store documents
@@ -92,9 +93,10 @@ module Tire
         else
           STDERR.puts "[ERROR] Too many exceptions occured, giving up. The HTTP response was: #{error.message}"
         end
+
       ensure
         curl = %Q|curl -X POST "#{Configuration.url}/_bulk" -d '{... data omitted ...}'|
-        logged(error, 'BULK', curl)
+        logged('BULK', curl)
       end
     end
 
@@ -132,14 +134,21 @@ module Tire
       end
       raise ArgumentError, "Please pass a document ID" unless id
 
-      result = Configuration.client.delete "#{Configuration.url}/#{@name}/#{type}/#{id}"
+      url    = "#{Configuration.url}/#{@name}/#{type}/#{id}"
+      result = Configuration.client.delete url
       MultiJson.decode(result.body) if result.success?
+
+    ensure
+      curl = %Q|curl -X DELETE "#{url}"|
+      logged(id, curl)
     end
 
     def retrieve(type, id)
       raise ArgumentError, "Please pass a document ID" unless id
 
-      @response = Configuration.client.get "#{Configuration.url}/#{@name}/#{type}/#{id}"
+      url       = "#{Configuration.url}/#{@name}/#{type}/#{id}"
+      @response = Configuration.client.get url
+
       h = MultiJson.decode(@response.body)
       if Configuration.wrapper == Hash then h
       else
@@ -148,37 +157,37 @@ module Tire
         document.update('id' => h['_id'], '_type' => h['_type'], '_index' => h['_index'], '_version' => h['_version'])
         Configuration.wrapper.new(document)
       end
+
+    ensure
+      curl = %Q|curl -X GET "#{url}"|
+      logged(id, curl)
     end
 
     def refresh
       @response = Configuration.client.post "#{Configuration.url}/#{@name}/_refresh", ''
-    rescue Exception => error
-      raise
+
     ensure
       curl = %Q|curl -X POST "#{Configuration.url}/#{@name}/_refresh"|
-      logged(error, '_refresh', curl)
+      logged('_refresh', curl)
     end
 
     def open(options={})
       # TODO: Remove the duplication in the execute > rescue > ensure chain
       @response = Configuration.client.post "#{Configuration.url}/#{@name}/_open", MultiJson.encode(options)
       MultiJson.decode(@response.body)['ok']
-    rescue Exception => error
-      raise
+
     ensure
       curl = %Q|curl -X POST "#{Configuration.url}/#{@name}/open"|
-      logged(error, '_open', curl)
+      logged('_open', curl)
     end
 
     def close(options={})
-      # TODO: Remove the duplication in the execute > rescue > ensure chain
       @response = Configuration.client.post "#{Configuration.url}/#{@name}/_close", MultiJson.encode(options)
       MultiJson.decode(@response.body)['ok']
-    rescue Exception => error
-      raise
+
     ensure
       curl = %Q|curl -X POST "#{Configuration.url}/#{@name}/_close"|
-      logged(error, '_close', curl)
+      logged('_close', curl)
     end
 
     def analyze(text, options={})
@@ -186,11 +195,10 @@ module Tire
       params  = options.to_param
       @response = Configuration.client.get "#{Configuration.url}/#{@name}/_analyze?#{params}", text
       @response.success? ? MultiJson.decode(@response.body) : false
-    rescue Exception => error
-      raise
+
     ensure
       curl = %Q|curl -X GET "#{Configuration.url}/#{@name}/_analyze?#{params}" -d '#{text}'|
-      logged(error, '_analyze', curl)
+      logged('_analyze', curl)
     end
 
     def register_percolator_query(name, options={}, &block)
@@ -198,21 +206,19 @@ module Tire
 
       @response = Configuration.client.put "#{Configuration.url}/_percolator/#{@name}/#{name}", MultiJson.encode(options)
       MultiJson.decode(@response.body)['ok']
-      rescue Exception => error
-        raise
-      ensure
-        curl = %Q|curl -X PUT "#{Configuration.url}/_percolator/#{@name}/?pretty=1" -d '#{MultiJson.encode(options)}'|
-        logged(error, '_percolator', curl)
+
+    ensure
+      curl = %Q|curl -X PUT "#{Configuration.url}/_percolator/#{@name}/?pretty=1" -d '#{MultiJson.encode(options)}'|
+      logged('_percolator', curl)
     end
 
     def unregister_percolator_query(name)
       @response = Configuration.client.delete "#{Configuration.url}/_percolator/#{@name}/#{name}"
       MultiJson.decode(@response.body)['ok']
-      rescue Exception => error
-        raise
-      ensure
-        curl = %Q|curl -X DELETE "#{Configuration.url}/_percolator/#{@name}"|
-        logged(error, '_percolator', curl)
+
+    ensure
+      curl = %Q|curl -X DELETE "#{Configuration.url}/_percolator/#{@name}"|
+      logged('_percolator', curl)
     end
 
     def percolate(*args, &block)
@@ -229,26 +235,24 @@ module Tire
       @response = Configuration.client.get "#{Configuration.url}/#{@name}/#{type}/_percolate", MultiJson.encode(payload)
       MultiJson.decode(@response.body)['matches']
 
-      rescue Exception => error
-        # raise
-      ensure
-        curl = %Q|curl -X GET "#{Configuration.url}/#{@name}/#{type}/_percolate?pretty=1" -d '#{payload.to_json}'|
-        logged(error, '_percolate', curl)
+    ensure
+      curl = %Q|curl -X GET "#{Configuration.url}/#{@name}/#{type}/_percolate?pretty=1" -d '#{payload.to_json}'|
+      logged('_percolate', curl)
     end
 
-    def logged(error=nil, endpoint='/', curl='')
+    def logged(endpoint='/', curl='')
       if Configuration.logger
+        error = $!
 
         Configuration.logger.log_request endpoint, @name, curl
 
-        code = @response ? @response.code : error.message rescue 200
+        code = @response ? @response.code : error.class rescue 200
 
         if Configuration.logger.level.to_s == 'debug'
-          # FIXME: Depends on RestClient implementation
           body = if @response
             defined?(Yajl) ? Yajl::Encoder.encode(@response.body, :pretty => true) : MultiJson.encode(@response.body)
           else
-            error.http_body rescue ''
+            error.message rescue ''
           end
         else
           body = ''

data/lib/tire/logger.rb

@@ -7,9 +7,9 @@ module Tire
       else
         File.open(device, 'a')
       end
-      @device.sync = true
+      @device.sync = true if @device.respond_to?(:sync)
       @options = options
-      at_exit { @device.close unless @device.closed? }
+      at_exit { @device.close unless @device.closed? } if @device.respond_to?(:closed?) && @device.respond_to?(:close)
     end
 
     def level
@@ -46,8 +46,8 @@ module Tire
       content  = "# #{time}"
       content += " [#{status}]"
       content += " (#{took} msec)" if took
-      content += "\n#\n" unless json == ''
-      json.each_line { |line| content += "# #{line}" } unless json == ''
+      content += "\n#\n" unless json.to_s !~ /\S/
+      json.to_s.each_line { |line| content += "# #{line}" } unless json.to_s !~ /\S/
       content += "\n\n"
       write content
     end

data/lib/tire/search.rb

@@ -8,10 +8,10 @@ module Tire
 
       def initialize(indices=nil, options = {}, &block)
         @indices = Array(indices)
+        @types   = Array(options.delete(:type))
         @options = options
-        @type    = @options[:type]
 
-        @url     = Configuration.url+['/', @indices.join(','), @type, '_search'].compact.join('/').squeeze('/')
+        @url     = Configuration.url+['/', @indices.join(','), @types.join(','), '_search'].compact.join('/').squeeze('/')
 
         block.arity < 1 ? instance_eval(&block) : block.call(self) if block_given?
       end
@@ -69,7 +69,7 @@ module Tire
         @response = Configuration.client.get(@url, self.to_json)
         if @response.failure?
           STDERR.puts "[REQUEST FAILED] #{self.to_curl}\n"
-          raise SearchRequestFailed
+          raise SearchRequestFailed, @response.to_s
         end
         @json     = MultiJson.decode(@response.body)
         @results  = Results::Collection.new(@json, @options)
@@ -119,7 +119,7 @@ module Tire
             body = ''
           end
 
-          Configuration.logger.log_response code || 'N/A', took || 'N/A', body
+          Configuration.logger.log_response code || 'N/A', took || 'N/A', body || 'N/A'
         end
       end
 

data/lib/tire/version.rb

@@ -1,10 +1,10 @@
 module Tire
-  VERSION   = "0.3.9"
+  VERSION   = "0.3.10"
 
   CHANGELOG =<<-END
     IMPORTANT CHANGES LATELY:
 
-    * Added support for filtered queries [#134]
-    * Added support for "custom_score" queries [#133]
+    * Fixes and improvements for Logger    [#142]
+    * Better handling of search exceptions [#145]
   END
 end

data/test/unit/http_response_test.rb

@@ -37,6 +37,10 @@ module Tire
           assert Response.new('NotFound', 404).failure?
         end
 
+        should "return string representation" do
+          assert_equal "200 : Hello", Response.new('Hello', 200).to_s
+        end
+
       end
 
     end

data/test/unit/tire_test.rb

@@ -46,6 +46,13 @@ module Tire
           end
         end
 
+        should "raise SearchRequestFailed when receiving bad response from backend" do
+          assert_raise(Search::SearchRequestFailed) do
+            Tire::Configuration.client.expects(:post).returns( mock_response('INDEX DOES NOT EXIST', 404) )
+            Tire.search 'not-existing', :query => { :query_string => { :query => 'foo' }}
+          end
+        end
+
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tire
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-30 00:00:00.000000000 Z
+date: 2011-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70250440988100 !ruby/object:Gem::Requirement
+  requirement: &70120928192280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *70250440988100
+  version_requirements: *70120928192280
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70250440987640 !ruby/object:Gem::Requirement
+  requirement: &70120928191820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70250440987640
+  version_requirements: *70120928191820
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70250440987180 !ruby/object:Gem::Requirement
+  requirement: &70120928191360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70250440987180
+  version_requirements: *70120928191360
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70250440986720 !ruby/object:Gem::Requirement
+  requirement: &70120928190900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70250440986720
+  version_requirements: *70120928190900
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70250440986260 !ruby/object:Gem::Requirement
+  requirement: &70120928190440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70250440986260
+  version_requirements: *70120928190440
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70250436367320 !ruby/object:Gem::Requirement
+  requirement: &70120928189980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.8.0
   type: :development
   prerelease: false
-  version_requirements: *70250436367320
+  version_requirements: *70120928189980
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70250436365820 !ruby/object:Gem::Requirement
+  requirement: &70120928189600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70250436365820
+  version_requirements: *70120928189600
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70250436364080 !ruby/object:Gem::Requirement
+  requirement: &70120928189140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70250436364080
+  version_requirements: *70120928189140
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70250436362640 !ruby/object:Gem::Requirement
+  requirement: &70120928188640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 3.0.7
   type: :development
   prerelease: false
-  version_requirements: *70250436362640
+  version_requirements: *70120928188640
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70250436361060 !ruby/object:Gem::Requirement
+  requirement: &70120928188140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 2.2.1
   type: :development
   prerelease: false
-  version_requirements: *70250436361060
+  version_requirements: *70120928188140
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70250441020080 !ruby/object:Gem::Requirement
+  requirement: &70120928187760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70250441020080
+  version_requirements: *70120928187760
 - !ruby/object:Gem::Dependency
   name: supermodel
-  requirement: &70250441019620 !ruby/object:Gem::Requirement
+  requirement: &70120928187300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70250441019620
+  version_requirements: *70120928187300
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70250441019180 !ruby/object:Gem::Requirement
+  requirement: &70120932742840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70250441019180
+  version_requirements: *70120932742840
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70250441018760 !ruby/object:Gem::Requirement
+  requirement: &70120934930540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70250441018760
+  version_requirements: *70120934930540
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70250441018340 !ruby/object:Gem::Requirement
+  requirement: &70120934930120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,7 +175,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70250441018340
+  version_requirements: *70120934930120
 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
@@ -289,9 +289,8 @@ 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 support for filtered queries [#134]\n  *
-  Added support for \"custom_score\" queries [#133]\n\n  See the full changelog at
-  <http://github.com/karmi/tire/commits/v0.3.9>.\n\n--------------------------------------------------------------------------------\n"
+  \ IMPORTANT CHANGES LATELY:\n\n  * Fixes and improvements for Logger    [#142]\n
+  \ * Better handling of search exceptions [#145]\n\n  See the full changelog at <http://github.com/karmi/tire/commits/v0.3.10>.\n\n--------------------------------------------------------------------------------\n"
 rdoc_options:
 - --charset=UTF-8
 require_paths: