elementary-rpc 2.1.1.35 → 2.1.1.37

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzI0MzJiODBlMmQzMjgyNTY3NGNkMzczNWVkNWZhNmIyMzU3YzRmNQ==
+    YTY3NTY0NGQwOTgxZmJlM2U2ZWMzMDg3NTY5OThhMmI0NTQzZjU3Mg==
   data.tar.gz: !binary |-
-    ZjUxMzA2MGI2MzMxZWI1YTkwYTc0MDY3NzI2MWVkOThjZWQ2MGI1YQ==
+    YzlmMTdmMWM5ZDFhMzc4NWM2MDY5MTNkZDYyY2YzNGE4YmUzZjk4MQ==
 SHA512:
   metadata.gz: !binary |-
-    ODA3MGM4ZDVhNTcyYmMxNDA5ZmYxZjE2YmVhZmVhNjcxYzJlMDkwNjc0YWI2
-    YWVjZTRhNmNhZmU3ZWY3YWY4YmNiNjhlZWJhMzc1MTk0YWM1MThhOTQyNmQ3
-    YzNjMTQ1NjUwZDJkMTg2NGVhYzI3NWFiNTg5ODQ2Njk1OTUxYmI=
+    MDZiMTlhZTNjNzMxNjIxODViZjEzMmQ3MDZiZDRhNTMwZDcxNjdiNTYyYjJh
+    ZTllYWJmNzQ2MTVjY2YyYTQ2ODQwM2UxOTQ3N2Q1NTVjYzU5MjU1MGIyZmIw
+    Zjc3Zjc0YzA4MmQxMDNiMmRjZTI3NWIwYmE0MjgwNzdlNjU1MGM=
   data.tar.gz: !binary |-
-    Zjc0N2JiNDllNDc4NzRlMTJjZjRjZmUwYWJiOTU4ZGIwYTM0NDBiODc3MmQy
-    NzFmMmVjMDczMDlmMjNjNTQ2NGNiMGNhNDE4NjIxYWIyMTQxNWU1NjRjZTVm
-    YzQ0NDZjMWU4NWYxZWI3NDNmNmViMTA5OGViZmVkOTY0ZDE4ZWQ=
+    MzkwMTc1MjJkNDZiMWJlNzVjNjZiOTMzYzJjZjE1NjU1MzFjZWE2MjNiMzg0
+    ZjU4NmU5YjA3ZWNhYTE2NTdhNWNkMzAyZTY5MjQwZDBlMDRjZTYzMTEwMzZi
+    OWFmMThmMWU1YmU0YjU0YTIxMDAzN2Y3MDY1ZDEyZmEyMDdjYWE=

data/README.md

@@ -54,6 +54,18 @@ def connection
   @connection = Elementary::Connection.new(Echoserv::Simple,
                                              :hosts => hosts)
 end
+# We can also use existing Faraday middleware, since our HTTP transport is built
+# on Faraday:
+c = Elementary::Connection.new(Echoserv::Simple,
+                                :hosts => hosts,
+                                :transport_options => {
+                                  :faraday_middleware => [
+                                    [ FaradayMiddleware::FollowRedirects, :limit => 2 ]
+                                   ]
+                                 })
+
+
+
 # Create a Protobuf message to send over RPC
 msg = Echoserv::String.new(:data => str)
 

data/lib/elementary/transport/http.rb

@@ -48,14 +48,27 @@ module Elementary
       def client
         return @client if @client
 
+        faraday_middleware = @options.delete(:faraday_middleware) || []
         faraday_options = @options.merge({:url => host_url})
         logging = faraday_options.delete(:logging)
         logger = faraday_options.delete(:logger)
+
         @client = Faraday.new(faraday_options) do |f|
           f.request :raise_on_status
           f.response :logger, logger if logging
           f.adapter :net_http_persistent
         end
+
+        # Adapters aren't middleware, so we have to pop the adapter off before
+        # we insert new middleware.  See:
+        # https://github.com/lostisland/faraday/issues/375,
+        # https://github.com/lostisland/faraday/issues/47
+        adapter = @client.builder.handlers.pop
+        faraday_middleware.each do |klass, *args|
+          @client.use klass, *args
+        end
+        @client.builder.handlers << adapter
+
         return @client
       end
     end

data/spec/transport/http_spec.rb

@@ -1,6 +1,9 @@
 require 'spec_helper'
 require 'elementary/transport/http'
 
+class FakeMiddleware1 ; end
+class FakeMiddleware2 ; end
+
 describe Elementary::Transport::HTTP do
   let(:hosts) { [] }
   let(:opts) { {} }
@@ -70,5 +73,28 @@ describe Elementary::Transport::HTTP do
         expect(client).to be_instance_of Faraday::Connection
       end
     end
+
+    context 'with faraday middleware passed to the initializer' do
+      let(:opts) do
+        {
+          :faraday_middleware => [
+            [ FakeMiddleware1, { :middleware_level => 1} ],
+            [ FakeMiddleware2, { :middleware_level => 2} ]
+          ]
+        }
+      end
+
+      it 'should use those middlewares' do
+        expect(client.builder.handlers).to include(FakeMiddleware1)
+        expect(client.builder.handlers).to include(FakeMiddleware2)
+        middleware_opts = client.builder.handlers.map do |h|
+          h.instance_variable_get(:@args)
+        end
+        expect(middleware_opts).to include([{ :middleware_level => 1 }])
+        expect(middleware_opts).to include([{ :middleware_level => 2 }])
+
+        expect(client).to be_instance_of Faraday::Connection
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elementary-rpc
 version: !ruby/object:Gem::Version
-  version: 2.1.1.35
+  version: 2.1.1.37
 platform: ruby
 authors:
 - R. Tyler Croy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2015-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler