afterpay 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0f91404c5d5fb6e1575f4beb24517b27902c6c4a6ecc7082f91d79ceee8c16a
-  data.tar.gz: 5cd752c26bcffba90e75574309dfaf6adab18a203d3534f963199c5b2e2c19ad
+  metadata.gz: 9ef17010e4937b9dcd9f33a9b6cb86018c5359bbc2114ec4cecf7f2496de5a4e
+  data.tar.gz: 53371cb5b49385109d8cd97613af0820e77c4b0371304e8902a736861177db95
 SHA512:
-  metadata.gz: 89eed2a49559ed62512b2e1a7db600cd0217aba8f4c55c07667cabbce12eb5e47843ecc78d64f8b5b3e81c6eed4a032afae187fb089c2685498046ec15c4f063
-  data.tar.gz: e284f5bb19b2908c621769d9abc1a3c170af32d0147bac7270fa8d432930c30e2dcd6de048df175d5c8cffa2b49856e4f8ce0ba8a7af6e03112be94d165b95b8
+  metadata.gz: 8a0c9dbed40e6a784e3cedcbbca139ebd40d23e9efc65d7cb6634de25ec20588036ae5acf81d844c08aa3de65d9e930e8b90f4154bced90ae756545c3f4029a6
+  data.tar.gz: 83e959ba698efe7f5fefbc777ee5df46a551234b846ad649e1450e4fe68fca1768de9f32f7a1906cf8cf4f836cb4a3f4eeaae5f8ee372326eb5c15bcbbb4b508

data/.rubocop.yml

@@ -1,5 +1,8 @@
 inherit_gem:
   relaxed-rubocop: .rubocop.yml
 
+AllCops:
+  TargetRubyVersion: 2.5
+
 Lint/MissingSuper:
   Enabled: false

data/README.md

@@ -30,7 +30,7 @@ Merchant ID and Secret Key are required to work with Afterpay API
 Afterpay.configure do |c|
   c.merchant_id = 'your_merchant_id'
   c.secret_key  = 'your_secret_key'
-  c.server      = 'us_or_au_server' # Default is 'https://api.us.afterpay.com/'
+  c.server      = 'us_or_au_server' # Default is 'https://global-api.afterpay.com/'
   c.user_agent  = 'MyAfterpayModule/1.0.0 (E-Commerce Platform Name/1.0.0; PHP/7.0.0; Merchant/600032000) https://merchant.example.com' # Default is nil
 end
 ```

data/afterpay.gemspec

@@ -23,9 +23,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = %w[lib]
 
-  spec.add_runtime_dependency     'faraday',            '~> 0.15', '>= 0.15.3'
-  spec.add_runtime_dependency     'faraday_middleware', '~> 0.12', '>= 0.12.2'
-  spec.add_runtime_dependency     'hashie',             '~> 3.6',  '>= 3.6.0'
+  spec.add_runtime_dependency     'faraday',            '~> 1.0'
+  spec.add_runtime_dependency     'faraday_middleware', '~> 1.0'
+  spec.add_runtime_dependency     'hashie',             '~> 4.0'
 
   spec.add_development_dependency 'bundler',            '~> 2.2.22'
   spec.add_development_dependency 'codecov',            '~> 0.5.2'

data/lib/afterpay/api/order/find.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Afterpay
+  module API
+    module Order
+      class Find < Base
+        def initialize(params = {})
+          @token = params[:token]
+        end
+
+        private
+
+        attr_reader :token
+
+        def payload
+          {
+            action: :get,
+            endpoint: endpoint
+          }
+        end
+
+        def endpoint
+          "#{URL}/#{token}"
+        end
+      end
+    end
+  end
+end

data/lib/afterpay/components/merchant.rb

@@ -12,6 +12,12 @@ module Afterpay
       # @return [String]
       # The user to redirected to this URL if the payment process is cancelled.
       attr_accessor :redirect_cancel_url
+
+      # @attribute popup_origin_url
+      # @return [String]
+      # URL to receive Javascript callbacks from Afterpay (e.g. onComplete, onShippingAddressChange, etc).
+      # Include the scheme, hostname and port. Port is optional.
+      attr_accessor :popup_origin_url
     end
   end
 end

data/lib/afterpay/components/order.rb

@@ -62,6 +62,11 @@ module Afterpay
       # @return [Afterpay::Components::Money]
       # The shipping amount.
       attr_accessor :shipping_amount
+
+      # @attribute mode
+      # @return [String]
+      # Set to `express` for an express-flow checkout.
+      attr_accessor :mode
     end
   end
 end

data/lib/afterpay/error_handler.rb

@@ -11,13 +11,17 @@ module Afterpay
       def inspect(response)
         return response if response.ok?
 
-        raise ERRORS[response.status], response_message(response)
+        raise ERRORS[response.status].new(response_error_code(response)), response_message(response)
       end
 
       def response_message(response)
         response.body.is_a?(String) ? JSON.parse(response.body)['message'] : response.message
       end
 
+      def response_error_code(response)
+        response.body.is_a?(String) ? JSON.parse(response.body)['errorCode'] : response.body.errorCode
+      end
+
       ERRORS = {
         400 => BadRequestError,
         401 => UnathorizedError,

data/lib/afterpay/errors.rb

@@ -1,7 +1,14 @@
 # frozen_string_literal: true
 
 module Afterpay
-  class BaseError                 < StandardError; end
+  class BaseError < StandardError
+    attr_accessor :error_code
+
+    def initialize(error_code)
+      super
+      @error_code = error_code
+    end
+  end
 
   class BadRequestError           < BaseError;     end
 

data/lib/afterpay/http_service.rb

@@ -18,8 +18,7 @@ module Afterpay
     # Afterpay default middleware stack
     DEFAULT_MIDDLEWARE = proc do |builder|
       builder.request    :json
-
-      builder.basic_auth(*::Afterpay.configuration.values)
+      builder.request    :basic_auth, *::Afterpay.configuration.values
 
       builder.response   :mashify
       builder.response   :json, content_type: /\bjson$/

data/lib/afterpay/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Afterpay
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/lib/afterpay.rb

@@ -5,6 +5,7 @@ require 'afterpay/api/configuration'
 require 'afterpay/api/configuration/retrieve'
 require 'afterpay/api/order'
 require 'afterpay/api/order/create'
+require 'afterpay/api/order/find'
 require 'afterpay/api/payment'
 require 'afterpay/api/payment/capture'
 require 'afterpay/api/payment/refund'
@@ -62,5 +63,5 @@ module Afterpay
     end
   end
 
-  DEFAULT_SERVER = 'https://api.us.afterpay.com/'
+  DEFAULT_SERVER = 'https://global-api.afterpay.com/'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: afterpay
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Sergey Vygovsky
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-30 00:00:00.000000000 Z
+date: 2021-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -19,60 +19,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.15.3
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.15.3
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.6.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.6.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -257,6 +239,7 @@ files:
 - lib/afterpay/api/configuration/retrieve.rb
 - lib/afterpay/api/order.rb
 - lib/afterpay/api/order/create.rb
+- lib/afterpay/api/order/find.rb
 - lib/afterpay/api/payment.rb
 - lib/afterpay/api/payment/auth.rb
 - lib/afterpay/api/payment/capture.rb