saddle 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40349fa3b434064564e6060fafbfede9327e3ad28d28035ecc6ce3eefebc096d
-  data.tar.gz: 68d77c929a14a18571ec4be49fa2daf0e207840add48e3424220643a68c57be5
+  metadata.gz: 4023ece557e6ce616a2716b16f7cbfcd78250ed974b952fa626bd2231d4b40f7
+  data.tar.gz: 0213abb4917acb28ed0a2f7d7400ddf71b2d228d1711d3046d825bfed167cbba
 SHA512:
-  metadata.gz: d84f468133bedaa13ecb030dc2819a0f23b39255b1e500301b5e220d638b2d125106ebea591f2b25628e366fc433e9f440217a94a84f30367a4acb471cbfb0a1
-  data.tar.gz: ab8fccb3facdd3d186627c6c76569e3209b8d7cad3608125a4c24799ba7eaf58c4e2ac04f5793d23c9d989a0a4c6bace879952ffa658bd5a76653aaa9547f85e
+  metadata.gz: 63b0c9c90a6db1cd20a83ccabea81f0f65d96c18ee15f6fb16368c4d1671abebf0c9196fe81610c6a184500a6a4eff06b935fc625a6f7d3fba11bcb52971f029
+  data.tar.gz: 712df18e85b0c9f2614bf8d2997939f3142c9f1d7cf4a637c3a69b7f845b1414eb5f8ab6233974c005906ce49ac207f390a15956119a29daf55db0b0c04a90e5

data/.github/workflows/ci.yml

@@ -25,13 +25,23 @@ jobs:
           - activesupport_6.0
           - activesupport_6.1
           - activesupport_7.0
+          - activesupport_7.1
+          - faraday_0.x
+          - faraday_1
+          - faraday_2
         exclude:
+        - ruby-version: 2.6
+          gemfile: activesupport_7.1
         - ruby-version: 2.6
           gemfile: activesupport_7.0
         - ruby-version: '3.0'
           gemfile: activesupport_4.1
         - ruby-version: 3.1
           gemfile: activesupport_4.1
+        - ruby-version: '3.0'
+          gemfile: faraday_0.x
+        - ruby-version: 3.1
+          gemfile: faraday_0.x
     steps:
     - uses: actions/checkout@v3
 

data/Appraisals

@@ -37,3 +37,21 @@ end
 appraise "activesupport_7.0" do
   gem "activesupport", "~> 7.0.4"
 end
+
+appraise "activesupport_7.1" do
+  gem "activesupport", "~> 7.1.3"
+end
+
+appraise "faraday_0.x" do
+  gem "faraday", "~> 0.9"
+  gem "faraday_middleware"
+end
+
+appraise "faraday_1" do
+  gem "faraday", "~> 1.0"
+  gem "faraday_middleware"
+end
+
+appraise "faraday_2" do
+  gem "faraday", "~> 2.0"
+end

data/bin/saddle

@@ -3,6 +3,11 @@
 require 'erb'
 require 'ostruct'
 
+require 'active_support/version'
+if ActiveSupport::VERSION::STRING >= '7.1'
+  require 'active_support/deprecation'
+  require 'active_support/deprecator'
+end
 require 'active_support/core_ext/string'
 
 require 'saddle'

data/gemfiles/activesupport_7.1.gemfile

@@ -0,0 +1,20 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 7.1.3"
+
+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/faraday_0.x.gemfile

@@ -0,0 +1,21 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "faraday", "~> 0.9"
+gem "faraday_middleware"
+
+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/faraday_1.gemfile

@@ -0,0 +1,21 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "faraday", "~> 1.0"
+gem "faraday_middleware"
+
+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/faraday_2.gemfile

@@ -0,0 +1,20 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "faraday", "~> 2.0"
+
+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/lib/saddle/endpoint.rb

@@ -1,3 +1,8 @@
+require 'active_support/version'
+if ActiveSupport::VERSION::STRING >= '7.1'
+  require 'active_support/deprecation'
+  require 'active_support/deprecator'
+end
 require 'active_support/core_ext/string'
 
 

data/lib/saddle/method_tree_builder.rb

@@ -1,3 +1,8 @@
+require 'active_support/version'
+if ActiveSupport::VERSION::STRING >= '7.1'
+  require 'active_support/deprecation'
+  require 'active_support/deprecator'
+end
 require 'active_support/core_ext/string'
 
 require 'saddle/endpoint'

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

@@ -1,3 +1,8 @@
+require 'active_support/version'
+if ActiveSupport::VERSION::STRING >= '7.1'
+  require 'active_support/deprecation'
+  require 'active_support/deprecator'
+end
 require 'active_support/core_ext/string'
 
 require 'statsd'

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

@@ -13,6 +13,10 @@ module Saddle
         CONTENT_TYPE = 'Content-Type'.freeze
         MIME_TYPE    = 'application/json'.freeze
 
+        dependency do
+          require 'json' unless defined?(::JSON)
+        end if Faraday::VERSION < '2'
+
         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

@@ -10,6 +10,10 @@ module Saddle
         CONTENT_TYPE = 'Content-Type'.freeze
         MIME_TYPE    = 'application/json'.freeze
 
+        dependency do
+          require 'json' unless defined?(::JSON)
+        end if Faraday::VERSION < '2'
+
         def call(env)
           result = @app.call(env)
 

data/lib/saddle/requester.rb

@@ -2,6 +2,11 @@ require 'active_support/core_ext/hash'
 require 'active_support/notifications'
 
 require 'faraday'
+if Faraday::VERSION < '2'
+  gem 'faraday_middleware'
+
+  require 'faraday_middleware'
+end
 require 'saddle/faraday/request'
 require 'saddle/faraday/rack_builder'
 

data/lib/saddle/version.rb

@@ -1,3 +1,3 @@
 module Saddle
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/saddle.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.6'
 
   s.add_dependency 'activesupport', '>= 3.2'
-  s.add_dependency 'faraday', '~> 2.1'
+  s.add_dependency 'faraday', '>= 0.9.0'
 
   s.add_development_dependency 'appraisal'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saddle
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Mike Lewis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-06 00:00:00.000000000 Z
+date: 2024-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -28,16 +28,16 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -95,6 +95,10 @@ files:
 - gemfiles/activesupport_6.0.gemfile
 - gemfiles/activesupport_6.1.gemfile
 - gemfiles/activesupport_7.0.gemfile
+- gemfiles/activesupport_7.1.gemfile
+- gemfiles/faraday_0.x.gemfile
+- gemfiles/faraday_1.gemfile
+- gemfiles/faraday_2.gemfile
 - lib/saddle.rb
 - lib/saddle/client_attributes.rb
 - lib/saddle/endpoint.rb