elasticsearch-transport 1.0.2 → 1.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Mjg2ZWE4ZDY1YzIzNGQxMDAyOTEwNzc4MjYzZmZjYTJmZmZmZTY4Yg==
+    ZWFlNjhjYzk0N2Q0NGE0OTVkNzc5ODY3Y2Q2YTQ0YTVmMjgwOWYwYg==
   data.tar.gz: !binary |-
-    YzgwYzI0MjYzMGFhZWI2N2Y4ZjEwYTFiNGEwMzExOTI0ODViMGIxOA==
+    ZTIyNzc1OGM0YzE3YWNiMDYzZjcyZjljYjMzNzA4OWI5MDNhMGM0Mw==
 SHA512:
   metadata.gz: !binary |-
-    NDRlODJhYjlhOGMzMTljZWI5YWRlOTcwY2JmNjM1M2NkNzA3ZTU1OTgwYzcx
-    YTYxYWRkODZhYzk3ZmVmODRjMzI3NDQwZjFiYTJkYTBlMGNkNzg0MTY2ODdh
-    ZjQzYmFjMDA4ODZlMjUwZTc5NGE0NDBmYzIxMWViYzg2ZjAxM2E=
+    YmQzY2JiODk5Yjg3Njc0ZmY3MWU4N2IwOTRmN2IzYjhmYjExYjczNGI2M2Rj
+    OTE5NDVkNTNkNGY1N2E4MDRmN2FlODI1MTQ5OGE0MDU5MTg2YWIyMTU0MGY5
+    NjY2ZWRmMmZmYmE0MmVjNGMzMGQyMGEwYjk1YWFjMjgxNmIyNTY=
   data.tar.gz: !binary |-
-    YTdjYmUzMGI0NzU0ZGJkOTYxMTAzYmVhM2U4MzEwYmI2YmJiYjEyNzAzM2I4
-    ZTcwOTcyMDNkZjdlZTg0YTRlYzk2OWQ3MWI2ZTVlZmJmNWI5MmU3ZWNjOWZj
-    MDMzMDhlOWIyNjBjODI4ZGZiMzYwNjQxYTVkMWI2YWU5MjAzYTA=
+    YjEwZmI5YjIyYWNlMzM0ZGY1NmU3MzRiNDZmMGJlZjhmMTNjMDNjOTZiNGQx
+    ZDI1MjYyMjhkN2U3NjJkOTE5ZjNhMmQ2MDkxMzIxODQxYmZjYzdhY2UyZTk2
+    YWQyYzc0OGE2NWJmZDMzMTNmMGExZGEzN2I5MGJmNDFmMDQ0OGE=

data/README.md

@@ -28,8 +28,12 @@ Features overview:
 * Node reloading (based on cluster state) on errors or on demand
 
 For optimal performance, you should use a HTTP library which supports persistent ("keep-alive") connections,
-e.g. [Typhoeus](https://github.com/typhoeus/typhoeus) or [Patron](https://github.com/toland/patron).
-Just `require 'typhoeus'` or `require 'patron'` in your code, and it will be used.
+e.g. [Patron](https://github.com/toland/patron) or [Typhoeus](https://github.com/typhoeus/typhoeus).
+Just `require 'patron'` or `require 'typhoeus'; require 'typhoeus/adapters/faraday'` in your code,
+and it will be automatically used; other automatically used libraries are
+[HTTPClient](https://rubygems.org/gems/httpclient) and
+[Net::HTTP::Persistent](https://rubygems.org/gems/net-http-persistent).
+
 For detailed information, see example configurations [below](#transport-implementations).
 
 ## Installation

data/lib/elasticsearch/transport/transport/http/faraday.rb

@@ -18,11 +18,12 @@ module Elasticsearch
           #
           def perform_request(method, path, params={}, body=nil)
             super do |connection, url|
-              connection.connection.run_request \
+              response = connection.connection.run_request \
                 method.downcase.to_sym,
                 url,
                 ( body ? __convert_to_json(body) : nil ),
                 {}
+              Response.new response.status, response.body, response.headers
             end
           end
 

data/lib/elasticsearch/transport/transport/response.rb

@@ -12,6 +12,7 @@ module Elasticsearch
         # @param headers [Hash]    Response headers
         def initialize(status, body, headers={})
           @status, @body, @headers = status, body, headers
+          @body = body.force_encoding('UTF-8') if body.respond_to?(:force_encoding)
         end
       end
 

data/lib/elasticsearch/transport/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Transport
-    VERSION = "1.0.2"
+    VERSION = "1.0.4"
   end
 end

data/test/unit/response_test.rb

@@ -0,0 +1,15 @@
+require 'test_helper'
+
+class Elasticsearch::Transport::Transport::ResponseTest < Test::Unit::TestCase
+  context "Response" do
+
+    should "force-encode the body into UTF" do
+      body = "Hello Encoding!".encode(Encoding::ISO_8859_1)
+      assert_equal 'ISO-8859-1', body.encoding.name
+
+      response = Elasticsearch::Transport::Transport::Response.new 200, body
+      assert_equal 'UTF-8', response.body.encoding.name
+    end unless RUBY_1_8
+
+  end
+end

data/test/unit/transport_faraday_test.rb

@@ -25,6 +25,12 @@ class Elasticsearch::Transport::Transport::HTTP::FaradayTest < Test::Unit::TestC
       @transport.perform_request 'GET', '/'
     end
 
+    should "return a Response" do
+      @transport.connections.first.connection.expects(:run_request).returns(stub_everything)
+      response = @transport.perform_request 'GET', '/'
+      assert_instance_of Elasticsearch::Transport::Transport::Response, response
+    end
+
     should "properly prepare the request" do
       @transport.connections.first.connection.expects(:run_request).with do |method, url, body, headers|
         :post == method && '{"foo":"bar"}' == body

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-transport
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-22 00:00:00.000000000 Z
+date: 2014-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -358,6 +358,7 @@ files:
 - test/unit/connection_collection_test.rb
 - test/unit/connection_selector_test.rb
 - test/unit/connection_test.rb
+- test/unit/response_test.rb
 - test/unit/serializer_test.rb
 - test/unit/sniffer_test.rb
 - test/unit/transport_base_test.rb
@@ -397,6 +398,7 @@ test_files:
 - test/unit/connection_collection_test.rb
 - test/unit/connection_selector_test.rb
 - test/unit/connection_test.rb
+- test/unit/response_test.rb
 - test/unit/serializer_test.rb
 - test/unit/sniffer_test.rb
 - test/unit/transport_base_test.rb