afterpay-ruby 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9ccc8dfcbb33be10f1b7e80eabd69201a9394b2a84dffe15ee91d47f42c86e5
-  data.tar.gz: 8c59641cfcf6f1920a580663a48031d87b2f18f583dde0464d8a6dba19a9a7ad
+  metadata.gz: 5ca1e1c47d6b509844aedbf008e7af90c6b04534fbf163cb526b70891dcfa8f0
+  data.tar.gz: '072138f089151b6adc36c88eb37267a2c14fb3adff566777ef6af5d8fe158392'
 SHA512:
-  metadata.gz: 6fadbc3a2967b0e61682686c1e96cee187e40411c37d62a2174dc985f781c83eec4b8adad6cd8239dcdf114db7720acb8c76d842135857b01527c1c4ae76da63
-  data.tar.gz: 5d3c3f60df1ef845890c64daf337222e58f701f9a48785e3a233f6c864761f171b11e8d4bf46c05f804775f2511f4e3ba19b8236f624ad1ea0c85307394d2105
+  metadata.gz: a6243f64a347561daabde5135449521dffee10fb1c3b1faff2f0a34156ffc53fa358bb32851dcd59b608c02f1a8bfd1843c332e9af2a5a5fd0fd123b69841c64
+  data.tar.gz: 2d561c95396fa24a42afa375748e8e61b8d3a03454d40ec82827a38f00762ad832ea4890812a91cee41f8e26a843e95c6465426aa4bf2314f781f6c0a4fabf38

data/Gemfile

@@ -4,8 +4,8 @@ source "https://rubygems.org"
 gemspec
 
 group :test do
+  gem "coveralls", require: false
   gem "simplecov", require: false
   gem "vcr", "~> 4.0"
   gem "webmock", "~> 3.5", ">= 3.5.1"
-  gem 'coveralls', require: false
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    afterpay-ruby (0.1.1)
+    afterpay-ruby (0.1.3)
       faraday (>= 0.8, < 1.0)
       faraday_middleware (~> 0.13.1)
       money (>= 6.7.1, < 7.0.0)
@@ -33,9 +33,9 @@ GEM
       concurrent-ruby (~> 1.0)
     json (2.2.0)
     method_source (0.9.2)
-    money (6.13.2)
+    money (6.13.3)
       i18n (>= 0.6.4, <= 2)
-    multipart-post (2.0.0)
+    multipart-post (2.1.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)

data/README.md

@@ -53,7 +53,12 @@ order = Afterpay::Order.create(
   consumer: <Afterpay::Consumer>,
   items: [<Afterpay::Item>],
   success_url: <String>,
-  cancel_url: <String>
+  cancel_url: <String>,
+  reference: <String>,
+  shipping: <Money | optional>,
+  discounts: [<Afterpay::Discount | optional>],
+  billing_address: <Afterpay::Address | optional>,
+  shipping_address: <Afterpay::Address | optional>,
 )
 
 # OR
@@ -127,6 +132,38 @@ Afterpay::Item.new(
 )
 ```
 
+### Discount Object
+
+[api docs](https://docs.afterpay.com/au-online-api-v1.html#discount-object)
+
+Discount Applied to the Order
+
+```ruby
+Afterpay::Discount.new(
+  name: <String>,
+  amount: <Money>
+)
+```
+
+### Address Object
+
+[api docs](https://docs.afterpay.com/au-online-api-v1.html#contact-object)
+
+Item holds the details of purchace per item.
+
+```ruby
+Afterpay::Address.new(
+  name: <String>,
+  line_1: <String>,
+  line_2: <String | optional>,
+  suburb: <String | optional>,
+  state: <String>,
+  postcode: <String | Number>,
+  country: <String | optional>,
+  phone: <String>
+)
+```
+
 ## 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.

data/bin/console

@@ -4,6 +4,11 @@ require "bundler"
 require "bundler/setup"
 require "afterpay"
 
+begin
+  require_relative "../configure"
+rescue LoadError
+end
+
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
 

data/configure.rb

@@ -3,6 +3,8 @@
 require "dotenv"
 Dotenv.load
 
+Money.default_currency = ENV["DEFAULT_CURRENCY"] || "AUD"
+
 Afterpay.configure do |config|
   config.app_id = ENV["APP_ID"]
   config.secret = ENV["SECRET"]
@@ -13,3 +15,5 @@ Afterpay.configure do |config|
   # Sets the environment for Afterpay
   # config.env = "sandbox" # :live
 end
+
+Afterpay.config.freeze

data/lib/afterpay.rb

@@ -9,6 +9,8 @@ require_relative "afterpay/item"
 require_relative "afterpay/order"
 require_relative "afterpay/payment"
 require_relative "afterpay/error"
+require_relative "afterpay/discount"
+require_relative "afterpay/address"
 require_relative "afterpay/money_util"
 
 module Afterpay

data/lib/afterpay/address.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Afterpay
+  class Address
+    attr_accessor :name, :line1, :line2, :suburb, :state, :postcode, :country, :phone
+
+    # Initializes an Order object
+    #
+    # @overload initialize(total:, items:, consumer:, success_url:, cancel_url:, payment_type:)
+    #   @param name [String] The name
+    #   @param line_1 [String] Address line 1
+    #   @param line_2 [String] optional Address line 2
+    #   @param suburb [String] optional Suburb
+    #   @param state [String] State
+    #   @param postcode [String] Postal code
+    #   @param country [String] optional country Code
+    #   @param phone [String|Number] The phone number
+    def initialize(attributes = {})
+      @name = attributes[:name]
+      @line1 = attributes[:line_1] || ""
+      @line2 = attributes[:line_2] || ""
+      @suburb = attributes[:suburb] || ""
+      @state = attributes[:state] || ""
+      @postcode = attributes[:postcode]
+      @country = attributes[:country] || "AU"
+      @phone = attributes[:phone]
+    end
+
+    def to_hash
+      {
+        name: name,
+        line1: line1,
+        suburb: suburb,
+        state: state,
+        postcode: postcode.to_s,
+        countryCode: country,
+        phoneNumber: phone.to_s
+      }
+    end
+  end
+end

data/lib/afterpay/discount.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Afterpay
+  class Discount
+    attr_accessor :name, :amount
+
+    def initialize(name:, amount:)
+      @name = name
+      @amount = amount
+    end
+
+    def to_hash
+      {
+        displayName: name,
+        amount: {
+          amount: amount.to_f,
+          currency: amount.currency.iso_code
+        }
+      }
+    end
+  end
+end

data/lib/afterpay/order.rb

@@ -16,17 +16,18 @@ module Afterpay
                    :tax,
                    :discounts,
                    :billing,
-                   :shipping,
+                   :shipping_address,
+                   :billing_address,
                    :merchant_reference
 
-  # Finds Order from Afterpay API
-  # @param token [String]
-  # @return [Order]
-  def self.find(token)
-    request = Afterpay.client.get("/v1/orders/#{token}")
+    # Finds Order from Afterpay API
+    # @param token [String]
+    # @return [Order]
+    def self.find(token)
+      request = Afterpay.client.get("/v1/orders/#{token}")
 
-    Order.from_response(request.body)
-  end
+      Order.from_response(request.body)
+    end
 
     # Builds Order from response
     # @param response [Hash] response params from API
@@ -65,6 +66,10 @@ module Afterpay
     #   @param success_url [String] the path to redirect on successful payment
     #   @param cancel_url [String] the path to redirect on failed payment
     #   @param payment_type [String] Payment type defaults to {Config#type}
+    #   @param shipping [Money] optional the billing Address
+    #   @param discounts [Array<Afterpay::Discount>] optional discounts
+    #   @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
@@ -75,7 +80,7 @@ module Afterpay
 
     # Builds structure to API specs
     def to_hash
-      {
+      data = {
         totalAmount: {
           amount: total.to_f,
           currency: total.currency.iso_code
@@ -86,11 +91,19 @@ module Afterpay
           redirectConfirmUrl: attributes.success_url,
           redirectCancelUrl: attributes.cancel_url
         },
-        merchantReference: attributes.merchant_reference,
+        merchantReference: attributes.reference,
         taxAmount: attributes.tax,
-        shippingAmount: attributes.shipping,
+        shippingAmount: {
+          amount: shipping.to_f,
+          currency: shipping.currency.iso_code
+        },
         paymentType: attributes.payment_type
       }
+
+      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
     end
 
     # Sends the create request to Afterpay server

data/lib/afterpay/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: afterpay-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Eli
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-24 00:00:00.000000000 Z
+date: 2019-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -165,9 +165,11 @@ files:
 - configure.rb
 - lib/afterpay-ruby.rb
 - lib/afterpay.rb
+- lib/afterpay/address.rb
 - lib/afterpay/client.rb
 - lib/afterpay/config.rb
 - lib/afterpay/consumer.rb
+- lib/afterpay/discount.rb
 - lib/afterpay/error.rb
 - lib/afterpay/item.rb
 - lib/afterpay/money_util.rb