saddle 0.1.0 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: c6cbc5f3bed08d163ba1f6bb948acb555c16b9034ff6adac036a0f1f4252f872
+  data.tar.gz: 6b509a1bdb969e7b54c3c6fd93d742ef3cfd7144de2e8c36014f8a5fdc32484a
+SHA512:
+  metadata.gz: c22f775da62289da5111c42fc64373aec52b3c831b828a0b40f9fda5d354d569da0481e8d789422965cd802ea23855816c4d53224ec3507a5a8dd977f7209c0c
+  data.tar.gz: 392ebba3e48907a68867ba54125fdccbc26df04659fd84db2aa053823af414da24093eca48bf3b460efaf43bfcbc1792c813b25e04c6a521b221f815ef89503d

data/.github/workflows/ci.yml

@@ -0,0 +1,55 @@
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on: [pull_request, push]
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: [2.6, 2.7, '3.0', 3.1]
+        gemfile:
+          - activesupport_3.2
+          - activesupport_4.0
+          - activesupport_4.1
+          - activesupport_4.2
+          - activesupport_5.0
+          - activesupport_5.1
+          - activesupport_5.2
+          - activesupport_6.0
+          - activesupport_6.1
+          - activesupport_7.0
+        exclude:
+        - ruby-version: 2.6
+          gemfile: activesupport_7.0
+        - ruby-version: '3.0'
+          gemfile: activesupport_4.1
+        - ruby-version: 3.1
+          gemfile: activesupport_4.1
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+
+    - name: Generate Appraisal gemfiles
+      run: bundle exec appraisal generate
+
+    - name: Install dependencies
+      env:
+        BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
+      run: bundle install
+
+    - name: Run rspec
+      env:
+        BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
+      run: bundle exec rspec

data/.gitignore

@@ -12,6 +12,7 @@
 # Gems
 *.gem
 Gemfile.lock
+gemfiles/*.lock
 
 # IDEs
 .idea

data/Appraisals

@@ -0,0 +1,39 @@
+appraise "activesupport_3.2" do
+  gem "activesupport", "~> 3.2.22"
+end
+
+appraise "activesupport_4.0" do
+  gem "activesupport", "~> 4.0.13"
+end
+
+appraise "activesupport_4.1" do
+  gem "activesupport", "~> 4.1.16"
+end
+
+appraise "activesupport_4.2" do
+  gem "activesupport", "~> 4.2.11"
+end
+
+appraise "activesupport_5.0" do
+  gem "activesupport", "~> 5.0.7"
+end
+
+appraise "activesupport_5.1" do
+  gem "activesupport", "~> 5.1.7"
+end
+
+appraise "activesupport_5.2" do
+  gem "activesupport", "~> 5.2.8"
+end
+
+appraise "activesupport_6.0" do
+  gem "activesupport", "~> 6.0.6"
+end
+
+appraise "activesupport_6.1" do
+  gem "activesupport", "~> 6.1.7"
+end
+
+appraise "activesupport_7.0" do
+  gem "activesupport", "~> 7.0.4"
+end

data/Gemfile

@@ -4,8 +4,8 @@ gemspec
 
 group :test do
   gem 'rake'
-  gem 'rspec', '~> 2.14.1'
-  gem 'rspec-instafail', '~> 0.2'
+  gem 'rspec', '~> 3.12'
+  gem 'rspec-instafail', '~> 1'
 
   gem 'airbrake'
   gem 'simple_oauth', '~> 0.2.0' # Optional dependency

data/README.md

@@ -64,15 +64,47 @@ Saddle enables you to create beautifully stable and functionaly API clients, in
 
 ## version notes
 
+* Saddle versions 0.2.x supports Ruby 3.x, drops support for 2.6
 * Saddle versions 0.1.x are compatible with Faraday versions ~> 0.9.0
 * Saddle versions 0.0.x are compatible with Faraday versions ~> 0.8.7
 
+## Appraisal Usage
+
+Appraisal is a gem that allows us to test our library against different versions of dependencies in repeatable scenarios called "appraisals". For more information see
+the [Appraisal repository](https://github.com/thoughtbot/appraisal)
+
+First make sure appraisal is installed by running
+
+```
+$ bundle install
+```
+
+To update the Appraisal's gemfiles run
+
+```
+$ bundle exec appraisal generate
+```
+
+To test against a specific version of `activesupport` first install the dependencies, ideally we would want to install them by running
+```
+$ bundle exec appraisal install
+```
+
+However, this isn't posible fot the different constraints these versions have. So instead install the dependencies for the desired version we want to test against by running
+
+```
+$ BUNDLE_GEMFILE=gemfiles/activesupport_6.0.gemfiles bundle install
+```
+
+In this example we want to install the dependencies of `activesupport` version `6.0`. Then to run `rspec` with that constraints we run
+
+```
+$ BUNDLE_GEMFILE=gemfiles/activesupport_6.0.gemfiles bundle exec rspec
+```
 
 ## Code Status
 
-* [![Build Status](https://travis-ci.org/mLewisLogic/saddle.png?branch=master)](https://travis-ci.org/mLewisLogic/saddle)
 * [![Code Climate](https://codeclimate.com/github/mLewisLogic/saddle.png)](https://codeclimate.com/github/mLewisLogic/saddle)
-* [![Dependency Status](https://gemnasium.com/mLewisLogic/saddle.png)](https://gemnasium.com/mLewisLogic/saddle)
 
 
 ## License

data/bin/template/lib/saddle-client/middleware/exception_raiser.rb

@@ -19,7 +19,7 @@ module <%= root_module %>
       def call(env)
         begin
           @app.call(env)
-        rescue Faraday::Error::ClientError => e
+        rescue Faraday::ClientError => e
           # This is our chance to reinterpret the response into a meaningful, client-specific
           # exception that a consuming service can handle
           exception = <%= root_module %>::GenericException

data/gemfiles/activesupport_3.2.gemfile

@@ -0,0 +1,20 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 3.2.22"
+
+group :test do
+  gem "rake"
+  gem "rspec", "~> 3.12"
+  gem "rspec-instafail", "~> 1"
+  gem "airbrake"
+  gem "simple_oauth", "~> 0.2.0"
+  gem "statsd-ruby", require: ["statsd"]
+end
+
+group :development, :test do
+  gem "pry"
+end
+
+gemspec path: "../"

data/gemfiles/activesupport_4.0.gemfile

@@ -0,0 +1,20 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 4.0.13"
+
+group :test do
+  gem "rake"
+  gem "rspec", "~> 3.12"
+  gem "rspec-instafail", "~> 1"
+  gem "airbrake"
+  gem "simple_oauth", "~> 0.2.0"
+  gem "statsd-ruby", require: ["statsd"]
+end
+
+group :development, :test do
+  gem "pry"
+end
+
+gemspec path: "../"

data/gemfiles/activesupport_4.1.gemfile

@@ -0,0 +1,20 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 4.1.16"
+
+group :test do
+  gem "rake"
+  gem "rspec", "~> 3.12"
+  gem "rspec-instafail", "~> 1"
+  gem "airbrake"
+  gem "simple_oauth", "~> 0.2.0"
+  gem "statsd-ruby", require: ["statsd"]
+end
+
+group :development, :test do
+  gem "pry"
+end
+
+gemspec path: "../"

data/gemfiles/activesupport_4.2.gemfile

@@ -0,0 +1,20 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 4.2.11"
+
+group :test do
+  gem "rake"
+  gem "rspec", "~> 3.12"
+  gem "rspec-instafail", "~> 1"
+  gem "airbrake"
+  gem "simple_oauth", "~> 0.2.0"
+  gem "statsd-ruby", require: ["statsd"]
+end
+
+group :development, :test do
+  gem "pry"
+end
+
+gemspec path: "../"

data/gemfiles/activesupport_5.0.gemfile

@@ -0,0 +1,20 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 5.0.7"
+
+group :test do
+  gem "rake"
+  gem "rspec", "~> 3.12"
+  gem "rspec-instafail", "~> 1"
+  gem "airbrake"
+  gem "simple_oauth", "~> 0.2.0"
+  gem "statsd-ruby", require: ["statsd"]
+end
+
+group :development, :test do
+  gem "pry"
+end
+
+gemspec path: "../"

data/gemfiles/activesupport_5.1.gemfile

@@ -0,0 +1,20 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 5.1.7"
+
+group :test do
+  gem "rake"
+  gem "rspec", "~> 3.12"
+  gem "rspec-instafail", "~> 1"
+  gem "airbrake"
+  gem "simple_oauth", "~> 0.2.0"
+  gem "statsd-ruby", require: ["statsd"]
+end
+
+group :development, :test do
+  gem "pry"
+end
+
+gemspec path: "../"

data/gemfiles/activesupport_5.2.gemfile

@@ -0,0 +1,20 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 5.2.8"
+
+group :test do
+  gem "rake"
+  gem "rspec", "~> 3.12"
+  gem "rspec-instafail", "~> 1"
+  gem "airbrake"
+  gem "simple_oauth", "~> 0.2.0"
+  gem "statsd-ruby", require: ["statsd"]
+end
+
+group :development, :test do
+  gem "pry"
+end
+
+gemspec path: "../"

data/gemfiles/activesupport_6.0.gemfile

@@ -0,0 +1,20 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 6.0.6"
+
+group :test do
+  gem "rake"
+  gem "rspec", "~> 3.12"
+  gem "rspec-instafail", "~> 1"
+  gem "airbrake"
+  gem "simple_oauth", "~> 0.2.0"
+  gem "statsd-ruby", require: ["statsd"]
+end
+
+group :development, :test do
+  gem "pry"
+end
+
+gemspec path: "../"

data/gemfiles/activesupport_6.1.gemfile

@@ -0,0 +1,20 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 6.1.7"
+
+group :test do
+  gem "rake"
+  gem "rspec", "~> 3.12"
+  gem "rspec-instafail", "~> 1"
+  gem "airbrake"
+  gem "simple_oauth", "~> 0.2.0"
+  gem "statsd-ruby", require: ["statsd"]
+end
+
+group :development, :test do
+  gem "pry"
+end
+
+gemspec path: "../"

data/gemfiles/activesupport_7.0.gemfile

@@ -0,0 +1,20 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 7.0.4"
+
+group :test do
+  gem "rake"
+  gem "rspec", "~> 2.14.1"
+  gem "rspec-instafail", "~> 0.2"
+  gem "airbrake"
+  gem "simple_oauth", "~> 0.2.0"
+  gem "statsd-ruby", require: ["statsd"]
+end
+
+group :development, :test do
+  gem "pry"
+end
+
+gemspec path: "../"

data/lib/saddle/middleware/request/encode_json.rb

@@ -1,7 +1,5 @@
 require 'faraday'
 
-
-
 module Saddle
   module Middleware
     module Request
@@ -15,10 +13,6 @@ module Saddle
         CONTENT_TYPE = 'Content-Type'.freeze
         MIME_TYPE    = 'application/json'.freeze
 
-        dependency do
-          require 'json' unless defined?(::JSON)
-        end
-
         def call(env)
           if env[:saddle][:request_style] == :json
             # Make sure we're working with a valid body that's not a String

data/lib/saddle/middleware/response/parse_json.rb

@@ -1,7 +1,5 @@
 require 'faraday'
 
-
-
 module Saddle
   module Middleware
     module Response
@@ -12,10 +10,6 @@ module Saddle
         CONTENT_TYPE = 'Content-Type'.freeze
         MIME_TYPE    = 'application/json'.freeze
 
-        dependency do
-          require 'json' unless defined?(::JSON)
-        end
-
         def call(env)
           result = @app.call(env)
 

data/lib/saddle/middleware/response/raise_error.rb

@@ -11,9 +11,9 @@ module Saddle
 
           case result.status
           when 404
-            raise Faraday::Error::ResourceNotFound, response_values(result)
+            raise Faraday::ResourceNotFound, response_values(result)
           when 400...600
-            raise Faraday::Error::ClientError, response_values(result)
+            raise Faraday::ClientError, response_values(result)
           end
 
           result

data/lib/saddle/middleware/ruby_timeout.rb

@@ -19,7 +19,7 @@ module Saddle
         end
       # It is possible that faraday will catch the timeout first and throw
       # this exception, rethrow as a class derived from standard error.
-      rescue Faraday::Error::TimeoutError
+      rescue Faraday::TimeoutError
         raise Saddle::TimeoutError
       end
 

data/lib/saddle/requester.rb

@@ -1,7 +1,7 @@
 require 'active_support/core_ext/hash'
+require 'active_support/notifications'
 
 require 'faraday'
-require 'faraday_middleware'
 require 'saddle/faraday/request'
 require 'saddle/faraday/rack_builder'
 
@@ -173,7 +173,7 @@ module Saddle
         connection.use(Saddle::Middleware::Response::ParseJson)
 
         # Set up instrumentation around the adapter for extensibility
-        connection.use(FaradayMiddleware::Instrumentation)
+        connection.request :instrumentation
 
         # Add in extra env data if needed
         connection.use(Saddle::Middleware::ExtraEnv)

data/lib/saddle/version.rb

@@ -1,3 +1,3 @@
 module Saddle
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/saddle.gemspec

@@ -21,13 +21,11 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split($\)
   s.executables   = ['saddle']
   s.test_files    = s.files.grep(%r{^(spec)/})
-  
-  if RUBY_VERSION < '1.9'
-    s.add_dependency 'activesupport', '~> 3.0'
-  else
-    s.add_dependency 'activesupport', '>= 3.0'
-  end
 
-  s.add_dependency 'faraday', '~> 0.9.0'
-  s.add_dependency 'faraday_middleware', '~> 0.9.0'
+  s.required_ruby_version = '>= 2.6'
+
+  s.add_dependency 'activesupport', '>= 3.2'
+  s.add_dependency 'faraday', '~> 2.1'
+
+  s.add_development_dependency 'appraisal'
 end

data/spec/endpoint/base_endpoint_spec.rb

@@ -4,11 +4,11 @@ describe Saddle::BaseEndpoint do
   let(:base_endpoint) { Saddle::BaseEndpoint.new(Saddle::Client.create) }
 
   it 'can define singleton methods' do
-    expect(base_endpoint.respond_to?(:define_singleton_method)).to be_true
+    expect(base_endpoint.respond_to?(:define_singleton_method)).to be_truthy
   end
 
   it 'responds to any defined singleton methods' do
     base_endpoint.define_singleton_method(:my_method) { true }
-    expect(base_endpoint.my_method).to be_true
+    expect(base_endpoint.my_method).to be_truthy
   end
 end

data/spec/middleware/instrumentation_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 
-describe 'FaradayMiddleware::Instrumentation' do
+describe 'Faraday::Instrumentation' do
 
   context "test integration of instrumentation middleware" do
 

data/spec/middleware/request/retry_spec.rb

@@ -72,7 +72,7 @@ describe Saddle::Client do
           }
           expect {
             @default_client.requester.post(url)
-          }.to raise_error(Faraday::Error::ClientError)
+          }.to raise_error(Faraday::ClientError)
         end
 
         it "should retry if it is marked as idempotent" do

metadata

@@ -1,64 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: saddle
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Mike Lewis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-02 00:00:00.000000000 Z
+date: 2023-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0'
 description: Makes writing API clients as easy as giving high fives
 email: mike.lewis@airbnb.com
 executables:
@@ -66,9 +59,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".github/workflows/ci.yml"
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- Appraisals
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -90,6 +85,16 @@ files:
 - bin/template/spec/middleware/exception_raiser_spec.rb
 - bin/template/spec/spec_helper.rb
 - bin/template/spec/stub/stub_spec.rb
+- gemfiles/activesupport_3.2.gemfile
+- gemfiles/activesupport_4.0.gemfile
+- gemfiles/activesupport_4.1.gemfile
+- gemfiles/activesupport_4.2.gemfile
+- gemfiles/activesupport_5.0.gemfile
+- gemfiles/activesupport_5.1.gemfile
+- gemfiles/activesupport_5.2.gemfile
+- gemfiles/activesupport_6.0.gemfile
+- gemfiles/activesupport_6.1.gemfile
+- gemfiles/activesupport_7.0.gemfile
 - lib/saddle.rb
 - lib/saddle/client_attributes.rb
 - lib/saddle/endpoint.rb
@@ -132,27 +137,25 @@ files:
 homepage: https://github.com/mLewisLogic/saddle
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 3.0.3.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A full-featured, generic consumer layer for you to build API client implementations
   with.
 test_files: