flowcommerce-activemerchant 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fd3cd7c71165eb856d2df8a62f381c4a345216c2
-  data.tar.gz: 2da46342bd287ac1400862e00ab21d61d43b62e7
+SHA256:
+  metadata.gz: 863d0652e20731cf27b0aece10bef3a84f30591c2795edf5a5e4cff849e6113c
+  data.tar.gz: c43210cb05f3edb2a374f23c84a1a1019a45fddc2b31a95961644b27f077ad94
 SHA512:
-  metadata.gz: 3531b26248d5a5015dc02786d73176b7e80b1e7ebac09a786a8ff4198fb22f0f478eb61080b643e8c38d16d794a3fd66cacc44477bb1775504731fa913cd7429
-  data.tar.gz: b9c3740fc926e3060403e9adfd64610d45a2534bf1d4ca0fcf19fa833a45fce930a8e8d2af43a477ee7a34dcb2296e823392949700bfee6c75b0f4936b10badc
+  metadata.gz: fc9e5cc9e1c7833032104308bb743fd7a01b65f6b30745f325e54502b037d703d134ec608ee7a2e18cafec488000782da97da7d028f40216e288843b0b5dfb09
+  data.tar.gz: c6655876fc5a3efd3b950b4aa89cd41e64fe49ff7469fd4274f46e8f3e6b580fedd6fd4eabc9f61999b0a007793db524836248862347ca9a56e87861a4f7f42e

data/lib/active_merchant/billing/gateways/flow.rb

@@ -1,4 +1,4 @@
-  # @Flow.io (2017)
+# @Flow.io (2017)
 # Active Merchant adapter for Flow api
 
 require 'flowcommerce-reference'
@@ -6,15 +6,7 @@ require 'flowcommerce-reference'
 module ActiveMerchant
   module Billing
     class FlowGateway < Gateway
-      unless defined?(::ActiveMerchant::Billing::FlowGateway::VERSION)
-        VERSION = File.read(File.expand_path("../../../../.version", File.dirname(__FILE__))).chomp
-
-        FORM_TYPES = [
-          :authorization_copy_form, :direct_authorization_form, :merchant_of_record_authorization_form,
-          :paypal_authorization_form, :redirect_authorization_form, :inline_authorization_form,
-          :card_authorization_form, :ach_authorization_form
-        ]
-      end
+      VERSION = '0.2.0' unless defined?(::ActiveMerchant::Billing::FlowGateway::VERSION)
 
       self.display_name        = 'Flow.io Pay'
       self.homepage_url        = 'https://www.flow.io/'
@@ -22,7 +14,6 @@ module ActiveMerchant
       self.supported_countries = FlowCommerce::Reference::Countries::ISO_3166_2
       self.supported_cardtypes = FlowCommerce::Reference::PaymentMethods::SUPPORTED_CREDIT_CARDS
 
-
       def initialize options = {}
         @flow_api_key      = options[:api_key]      || ENV['FLOW_API_KEY']
         @flow_organization = options[:organization] || ENV['FLOW_ORGANIZATION']
@@ -36,29 +27,25 @@ module ActiveMerchant
       # Create a new authorization.
       # https://docs.flow.io/module/payment/resource/authorizations#post-organization-authorizations
       def authorize cc_or_token, order_number, opts={}
-        unless opts[:currency]
-          return error_response('Currency is a required option')
-        end
-
-        unless opts[:discriminator]
-          return error_response 'Discriminator is not defined, please choose one [%s]' % FORM_TYPES.join(', ')
-        end
+        return error_response('Currency is a required option') unless opts[:currency]
 
-        unless FORM_TYPES.include?(opts[:discriminator].to_sym)
-          return error_response 'Discriminator [%s] not found, please choose one [%s]' % [opts[:discriminator], FORM_TYPES.join(', ')]
-        end
+        opts[:discriminator] ||= 'merchant_of_record'
 
         body = {
-          amount:        opts[:amount] || 0.0,
-          currency:      opts[:currency],
-          discriminator: opts[:discriminator],
-          token:         store(cc_or_token),
-          order_number:  order_number
+          amount:       opts[:amount] || 0.0,
+          currency:     opts[:currency],
+          token:        store(cc_or_token),
+          order_number: order_number
         }
 
-        response = flow_instance.authorizations.post @flow_organization, body
+        authorization_form = if opts[:discriminator].to_s.include?('merchant')
+          ::Io::Flow::V0::Models::MerchantOfRecordAuthorizationForm.new body
+        else
+          ::Io::Flow::V0::Models::DirectAuthorizationForm.new body
+        end
 
-        Response.new true, 'Flow authorize - Success', { response: response }, { authorization: response.id }
+        response = flow_instance.authorizations.post @flow_organization, authorization_form
+        Response.new true, 'Flow authorize - Success', { response: response }
       rescue => exception
         error_response exception
       end
@@ -67,13 +54,11 @@ module ActiveMerchant
       def flow_get_authorization order_number:
         response = flow_instance.authorizations.get @flow_organization, order_number: order_number
         response.last
-      rescue => exception
-        error_response exception
       end
 
       # https://docs.flow.io/module/payment/resource/captures#post-organization-captures
       def capture amount, authorization_key, options={}
-        return error_response('Currency is a required option') unless options[:currency]
+        options[:currency] ||= 'USD'
 
         body = {
           authorization_id: authorization_key,
@@ -97,10 +82,10 @@ module ActiveMerchant
         error_response exception
       end
 
-      def purchase credit_card, order_number, options={}
-        response = authorize credit_card, order_number, options
-        capture options[:amount], response.authorization, options
-      end
+      # def purchase money, credit_card, options={}
+      #   response = authorize money, credit_card, options
+      #   capture money, response.authorization
+      # end
 
       # https://docs.flow.io/module/payment/resource/reversals#post-organization-reversals
       # if amount is not provided, reverse the full or remaining amount
@@ -143,6 +128,14 @@ module ActiveMerchant
         error_response exception
       end
 
+      # store credit card with flow and get reference token
+      def store credit_card, options={}
+        response = cc_with_token credit_card
+        Response.new true, 'Credit card stored', { response: response, token: response.token }
+      rescue Io::Flow::V0::HttpClient::ServerError => exception
+        error_response exception
+      end
+
       # stores credit card and returns credit card Flow token String id
       def store input
         credit_card =
@@ -162,35 +155,10 @@ module ActiveMerchant
                        cvv: credit_card.verification_value,
            expiration_year: credit_card.year.to_i,
           expiration_month: credit_card.month.to_i
-                   address: credit_card.address
         }
 
         response  = flow_instance.cards.post @flow_organization, data
-
-        if response.respond_to?(:token)
-          Response.new true, 'Flow refund - Success', { response: response }
-        else
-          Response.new false, 'Flow POST /:organization/cards - Failure', { response: response }
-        end
-      rescue Io::Flow::V0::HttpClient::ServerError => exception
-        error_response exception
-      end
-
-      # Creates and order
-      # https://docs.flow.io/module/localization/resource/orders#post-organization-orders
-      def flow_create_order body, query_string={}
-        flow_instance.orders.post @flow_organization, body, query_string
-      rescue => exception
-        error_response exception
-      end
-
-      # Submits an order and
-      # pushes all subsequent authorizations from status "review" to "authorized"
-      # takes ~ 60 seconds
-      def flow_submission_by_number order_number
-        flow_instance.orders.put_submissions_by_number @flow_organization, order_number
-      rescue => exception
-        error_response exception
+        response.token
       end
 
       private
@@ -221,6 +189,10 @@ module ActiveMerchant
       end
 
       def assert_currency currency, amount
+        unless currency.to_s.length == 3
+          raise ArgumentError.new('Currency is required if amount is provided')
+        end
+
         FlowCommerce::Reference::Currencies.find! currency
         amount.to_f
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flowcommerce-activemerchant
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Dino Reic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-14 00:00:00.000000000 Z
+date: 2018-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -59,8 +59,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- "./.version"
-- "./LICENSE"
 - "./lib/active_merchant/billing/gateways/flow.rb"
 - "./lib/flowcommerce-activemerchant.rb"
 homepage: https://www.flow.io
@@ -83,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
 summary: Adapter for Flow.io global payment gateway

data/.version

@@ -1 +0,0 @@
-0.1.4

data/LICENSE

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2017 - 2018 Flow Commerce Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.