saddle 0.0.53 → 0.2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODQ4YmI4OGJiZDRjMjBhNmFkOWI1NGEzZWIyNDA0NWM3NGJjZTdlMQ==
-  data.tar.gz: !binary |-
-    NGI3MWM5MDgzZWIyYjVkM2RhYzk1YmRjMGY5YjU3MmE2N2MxNGYyMQ==
+SHA256:
+  metadata.gz: c6cbc5f3bed08d163ba1f6bb948acb555c16b9034ff6adac036a0f1f4252f872
+  data.tar.gz: 6b509a1bdb969e7b54c3c6fd93d742ef3cfd7144de2e8c36014f8a5fdc32484a
 SHA512:
-  metadata.gz: !binary |-
-    M2JkMWY0YTljNmFmOGI3MjA0NjY0MDRkZmU0ODc4MDNlYmYzMTNmNjVkMmJl
-    YmI4ZjBkMzhiOWJhMmFlYjg1MGE1YTJjZDg4MmY5Mjc0N2RmNDBkZjFjZmMy
-    ZjYxZWVjYzZiZjI1MzMwYWJmMjdiYWY3NDJmODNmMDk5ZGY0M2I=
-  data.tar.gz: !binary |-
-    M2Q3NWU4ODRkZGRkOWI5MDY2NmFkZWY3NDViNmZmYjE2NWJlMjEyYTBhY2Qx
-    ZGY3M2VmYzIwMmFkMjc2M2VlZTRhNTQwZjU1Yjg1MGRlNzMyMTQ0Mzg0NDRj
-    NGViYjZjY2EwMWIwN2VkYzgzNGU0MGI2NjJiODVkNGY5M2ZjZDU=
+  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/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.0.54
+* Work with faraday ~> 0.9.0. With these changes, Saddle no longer works with faraday < 0.9.
+
 # 0.0.49
 * Support `extra_env` as a client option to load more into the env pre-adapter.
 

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

@@ -41,16 +41,16 @@ Saddle enables you to create beautifully stable and functionaly API clients, in
 [saddle-example](https://github.com/mLewisLogic/saddle-example)
 
 ### client construction
-0. For the sake of cleanliness, pick a namespace that everything related to your client should live in. For this example, we'll use __SaddleExample__
-1. Inherit your client class, __SaddleExample::Client__, from __Saddle::Client__
-2. Create an _endpoints_ directory at the same level as your client class file
-3. Create endpoint classes in the _endpoints_ directory that inherit from __Saddle::TraversalEndpoint__ and are under the __SaddleExample::Endpoints__ namespace module
-    1. Give these endpoints methods that call _get_ or _post_ to perform the actual request
-    2. Their module/class namespace determines how they are accessed in the client's call tree. For example, the get\_all() in __SaddleExample::Endpoints::Fish::Guppy__ would be accessed by:
+0. For the sake of cleanliness, pick a namespace that everything related to your client should live in. For this example, we'll use __SaddleExample__.
+1. Inherit your client class, __SaddleExample::Client__, from __Saddle::Client__.
+2. Create an _endpoints_ directory at the same level as your client class file.
+3. Create endpoint classes in the _endpoints_ directory that inherit from __Saddle::TraversalEndpoint__ and are under the __SaddleExample::Endpoints__ namespace module.
+    1. Give these endpoints methods that call `get` or `post` to perform the actual request
+    2. Their module/class namespace determines how they are accessed in the client's call tree. For example, the `get_all` in __SaddleExample::Endpoints::Fish::Guppy__ would be accessed by:
 
-        client.fish.guppy.get_all()
+            client.fish.guppy.get_all
 
-    3. If you need REST style endpoints like client.fish('guppy').catch() then check out __Saddle::ResourceEndpoint__ and how it's used in [saddle-example](https://github.com/mLewisLogic/saddle-example/blob/master/lib/endpoints/kitten.rb)
+    3. If you need REST style endpoints like `client.kitten.by_id('Whiskers').info` then check out __Saddle::ResourceEndpoint__ and how it's used in [saddle-example](https://github.com/mLewisLogic/saddle-example/blob/master/lib/saddle-example/endpoints/kitten.rb)
 
 4. Initialize an instance of your client. ex:
 
@@ -62,11 +62,49 @@ Saddle enables you to create beautifully stable and functionaly API clients, in
 * xml posting/parsing
 
 
+## 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/endpoint.rb

@@ -17,18 +17,15 @@ module Saddle
     def initialize(requester, relative_path_override=nil, parent=nil)
       @requester = requester
       @parent = parent
-      @relative_path = relative_path_override || _relative_path()
+      @relative_path = relative_path_override || _relative_path
     end
 
 
     # Generic request wrapper
     def request(method, action, params={}, options={})
       # Augment in interesting options
-      options[:saddle] ||= {}
-      options[:saddle] = {
-        :call_chain => _path_array(),
-        :action => action,
-      }
+      options[:call_chain] = _path_array
+      options[:action] = action
       @requester.send(method, _path(action), params, options)
     end
 
@@ -87,7 +84,7 @@ module Saddle
         if defined?(self.class::ABSOLUTE_PATH)
           [self.class::ABSOLUTE_PATH]
         else
-          _path_array()
+          _path_array
         end
       # Join it with the action
       paths = pre_action_paths + [action]
@@ -97,7 +94,7 @@ module Saddle
     end
 
     def _path_array
-      _endpoint_chain().map(&:relative_path).compact
+      _endpoint_chain.map(&:relative_path).compact
     end
 
     # Get the parent chain that led to this endpoint
@@ -108,7 +105,7 @@ module Saddle
         chain << node
         node = node.parent
       end
-      chain.reverse()
+      chain.reverse
     end
 
     # If the parent is not an endpoint, it is a root node

data/lib/saddle/faraday/rack_builder.rb

@@ -0,0 +1,15 @@
+module Saddle
+  # Same as the standard Faraday::RackBuilder, but also allows passing saddle options to the env.
+  class RackBuilder < ::Faraday::RackBuilder
+    def saddle_options
+      @saddle_options ||= {}
+    end
+
+    def build_env(connection, request)
+      env = super
+      env[:saddle] = saddle_options.deep_merge(request.saddle_options)
+      env
+    end
+
+  end
+end

data/lib/saddle/faraday/request.rb

@@ -0,0 +1,4 @@
+# Allow saddle options to be accessible through Faraday::Request.
+Faraday::Request.instance_eval do
+  attr_accessor :saddle_options
+end

data/lib/saddle/middleware/authentication/oauth1.rb

@@ -14,17 +14,17 @@ module Saddle
         TYPE_URLENCODED = 'application/x-www-form-urlencoded'.freeze
 
         def call(env)
-          if env[:request][:client_options][:oauth1] &&
-             env[:request][:client_options][:oauth1][:consumer_key] &&
-             env[:request][:client_options][:oauth1][:consumer_secret] &&
-             env[:request][:client_options][:oauth1][:token] &&
-             env[:request][:client_options][:oauth1][:token_secret]
+          if env[:saddle][:client_options][:oauth1] &&
+             env[:saddle][:client_options][:oauth1][:consumer_key] &&
+             env[:saddle][:client_options][:oauth1][:consumer_secret] &&
+             env[:saddle][:client_options][:oauth1][:token] &&
+             env[:saddle][:client_options][:oauth1][:token_secret]
 
             env[:request_headers]['Authorization'] ||= SimpleOAuth::Header.new(
               env[:method],
               env[:url].to_s,
               filtered_body_params(env),
-              env[:request][:client_options][:oauth1]
+              env[:saddle][:client_options][:oauth1]
             ).to_s
           end
 

data/lib/saddle/middleware/authentication/oauth2.rb

@@ -16,10 +16,10 @@ module Saddle
         end
 
         def call(env)
-          if env[:request][:client_options][@key_name.to_sym]
+          if env[:saddle][:client_options][@key_name.to_sym]
             new_query = []
             new_query << env[:url].query if env[:url].query
-            new_query << "#{@key_name}=#{CGI.escape(env[:request][:client_options][@key_name.to_sym].to_s)}"
+            new_query << "#{@key_name}=#{CGI.escape(env[:saddle][:client_options][@key_name.to_sym].to_s)}"
             env[:url].query = new_query.join('&')
           end
 

data/lib/saddle/middleware/extra_env.rb

@@ -9,8 +9,8 @@ module Saddle
 
     class ExtraEnv < Faraday::Middleware
       def call(env)
-        if env[:request][:client_options][:extra_env]
-          env.merge!(env[:request][:client_options][:extra_env])
+        if env[:saddle][:client_options][:extra_env]
+          env.merge!(env[:saddle][:client_options][:extra_env])
         end
 
         @app.call env

data/lib/saddle/middleware/logging/rails.rb

@@ -15,7 +15,7 @@ module Saddle
             @app.call(env)
           rescue => e
             if defined?(Rails.logger)
-              Rails.logger.error("#{env[:request][:saddle][:client].name} error: #{e}")
+              Rails.logger.error("#{env[:saddle][:client].name} error: #{e}")
             end
             # Re-raise the error
             raise

data/lib/saddle/middleware/logging/statsd.rb

@@ -33,16 +33,16 @@ module Saddle
 
         def call(env)
           # Try to build up a path for the STATSD logging
-          if env[:request][:statsd_path]
-            statsd_path = env[:request][:statsd_path]
-          elsif env[:request][:saddle]
+          if env[:saddle][:statsd_path]
+            statsd_path = env[:saddle][:statsd_path]
+          elsif env[:saddle][:client]
             statsd_path_components = [
               'saddle',
-              env[:request][:saddle][:client].name.underscore,
+              env[:saddle][:client].name.underscore,
             ]
-            if env[:request][:saddle][:call_chain] && env[:request][:saddle][:action]
-              statsd_path_components += env[:request][:saddle][:call_chain]
-              statsd_path_components << env[:request][:saddle][:action]
+            if env[:saddle][:call_chain] && env[:saddle][:action]
+              statsd_path_components += env[:saddle][:call_chain]
+              statsd_path_components << env[:saddle][:action]
             else
               statsd_path_components << 'raw'
               statsd_path_components << "#{env[:url].host}#{env[:url].path}"

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

@@ -1,7 +1,5 @@
 require 'faraday'
 
-
-
 module Saddle
   module Middleware
     module Request
@@ -15,12 +13,8 @@ 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[:request][:request_style] == :json
+          if env[:saddle][:request_style] == :json
             # Make sure we're working with a valid body that's not a String
             if env[:body] and !env[:body].respond_to?(:to_str)
               env[:request_headers][CONTENT_TYPE] ||= MIME_TYPE

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

@@ -10,8 +10,8 @@ module Saddle
 
       class PathPrefix < Faraday::Middleware
         def call(env)
-          if env[:request][:client_options][:path_prefix]
-            env[:url].path = "/#{env[:request][:client_options][:path_prefix]}#{env[:url].path}"
+          if env[:saddle][:client_options][:path_prefix]
+            env[:url].path = "/#{env[:saddle][:client_options][:path_prefix]}#{env[:url].path}"
           end
 
           @app.call env

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

@@ -17,13 +17,13 @@ module Saddle
         end
 
         def call(env)
-          retries = env[:request][:num_retries] || 0
-          backoff = env[:request][:retry_backoff] || 0.050 # in seconds
+          retries = env[:saddle][:num_retries] || 0
+          backoff = env[:saddle][:retry_backoff] || 0.050 # in seconds
           begin
             @app.call(self.class.deep_copy(env))
           rescue => e
             # Only retry for GET or if the request is marked as idempotent
-            if env[:method] == :get || env[:request][:idempotent]
+            if env[:method] == :get || env[:saddle][:idempotent]
               unless @ignored_exceptions.include?(e.class)
                 # Retry a limited number of times
                 if retries > 0
@@ -40,7 +40,11 @@ module Saddle
         end
 
         def self.deep_copy(value)
-          if value.is_a?(Hash)
+          if value.is_a?(Struct)
+            result = value.clone
+            value.each{|k, v| result.send("#{k}=", deep_copy(v))}
+            result
+          elsif value.is_a?(Hash)
             result = value.clone
             value.each{|k, v| result[k] = deep_copy(v)}
             result

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

@@ -24,7 +24,7 @@ module Saddle
 
 
         def call(env)
-          if env[:request][:request_style] == :urlencoded
+          if env[:saddle][:request_style] == :urlencoded
             # Make sure we're working with a valid body that's not a String
             if env[:body] and !env[:body].respond_to?(:to_str)
               if has_multipart?(env[:body])

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

@@ -13,7 +13,7 @@ module Saddle
           user_agent = nil
           # Build a user agent that looks like 'SaddleExample 0.0.1'
           begin
-            user_agent = client_name = env[:request][:saddle][:client].name
+            user_agent = client_name = env[:saddle][:client].name
             parent_module = client_name.split('::')[0..-2].join('::').constantize
             if parent_module
               if defined?(parent_module::VERSION)

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

@@ -13,7 +13,7 @@ module Saddle
           begin
             @app.call(env)
           rescue
-            if res = env[:request][:default_response]
+            if res = env[:saddle][:default_response]
               return ::Faraday::Response.new(:body => res)
             else
               raise

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

@@ -13,13 +13,13 @@ module Saddle
     class RubyTimeout < Faraday::Middleware
 
       def call(env)
-        timeout = env[:request][:hard_timeout] # nil or 0 means no timeout
+        timeout = env[:saddle][:hard_timeout] # nil or 0 means no timeout
         Timeout.timeout(timeout, Saddle::TimeoutError) do
           @app.call(env)
         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,8 +1,9 @@
 require 'active_support/core_ext/hash'
+require 'active_support/notifications'
 
 require 'faraday'
-require 'faraday_middleware'
-
+require 'saddle/faraday/request'
+require 'saddle/faraday/rack_builder'
 
 require 'saddle/middleware/request/encode_json'
 require 'saddle/middleware/request/path_prefix'
@@ -79,7 +80,7 @@ module Saddle
     # Make a GET request
     def get(url, params={}, options={})
       response = connection.get do |req|
-        req.options.deep_merge!(options)
+        req.saddle_options = options
         req.body = options[:body] if options.has_key?(:body)
         req.url(url, params)
       end
@@ -89,7 +90,7 @@ module Saddle
     # Make a POST request
     def post(url, data={}, options={})
       response = connection.post do |req|
-        req.options.deep_merge!(options)
+        req.saddle_options = options
         req.url(url)
         req.body = data
       end
@@ -99,7 +100,7 @@ module Saddle
     # Make a PUT request
     def put(url, data={}, options={})
       response = connection.put do |req|
-        req.options.deep_merge!(options)
+        req.saddle_options = options
         req.url(url)
         req.body = data
       end
@@ -109,7 +110,7 @@ module Saddle
     # Make a DELETE request
     def delete(url, params={}, options={})
       response = connection.delete do |req|
-        req.options.deep_merge!(options)
+        req.saddle_options = options
         req.url(url, params)
       end
       handle_response(response)
@@ -131,61 +132,59 @@ module Saddle
 
     # Build a connection instance, wrapped in the middleware that we want
     def connection
-      @connection ||= Faraday.new(base_url) do |builder|
+      @connection ||= Faraday.new(base_url, :builder_class => Saddle::RackBuilder) do |connection|
         # Include the requester level options
-        builder.options[:client_options] = @options
+        connection.builder.saddle_options[:client_options] = @options
 
         # Config options
-        builder.options[:timeout] = @timeout
-        builder.options[:request_style] = @request_style
-        builder.options[:num_retries] = @num_retries
-        builder.options[:saddle] = {
-          :client => @parent_client,
-        }
+        connection.options[:timeout] = @timeout
+        connection.builder.saddle_options[:request_style] = @request_style
+        connection.builder.saddle_options[:num_retries] = @num_retries
+        connection.builder.saddle_options[:client] = @parent_client
 
         # Support default return values upon exception
-        builder.use(Saddle::Middleware::Response::DefaultResponse)
+        connection.use(Saddle::Middleware::Response::DefaultResponse)
 
         # Hard timeout on the entire request
-        builder.use(Saddle::Middleware::RubyTimeout)
+        connection.use(Saddle::Middleware::RubyTimeout)
 
         # Set up a user agent
-        builder.use(Saddle::Middleware::Request::UserAgent)
+        connection.use(Saddle::Middleware::Request::UserAgent)
 
         # Set up the path prefix if needed
-        builder.use(Saddle::Middleware::Request::PathPrefix)
+        connection.use(Saddle::Middleware::Request::PathPrefix)
 
         # Apply additional implementation-specific middlewares
         @additional_middlewares.each do |m|
-          m[:args] ? builder.use(m[:klass], *m[:args]) : builder.use(m[:klass])
+          m[:args] ? connection.use(m[:klass], *m[:args]) : connection.use(m[:klass])
         end
 
         # Request encoding
-        builder.use(Saddle::Middleware::Request::JsonEncoded)
-        builder.use(Saddle::Middleware::Request::UrlEncoded)
+        connection.use(Saddle::Middleware::Request::JsonEncoded)
+        connection.use(Saddle::Middleware::Request::UrlEncoded)
 
         # Automatic retries
-        builder.use(Saddle::Middleware::Request::Retry)
+        connection.use(Saddle::Middleware::Request::Retry)
 
         # Raise exceptions on 4xx and 5xx errors
-        builder.use(Saddle::Middleware::Response::RaiseError)
+        connection.use(Saddle::Middleware::Response::RaiseError)
 
         # Handle parsing out the response if it's JSON
-        builder.use(Saddle::Middleware::Response::ParseJson)
+        connection.use(Saddle::Middleware::Response::ParseJson)
 
         # Set up instrumentation around the adapter for extensibility
-        builder.use(FaradayMiddleware::Instrumentation)
+        connection.request :instrumentation
 
         # Add in extra env data if needed
-        builder.use(Saddle::Middleware::ExtraEnv)
+        connection.use(Saddle::Middleware::ExtraEnv)
 
         # Set up our adapter
         if @stubs.nil?
           # Use the default adapter
-          builder.adapter(@http_adapter[:key], *@http_adapter[:args])
+          connection.adapter(@http_adapter[:key], *@http_adapter[:args])
         else
           # Use the test adapter
-          builder.adapter(:test, @stubs)
+          connection.adapter(:test, @stubs)
         end
       end
     end

data/lib/saddle/version.rb

@@ -1,3 +1,3 @@
 module Saddle
-  VERSION = '0.0.53'
+  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.8.7'
-  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

data/spec/requester/get_spec.rb

@@ -26,7 +26,7 @@ describe Saddle::Client do
       end
 
       it "should request properly with params in the body" do
-        @stubs.send(:new_stub, :get, '/test', "body data") {
+        @stubs.send(:new_stub, :get, '/test', {}, "body data") {
           [
             200,
             {},

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: saddle
 version: !ruby/object:Gem::Version
-  version: 0.0.53
+  version: 0.2.0
 platform: ruby
 authors:
 - Mike Lewis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-13 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
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     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:
@@ -59,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
@@ -83,10 +85,22 @@ 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
 - lib/saddle/errors.rb
+- lib/saddle/faraday/rack_builder.rb
+- lib/saddle/faraday/request.rb
 - lib/saddle/method_tree_builder.rb
 - lib/saddle/middleware/authentication/oauth1.rb
 - lib/saddle/middleware/authentication/oauth2.rb
@@ -130,17 +144,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: A full-featured, generic consumer layer for you to build API client implementations