attune 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa77fa0fcbd44e02a0b3a26e722a76f3e7fabbff
-  data.tar.gz: bc15acc01376c94db3192f81a90d114aa6040e91
+  metadata.gz: 45c59186f1dcdeca6c980301341d727d19de096a
+  data.tar.gz: ea00f9ff82b7b97f16b47eaebf4da9c0d02312fb
 SHA512:
-  metadata.gz: 04272c55ef9a1f7095a2e77beaf008451aa73bf115fc5f99cf791f34e76e1dad2ffda8c3f1fde06b40203530fd6643822c563bd389772430b1f3ec9dbcb04b34
-  data.tar.gz: b95899dd52c6d526944569c775bfae2e942bfda23766b346792bfb68f28a0c6bc1103055ae9f5e86f1199842b788719348ef24f49d6fb888b2ba4585ce0600e6
+  metadata.gz: ce5686a15ec87759aec89f089bed2f5b928411436b277c70d686e007476738a0c05231092650d2e1e2358e9d3729389b84df6f0fbd1e01f066fabe24a8074123
+  data.tar.gz: c8522c490bfb68816751ced0bb971568baf5975f9653f16b4d7c21af7fe745e64e15aba851f9b0bdecd3d52013519fb8b42fc2caf1ce680107a0c85514ad9f81

data/lib/attune/client.rb

@@ -239,9 +239,14 @@ module Attune
 
     def adapter
       raise DisabledException if disabled?
-      conn = Faraday.new(url: endpoint, builder: middleware, request: {timeout: timeout})
-      conn.authorization :Bearer, auth_token unless !auth_token
-      conn
+      Faraday.new(url: endpoint, builder: middleware) do |connection|
+        connection.options.timeout = timeout
+
+        # Needed for encoding of BATCH GET requests
+        connection.options.params_encoder = Faraday::FlatParamsEncoder
+
+        connection.authorization :Bearer, auth_token unless !auth_token
+      end
     end
   end
 end

data/lib/attune/default.rb

@@ -1,4 +1,3 @@
-require 'attune/param_flattener'
 require "attune/call_dropping"
 require "attune/json_logger"
 
@@ -9,10 +8,7 @@ module Attune
 
     ENDPOINT = "http://localhost/".freeze
 
-    MIDDLEWARE = Faraday::Builder.new do |builder|
-      # Needed for encoding of BATCH GET requests
-      builder.use Attune::ParamFlattener
-
+    MIDDLEWARE = Faraday::RackBuilder.new do |builder|
       # Log all requests
       builder.use Attune::CallDropping
 

data/lib/attune/version.rb

@@ -1,3 +1,3 @@
 module Attune
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/attune/client_spec.rb

@@ -18,8 +18,7 @@ describe Attune::Client do
   let(:options){ {endpoint: 'http://example.com:8080/', middleware: middleware} }
   let(:stubs) { Faraday::Adapter::Test::Stubs.new }
   let(:middleware) do
-    Faraday::Builder.new do |builder|
-      builder.use Attune::ParamFlattener
+    Faraday::RackBuilder.new do |builder|
       builder.adapter :test, stubs
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attune
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - John Hawthorn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -130,7 +130,6 @@ files:
 - lib/attune/configurable.rb
 - lib/attune/default.rb
 - lib/attune/json_logger.rb
-- lib/attune/param_flattener.rb
 - lib/attune/version.rb
 - spec/attune/call_dropping_spec.rb
 - spec/attune/client_spec.rb

data/lib/attune/param_flattener.rb

@@ -1,17 +0,0 @@
-module Attune
-  # Faraday 0.8 can't make resuests like /?ids=123&ids=456 and forces the form
-  # /?ids[]=123&ids[]=456 (this is fixed in faraday 0.9)
-  #
-  # Fortunately faraday's middleware is quite powerful. This just strips the
-  # array syntax from the request.
-  class ParamFlattener < Faraday::Middleware
-    def call(env)
-      url = env[:url]
-
-      # replaces ?foo[]=123 with ?foo=123
-      url.query = url.query.gsub('%5B%5D', '') if url.query
-
-      @app.call(env)
-    end
-  end
-end