smartpay 0.2.14 → 0.2.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27577ba266e00cb77bb730e603c9b8f44d93d9062f4935f72f9ef29c9904c456
-  data.tar.gz: d9d98d1da2b90545f42ed7a982bca956fb6eaa9beb6b90a73c0789ae6ce07bfe
+  metadata.gz: 3897098e68300e9004b822ba8f797040b02c00362428cee023ba598415bd4a54
+  data.tar.gz: dd42d0ad91f798d88fd765270975e9d61dde01cd3b52143c0d762bb1577f71b6
 SHA512:
-  metadata.gz: 5a95a99d46cd097137108c2839802e79903ecb6902ccfafc637eee370c1bf96c272c20a8e6dc5c54af8a1d7aa3114cb6d8f1c55ced9b2916384cc5249c05a5ec
-  data.tar.gz: 3a6651ccdf5d72b9716be260b5c20638220ef6c7da00e3ecd43db9ee405ac6ea5205d923aed0213ce9c84a4d5d0c16a22c4de4bb4a6dd373b9bc92c71bb00340
+  metadata.gz: 05df4d994fd49a80bd58d56bd58469639aa0ad50f7688d874cce1b412e8366fe5afb82acf6082c00e40b3b0a7491bba4a7242117e65ab22e8fd326cbd0b9e65a
+  data.tar.gz: ed67c91a5e4f43991a362d77c2c2ac4f430265c14f3c236941c26f482a162683bdddbc10700e82344b9b923c698bbbd9126cd8c1cb7975bc1506807de2888a80

data/.rubocop.yml

@@ -1,13 +1,13 @@
-AllCops:
-  TargetRubyVersion: 2.4
-
-Style/StringLiterals:
-  Enabled: true
-  EnforcedStyle: double_quotes
-
-Style/StringLiteralsInInterpolation:
-  Enabled: true
-  EnforcedStyle: double_quotes
-
-Layout/LineLength:
-  Max: 120
+AllCops:
+  TargetRubyVersion: 2.5
+
+Style/StringLiterals:
+  Enabled: true
+  EnforcedStyle: double_quotes
+
+Style/StringLiteralsInInterpolation:
+  Enabled: true
+  EnforcedStyle: double_quotes
+
+Layout/LineLength:
+  Max: 120

data/README.md

@@ -1,181 +1,181 @@
-# Smartpay Ruby Library
-
-The Smartpay Ruby library offers easy access to Smartpay API from applications written in Ruby.
-
-## Documentation
-
-- [Payment Flow](https://docs.smartpay.co/#payment_flow)
-- [API Document](https://api-doc.smartpay.co)
-
-## Requirements
-
-- Ruby 2.6+
-- Smartpay `API keys & secrets`. You can find your credential at the `settings > credentials` page on your [dashboard](https://dashboard.smartpay.co/settings/credentials).
-
-## Installation
-
-If you use system built-in Ruby, you might need to be the `sudoer` to be able to `sudo` in some of the following steps. We recommend you to use either [rbenv](https://github.com/rbenv/rbenv) or [rvm](https://rvm.io/) to have your own non-global Ruby to avoid potential permission issues.
-
-Once you have your Ruby in place, add the latest version of Smartpay to your project's dependencies:
-
-```sh
-gem install smartpay
-```
-
-If you want to build the gem yourself from source:
-
-```sh
-gem build smartpay.gemspec
-```
-
-### Bundler
-
-If you are installing via bundler, make sure that you use the `https` resource in your Gemfile to avoid the risk of gems being compromised:
-
-```ruby
-source 'https://rubygems.org'
-
-gem 'smartpay'
-```
-
-## Usage
-
-The package needs to be configured with your own API keys, you can find them on your [dashboard](https://dashboard.smartpay.co/settings/credentials).
-
-```ruby
-Smartpay.configure do |config|
-  config.public_key = '<YOUR_PUBLIC_KEY>' # the one starts with pk_test_
-  config.secret_key = '<YOUR_SECRET_KEY>' # the one starts with sk_test_
-end
-```
-
-### Create Checkout session
-
-You can find the description and requirement for request payload in [API Document](https://api-doc.smartpay.co/#8a3538b1-530c-448c-8bae-4a41cdf0b8fd).
-
-```ruby
-payloaad = {
-  "customerInfo": {
-    "emailAddress": "success@smartpay.co",
-  },
-  "orderData": {
-    "amount": 250,
-    "currency": "JPY",
-    "shippingInfo": {
-      "address": {
-        "line1": "line1",
-        "locality": "locality",
-        "postalCode": "123",
-        "country": "JP"
-      },
-    },
-    "lineItemData": [{
-      "priceData": {
-        "productData": {
-          "name": "レブロン 18 LOW",
-        },
-        "amount": 250,
-        "currency": "JPY",
-      },
-      "quantity": 1
-    }]
-  },
-  "reference": "order_ref_1234567",
-  "successUrl": "https://docs.smartpay.co/example-pages/checkout-successful",
-  "cancelUrl": "https://docs.smartpay.co/example-pages/checkout-canceled"
-}
-```
-
-Create a checkout session by using `Smartpay::Api.create_checkout_session` with your request payload.
-
-```ruby
-session = Smartpay::Api.create_checkout_session(payload)
-```
-
-Then, you can redirect your customer to the session url by calling `redirect_url`:
-
-```ruby
-session.redirect_url
-```
-
-## Use with your favorite frameworks
-
-### Ruby on Rails (RoR)
-
-#### Install Rails
-
-```sh
-gem install rails
-```
-
-#### Create your app
-
-```sh
-rails new app-with-smartpay
-```
-
-#### Add Smartpay
-
-```sh
-cd app-with-smartpay
-bundle add smartpay
-```
-
-#### Generator
-
-```sh
-bundle exec rails generate smartpay:install
-```
-
-This introduces 4 changes for a pre-built Smartpay Checkout example:
-
-> 1. A new initializer - `config/initializers/smartpay.rb`. You will have to update the `config.public_key` and `config.secret_key` with your own credentials to make this work.
-> 2. A new controller - `app/controllers/smartpays_controller.rb`. This is where you can see how a Checkout session is configured & created.
-> 3. A new view - `app/views/smartpays/index.html.erb`. The minimum frontend required.
-> 4. A new route in config/routes.rb.
-
-#### Fill in your API keys
-
-Edit the keys with your own credentials in `config/initializers/smartpay.rb`.
-
-```ruby
-  ...
-  config.public_key = '<YOUR_PUBLIC_KEY>' # the one starts with pk_test_
-  config.secret_key = '<YOUR_SECRET_KEY>' # the one starts with sk_test_
-  ...
-```
-
-#### Start your server
-
-```sh
-bundle exec rails server
-```
-
-### Test with Checkout Session
-
-Visit [http://localhost:3000/smartpays](http://localhost:3000/smartpays).
-
-Click the `checkout` button on the page to be redirected to Smartpay's Checkout.
-
-To try out different cases, you can use the following test credit cards for different cases:
-
-- Payment succeeds: `4242 4242 4242 4242`
-- Payment is declined: `4100 0000 0000 0019`
-
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-## Contributing
-
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/smartpay. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/[USERNAME]/smartpay/blob/master/CODE_OF_CONDUCT.md).
-
-## License
-
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
-
-## Code of Conduct
-
-Everyone interacting in the Smartpay project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/smartpay/blob/master/CODE_OF_CONDUCT.md).
+# Smartpay Ruby Library
+
+The Smartpay Ruby library offers easy access to Smartpay API from applications written in Ruby.
+
+## Documentation
+
+- [Payment Flow](https://docs.smartpay.co/#payment_flow)
+- [API Document](https://api-doc.smartpay.co)
+
+## Requirements
+
+- Ruby 2.6+
+- Smartpay `API keys & secrets`. You can find your credential at the `settings > credentials` page on your [dashboard](https://dashboard.smartpay.co/settings/credentials).
+
+## Installation
+
+If you use system built-in Ruby, you might need to be the `sudoer` to be able to `sudo` in some of the following steps. We recommend you to use either [rbenv](https://github.com/rbenv/rbenv) or [rvm](https://rvm.io/) to have your own non-global Ruby to avoid potential permission issues.
+
+Once you have your Ruby in place, add the latest version of Smartpay to your project's dependencies:
+
+```sh
+gem install smartpay
+```
+
+If you want to build the gem yourself from source:
+
+```sh
+gem build smartpay.gemspec
+```
+
+### Bundler
+
+If you are installing via bundler, make sure that you use the `https` resource in your Gemfile to avoid the risk of gems being compromised:
+
+```ruby
+source 'https://rubygems.org'
+
+gem 'smartpay'
+```
+
+## Usage
+
+The package needs to be configured with your own API keys, you can find them on your [dashboard](https://dashboard.smartpay.co/settings/credentials).
+
+```ruby
+Smartpay.configure do |config|
+  config.public_key = '<YOUR_PUBLIC_KEY>' # the one starts with pk_test_
+  config.secret_key = '<YOUR_SECRET_KEY>' # the one starts with sk_test_
+end
+```
+
+### Create Checkout session
+
+You can find the description and requirement for request payload in [API Document](https://api-doc.smartpay.co/#8a3538b1-530c-448c-8bae-4a41cdf0b8fd).
+
+```ruby
+payloaad = {
+  "customerInfo": {
+    "emailAddress": "success@smartpay.co",
+  },
+  "orderData": {
+    "amount": 250,
+    "currency": "JPY",
+    "shippingInfo": {
+      "address": {
+        "line1": "line1",
+        "locality": "locality",
+        "postalCode": "123",
+        "country": "JP"
+      },
+    },
+    "lineItemData": [{
+      "priceData": {
+        "productData": {
+          "name": "レブロン 18 LOW",
+        },
+        "amount": 250,
+        "currency": "JPY",
+      },
+      "quantity": 1
+    }]
+  },
+  "reference": "order_ref_1234567",
+  "successUrl": "https://docs.smartpay.co/example-pages/checkout-successful",
+  "cancelUrl": "https://docs.smartpay.co/example-pages/checkout-canceled"
+}
+```
+
+Create a checkout session by using `Smartpay::Api.create_checkout_session` with your request payload.
+
+```ruby
+session = Smartpay::Api.create_checkout_session(payload)
+```
+
+Then, you can redirect your customer to the session url by calling `redirect_url`:
+
+```ruby
+session.redirect_url
+```
+
+## Use with your favorite frameworks
+
+### Ruby on Rails (RoR)
+
+#### Install Rails
+
+```sh
+gem install rails
+```
+
+#### Create your app
+
+```sh
+rails new app-with-smartpay
+```
+
+#### Add Smartpay
+
+```sh
+cd app-with-smartpay
+bundle add smartpay
+```
+
+#### Generator
+
+```sh
+bundle exec rails generate smartpay:install
+```
+
+This introduces 4 changes for a pre-built Smartpay Checkout example:
+
+> 1. A new initializer - `config/initializers/smartpay.rb`. You will have to update the `config.public_key` and `config.secret_key` with your own credentials to make this work.
+> 2. A new controller - `app/controllers/smartpays_controller.rb`. This is where you can see how a Checkout session is configured & created.
+> 3. A new view - `app/views/smartpays/index.html.erb`. The minimum frontend required.
+> 4. A new route in config/routes.rb.
+
+#### Fill in your API keys
+
+Edit the keys with your own credentials in `config/initializers/smartpay.rb`.
+
+```ruby
+  ...
+  config.public_key = '<YOUR_PUBLIC_KEY>' # the one starts with pk_test_
+  config.secret_key = '<YOUR_SECRET_KEY>' # the one starts with sk_test_
+  ...
+```
+
+#### Start your server
+
+```sh
+bundle exec rails server
+```
+
+### Test with Checkout Session
+
+Visit [http://localhost:3000/smartpays](http://localhost:3000/smartpays).
+
+Click the `checkout` button on the page to be redirected to Smartpay's Checkout.
+
+To try out different cases, you can use the following test credit cards for different cases:
+
+- Payment succeeds: `4242 4242 4242 4242`
+- Payment is declined: `4100 0000 0000 0019`
+
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/smartpay. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/[USERNAME]/smartpay/blob/master/CODE_OF_CONDUCT.md).
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+
+## Code of Conduct
+
+Everyone interacting in the Smartpay project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/smartpay/blob/master/CODE_OF_CONDUCT.md).

data/lib/smartpay/api.rb

@@ -1,13 +1,13 @@
-# frozen_string_literal: true
-
-module Smartpay
-  class Api
-    class << self
-      def create_checkout_session(payload)
-        Responses::CheckoutSession.new(
-          Client.post('/checkout-sessions', Requests::CheckoutSession.new(payload).as_hash)
-        )
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Smartpay
+  class Api
+    class << self
+      def create_checkout_session(payload)
+        Responses::CheckoutSession.new(
+          Client.post("/checkout-sessions", Requests::CheckoutSession.new(payload).as_hash)
+        )
+      end
+    end
+  end
+end

data/lib/smartpay/client.rb

@@ -1,44 +1,45 @@
-# frozen_string_literal: true
-
-require 'rest-client'
-
-module Smartpay
-  class Client
-    class << self
-      def post(path, payload = {})
-        request_payload = default_payload.merge(payload)
-        response = RestClient::Request.execute(method: :post, url: api_url(path), headers: headers, timeout: timeout, payload: request_payload.to_json)
-        JSON.parse(response.body, symbolize_names: true)
-      end
-
-      private
-
-      def api_url(path)
-        "#{Smartpay.configuration.api_url}#{path}"
-      end
-
-      def timeout
-        Smartpay.configuration.post_timeout
-      end
-
-      def headers
-        {
-          accept: :json,
-          content_type: :json,
-          Authorization: "Basic #{secret_key}"
-        }
-      end
-
-      def secret_key
-        Smartpay.configuration.secret_key
-      end
-
-      def default_payload
-        {
-          'dev-lang': :ruby,
-          'sdk-version': Smartpay::VERSION
-        }.freeze
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+require "rest-client"
+
+module Smartpay
+  class Client
+    class << self
+      def post(path, payload = {})
+        request_payload = default_payload.merge(payload)
+        response = RestClient::Request.execute(method: :post, url: api_url(path), headers: headers, timeout: timeout,
+                                               payload: request_payload.to_json)
+        JSON.parse(response.body, symbolize_names: true)
+      end
+
+      private
+
+      def api_url(path)
+        "#{Smartpay.configuration.api_url}#{path}"
+      end
+
+      def timeout
+        Smartpay.configuration.post_timeout
+      end
+
+      def headers
+        {
+          accept: :json,
+          content_type: :json,
+          Authorization: "Basic #{secret_key}"
+        }
+      end
+
+      def secret_key
+        Smartpay.configuration.secret_key
+      end
+
+      def default_payload
+        {
+          'dev-lang': :ruby,
+          'sdk-version': Smartpay::VERSION
+        }.freeze
+      end
+    end
+  end
+end

data/lib/smartpay/configuration.rb

@@ -1,30 +1,48 @@
-# frozen_string_literal: true
-
-module Smartpay
-  class Configuration
-    attr_accessor :public_key, :secret_key
-    attr_writer :post_timeout, :api_url, :checkout_url
-
-    DEFAULT_TIMEOUT_SETTING = 30
-    DEFAULT_API_URL = 'https://api.smartpay.co/v1'
-    DEFAULT_CHECKOUT_URL = 'https://checkout.smartpay.co'
-
-    def initialize
-      @post_timeout = DEFAULT_TIMEOUT_SETTING
-      @api_url = DEFAULT_API_URL
-      @checkout_url = DEFAULT_CHECKOUT_URL
-    end
-
-    def post_timeout
-      @post_timeout || DEFAULT_TIMEOUT_SETTING
-    end
-
-    def api_url
-      @api_url || DEFAULT_API_URL
-    end
-
-    def checkout_url
-      @checkout_url || DEFAULT_CHECKOUT_URL
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Smartpay
+  class Configuration
+    attr_accessor :public_key, :secret_key
+    attr_writer :post_timeout, :api_url, :checkout_url
+
+    DEFAULT_TIMEOUT_SETTING = 30
+    DEFAULT_API_URL = "https://api.smartpay.co/v1"
+    DEFAULT_CHECKOUT_URL = "https://checkout.smartpay.co"
+
+    def initialize
+      @post_timeout = DEFAULT_TIMEOUT_SETTING
+      @api_url = if in_development_mode?
+                   ENV["SMARTPAY_API_PREFIX"].downcase || DEFAULT_API_URL
+                 else
+                   DEFAULT_API_URL
+                 end
+      @checkout_url = if in_development_mode? && ENV["SMARTPAY_CHECKOUT_URL"].is_a?(String)
+                        ENV["SMARTPAY_CHECKOUT_URL"].downcase || DEFAULT_CHECKOUT_URL
+                      else
+                        DEFAULT_CHECKOUT_URL
+                      end
+    end
+
+    def post_timeout
+      @post_timeout || DEFAULT_TIMEOUT_SETTING
+    end
+
+    def api_url
+      if in_development_mode?
+        @api_url || ENV["SMARTPAY_API_PREFIX"].downcase || DEFAULT_API_URL
+      else
+        @api_url || DEFAULT_API_URL
+      end
+    end
+
+    def checkout_url
+      @checkout_url || DEFAULT_CHECKOUT_URL
+    end
+
+    private
+
+    def in_development_mode?
+      ENV["SMARTPAY_API_PREFIX"].downcase.include?("api.smartpay") if ENV["SMARTPAY_API_PREFIX"].is_a?(String)
+    end
+  end
+end

data/lib/smartpay/requests/checkout_session.rb

@@ -1,194 +1,120 @@
-# frozen_string_literal: true
-
-module Smartpay
-  module Requests
-    class CheckoutSession
-      attr_accessor :payload
-
-      REQUIREMENT_KEY_NAME = [:successURL, :cancelURL, :customerInfo, :orderData].freeze
-      CAN_FALLBACK_KEYS = [:customerInfo, :orderData].freeze
-
-      def initialize(raw_payload)
-        @payload = raw_payload.transform_keys(&:to_sym)
-      end
-
-      def as_hash
-        check_requirement!
-        normalize_payload
-      end
-
-      private
-
-      def check_requirement!
-        REQUIREMENT_KEY_NAME.each do |key_name|
-          next if CAN_FALLBACK_KEYS.include?(key_name)
-          raise Errors::InvalidRequestPayloadError, key_name unless payload.include?(key_name)
-        end
-      end
-
-      def normalize_payload
-        currency = get_currency
-        total_amount = get_total_amount
-
-        {
-          customerInfo: normalize_customer_info(payload.dig(:customerInfo) || payload.dig(:customer) || {}),
-          orderData: normalize_order_data(payload.dig(:orderData) || {
-            amount: total_amount,
-            currency: currency,
-            captureMethod: payload.dig(:captureMethod),
-            confirmationMethod: payload.dig(:confirmationMethod),
-            coupons: payload.dig(:coupons),
-            shippingInfo: payload.dig(:shippingInfo) || normalize_shipping(payload.dig(:shipping)),
-            lineItemData: payload.dig(:orderData, :lineItemData) || payload.dig(:items),
-            description: payload.dig(:orderDescription),
-            metadata: payload.dig(:orderMetadata)
-          }),
-          reference: payload.dig(:reference),
-          metadata: payload.dig(:metadata),
-          successUrl: payload.dig(:successURL),
-          cancelUrl: payload.dig(:cancelURL),
-          test: payload.dig(:test) || false
-        }
-      end
-
-      def normalize_customer_info(info)
-        return if info.nil?
-        customer = info.transform_keys(&:to_sym)
-        {
-          accountAge: customer.dig(:accountAge),
-          emailAddress: customer.dig(:emailAddress) || customer.dig(:email),
-          firstName: customer.dig(:firstName),
-          lastName: customer.dig(:lastName),
-          firstNameKana: customer.dig(:firstNameKana),
-          lastNameKana: customer.dig(:lastNameKana),
-          address: customer.dig(:address),
-          phoneNumber: customer.dig(:phoneNumber) || customer.dig(:phone),
-          dateOfBirth: customer.dig(:dateOfBirth),
-          legalGender: customer.dig(:legalGender) || customer.dig(:gender),
-          reference: customer.dig(:reference)
-        }
-      end
-
-      def normalize_shipping(shipping)
-        return if shipping.nil?
-        shipping= shipping.transform_keys(&:to_sym)
-        {
-          address: shipping.dig(:address) || {
-            line1: shipping.dig(:line1),
-            line2: shipping.dig(:line2),
-            line3: shipping.dig(:line3),
-            line4: shipping.dig(:line4),
-            line5: shipping.dig(:line5),
-            subLocality: shipping.dig(:subLocality),
-            locality: shipping.dig(:locality),
-            administrativeArea: shipping.dig(:administrativeArea),
-            postalCode: shipping.dig(:postalCode),
-            country: shipping.dig(:country),
-          },
-          addressType: shipping.dig(:addressType)
-        }
-      end
-
-      def normalize_order_data(order)
-        return if order.nil?
-        order = order.transform_keys(&:to_sym)
-        {
-          amount: order.dig(:amount),
-          currency: order.dig(:currency),
-          captureMethod: order.dig(:captureMethod),
-          confirmationMethod: order.dig(:confirmationMethod),
-          coupons: order.dig(:coupons),
-          shippingInfo: order.dig(:shippingInfo),
-          lineItemData: normalize_line_items(order.dig(:lineItemData) || order.dig(:items))
-        }
-      end
-
-      def normalize_line_items(data)
-        return [] if data.nil?
-
-        data.map do |item|
-          line_item = item.transform_keys(&:to_sym)
-          {
-            price: line_item.dig(:price),
-            priceData: normalize_price_data(line_item.dig(:priceData) || {
-              productData: {
-                name: line_item.dig(:name),
-                brand: line_item.dig(:brand),
-                categories: line_item.dig(:categories),
-                gtin: line_item.dig(:gtin),
-                images: line_item.dig(:images),
-                reference: line_item.dig(:reference),
-                url: line_item.dig(:url),
-                description: line_item.dig(:productDescription),
-                metadata: line_item.dig(:productMetadata)
-              },
-              amount: line_item.dig(:amount),
-              currency: line_item.dig(:currency),
-              label: line_item.dig(:label),
-              description: line_item.dig(:priceDescription),
-              metadata: line_item.dig(:priceMetadata)
-            }),
-            quantity: line_item.dig(:quantity),
-            description: line_item.dig(:description),
-            metadata: line_item.dig(:metadata)
-          }
-        end
-      end
-
-      def normalize_price_data(data)
-        return if data.nil?
-        data = data.transform_keys(&:to_sym)
-        {
-          productData: normalize_product_data(data.dig(:productData) || {}),
-          amount: data.dig(:amount),
-          currency: data.dig(:currency),
-          metadata: data.dig(:metadata)
-        }
-      end
-
-      def normalize_product_data(product)
-        return if product.nil?
-        product = product.transform_keys(&:to_sym)
-        {
-          name: product.dig(:name),
-          brand: product.dig(:brand),
-          categories: product.dig(:categories),
-          description: product.dig(:description),
-          gtin: product.dig(:gtin),
-          images: product.dig(:images),
-          reference: product.dig(:reference),
-          url: product.dig(:url),
-          metadata: product.dig(:metadata)
-        }
-      end
-
-      def get_currency
-        currency = payload.dig(:orderData, :currency) || payload.dig(:orderData, 'currency')
-        if currency.nil?
-          items = get_items
-          if !items.nil? && items.count > 0
-            currency = items.first.dig(:currency) || items.first.dig('currency')
-          end
-        end
-        currency
-      end
-
-      def get_total_amount
-        total_amount = payload.dig(:orderData, :amount) || payload.dig(:orderData, 'amount')
-        if total_amount.nil?
-          items = get_items
-          if !items.nil? && items.count > 0
-            total_amount = items.inject(0) { |sum, item| sum + (item[:amount] || item['amount'] || 0) }
-          end
-        end
-        total_amount
-      end
-
-      def get_items
-        @items ||= payload.dig(:orderData, :lineItemData, :priceData) ||
-          payload.dig(:orderData, 'lineItemData', 'priceData') ||
-          payload.dig(:items)
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Smartpay
+  module Requests
+    class CheckoutSession
+      attr_accessor :payload
+
+      REQUIREMENT_KEY_NAME = [:successUrl, :cancelUrl, :customerInfo, :currency, :items].freeze
+      CAN_FALLBACK_KEYS = [:customerInfo].freeze
+
+      def initialize(raw_payload)
+        @payload = raw_payload.transform_keys(&:to_sym)
+      end
+
+      def as_hash
+        check_requirement!
+        normalize_payload
+      end
+
+      private
+
+      def check_requirement!
+        REQUIREMENT_KEY_NAME.each do |key_name|
+          next if CAN_FALLBACK_KEYS.include?(key_name)
+          raise Errors::InvalidRequestPayloadError, key_name unless payload.include?(key_name)
+        end
+      end
+
+      def normalize_payload
+        shipping_info = payload.dig(:shippingInfo) || normalize_shipping(payload.dig(:shipping))
+        if shipping_info && shipping_info[:feeCurrency].nil? && !(shipping_info[:feeAmount].nil?)
+          shipping_info[:feeCurrency] = payload.dig(:currency)
+        end
+
+        {
+          customerInfo: normalize_customer_info(payload.dig(:customerInfo) || payload.dig(:customer) || {}),
+          amount: payload.dig(:amount),
+          captureMethod: payload.dig(:captureMethod),
+          currency: payload.dig(:currency),
+          description: payload.dig(:description),
+          shippingInfo: shipping_info,
+          items: normalize_items(payload.dig(:items)),
+          metadata: payload.dig(:metadata) || {},
+          reference: payload.dig(:reference),
+          successUrl: payload.dig(:successURL),
+          cancelUrl: payload.dig(:cancelURL),
+          test: payload.dig(:test) || false
+        }
+      end
+
+      def normalize_customer_info(info)
+        return if info.nil?
+        customer = info.transform_keys(&:to_sym)
+        {
+          accountAge: customer.dig(:accountAge),
+          emailAddress: customer.dig(:emailAddress) || customer.dig(:email),
+          firstName: customer.dig(:firstName),
+          lastName: customer.dig(:lastName),
+          firstNameKana: customer.dig(:firstNameKana),
+          lastNameKana: customer.dig(:lastNameKana),
+          address: customer.dig(:address),
+          phoneNumber: customer.dig(:phoneNumber) || customer.dig(:phone),
+          dateOfBirth: customer.dig(:dateOfBirth),
+          legalGender: customer.dig(:legalGender) || customer.dig(:gender),
+          reference: customer.dig(:reference)
+        }
+      end
+
+      def normalize_shipping(shipping)
+        return if shipping.nil?
+        shipping= shipping.transform_keys(&:to_sym)
+        {
+          address: shipping.dig(:address) || {
+            line1: shipping.dig(:line1),
+            line2: shipping.dig(:line2),
+            line3: shipping.dig(:line3),
+            line4: shipping.dig(:line4),
+            line5: shipping.dig(:line5),
+            subLocality: shipping.dig(:subLocality),
+            locality: shipping.dig(:locality),
+            administrativeArea: shipping.dig(:administrativeArea),
+            postalCode: shipping.dig(:postalCode),
+            country: shipping.dig(:country),
+          },
+          addressType: shipping.dig(:addressType),
+          feeAmount: shipping.dig(:feeAmount),
+          feeCurrency: shipping.dig(:feeCurrency),
+        }
+      end
+
+      def normalize_items(data)
+        return [] if data.nil?
+
+        data.map do |item|
+          line_item = item.transform_keys(&:to_sym)
+          {
+            quantity: line_item.dig(:quantity),
+            label: line_item.dig(:label),
+            name: line_item.dig(:name),
+            description: line_item.dig(:description),
+            amount: line_item.dig(:amount),
+            currency: line_item.dig(:currency),
+            brand: line_item.dig(:brand),
+            categories: line_item.dig(:categories),
+            gtin: line_item.dig(:gtin),
+            images: line_item.dig(:images),
+            reference: line_item.dig(:reference),
+            url: line_item.dig(:url),
+            description: line_item.dig(:description),
+            priceDescription: line_item.dig(:priceDescription),
+            productDescription: line_item.dig(:productDescription),
+            metadata: line_item.dig(:metadata),
+            productMetadata: line_item.dig(:productMetadata),
+            priceMetadata: line_item.dig(:priceMetadata)
+          }
+        end
+      end
+    end
+  end
+end

data/lib/smartpay/responses/checkout_session.rb

@@ -1,35 +1,40 @@
-# frozen_string_literal: true
-
-module Smartpay
-  module Responses
-    class CheckoutSession
-      attr_reader :response
-
-      def initialize(response)
-        @response = response
-      end
-
-      def redirect_url
-        URI.escape("#{checkout_url}/login?session-id=#{response[:id]}&public-key=#{public_key}")
-      end
-
-      def as_hash
-        @response
-      end
-
-      def as_json
-        @response.to_json
-      end
-
-      private
-
-      def checkout_url
-        Smartpay.configuration.checkout_url
-      end
-
-      def public_key
-        Smartpay.configuration.public_key
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Smartpay
+  module Responses
+    class CheckoutSession
+      attr_reader :response
+
+      def initialize(response)
+        @response = response
+      end
+
+      def redirect_url(options = {})
+        url = "#{checkout_url}/login"
+        promotion_code = options[:promotion_code] || response[:metadata][:__promotion_code__] || nil
+        qs = "session-id=#{URI.encode_www_form_component(response[:id])}&public-key=#{URI.encode_www_form_component(public_key)}"
+        qs = "#{qs}&promotion-code=#{URI.encode_www_form_component(promotion_code)}" if promotion_code
+        
+        "#{url}?#{qs}"
+      end
+
+      def as_hash
+        @response
+      end
+
+      def as_json
+        @response.to_json
+      end
+
+      private
+
+      def checkout_url
+        Smartpay.configuration.checkout_url
+      end
+
+      def public_key
+        Smartpay.configuration.public_key
+      end
+    end
+  end
+end

data/lib/smartpay/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Smartpay
-  VERSION = "0.2.14"
+  VERSION = "0.2.18"
 end

data/lib/smartpay.rb

@@ -1,25 +1,25 @@
-# frozen_string_literal: true
-
-require 'json'
-
-require_relative "smartpay/version"
-require_relative 'smartpay/configuration'
-require_relative 'smartpay/client'
-require_relative 'smartpay/api'
-require_relative 'smartpay/errors/invalid_request_payload_error'
-require_relative 'smartpay/requests/checkout_session'
-require_relative 'smartpay/responses/checkout_session'
-
-module Smartpay
-  class << self
-    attr_accessor :configuration
-
-    def configuration
-      @configuration ||= Smartpay::Configuration.new
-    end
-
-    def configure
-      yield(configuration)
-    end
-  end
-end
+# frozen_string_literal: true
+
+require "json"
+
+require_relative "smartpay/version"
+require_relative "smartpay/configuration"
+require_relative "smartpay/client"
+require_relative "smartpay/api"
+require_relative "smartpay/errors/invalid_request_payload_error"
+require_relative "smartpay/requests/checkout_session"
+require_relative "smartpay/responses/checkout_session"
+
+module Smartpay
+  class << self
+    attr_accessor :configuration
+
+    def configuration
+      @configuration ||= Smartpay::Configuration.new
+    end
+
+    def configure
+      yield(configuration)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smartpay
 version: !ruby/object:Gem::Version
-  version: 0.2.14
+  version: 0.2.18
 platform: ruby
 authors:
 - Smartpay
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-28 00:00:00.000000000 Z
+date: 2022-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client