affirm-ruby 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67183e4230f5af0d79d948af0cc45151a79e7b0ad5781acc2732a4869dcb7955
-  data.tar.gz: 60122b43c022b3ee088c16ad27e6ecef53abcf5a689173124d6924054df66fa2
+  metadata.gz: 311a0f81d64a7f23bbfbc57366e2f174d4c80a1914fd59c225f3849a49992264
+  data.tar.gz: 7881f6ca2e67a47a50de4c12bbfcd53427a9084c1d68c6ff2ecb01e8f1df476f
 SHA512:
-  metadata.gz: f23b7bd7c0b5873d0bb61768dfc4466df7d639e167274c93336a255274b5021d8c6da0e403ef135c02974771b6bf5f35189f31eaa1e2f3e6a464b7a8f882cae6
-  data.tar.gz: d12b4ee1efe1af57fb29481280972b69a642ed79e3af528b8049559260a8b31118b53fa02634df87a3ca7ffe263867fb519833e89f8287d94d1deaa53357e1c0
+  metadata.gz: a861d1e63477c020271f17c8b1f4648918a4fc38b5d546bfe9554dd52246ecfc7dbaf374f75d8390433e58914949a36e3cc64e1802de00791995394f4f81e620
+  data.tar.gz: 2c1e55d82b904144ae5add4cafc9ab4077dd1308472cfa0d7b23581332ccff84f7d6c74ce5c0ee85811e4170a2b2bb064c1afb242da73c55f472713b5216dbb5

data/CHANGELOG.md

@@ -4,13 +4,17 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
-## [1.1.3][] (2020-10-30)
+## [1.1.3][] (2022-04-29)
+
+Fixes:
+
+  - Fix error on Ruby 3 (embold-tyler in [#6](https://github.com/spectator/affirm/pull/6))
 
 ## [1.1.2][] (2021-10-30)
 
 Fixes:
 
-  - Relax Ruby requirement (embold-tyler in [#4](https://github.com/spectator/affirm/pull/4))
+  - Relax Ruby requirement (embold-tyler in [#5](https://github.com/spectator/affirm/pull/5))
 
 ## [1.1.0][] (2019-09-03)
 

data/Gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: .
   specs:
-    affirm-ruby (1.1.1)
+    affirm-ruby (1.2.0)
       faraday
-      faraday_middleware
       virtus (~> 1.0, >= 1.0.0)
 
 GEM
@@ -13,35 +12,35 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    byebug (5.0.0)
-      columnize (= 0.9.0)
+    base64 (0.1.1)
+    byebug (11.1.3)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    columnize (0.9.0)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.3)
+    diff-lcs (1.5.0)
     equalizer (0.0.11)
-    faraday (0.15.4)
-      multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.13.1)
-      faraday (>= 0.7.4, < 1.0)
+    faraday (2.7.11)
+      base64
+      faraday-net_http (>= 2.0, < 3.1)
+      ruby2_keywords (>= 0.0.4)
+    faraday-net_http (3.0.2)
     ice_nine (0.11.2)
-    multipart-post (2.1.1)
-    rake (13.0.1)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
+    rake (13.1.0)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
+    ruby2_keywords (0.0.5)
     thread_safe (0.3.6)
     virtus (1.0.5)
       axiom-types (~> 0.1)
@@ -50,7 +49,8 @@ GEM
       equalizer (~> 0.0, >= 0.0.9)
 
 PLATFORMS
-  ruby
+  arm64-darwin-22
+  x86_64-darwin-21
 
 DEPENDENCIES
   affirm-ruby!
@@ -60,4 +60,4 @@ DEPENDENCIES
   rspec
 
 BUNDLED WITH
-   2.0.2
+   2.4.19

data/affirm.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = [">= 2.1", "< 4.0"]
   spec.add_dependency "faraday"
-  spec.add_dependency "faraday_middleware"
   spec.add_dependency "virtus", "~> 1.0", ">= 1.0.0"
 
   spec.add_development_dependency "bundler"

data/lib/affirm/client.rb

@@ -6,7 +6,7 @@ module Affirm
     private :url_prefix
 
     class << self
-      def request(method, path, **data)
+      def request(method, path, data={})
         new.public_send(method, path, data)
       end
     end
@@ -14,18 +14,18 @@ module Affirm
     def initialize
       @url_prefix = "/api/v2"
       @connection = Faraday.new(Affirm.configuration.endpoint) do |conn|
-        conn.basic_auth(basic_auth_user, basic_auth_password)
+        conn.request :authorization, :basic, basic_auth_user, basic_auth_password
         conn.request  :json
         conn.response :json, content_type: /\bjson$/
         conn.adapter  Faraday.default_adapter
       end
     end
 
-    def get(path, **data)
+    def get(path, data={})
       connection.get(normalized_path(path), data)
     end
 
-    def post(path, **data)
+    def post(path, data={})
       connection.post(normalized_path(path), data)
     end
 

data/lib/affirm/version.rb

@@ -1,3 +1,3 @@
 module Affirm
-  VERSION = "1.1.2"
+  VERSION = "1.2.0"
 end

data/lib/affirm.rb

@@ -1,7 +1,6 @@
 require "forwardable"
 
 require "faraday"
-require "faraday_middleware"
 require "virtus"
 
 require "affirm/client"

data/spec/charge_spec.rb

@@ -266,9 +266,11 @@ RSpec.describe Affirm::Charge do
       before do
         expect(Affirm::Client).to receive(:request)
           .with(:post, "charges/1/update",
-            order_id: "XYZ-007",
-            shipping_carrier: "FedEx",
-            shipping_confirmation: "1ZX007")
+                {
+                  order_id: "XYZ-007",
+                  shipping_carrier: "FedEx",
+                  shipping_confirmation: "1ZX007"
+                })
           .and_return(failed_response)
       end
 
@@ -310,9 +312,11 @@ RSpec.describe Affirm::Charge do
       before do
         expect(Affirm::Client).to receive(:request)
           .with(:post, "charges/1/update",
-            order_id: "XYZ-007",
-            shipping_carrier: "FedEx",
-            shipping_confirmation: "1ZX007"
+                {
+                  order_id: "XYZ-007",
+                  shipping_carrier: "FedEx",
+                  shipping_confirmation: "1ZX007"
+                }
           )
           .and_return(successful_response)
       end

data/spec/client_spec.rb

@@ -1,28 +1,16 @@
 require "helper"
 
 RSpec.describe Affirm::Client do
-  context "new instance" do
-    it "creates Faraday connection" do
-      expect(subject.connection).to be_an_instance_of(Faraday::Connection)
+  before(:all) do
+    Affirm.configure do |config|
+      config.public_api_key  = "abc"
+      config.private_api_key = "xyz"
     end
   end
 
-  context "with api keys set" do
-    before do
-      Affirm.configure do |config|
-        config.public_api_key  = "abc"
-        config.private_api_key = "xyz"
-      end
-    end
-
-    it "sets json handlers" do
-      expect(
-        subject.connection.builder.handlers
-      ).to include(FaradayMiddleware::EncodeJson, FaradayMiddleware::ParseJson)
-    end
-
-    it "sets basic auth header" do
-      expect(subject.connection.headers["Authorization"]).to eq("Basic YWJjOnh5eg==")
+  context "new instance" do
+    it "creates Faraday connection" do
+      expect(subject.connection).to be_an_instance_of(Faraday::Connection)
     end
   end
 
@@ -41,6 +29,11 @@ RSpec.describe Affirm::Client do
       subject.connection.adapter(:test, @stubs)
     end
 
+    it "sets basic auth header" do
+      response = subject.post("foo", {})
+      expect(response.env.request_headers["Authorization"]).to eq("Basic YWJjOnh5eg==")
+    end
+
     it "makes request to full url" do
       response = subject.post("foo", {})
       expect(response.env.url.to_s).to eq("https://api.affirm.com/api/v2/foo")
@@ -74,6 +67,11 @@ RSpec.describe Affirm::Client do
       subject.connection.adapter(:test, @stubs)
     end
 
+    it "sets basic auth header" do
+      response = subject.get("foo", {})
+      expect(response.env.request_headers["Authorization"]).to eq("Basic YWJjOnh5eg==")
+    end
+
     it "makes request to full url" do
       response = subject.get("foo", {})
       expect(response.env.url.to_s).to eq("https://api.affirm.com/api/v2/foo")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: affirm-ruby
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Yury Velikanau
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-01 00:00:00.000000000 Z
+date: 2023-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -25,20 +25,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: faraday_middleware
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: virtus
   requirement: !ruby/object:Gem::Requirement
@@ -184,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Ruby wrapper for Affirm.com API