pay 1.0.0.beta4 → 1.0.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04da4cf2db886ff26020de3ff98a468590fe10fd884c0ecc751426495eb7e149
-  data.tar.gz: f9bda1c5e7d668e6dc84af02c6f8a90c3e3fc63fdb4468c35621151e5191535d
+  metadata.gz: bff729474d018c2cff20005da118f397da764871afb0f15b15b8a589a7126ce4
+  data.tar.gz: 9805c0129c0682a688d5a1f17e7605168505e04fb74710ad055a5ace9ac7b1f3
 SHA512:
-  metadata.gz: 692a1e69cca21a7b6329010a491043af5e31fe8e6d626bec1f244273a5078e86eb5ead1f6800c6e7f936da8bcf4f492606b8fa6e2987a4e13ec3df5f674b5893
-  data.tar.gz: 9b4b8fc38fde6014934d52d1e1ffbdaa863184e4e74138b4eea114e100c4582f70e3a3265120fee047a9b49275e1fd110184ed09207909e30536e789f3ab4fbc
+  metadata.gz: ee9881e420e5bd374effc080faf624603cff7cec5bcbccf49ed234ccc441969fea8e6fa3736a59430b4e7dd7332bc327d18ab0a9206d2af46418c434bf655c6b
+  data.tar.gz: 16eac44178c8a355bf3c93657c760c2383fdb44d1ad2a9f0ceca61b155911d255621d5d6eeb84e240b19338a49937442d9f96d1dcdf807e8ae7ab25bce63b8b7

data/lib/pay/braintree.rb

@@ -1,16 +1,41 @@
-require 'pay/braintree/api'
+require 'pay/env'
 require 'pay/braintree/billable'
 require 'pay/braintree/charge'
 require 'pay/braintree/subscription'
 
 module Pay
   module Braintree
-    def self.setup
-      Pay::Braintree::Api.set_api_keys
+    include Env
+
+    extend self
+
+    def setup
+      Pay.braintree_gateway = ::Braintree::Gateway.new(
+        environment: environment.to_sym,
+        merchant_id: merchant_id,
+        public_key:  public_key,
+        private_key: private_key
+      )
 
       Pay.charge_model.include Pay::Braintree::Charge
       Pay.subscription_model.include Pay::Braintree::Subscription
       Pay.user_model.include Pay::Braintree::Billable
     end
+
+    def public_key
+      find_value_by_name(:braintree, :public_key)
+    end
+
+    def private_key
+      find_value_by_name(:braintree, :private_key)
+    end
+
+    def merchant_id
+      find_value_by_name(:braintree, :merchant_id)
+    end
+
+    def environment
+      find_value_by_name(:braintree, :environment) || 'sandbox'
+    end
   end
 end

data/lib/pay/env.rb

@@ -0,0 +1,35 @@
+module Pay
+  module Env
+
+    private
+
+    # Search for environment variables
+    #
+    # We must handle a lot of different cases, including the new Rails 6
+    # environment separated credentials files which have no nesting for
+    # the current environment.
+    #
+    # 1. Check environment variable
+    # 2. Check environment scoped credentials, then secrets
+    # 3. Check unscoped credentials, then secrets
+    def find_value_by_name(scope, name)
+      ENV["#{scope.upcase}_#{name.upcase}"] ||
+        credentials.dig(env, scope, name) ||
+        secrets.dig(env, scope, name) ||
+        credentials.dig(scope, name) ||
+        secrets.dig(scope, name)
+    end
+
+    def env
+      Rails.env.to_sym
+    end
+
+    def secrets
+      Rails.application.secrets
+    end
+
+    def credentials
+      Rails.application.credentials
+    end
+  end
+end

data/lib/pay/stripe.rb

@@ -1,4 +1,4 @@
-require 'pay/stripe/api'
+require 'pay/env'
 require 'pay/stripe/billable'
 require 'pay/stripe/charge'
 require 'pay/stripe/subscription'
@@ -6,12 +6,29 @@ require 'pay/stripe/webhooks'
 
 module Pay
   module Stripe
-    def self.setup
-      Pay::Stripe::Api.set_api_keys
+    include Env
+
+    extend self
+
+    def setup
+      ::Stripe.api_key = private_key
+      ::StripeEvent.signing_secret = signing_secret
 
       Pay.charge_model.include Pay::Stripe::Charge
       Pay.subscription_model.include Pay::Stripe::Subscription
       Pay.user_model.include Pay::Stripe::Billable
     end
+
+    def public_key
+      find_value_by_name(:stripe, :public_key)
+    end
+
+    def private_key
+      find_value_by_name(:stripe, :private_key)
+    end
+
+    def signing_secret
+      find_value_by_name(:stripe, :signing_secret)
+    end
   end
 end

data/lib/pay/stripe/webhooks.rb

@@ -1,12 +1,6 @@
 require 'stripe_event'
 Dir[File.join(__dir__, 'webhooks', '**', '*.rb')].each { |file| require file }
 
-env         = Rails.env.to_sym
-secrets     = Rails.application.secrets
-credentials = Rails.application.credentials
-
-StripeEvent.signing_secret = ENV["STRIPE_SIGNING_SECRET"] || secrets.dig(env, :stripe, :signing_secret) || credentials.dig(env, :stripe, :signing_secret)
-
 StripeEvent.configure do |events|
   # Listen to the charge event to make sure we get non-subscription
   # purchases as well. Invoice is only for subscriptions and manual creation

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = '1.0.0.beta4'
+  VERSION = '1.0.0.beta5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta4
+  version: 1.0.0.beta5
 platform: ruby
 authors:
 - Jason Charnes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-26 00:00:00.000000000 Z
+date: 2019-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -242,14 +242,13 @@ files:
 - lib/pay/billable.rb
 - lib/pay/billable/sync_email.rb
 - lib/pay/braintree.rb
-- lib/pay/braintree/api.rb
 - lib/pay/braintree/billable.rb
 - lib/pay/braintree/charge.rb
 - lib/pay/braintree/subscription.rb
 - lib/pay/engine.rb
+- lib/pay/env.rb
 - lib/pay/receipts.rb
 - lib/pay/stripe.rb
-- lib/pay/stripe/api.rb
 - lib/pay/stripe/billable.rb
 - lib/pay/stripe/charge.rb
 - lib/pay/stripe/subscription.rb

data/lib/pay/braintree/api.rb

@@ -1,30 +0,0 @@
-module Pay
-  module Braintree
-    module Api
-      def self.set_api_keys
-        environment = get_key_for(:environment, 'sandbox')
-        merchant_id = get_key_for(:merchant_id)
-        public_key  = get_key_for(:public_key)
-        private_key = get_key_for(:private_key)
-
-        Pay.braintree_gateway = ::Braintree::Gateway.new(
-          environment: environment.to_sym,
-          merchant_id: merchant_id,
-          public_key: public_key,
-          private_key: private_key
-        )
-      end
-
-      def self.get_key_for(name, default = '')
-        env         = Rails.env.to_sym
-        secrets     = Rails.application.secrets
-        credentials = Rails.application.credentials
-
-        ENV["BRAINTREE_#{name.upcase}"] ||
-          secrets.dig(env, :braintree, name) ||
-          credentials.dig(env, :braintree, name) ||
-          default
-      end
-    end
-  end
-end

data/lib/pay/stripe/api.rb

@@ -1,13 +0,0 @@
-module Pay
-  module Stripe
-    module Api
-      def self.set_api_keys
-        env         = Rails.env.to_sym
-        secrets     = Rails.application.secrets
-        credentials = Rails.application.credentials
-
-        ::Stripe.api_key = ENV["STRIPE_PRIVATE_KEY"] || secrets.dig(env, :stripe, :private_key) || credentials.dig(env, :stripe, :private_key)
-      end
-    end
-  end
-end