pay 3.0.19 → 3.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '093c067bb867fddfbdb00486613ad7be4b9e1d3d0d5ff1e22ec3d892b6bb76b3'
-  data.tar.gz: d4b53a841c0e7cae39f6c73786dbfbe20bc61c81dbbfe3885cbe2a0b0f830936
+  metadata.gz: fc336f11aa6bdd63887622dd48fbec5a3f52b440b41a73d63478a0239d4c787a
+  data.tar.gz: 31e98a7bbe5a0c9ba92201964aab99b3a3743cc42f15eac275f6032a9f52293f
 SHA512:
-  metadata.gz: cee4d5e1b4ed8954e7004b121165c5e4b4dc69f5a39a01b4f9b90197ef4a8dc04cca5660488b7b2da2975a78d9cf0e5356cd30e84923af56e2460277c6c79979
-  data.tar.gz: 261fdecca8eb33582d279ce18f76fe4c80e3efe5fb95c479549c8c4232e53b6096a69decd3915ac12fe7792035e14e88122ef35a459090b5f4e8a710588a2b80
+  metadata.gz: 194be2c0276670440ff121b00048eedba5f91f1a85b53be9bd0145f5147f78d14ab739e57ae90590f6a751c5b3f2013e139650201bfe2b19d455b28c40c896dc
+  data.tar.gz: 9cc1c6d63c0360ccd54b2ee0143b933b292279016618e7e3130b97c150c64350756d7663682f1235f86d7a4983c971def19a7fef13d8148124040b1fccf39c63

data/app/views/pay/user_mailer/receipt.html.erb

@@ -10,7 +10,7 @@ Amount: <%= params[:charge].amount_with_currency %><br/>
 Charged to: <%= params[:charge].charged_to %><br/>
 Transaction ID: <%= params[:charge].id %><br/>
 Date: <%= params[:charge].created_at %><br/>
-<% if params[:charge].customer.owner.extra_billing_info? %>
+<% if params[:charge].customer.owner.try(:extra_billing_info?) %>
 <%= params[:charge].customer.owner.extra_billing_info %><br/>
 <% end %>
 <br/>

data/app/views/pay/user_mailer/refund.html.erb

@@ -11,7 +11,7 @@ Amount: <%= params[:charge].amount_refunded_with_currency %><br/>
 Refunded to: <%= params[:charge].charged_to %><br/>
 Transaction ID: <%= params[:charge].id %><br/>
 Date: <%= params[:charge].created_at %><br/>
-<% if params[:charge].customer.owner.extra_billing_info? %>
+<% if params[:charge].customer.owner.try(:extra_billing_info?) %>
 <%= params[:charge].customer.owner.extra_billing_info %><br/>
 <% end %>
 <br/>

data/lib/pay/receipts.rb

@@ -21,7 +21,7 @@ module Pay
         [I18n.t("pay.receipt.amount"), Pay::Currency.format(amount, currency: currency)],
         [I18n.t("pay.receipt.charged_to"), charged_to]
       ]
-      line_items << [I18n.t("pay.receipt.additional_info"), customer.owner.extra_billing_info] if customer.owner.extra_billing_info?
+      line_items << [I18n.t("pay.receipt.additional_info"), customer.owner.extra_billing_info] if customer.owner.try(:extra_billing_info?)
       line_items << [I18n.t("pay.receipt.refunded"), Pay::Currency.format(amount_refunded, currency: currency)] if refunded?
 
       defaults = {
@@ -49,7 +49,7 @@ module Pay
 
     def invoice_pdf(**options)
       bill_to = [customer.owner.name]
-      bill_to += [customer.owner.extra_billing_info] if customer.owner.extra_billing_info?
+      bill_to += [customer.owner.extra_billing_info] if customer.owner.try(:extra_billing_info?)
       bill_to += [nil, customer.owner.email]
 
       total = Pay::Currency.format(amount, currency: currency)

data/lib/pay/version.rb

@@ -1,3 +1,3 @@
 module Pay
-  VERSION = "3.0.19"
+  VERSION = "3.0.20"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pay
 version: !ruby/object:Gem::Version
-  version: 3.0.19
+  version: 3.0.20
 platform: ruby
 authors:
 - Jason Charnes
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-15 00:00:00.000000000 Z
+date: 2021-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -123,14 +123,7 @@ files:
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/1_create_pay_tables.rb
-- lib/generators/active_record/billable_generator.rb
-- lib/generators/active_record/merchant_generator.rb
-- lib/generators/active_record/templates/billable_migration.rb
-- lib/generators/active_record/templates/merchant_migration.rb
-- lib/generators/pay/billable_generator.rb
 - lib/generators/pay/email_views_generator.rb
-- lib/generators/pay/merchant_generator.rb
-- lib/generators/pay/orm_helpers.rb
 - lib/generators/pay/views_generator.rb
 - lib/pay.rb
 - lib/pay/adapter.rb

data/lib/generators/active_record/billable_generator.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-require "rails/generators/active_record"
-require "generators/pay/orm_helpers"
-
-module ActiveRecord
-  module Generators
-    class BillableGenerator < ActiveRecord::Generators::Base
-      include Pay::Generators::OrmHelpers
-      source_root File.expand_path("../templates", __FILE__)
-
-      def copy_pay_billable_migration
-        if (behavior == :invoke && model_exists?) || (behavior == :revoke && migration_exists?(table_name))
-          migration_template "billable_migration.rb", "#{migration_path}/add_pay_billable_to_#{table_name}.rb", migration_version: migration_version
-        else
-          say "#{model_path} does not exist.", :red
-          say "⚠️  Make sure the #{name} model exists before running this generator."
-        end
-      end
-
-      # If the file already contains the contents, the user will receive this warning:
-      #
-      #   File unchanged! The supplied flag value not found!
-      #
-      # This can be ignored as it just means the contents already exist and the file is unchanged.
-      # Thor will be updated to improve this message: https://github.com/rails/thor/issues/706
-      def inject_pay_billable_content
-        return unless model_exists?
-
-        content = model_contents
-        class_path = (namespaced? ? class_name.to_s.split("::") : [class_name])
-        indent_depth = class_path.size - 1
-        content = content.split("\n").map { |line| "  " * indent_depth + line }.join("\n") << "\n"
-        inject_into_class(model_path, class_path.last, content)
-      end
-
-      private
-
-      def model_contents
-        "  include Pay::Billable"
-      end
-    end
-  end
-end

data/lib/generators/active_record/merchant_generator.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-require "rails/generators/active_record"
-require "generators/pay/orm_helpers"
-
-module ActiveRecord
-  module Generators
-    class MerchantGenerator < ActiveRecord::Generators::Base
-      include Pay::Generators::OrmHelpers
-      source_root File.expand_path("../templates", __FILE__)
-
-      def copy_pay_merchant_migration
-        if (behavior == :invoke && model_exists?) || (behavior == :revoke && migration_exists?(table_name))
-          migration_template "merchant_migration.rb", "#{migration_path}/add_pay_merchant_to_#{table_name}.rb", migration_version: migration_version
-        else
-          say "#{model_path} does not exist.", :red
-          say "⚠️  Make sure the #{name} model exists before running this generator."
-        end
-      end
-
-      # If the file already contains the contents, the user will receive this warning:
-      #
-      #   File unchanged! The supplied flag value not found!
-      #
-      # This can be ignored as it just means the contents already exist and the file is unchanged.
-      # Thor will be updated to improve this message: https://github.com/rails/thor/issues/706
-      def inject_pay_merchant_content
-        return unless model_exists?
-
-        content = model_contents
-        class_path = (namespaced? ? class_name.to_s.split("::") : [class_name])
-        indent_depth = class_path.size - 1
-        content = content.split("\n").map { |line| "  " * indent_depth + line }.join("\n") << "\n"
-        inject_into_class(model_path, class_path.last, content)
-      end
-
-      private
-
-      def model_contents
-        "  include Pay::Merchant"
-      end
-    end
-  end
-end

data/lib/generators/active_record/templates/billable_migration.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-class AddPayBillableTo<%= table_name.camelize %> < ActiveRecord::Migration<%= migration_version %>
-  def change
-    change_table :<%= table_name %>, bulk: true do |t|
-      t.string :processor
-      t.string :processor_id
-      t.public_send(Pay::Adapter.json_column_type, :pay_data)
-      t.datetime :trial_ends_at
-      t.string :card_type
-      t.string :card_last4
-      t.string :card_exp_month
-      t.string :card_exp_year
-      t.text :extra_billing_info
-    end
-  end
-end

data/lib/generators/active_record/templates/merchant_migration.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-class AddPayMerchantTo<%= table_name.camelize %> < ActiveRecord::Migration<%= migration_version %>
-  def change
-    add_column table_name, :merchant_processor, :string
-
-    # We may already have the pay_data column if a Pay::Billable object is also a Pay::Merchant
-    unless ActiveRecord::Base.connection.column_exists?(table_name, :pay_data)
-      add_column :<%= table_name %>, :pay_data, Pay::Adapter.json_column_type
-    end
-  end
-end

data/lib/generators/pay/billable_generator.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require "rails/generators/named_base"
-
-module Pay
-  module Generators
-    class BillableGenerator < Rails::Generators::NamedBase
-      include Rails::Generators::ResourceHelpers
-
-      source_root File.expand_path("../templates", __FILE__)
-
-      desc "Generates a migration to add Pay::Billable fields to a model."
-
-      hook_for :orm
-    end
-  end
-end

data/lib/generators/pay/merchant_generator.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require "rails/generators/named_base"
-
-module Pay
-  module Generators
-    class MerchantGenerator < Rails::Generators::NamedBase
-      include Rails::Generators::ResourceHelpers
-
-      source_root File.expand_path("../templates", __FILE__)
-
-      desc "Generates a migration to add Pay::Merchant fields to a model."
-
-      hook_for :orm
-    end
-  end
-end

data/lib/generators/pay/orm_helpers.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-module Pay
-  module Generators
-    module OrmHelpers
-      private
-
-      def model_exists?
-        File.exist?(File.join(destination_root, model_path))
-      end
-
-      def migration_exists?(table_name)
-        Dir.glob("#{File.join(destination_root, migration_path)}/[0-9]*_*.rb").grep(/\d+_add_devise_to_#{table_name}.rb$/).first
-      end
-
-      def migration_path
-        if Rails.version >= "5.0.3"
-          db_migrate_path
-        else
-          @migration_path ||= File.join("db", "migrate")
-        end
-      end
-
-      def model_path
-        @model_path ||= File.join("app", "models", "#{file_path}.rb")
-      end
-
-      def migration_version
-        if rails5_and_up?
-          "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
-        end
-      end
-
-      def rails5_and_up?
-        Rails::VERSION::MAJOR >= 5
-      end
-    end
-  end
-end