Merge pull request #2 from Shopify/seb-faraday-2.x

faraday 2.x

Author: lavoiesl

Appraisals

@@ -1,20 +1,30 @@
-appraise '3.2' do
+appraise 'activesupport-3.2' do
   gem 'activesupport', '~> 3.2.22'
   gem 'minitest', '~> 5'
 end
 
-appraise '4.0' do
+appraise 'activesupport-4.0' do
   gem 'activesupport', '~> 4.0.13'
 end
 
-appraise '4.1' do
+appraise 'activesupport-4.1' do
   gem 'activesupport', '~> 4.1.14'
 end
 
-appraise '4.2' do
+appraise 'activesupport-4.2' do
   gem 'activesupport', '~> 4.2.5.1'
 end
 
-appraise '5.0' do
+appraise 'activesupport-5.0' do
   gem 'activesupport', '~> 5.0.0'
 end
+
+appraise 'faraday-1.x' do
+  gem 'faraday', '~> 1.10'
+  gem 'faraday-gzip', '~> 1.0'
+end
+
+appraise 'faraday-2.x' do
+  gem 'faraday', '~> 2.0'
+  gem 'faraday-gzip', '~> 2.0'
+end

Gemfile

@@ -3,7 +3,6 @@ source "https://rubygems.org"
 gemspec
 
 gem 'rake'
-gem 'appraisal'
 
 gem "activesupport"
 gem 'addressable', '~> 2.2'

gemfiles/5.2.3.gemfile

@@ -3,14 +3,13 @@
 source "https://rubygems.org"
 
 gem "rake"
-gem "appraisal"
 gem "activesupport", "~> 3.2.22"
 gem "addressable", "~> 2.2"
-gem "codeclimate-test-reporter", :group => :test, :require => nil
+gem "codeclimate-test-reporter", group: :test, require: nil
 gem "minitest", "~> 5"
 
 group :development, :test do
-  gem "byebug", :platforms => [:mri_20, :mri_21, :mri_22]
+  gem "byebug", "~> 10.0", platforms: [:mri_20, :mri_21, :mri_22]
 end
 
-gemspec :path => "../"
+gemspec path: "../"

gemfiles/6.0.gemfile

@@ -3,13 +3,12 @@
 source "https://rubygems.org"
 
 gem "rake"
-gem "appraisal"
 gem "activesupport", "~> 4.0.13"
 gem "addressable", "~> 2.2"
-gem "codeclimate-test-reporter", :group => :test, :require => nil
+gem "codeclimate-test-reporter", group: :test, require: nil
 
 group :development, :test do
-  gem "byebug", :platforms => [:mri_20, :mri_21, :mri_22]
+  gem "byebug", "~> 10.0", platforms: [:mri_20, :mri_21, :mri_22]
 end
 
-gemspec :path => "../"
+gemspec path: "../"

gemfiles/3.2.gemfile renamed to gemfiles/activesupport_3.2.gemfile

@@ -3,13 +3,12 @@
 source "https://rubygems.org"
 
 gem "rake"
-gem "appraisal"
 gem "activesupport", "~> 4.1.14"
 gem "addressable", "~> 2.2"
-gem "codeclimate-test-reporter", :group => :test, :require => nil
+gem "codeclimate-test-reporter", group: :test, require: nil
 
 group :development, :test do
-  gem "byebug", :platforms => [:mri_20, :mri_21, :mri_22]
+  gem "byebug", "~> 10.0", platforms: [:mri_20, :mri_21, :mri_22]
 end
 
-gemspec :path => "../"
+gemspec path: "../"

gemfiles/4.0.gemfile renamed to gemfiles/activesupport_4.0.gemfile

@@ -3,13 +3,12 @@
 source "https://rubygems.org"
 
 gem "rake"
-gem "appraisal"
 gem "activesupport", "~> 4.2.5.1"
 gem "addressable", "~> 2.2"
-gem "codeclimate-test-reporter", :group => :test, :require => nil
+gem "codeclimate-test-reporter", group: :test, require: nil
 
 group :development, :test do
-  gem "byebug", :platforms => [:mri_20, :mri_21, :mri_22]
+  gem "byebug", "~> 10.0", platforms: [:mri_20, :mri_21, :mri_22]
 end
 
-gemspec :path => "../"
+gemspec path: "../"

gemfiles/4.1.gemfile renamed to gemfiles/activesupport_4.1.gemfile

@@ -3,13 +3,12 @@
 source "https://rubygems.org"
 
 gem "rake"
-gem "appraisal"
 gem "activesupport", "~> 5.0.0"
 gem "addressable", "~> 2.2"
-gem "codeclimate-test-reporter", :group => :test, :require => nil
+gem "codeclimate-test-reporter", group: :test, require: nil
 
 group :development, :test do
-  gem "byebug", :platforms => [:mri_20, :mri_21, :mri_22]
+  gem "byebug", "~> 10.0", platforms: [:mri_20, :mri_21, :mri_22]
 end
 
-gemspec :path => "../"
+gemspec path: "../"

gemfiles/4.2.gemfile renamed to gemfiles/activesupport_4.2.gemfile

@@ -0,0 +1,16 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "activesupport"
+gem "addressable", "~> 2.2"
+gem "codeclimate-test-reporter", group: :test, require: nil
+gem "faraday", "~> 1.10"
+gem "faraday-gzip", "~> 1.0"
+
+group :development, :test do
+  gem "byebug", "~> 10.0", platforms: [:mri_20, :mri_21, :mri_22]
+end
+
+gemspec path: "../"

gemfiles/5.0.gemfile renamed to gemfiles/activesupport_5.0.gemfile

@@ -0,0 +1,16 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "activesupport"
+gem "addressable", "~> 2.2"
+gem "codeclimate-test-reporter", group: :test, require: nil
+gem "faraday", "~> 2.0"
+gem "faraday-gzip", "~> 2.0"
+
+group :development, :test do
+  gem "byebug", "~> 10.0", platforms: [:mri_20, :mri_21, :mri_22]
+end
+
+gemspec path: "../"

gemfiles/faraday_1.x.gemfile

@@ -12,14 +12,15 @@ Gem::Specification.new do |s|
   s.summary = 'Build client libraries compliant with specification defined by jsonapi.org'
 
   s.add_dependency "activesupport", '>= 3.2.0'
-  s.add_dependency "faraday", '>= 0.15.2', '< 2.0'
-  s.add_dependency "faraday-gzip", '>= 0.1.0', '< 2.0'
+  s.add_dependency "faraday", '>= 1.10', '< 3.0'
+  s.add_dependency "faraday-gzip", '>= 1.0', '< 3.0'
   s.add_dependency "addressable", '~> 2.2'
   s.add_dependency "activemodel", '>= 3.2.0'
   s.add_dependency "rack", '>= 0.2'
 
   s.add_development_dependency "webmock", '~> 3.5.1'
   s.add_development_dependency "mocha"
+  s.add_development_dependency "appraisal"
 
   s.license = "MIT"
 

gemfiles/faraday_2.x.gemfile

@@ -13,7 +13,7 @@ def initialize(options = {})
         builder.request :json
         builder.use Middleware::JsonRequest
         builder.use Middleware::Status, status_middleware_options
-        builder.use Middleware::ParseJson
+        builder.response :json
         builder.use ::Faraday::Gzip::Middleware
         builder.adapter(*adapter_options)
       end
@@ -24,7 +24,7 @@ def initialize(options = {})
     #   inserted middleware will run after json parsed
     def use(middleware, *args, &block)
       return if faraday.builder.locked?
-      faraday.builder.insert_before(Middleware::ParseJson, middleware, *args, &block)
+      faraday.builder.insert_before(::Faraday::Response::Json, middleware, *args, &block)
     end
 
     def delete(middleware)

json_api_client.gemspec

@@ -1,7 +1,6 @@
 module JsonApiClient
   module Middleware
     autoload :JsonRequest, 'json_api_client/middleware/json_request'
-    autoload :ParseJson, 'json_api_client/middleware/parse_json'
     autoload :Status, 'json_api_client/middleware/status'
   end
-end
+end