attune 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72c7246f1cc247ce77f93171fd082005a189ad88
-  data.tar.gz: c8bac31b37aa6d41914d4e3bf3ddcd8df46b4bbb
+  metadata.gz: 3bcafd086e89663973f17106d28c4a1b198c32bf
+  data.tar.gz: 6321361a8d4d7b362d117810745ac2d1898959d8
 SHA512:
-  metadata.gz: f1ed5785966bc47a9c689735e4b459e295e49d5a3eb1f038adafc87e6bc9de462c0c53bcb05b76f4ef5d7c1752500c930d0e67bd5d8636a2a4459a94da3d1e2f
-  data.tar.gz: 79c8838e7273852fd7908cf9e5adfba6dd0706174582798fc85b2af3a7df163ed18428f13f2119436a9356b142297d8c1c3801a5384e067cee2a040e49e7a277
+  metadata.gz: 19d522512f5bfe0458c0f3e8abf15a130920c0d1934e40c59bd0116c380813dc17db49c79fcbd15960364c07b65b10f5092aafbdd8377c2f9284d6d078dbb109
+  data.tar.gz: 84564a663fd330b4d94bad07bd32410725baab5da48dfa259dc44509d6c11968911e288c21fdb7019f658006f3d5f45b33aada520e58eea3001cd58d3bd53e86

data/Gemfile

@@ -6,3 +6,5 @@ gem 'guard-rspec'
 gem 'pry'
 gem 'pry-rescue'
 gem 'pry-stack_explorer'
+
+gem "faraday", "~> 0.8.9"

data/attune.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "faraday", "~> 0.9.0"
+  spec.add_dependency "faraday", "~> 0.8"
   spec.add_dependency "net-http-persistent"
 
   spec.add_development_dependency "bundler", "~> 1.2"

data/lib/attune/client.rb

@@ -201,10 +201,10 @@ module Attune
     def encoded_ranking_params(options)
       params = {
         anonymous: options.fetch(:id),
-        view: options.fetch(:view),
-        entity_collection: options.fetch(:collection),
         entities: options.fetch(:entities).join(','),
-        ip: options.fetch(:ip, 'none')
+        entity_collection: options.fetch(:collection),
+        ip: options.fetch(:ip, 'none'),
+        view: options.fetch(:view)
       }
       Faraday::Utils::ParamsHash[params].to_query
     end
@@ -253,12 +253,7 @@ module Attune
 
     def adapter
       raise DisabledException if disabled?
-      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
-
+      Faraday.new(url: endpoint, builder: middleware, request: {timeout: timeout}) do |connection|
         connection.authorization :Bearer, auth_token unless !auth_token
       end
     end

data/lib/attune/default.rb

@@ -1,3 +1,4 @@
+require 'attune/param_flattener'
 require "attune/call_dropping"
 require "attune/json_logger"
 require "attune/net_http_persistent"
@@ -12,7 +13,10 @@ module Attune
     # user our version of NetHttpPersistent adapter
     Faraday::Adapter.register_middleware(attune_http_persistent: NetHttpPersistent)
 
-    MIDDLEWARE = Faraday::RackBuilder.new do |builder|
+    MIDDLEWARE = Faraday::Builder.new do |builder|
+      # Needed for encoding of BATCH GET requests
+      builder.use Attune::ParamFlattener
+
       # Log all requests
       builder.use Attune::CallDropping
 

data/lib/attune/param_flattener.rb

@@ -0,0 +1,17 @@
+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

data/lib/attune/version.rb

@@ -1,3 +1,3 @@
 module Attune
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/spec/attune/client_spec.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attune
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - John Hawthorn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2014-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
@@ -145,6 +145,7 @@ files:
 - lib/attune/default.rb
 - lib/attune/json_logger.rb
 - lib/attune/net_http_persistent.rb
+- lib/attune/param_flattener.rb
 - lib/attune/version.rb
 - spec/attune/call_dropping_spec.rb
 - spec/attune/client_spec.rb