pay 2.6.4 → 2.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a72ff3544c6fa85675a96d650f152b8f3593211f0c205a5a10cddca5d1f7c35
-  data.tar.gz: b7593ef07b57654f4ee566cf2fc538b495d22a9667ec90c6695759a464968dae
+  metadata.gz: a8d82f8b92018a0af540a835677d44a4b364bc37472ceb2869e6f78b81cb88df
+  data.tar.gz: 369d7fdc1dd186a8ab6ac4c964fb3983db4f5d1bc7ab856669b65c3f4696f658
 SHA512:
-  metadata.gz: 572f4f2989bce0a3afa7a483585e3e6f7e96f0487eb34bf5cb790a60a3b66bc0eeafa4ed48a011e00232770b565d1c592491eb613465054cf5de34bae58b168c
-  data.tar.gz: cd5059977bd91e4c72b8c51a7f8584b23d15e7bc988ca3421400e39232b781481271a57f06777c71c83cfee73bcab03312de35734c3138e3101e2aa125e4db27
+  metadata.gz: afb95708b3a2e08b44f6236e1ff51268b8287691206ce8a050bea609d88555f87feb295ed14d1dfa671982a365d0a7099a7cee6cd0b191cbae60647cf1097505
+  data.tar.gz: 05bc21e7a17c88c1d6ecaae86afd1f36c3e90ffd0e6f200cc9c360b5d5a400dfd28ac75c361eccd9d3e6ee8d52f3862044fed40da3eebf8ff101d591d35ffe0c

data/README.md

@@ -1,8 +1,10 @@
-<p align="center"><img src="docs/logo.svg" height="50px"></p>
+<p align="center"><img src="docs/images/logo.svg" height="50px"></p>
 
 ## Pay - Payments engine for Ruby on Rails
 
-[![Build Status](https://github.com/pay-rails/pay/workflows/Tests/badge.svg)](https://github.com/pay-rails/pay/actions) [![Gem Version](https://badge.fury.io/rb/pay.svg)](https://badge.fury.io/rb/pay)
+[![Build Status](https://github.com/pay-rails/pay/workflows/Tests/badge.svg)](https://github.com/pay-rails/pay/actions) [![Gem Version](https://badge.fury.io/rb/pay.svg)](https://badge.fury.io/rb/pay) 
+
+<img src="docs/images/stripe_partner_badge.svg" height="26px">
 
 Pay is a payments engine for Ruby on Rails 4.2 and higher.
 
@@ -37,7 +39,7 @@ gem 'stripe', '< 6.0', '>= 2.8'
 gem 'braintree', '< 3.0', '>= 2.92.0'
 
 # To use Paddle, also include:
-gem 'paddle_pay', '~> 0.0.1'
+gem 'paddle_pay', '~> 0.1'
 
 # To use Receipts
 gem 'receipts', '~> 1.0.0'
@@ -151,11 +153,12 @@ development:
     vendor_id: xxxx
     vendor_auth_code: yyyy
     public_key_base64: MII...==
+    environment: sandbox
 ```
 
 For Stripe, you can also use the `STRIPE_PUBLIC_KEY`, `STRIPE_PRIVATE_KEY` and `STRIPE_SIGNING_SECRET` environment variables.
 For Braintree, you can also use `BRAINTREE_MERCHANT_ID`, `BRAINTREE_PUBLIC_KEY`, `BRAINTREE_PRIVATE_KEY`, and `BRAINTREE_ENVIRONMENT` environment variables.
-For Paddle, you can also use `PADDLE_VENDOR_ID`, `PADDLE_VENDOR_AUTH_CODE` and `PADDLE_PUBLIC_KEY_BASE64` environment variables.
+For Paddle, you can also use `PADDLE_VENDOR_ID`, `PADDLE_VENDOR_AUTH_CODE`, `PADDLE_PUBLIC_KEY_BASE64` and `PADDLE_ENVIRONMENT` environment variables.
 
 ### Generators
 
@@ -621,6 +624,7 @@ development:
     vendor_id: xxxx
     vendor_auth_code: yyyy
     public_key_base64: MII...==
+    environment: sandbox
 ```
 
 Paddle receipts can be retrieved by a charge receipt URL.
@@ -686,6 +690,12 @@ If you'd like to change the views of the payment confirmation page, you can inst
 
 [<img src="https://d1jfzjx68gj8xs.cloudfront.net/items/2s3Z0J3Z3b1J1v2K2O1a/Screen%20Shot%202019-10-10%20at%2012.56.32%20PM.png?X-CloudApp-Visitor-Id=51470" alt="Stripe SCA Payment Confirmation" style="zoom: 25%;" />](https://d1jfzjx68gj8xs.cloudfront.net/items/2s3Z0J3Z3b1J1v2K2O1a/Screen%20Shot%202019-10-10%20at%2012.56.32%20PM.png)
 
+If you use the default views for payment confirmations, and also have a Content Security Policy in place for your application, make sure to add the following domains to their respective configurations in your `content_security_policy.rb` (otherwise these views won't load properly):
+
+* `style_src`: `https://unpkg.com`
+* `script_src`: `https://cdn.jsdelivr.net` and `https://js.stripe.com`
+* `frame_src`: `https://js.stripe.com`
+
 #### Background jobs
 
 If a user's email is updated and they have a `processor_id` set, Pay will enqueue a background job (EmailSyncJob) to sync the email with the payment processor.

data/app/models/pay/charge.rb

@@ -21,7 +21,7 @@ module Pay
     store_accessor :data, :paddle_receipt_url
 
     # Helpers for payment processors
-    %w[braintree stripe paddle].each do |processor_name|
+    %w[braintree stripe paddle fake_processor].each do |processor_name|
       define_method "#{processor_name}?" do
         processor == processor_name
       end
@@ -50,20 +50,8 @@ module Pay
       "#{card_type} (**** **** **** #{card_last4})"
     end
 
-    def stripe?
-      processor == "stripe"
-    end
-
-    def braintree?
-      processor == "braintree"
-    end
-
     def paypal?
       braintree? && card_type == "PayPal"
     end
-
-    def paddle?
-      processor == "paddle"
-    end
   end
 end

data/app/models/pay/subscription.rb

@@ -35,7 +35,7 @@ module Pay
     attribute :prorate, :boolean, default: true
 
     # Helpers for payment processors
-    %w[braintree stripe paddle].each do |processor_name|
+    %w[braintree stripe paddle fake_processor].each do |processor_name|
       define_method "#{processor_name}?" do
         processor == processor_name
       end

data/lib/pay/billable.rb

@@ -34,6 +34,7 @@ module Pay
     end
 
     def payment_processor_for(name)
+      raise Error, "No payment processor set. Assign a payment processor with 'object.processor = :stripe' or any supported processor." if name.blank?
       "Pay::#{name.to_s.classify}::Billable".constantize
     end
 

data/lib/pay/braintree/billable.rb

@@ -37,8 +37,8 @@ module Pay
 
           result.customer
         end
-      rescue ::Braintree::AuthorizationError
-        raise Pay::Braintree::AuthorizationError
+      rescue ::Braintree::AuthorizationError => e
+        raise Pay::Braintree::AuthorizationError, e
       rescue ::Braintree::BraintreeError => e
         raise Pay::Braintree::Error, e
       end
@@ -57,8 +57,8 @@ module Pay
         raise Pay::Braintree::Error, result unless result.success?
 
         save_transaction(result.transaction)
-      rescue ::Braintree::AuthorizationError
-        raise Pay::Braintree::AuthorizationError
+      rescue ::Braintree::AuthorizationError => e
+        raise Pay::Braintree::AuthorizationError, e
       rescue ::Braintree::BraintreeError => e
         raise Pay::Braintree::Error, e
       end
@@ -84,8 +84,8 @@ module Pay
         raise Pay::Braintree::Error, result unless result.success?
 
         billable.create_pay_subscription(result.subscription, "braintree", name, plan, status: :active)
-      rescue ::Braintree::AuthorizationError
-        raise Pay::Braintree::AuthorizationError
+      rescue ::Braintree::AuthorizationError => e
+        raise Pay::Braintree::AuthorizationError, e
       rescue ::Braintree::BraintreeError => e
         raise Pay::Braintree::Error, e
       end
@@ -94,6 +94,8 @@ module Pay
       #
       # Returns true if successful
       def update_card(token)
+        customer unless processor_id?
+
         result = gateway.payment_method.create(
           customer_id: processor_id,
           payment_method_nonce: token,
@@ -107,8 +109,8 @@ module Pay
         update_card_on_file result.payment_method
         update_subscriptions_to_payment_method(result.payment_method.token)
         true
-      rescue ::Braintree::AuthorizationError
-        raise Pay::Braintree::AuthorizationError
+      rescue ::Braintree::AuthorizationError => e
+        raise Pay::Braintree::AuthorizationError, e
       rescue ::Braintree::BraintreeError => e
         raise Pay::Braintree::Error, e
       end

data/lib/pay/braintree/charge.rb

@@ -17,7 +17,6 @@ module Pay
 
       def refund!(amount_to_refund)
         Pay.braintree_gateway.transaction.refund(processor_id, amount_to_refund / 100.0)
-
         pay_charge.update(amount_refunded: amount_to_refund)
       rescue ::Braintree::BraintreeError => e
         raise Pay::Braintree::Error, e

data/lib/pay/braintree/error.rb

@@ -1,8 +1,22 @@
 module Pay
   module Braintree
     class Error < Pay::Error
-      def message
-        result.message
+      # For any manually raised Braintree error results (for failure responses)
+      # we can raise this exception manually but treat it as if we wrapped an exception
+
+      attr_reader :result
+
+      def initialize(result)
+        if result.is_a?(::Braintree::ErrorResult)
+          super(result.message)
+          @result = result
+        else
+          super
+        end
+      end
+
+      def cause
+        super || result
       end
     end
   end

data/lib/pay/errors.rb

@@ -1,10 +1,6 @@
 module Pay
+  # https://avdi.codes/exception-causes-in-ruby-2-1/
   class Error < StandardError
-    attr_reader :result
-
-    def initialize(result = nil)
-      @result = result
-    end
   end
 
   class PaymentError < StandardError

data/lib/pay/paddle.rb

@@ -19,6 +19,7 @@ module Pay
     def self.setup
       ::PaddlePay.config.vendor_id = vendor_id
       ::PaddlePay.config.vendor_auth_code = vendor_auth_code
+      ::PaddlePay.config.environment = environment
 
       configure_webhooks
     end
@@ -31,6 +32,10 @@ module Pay
       find_value_by_name(:paddle, :vendor_auth_code)
     end
 
+    def self.environment
+      find_value_by_name(:paddle, :environment) || "production"
+    end
+
     def self.public_key_base64
       find_value_by_name(:paddle, :public_key_base64)
     end

data/lib/pay/paddle/error.rb

@@ -2,7 +2,7 @@ module Pay
   module Paddle
     class Error < Pay::Error
       def message
-        I18n.t("errors.paddle.#{result.code}", default: result.message)
+        I18n.t("errors.paddle.#{cause.code}", default: cause.message)
       end
     end
   end

data/lib/pay/stripe/error.rb

@@ -2,7 +2,7 @@ module Pay
   module Stripe
     class Error < Pay::Error
       def message
-        I18n.t("errors.stripe.#{result.code}", default: result.message)
+        I18n.t("errors.stripe.#{cause.code}", default: cause.message)
       end
     end
   end

data/lib/pay/stripe/merchant.rb

@@ -0,0 +1,28 @@
+module Pay
+  module Stripe
+    module Merchant
+      included do
+        store_accessor :stripe_connect_account_id
+      end
+
+      def create_account(**options)
+        defaults = {
+          type: "standard"
+        }
+
+        stripe_account = ::Stripe::Account.create(defaults.merge(options))
+        update(stripe_connect_account_id: stripe_account.id)
+        stripe_account
+      end
+
+      def account_link(refresh_url:, return_url:, type: "account_onboarding", **options)
+        Stripe::AccountLink.create({
+          account: stripe_connect_account_id,
+          refresh_url: refresh_url,
+          return_url: return_url,
+          type: type,
+        })
+      end
+    end
+  end
+end

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "2.6.4"
+  VERSION = "2.6.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 2.6.4
+  version: 2.6.5
 platform: ruby
 authors:
 - Jason Charnes
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-25 00:00:00.000000000 Z
+date: 2021-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -188,6 +188,7 @@ files:
 - lib/pay/stripe/billable.rb
 - lib/pay/stripe/charge.rb
 - lib/pay/stripe/error.rb
+- lib/pay/stripe/merchant.rb
 - lib/pay/stripe/subscription.rb
 - lib/pay/stripe/webhooks/charge_refunded.rb
 - lib/pay/stripe/webhooks/charge_succeeded.rb