afterpay-ruby 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ca1e1c47d6b509844aedbf008e7af90c6b04534fbf163cb526b70891dcfa8f0
-  data.tar.gz: '072138f089151b6adc36c88eb37267a2c14fb3adff566777ef6af5d8fe158392'
+  metadata.gz: ee47c1b29a922674e59599ea8f81338c88eeea755720f7d96f576d8552639069
+  data.tar.gz: 2205ddca07946fa9cfacf565ef7e91dc968b173ff7e091910f1ddd09f5fd2641
 SHA512:
-  metadata.gz: a6243f64a347561daabde5135449521dffee10fb1c3b1faff2f0a34156ffc53fa358bb32851dcd59b608c02f1a8bfd1843c332e9af2a5a5fd0fd123b69841c64
-  data.tar.gz: 2d561c95396fa24a42afa375748e8e61b8d3a03454d40ec82827a38f00762ad832ea4890812a91cee41f8e26a843e95c6465426aa4bf2314f781f6c0a4fabf38
+  metadata.gz: fe4162c069ad19bfca5b1a914c8321ad1fe67e2a7a9c67f0b897d38760c96fef8b1785748a937bc6158a82a7f720503061c13304645eb4f1a7527c0ae6a266ea
+  data.tar.gz: a82bcd5ef816ca4bc48a0dae7e864a219d10b7ad397b2e097294b85e44f3351530172ee6d1727905cca1ae8b145be6c630c8ae87a9687ddd9e4a175548779bed

data/.rubocop.yml

@@ -29,3 +29,5 @@ Metrics/MethodLength:
 Naming/FileName:
   Exclude:
     - "lib/afterpay-ruby.rb"
+Naming/VariableNumber:
+  Enabled: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    afterpay-ruby (0.1.3)
+    afterpay-ruby (0.1.4)
       faraday (>= 0.8, < 1.0)
       faraday_middleware (~> 0.13.1)
       money (>= 6.7.1, < 7.0.0)

data/README.md

@@ -55,6 +55,7 @@ order = Afterpay::Order.create(
   success_url: <String>,
   cancel_url: <String>,
   reference: <String>,
+  tax: <Money | optional>,
   shipping: <Money | optional>,
   discounts: [<Afterpay::Discount | optional>],
   billing_address: <Afterpay::Address | optional>,

data/lib/afterpay.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require "money"
+require_relative "afterpay/utils/money"
+
 require_relative "afterpay/version"
 require_relative "afterpay/client"
 require_relative "afterpay/config"
@@ -11,7 +13,6 @@ require_relative "afterpay/payment"
 require_relative "afterpay/error"
 require_relative "afterpay/discount"
 require_relative "afterpay/address"
-require_relative "afterpay/money_util"
 
 module Afterpay
   class << self

data/lib/afterpay/address.rb

@@ -2,7 +2,7 @@
 
 module Afterpay
   class Address
-    attr_accessor :name, :line1, :line2, :suburb, :state, :postcode, :country, :phone
+    attr_accessor :name, :line_1, :line_2, :suburb, :state, :postcode, :country, :phone
 
     # Initializes an Order object
     #
@@ -17,8 +17,8 @@ module Afterpay
     #   @param phone [String|Number] The phone number
     def initialize(attributes = {})
       @name = attributes[:name]
-      @line1 = attributes[:line_1] || ""
-      @line2 = attributes[:line_2] || ""
+      @line_1 = attributes[:line_1] || ""
+      @line_2 = attributes[:line_2] || ""
       @suburb = attributes[:suburb] || ""
       @state = attributes[:state] || ""
       @postcode = attributes[:postcode]
@@ -29,7 +29,8 @@ module Afterpay
     def to_hash
       {
         name: name,
-        line1: line1,
+        line1: line_1,
+        line2: line_2,
         suburb: suburb,
         state: state,
         postcode: postcode.to_s,
@@ -37,5 +38,20 @@ module Afterpay
         phoneNumber: phone.to_s
       }
     end
+
+    def self.from_response(response)
+      return nil if response.nil?
+
+      new(
+        name: response[:name],
+        line_1: response[:line1],
+        line_2: response[:line2],
+        suburb: response[:suburb],
+        state: response[:state],
+        postcode: response[:postcode],
+        country: response[:countryCode],
+        phone: response[:phoneNumber]
+      )
+    end
   end
 end

data/lib/afterpay/discount.rb

@@ -12,11 +12,17 @@ module Afterpay
     def to_hash
       {
         displayName: name,
-        amount: {
-          amount: amount.to_f,
-          currency: amount.currency.iso_code
-        }
+        amount: Utils::Money.api_hash(amount)
       }
     end
+
+    def self.from_response(response)
+      return nil if response.nil?
+
+      new(
+        name: response[:display_name],
+        amount: Utils::Money.from_response(response[:amount])
+      )
+    end
   end
 end

data/lib/afterpay/item.rb

@@ -33,7 +33,7 @@ module Afterpay
         name: response[:name],
         sku: response[:sku],
         quantity: response[:quantity],
-        price: MoneyUtil.from_response(response[:price])
+        price: Utils::Money.from_response(response[:price])
       )
     end
   end

data/lib/afterpay/order.rb

@@ -1,24 +1,13 @@
 # frozen_string_literal: true
 
-require "ostruct"
-require "forwardable"
-
 module Afterpay
   # The Order object for creating an order to `/v1/orders`
   class Order
-    extend Forwardable
+    attr_accessor :total, :consumer, :items, :shipping, :tax, :discounts,
+                  :billing, :shipping_address, :billing_address, :reference,
+                  :payment_type, :success_url, :cancel_url
 
-    def_delegators :@attributes,
-                   :total,
-                   :consumer,
-                   :items,
-                   :shipping,
-                   :tax,
-                   :discounts,
-                   :billing,
-                   :shipping_address,
-                   :billing_address,
-                   :merchant_reference
+    attr_reader :expiry, :token, :error
 
     # Finds Order from Afterpay API
     # @param token [String]
@@ -36,14 +25,14 @@ module Afterpay
       return nil if response.nil?
 
       new(
-        total: MoneyUtil.from_response(response[:total]),
+        total: Utils::Money.from_response(response[:total]),
         consumer: Consumer.from_response(response[:consumer]),
         items: response[:items].map { |item| Item.from_response(item) },
-        # billing: response[:billing],
-        # shipping: response[:shipping],
-        # discounts: Discount.from_response(response[:discounts]),
-        tax: MoneyUtil.from_response(response[:taxAmount]),
-        shipping: MoneyUtil.from_response(response[:shippingAmount])
+        billing_address: Address.from_response(response[:billing]),
+        shipping_address: Address.from_response(response[:shipping]),
+        discounts: response[:discounts].map { |discount| Discount.from_response(discount) },
+        tax: Utils::Money.from_response(response[:taxAmount]),
+        shipping: Utils::Money.from_response(response[:shippingAmount])
       )
     end
 
@@ -55,8 +44,6 @@ module Afterpay
       new(*args).create
     end
 
-    attr_reader :attributes, :expiry, :token, :error
-
     # Initializes an Order object
     #
     # @overload initialize(total:, items:, consumer:, success_url:, cancel_url:, payment_type:)
@@ -71,35 +58,30 @@ module Afterpay
     #   @param billing_address [<Afterpay::Address>] optional the billing Address
     #   @param shipping_address [<Afterpay::Address>] optional the shipping Address
     def initialize(attributes = {})
-      @attributes = OpenStruct.new(attributes)
-      @attributes.payment_type ||= Afterpay.config.type
-      @token = @attributes.token || nil
-      @expiry = nil
+      attributes.each { |key, value| instance_variable_set(:"@#{key}", value) }
+      @apayment_type ||= Afterpay.config.type
+      @token ||= nil
+      @expiry ||= nil
       @error = nil
     end
 
     # Builds structure to API specs
     def to_hash
       data = {
-        totalAmount: {
-          amount: total.to_f,
-          currency: total.currency.iso_code
-        },
+        totalAmount: Utils::Money.api_hash(total),
         consumer: consumer.to_hash,
         items: items.map(&:to_hash),
         merchant: {
-          redirectConfirmUrl: attributes.success_url,
-          redirectCancelUrl: attributes.cancel_url
-        },
-        merchantReference: attributes.reference,
-        taxAmount: attributes.tax,
-        shippingAmount: {
-          amount: shipping.to_f,
-          currency: shipping.currency.iso_code
+          redirectConfirmUrl: success_url,
+          redirectCancelUrl: cancel_url
         },
-        paymentType: attributes.payment_type
+        merchantReference: reference,
+        taxAmount: tax,
+        paymentType: payment_type
       }
 
+      data[:taxAmount] = Utils::Money.api_hash(tax) if tax
+      data[:shippingAmount] = Utils::Money.api_hash(shipping) if shipping
       data[:discounts] = discounts.map(&:to_hash) if discounts
       data[:billing] = billing_address.to_hash if billing_address
       data[:shipping] = shipping_address.to_hash if shipping_address

data/lib/afterpay/payment.rb

@@ -26,7 +26,7 @@ module Afterpay
       @id = attributes[:id]
       @status = attributes[:status]
       @created = attributes[:created]
-      @total = MoneyUtil.from_response(attributes[:total])
+      @total = Utils::Money.from_response(attributes[:total])
       @order = Order.from_response(attributes[:orderDetails])
       @error = Error.new(attributes) if attributes[:errorId]
     end

data/lib/afterpay/utils/money.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Afterpay
+  module Utils
+    class Money
+      # Converts Afterpay response to `Money`
+      # @return [Money]
+      def self.from_response(response)
+        return nil if response.nil?
+
+        ::Money.from_amount(
+          response[:amount].to_f,
+          response[:currency]
+        )
+      end
+
+      # Converts <oney to API compatible hash format
+      def self.api_hash(money)
+        {
+          amount: money.dollars.to_f,
+          currency: money.currency.iso_code
+        }
+      end
+    end
+  end
+end

data/lib/afterpay/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Afterpay
-  VERSION = "0.1.3".freeze
+  VERSION = "0.1.4".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: afterpay-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Eli
@@ -172,9 +172,9 @@ files:
 - lib/afterpay/discount.rb
 - lib/afterpay/error.rb
 - lib/afterpay/item.rb
-- lib/afterpay/money_util.rb
 - lib/afterpay/order.rb
 - lib/afterpay/payment.rb
+- lib/afterpay/utils/money.rb
 - lib/afterpay/version.rb
 homepage: https://github.com/bluethumbart/afterpay-ruby
 licenses:

data/lib/afterpay/money_util.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module Afterpay
-  # Money utility
-  module MoneyUtil
-    # Converts Afterpay response to `Money`
-    # @return [Money]
-    def self.from_response(response)
-      return nil if response.nil?
-
-      Money.from_amount(
-        response[:amount].to_f,
-        response[:currency]
-      )
-    end
-  end
-end