offsite_payments 2.7.11 → 2.7.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80e586df2a8864f246dc9aaa3ab3f53d3cc04b4f14200f195a504cf8cb3bb551
-  data.tar.gz: dbbf5498a71aa62aafc296834d849f7c2c307a1c6abcae457c50a4385108860f
+  metadata.gz: d025fba3cb9d4bd253242a960ede519e6e4d8eb42f4e519de20b25518c3e9fae
+  data.tar.gz: 625c9fc0b712b746b13fcecc1c1d720f9f8a089d74e17257f0750d3f658be2b9
 SHA512:
-  metadata.gz: 0c032a24a16ff43cf25fc011f1eddd2b0fde6f3064e14ae6982977d280f9eb6a99cc79d559e6091f6fc311a846a7ee21087b24f87448c07faa38eff46cb6fe37
-  data.tar.gz: d7205f0cc31e891d3f88b8c7c4419516f2f59232ccf342a39f32bd1a24f53ec623e51c190c17e7372fae04a6763b5aecf922893b6de875a33dc5d749c3c53f36
+  metadata.gz: 87bd4aaae479a2c590f9e450c347bf9ab9e11ae2f64f1c2290e2ae51240b17198d252bcc7143de9083e05521640075c6ad2159d97c09020dfd3a494f337f5f23
+  data.tar.gz: e4852bfbcd3329242f261f5f78ac42e97f15d61e690d5e38ece24616051e10b984e83abe93f58bdb63997c14f5244877ffd51a9907fe03e4614123cc3608e83c

data/lib/offsite_payments/integrations/bit_pay.rb

@@ -1,12 +1,13 @@
 module OffsitePayments #:nodoc:
   module Integrations #:nodoc:
     module BitPay
+      API_V1_URL = 'https://bitpay.com/api/invoice'
+      API_V1_TOKEN_REGEX = /[0OIl]/
+      API_V2_URL = 'https://bitpay.com/invoices'
+
       mattr_accessor :service_url
       self.service_url = 'https://bitpay.com/invoice'
 
-      mattr_accessor :invoicing_url
-      self.invoicing_url = 'https://bitpay.com/api/invoice'
-
       def self.notification(post, options = {})
         Notification.new(post, options)
       end
@@ -19,6 +20,18 @@ module OffsitePayments #:nodoc:
         Return.new(query_string)
       end
 
+      def self.v2_api_token?(api_token)
+        api_token.length >= 44 && !API_V1_TOKEN_REGEX.match(api_token)
+      end
+
+      def self.invoicing_url(api_token)
+        if v2_api_token?(api_token)
+          API_V2_URL
+        else
+          API_V1_URL
+        end
+      end
+
       class Helper < OffsitePayments::Helper
         def initialize(order_id, account, options)
           super
@@ -63,7 +76,7 @@ module OffsitePayments #:nodoc:
         private
 
         def create_invoice
-          uri = URI.parse(BitPay.invoicing_url)
+          uri = URI.parse(BitPay.invoicing_url(@account))
           http = Net::HTTP.new(uri.host, uri.port)
           http.use_ssl = true
 
@@ -115,7 +128,7 @@ module OffsitePayments #:nodoc:
         end
 
         def acknowledge(authcode = nil)
-          uri = URI.parse("#{OffsitePayments::Integrations::BitPay.invoicing_url}/#{transaction_id}")
+          uri = URI.parse("#{OffsitePayments::Integrations::BitPay.invoicing_url(@options[:credential1])}/#{transaction_id}")
 
           http = Net::HTTP.new(uri.host, uri.port)
           http.use_ssl = true

data/lib/offsite_payments/version.rb

@@ -1,3 +1,3 @@
 module OffsitePayments
-  VERSION = "2.7.11"
+  VERSION = "2.7.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: offsite_payments
 version: !ruby/object:Gem::Version
-  version: 2.7.11
+  version: 2.7.12
 platform: ruby
 authors:
 - Tobias Luetke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-14 00:00:00.000000000 Z
+date: 2019-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.14
+        version: 5.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.14
+        version: 5.2.3
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -76,36 +76,44 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.8.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.8.5
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.20
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 5.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.20
-    - - "<"
+        version: 5.2.3
+- !ruby/object:Gem::Dependency
+  name: actionview
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.1.6.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 5.1.6.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -176,6 +184,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Offsite Payments is a simple abstraction library used in and sponsored
   by Shopify. It is written by Tobias Luetke, Cody Fauser, and contributors. The aim
   of the project is to put as simple an abstraction as possible on top of offsite