saddle 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6cbc5f3bed08d163ba1f6bb948acb555c16b9034ff6adac036a0f1f4252f872
-  data.tar.gz: 6b509a1bdb969e7b54c3c6fd93d742ef3cfd7144de2e8c36014f8a5fdc32484a
+  metadata.gz: 40349fa3b434064564e6060fafbfede9327e3ad28d28035ecc6ce3eefebc096d
+  data.tar.gz: 68d77c929a14a18571ec4be49fa2daf0e207840add48e3424220643a68c57be5
 SHA512:
-  metadata.gz: c22f775da62289da5111c42fc64373aec52b3c831b828a0b40f9fda5d354d569da0481e8d789422965cd802ea23855816c4d53224ec3507a5a8dd977f7209c0c
-  data.tar.gz: 392ebba3e48907a68867ba54125fdccbc26df04659fd84db2aa053823af414da24093eca48bf3b460efaf43bfcbc1792c813b25e04c6a521b221f815ef89503d
+  metadata.gz: d84f468133bedaa13ecb030dc2819a0f23b39255b1e500301b5e220d638b2d125106ebea591f2b25628e366fc433e9f440217a94a84f30367a4acb471cbfb0a1
+  data.tar.gz: ab8fccb3facdd3d186627c6c76569e3209b8d7cad3608125a4c24799ba7eaf58c4e2ac04f5793d23c9d989a0a4c6bace879952ffa658bd5a76653aaa9547f85e

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/lib/saddle/requester.rb

@@ -47,13 +47,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.1'
 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.1
 platform: ruby
 authors:
 - Mike Lewis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-26 00:00:00.000000000 Z
+date: 2023-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -128,6 +128,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 +167,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