saddle 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6cbc5f3bed08d163ba1f6bb948acb555c16b9034ff6adac036a0f1f4252f872
-  data.tar.gz: 6b509a1bdb969e7b54c3c6fd93d742ef3cfd7144de2e8c36014f8a5fdc32484a
+  metadata.gz: 4023ece557e6ce616a2716b16f7cbfcd78250ed974b952fa626bd2231d4b40f7
+  data.tar.gz: 0213abb4917acb28ed0a2f7d7400ddf71b2d228d1711d3046d825bfed167cbba
 SHA512:
-  metadata.gz: c22f775da62289da5111c42fc64373aec52b3c831b828a0b40f9fda5d354d569da0481e8d789422965cd802ea23855816c4d53224ec3507a5a8dd977f7209c0c
-  data.tar.gz: 392ebba3e48907a68867ba54125fdccbc26df04659fd84db2aa053823af414da24093eca48bf3b460efaf43bfcbc1792c813b25e04c6a521b221f815ef89503d
+  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/bin/template/lib/saddle-client/stub.rb

@@ -9,7 +9,7 @@ module <%= root_module %>
 
     # Setup stubbing for all endpoints
     def stub!
-      <%= root_module %>::Endpoints::Status.any_instance.stub(:healthy?).and_return(
+      allow_any_instance_of(<%= root_module %>::Endpoints::Status).to receive(:healthy?).and_return(
         Stub::Data::TEST_STATUS_HEALTHY_RESPONSE
       )
     end

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'
 
@@ -47,13 +52,13 @@ module Saddle
       @host = opt[:host] || 'localhost'
       raise ':host must be a string' unless @host.is_a?(String)
       @port = opt[:port]
-      raise ':port must be nil or an integer' unless (@port.nil? || @port.is_a?(Fixnum))
+      raise ':port must be nil or an integer' unless (@port.nil? || @port.is_a?(Integer))
       @use_ssl = opt[:use_ssl] || false
       raise ':use_ssl must be true or false' unless (@use_ssl.is_a?(TrueClass) || @use_ssl.is_a?(FalseClass))
       @request_style = opt[:request_style] || :json
       raise ":request_style must be in: #{VALID_BODY_STYLES.join(',')}" unless VALID_BODY_STYLES.include?(@request_style)
       @num_retries = opt[:num_retries] || 3
-      raise ':num_retries must be an integer' unless @num_retries.is_a?(Fixnum)
+      raise ':num_retries must be an integer' unless @num_retries.is_a?(Integer)
       @timeout = opt[:timeout]
       raise ':timeout must be nil or an integer' unless (@timeout.nil? || @timeout.is_a?(Numeric))
       @extra_env = opt[:extra_env] || {}

data/lib/saddle/version.rb

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

data/spec/middleware/logging/statsd_spec.rb

@@ -15,8 +15,7 @@ describe Saddle::Middleware::Logging::StatsdLogger do
     end
 
     it "should log a request" do
-      ::Statsd.any_instance.should_receive(:time).with("saddle.statsd_client.raw.localhost-test").and_yield
-
+      allow_any_instance_of(::Statsd).to receive(:time).with("saddle.statsd_client.raw.localhost-test").and_yield
       client = StatsdClient.create(
         :stubs => Faraday::Adapter::Test::Stubs.new do |stub|
           stub.get('/test') {
@@ -32,8 +31,7 @@ describe Saddle::Middleware::Logging::StatsdLogger do
     end
 
     it "should allow overriding the path" do
-      ::Statsd.any_instance.should_receive(:time).with("hello").and_yield
-
+      allow_any_instance_of(::Statsd).to receive(:time).with("hello").and_yield
       client = StatsdClient.create(
         :stubs => Faraday::Adapter::Test::Stubs.new do |stub|
           stub.get('/test') {

data/spec/middleware/request/path_prefix_spec.rb

@@ -0,0 +1,136 @@
+require 'spec_helper'
+
+describe Saddle::Client do
+  context "when path_prefix is set" do
+    context "using the default client" do
+      before :each do
+        @stubs = Faraday::Adapter::Test::Stubs.new
+        @default_client = Saddle::Client.create(:stubs => @stubs, :path_prefix => 'api/v1')
+      end
+
+      context "with no path" do
+        context "for a GET request" do
+          context "with no params" do
+            it "should properly prefix the path" do
+              url = ''
+              @stubs.get('/api/v1/') {
+                [
+                  200,
+                  {},
+                  'Party!',
+                ]
+              }
+              @default_client.requester.get(url).should == 'Party!'
+            end
+          end
+
+          context "with params" do
+            it "should properly prefix the path" do
+              url = '?a=1'
+              @stubs.get('/api/v1/?a=1') {
+                [
+                  200,
+                  {},
+                  'Party!',
+                ]
+              }
+              @default_client.requester.get(url).should == 'Party!'
+            end
+          end
+        end
+
+        context "for a POST request" do
+          context "with no params" do
+            it "should properly prefix the path" do
+              url = ''
+              @stubs.post('/api/v1/') {
+                [
+                  200,
+                  {},
+                  'Party!',
+                ]
+              }
+              @default_client.requester.post(url).should == 'Party!'
+            end
+          end
+
+          context "with params" do
+            it "should properly prefix the path" do
+              url = '?a=1'
+              @stubs.post('/api/v1/?a=1') {
+                [
+                  200,
+                  {},
+                  'Party!',
+                ]
+              }
+              @default_client.requester.post(url).should == 'Party!'
+            end
+          end
+        end
+      end
+
+      context "with a path" do
+        context "for a GET request" do
+          context "with no params" do
+            it "should properly prefix the path" do
+              url = '/test'
+              @stubs.get('/api/v1/test') {
+                [
+                  200,
+                  {},
+                  'Party!',
+                ]
+              }
+              @default_client.requester.get(url).should == 'Party!'
+            end
+          end
+
+          context "with params" do
+            it "should properly prefix the path" do
+              url = '/test?a=1'
+              @stubs.get('/api/v1/test?a=1') {
+                [
+                  200,
+                  {},
+                  'Party!',
+                ]
+              }
+              @default_client.requester.get(url).should == 'Party!'
+            end
+          end
+        end
+
+        context "for a POST request" do
+          context "with no params" do
+            it "should properly prefix the path" do
+              url = '/test'
+              @stubs.post('/api/v1/test') {
+                [
+                  200,
+                  {},
+                  'Party!',
+                ]
+              }
+              @default_client.requester.post(url).should == 'Party!'
+            end
+          end
+
+          context "with params" do
+            it "should properly prefix the path" do
+              url = '/test?a=1'
+              @stubs.post('/api/v1/test?a=1') {
+                [
+                  200,
+                  {},
+                  'Party!',
+                ]
+              }
+              @default_client.requester.post(url).should == 'Party!'
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/multiple_spec.rb

@@ -61,8 +61,8 @@ describe Saddle::Client do
         client2 = Client2.create(:stubs => stubs)
 
         # Make sure client2's middleware isn't called
-        Middleware1.any_instance.should_receive(:subcall)
-        Middleware2.any_instance.should_not_receive(:subcall)
+        allow_any_instance_of(Middleware1).to receive(:subcall)
+        allow_any_instance_of(Middleware2).to receive(:subcall)
 
         # Make the call
         client1.requester.get('/')

data/spec/spec_helper.rb

@@ -2,3 +2,7 @@ require 'faraday' # for test stubs
 require 'saddle'
 
 require 'pry'
+
+RSpec.configure do |config|
+  config.expect_with(:rspec) { |c| c.syntax = [:should, :expect] }
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saddle
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Mike Lewis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-26 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
@@ -128,6 +132,7 @@ files:
 - spec/middleware/logging/airbrake_spec.rb
 - spec/middleware/logging/rails_spec.rb
 - spec/middleware/logging/statsd_spec.rb
+- spec/middleware/request/path_prefix_spec.rb
 - spec/middleware/request/retry_spec.rb
 - spec/middleware/response/default_response_spec.rb
 - spec/multiple_spec.rb
@@ -166,6 +171,7 @@ test_files:
 - spec/middleware/logging/airbrake_spec.rb
 - spec/middleware/logging/rails_spec.rb
 - spec/middleware/logging/statsd_spec.rb
+- spec/middleware/request/path_prefix_spec.rb
 - spec/middleware/request/retry_spec.rb
 - spec/middleware/response/default_response_spec.rb
 - spec/multiple_spec.rb