stretcher 1.18.0 → 1.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aab209cb636509b1ea78274d43c5865b7e97f469
-  data.tar.gz: 3db9ef4414c2d1cef9890a1fecc3c4f45a1789d4
+  metadata.gz: 687ea05d11e4a6f9e96deaf8127a85105b170819
+  data.tar.gz: 467daf1b89a43624ea66de6e0fcb4f0575f96d4c
 SHA512:
-  metadata.gz: fa737ad3d822e0411bcd66352f360865299e9eb616833ef1dd2cc9528cc91470f932fca9d39deb2d906b54643ef88fb0e947423b0d8903496e94b914596bf36d
-  data.tar.gz: 6be736d5a2dd82d0aeb10aca7997d2ac57aa86f52c5a549ed3d95ac8707d4e1ed2b77f918e140df46b912ef75372f70933852b9419a168d884bb12a08cbff6f1
+  metadata.gz: aeec19b3c20a5664f6b4be9b42fa01929b40315bb8baf3c75de8d5ca4b6a6655c8f1f1399e37ddb0aaedd73adbba062f4be095af9d10cac1c4782348127f4480
+  data.tar.gz: cacffffb224c51feaec032292e63df52b7ae3017ff72e50692bd0b03992d2953eaf3bd4e7dd331882434d3e53622bf5654631f36f1e307be7cbdb5aad27124c4

data/lib/stretcher/server.rb

@@ -4,8 +4,8 @@ module Stretcher
 
     # Internal use only.
     # Returns a properly configured HTTP client when initializing an instance
-    def self.build_client(uri, options={})
-      http = Faraday.new(:url => uri) do |builder|
+    def self.build_client(uri_components, options={})
+      http = Faraday.new(:url => uri_components) do |builder|
         builder.response :mashify
         builder.response :multi_json, :content_type => /\bjson$/
 
@@ -26,7 +26,6 @@ module Stretcher
         "Content-Type" => "application/json"
       }
 
-      uri_components = URI.parse(uri)
       if uri_components.user || uri_components.password
         http.basic_auth(uri_components.user, uri_components.password)
       end
@@ -73,10 +72,15 @@ module Stretcher
     # For instance:
     # configurator = proc {|builder| builder.adapter :typhoeus
     # Stretcher::Server.new('http://localhost:9200', :faraday_configurator => configurator)
+    #
+    # You may want to set one or both of :read_timeout and :open_timeout, for Faraday's HTTP
+    # settings. The default is read_timeout: 30, open_timeout: 2, which can be quite long
+    # in many situations
     def initialize(uri='http://localhost:9200', options={})
       @request_mtx = Mutex.new
-      @uri = uri
-      @http = self.class.build_client(@uri, options)
+      @uri = uri.to_s
+      @uri_components = URI.parse(@uri)
+      @http = self.class.build_client(@uri_components, options)
       @logger = self.class.build_logger(options)
     end
 
@@ -196,7 +200,7 @@ module Stretcher
 
     # Full path to the server root dir
     def path_uri(path=nil)
-      URI.join(@uri.to_s, path.to_s).to_s
+      URI.join(@uri.to_s, "#{@uri_components.path}/#{path.to_s}").to_s
     end
 
     # Handy way to query the server, returning *only* the body

data/lib/stretcher/version.rb

@@ -1,3 +1,3 @@
 module Stretcher
-  VERSION = "1.18.0"
+  VERSION = "1.18.1"
 end

data/spec/lib/stretcher_server_spec.rb

@@ -102,6 +102,11 @@ describe Stretcher::Server do
       subject { Stretcher::Server.new("http://example.com").path_uri("/foo") }
       it { should eq ("http://example.com/foo") }
     end
+
+    context "server lives in a subdirectory" do
+      subject { Stretcher::Server.new("http://example.com/mysubdir/").path_uri("/foo") }      
+      it { should eq ("http://example.com/mysubdir/foo") }
+    end
   end
 
   describe "#get_alias" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stretcher
 version: !ruby/object:Gem::Version
-  version: 1.18.0
+  version: 1.18.1
 platform: ruby
 authors:
 - Andrew Cholakian