reji 1.0.0 → 1.1.0

data/app/views/payment.html.erb

@@ -34,7 +34,7 @@
       </p>
 
       <div class="bg-white rounded-lg shadow-xl p-4 sm:py-6 sm:px-10 mb-5">
-        <% if @payment.is_succeeded %>
+        <% if @payment.succeeded? %>
           <h1 class="text-xl mt-2 mb-4 text-gray-700">
             Payment Successful
           </h1>
@@ -42,7 +42,7 @@
           <p class="mb-6">
             This payment was already successfully confirmed.
           </p>
-        <% elsif @payment.is_cancelleed %>
+        <% elsif @payment.cancelled? %>
           <h1 class="text-xl mt-2 mb-4 text-gray-700">
             Payment Cancelled
           </h1>
@@ -104,7 +104,7 @@
       </div>
 
       <p class="text-center text-gray-500 text-sm">
-        © <%= Time.now.year %>. All rights reserved.
+        © <%= Time.current.year %>. All rights reserved.
       </p>
     </div>
   </div>
@@ -126,7 +126,7 @@
         errorMessage: ''
       },
 
-      <% if ! @payment.is_succeeded && ! @payment.is_cancelleed && ! @payment.requires_action %>
+      <% if ! @payment.succeeded? && ! @payment.cancelled? && ! @payment.requires_action %>
       mounted: function () {
         this.configureStripe();
       },

data/app/views/receipt.html.erb

@@ -118,7 +118,7 @@
             <th align="left">Description</th>
             <th align="right">Date</th>
 
-            <% if invoice.has_tax %>
+            <% if invoice.tax? %>
                 <th align="right">Tax</th>
             <% end %>
 
@@ -129,13 +129,13 @@
           <% invoice.invoice_items.each do |item| %>
             <tr class="row">
               <td colspan="2"><%= item.description %></td>
-              <% if invoice.has_tax %>
+              <% if invoice.tax? %>
               <td>
                 <% if item.inclusive_tax_percentage > 0 %>
                   <%= item.inclusive_tax_percentage %>% incl.
                 <% end %>
 
-                <% if item.has_both_inclusive_and_exclusive_tax > 0 %>
+                <% if item.both_inclusive_and_exclusive_tax? %>
                   +
                 <% end %>
 
@@ -156,13 +156,13 @@
                 <%= subscription.start_date %>
                 <%= subscription.end_date %>
               </td>
-              <% if invoice.has_tax %>
+              <% if invoice.tax? %>
               <td>
                 <% if subscription.inclusive_tax_percentage > 0 %>
                   <%= subscription.inclusive_tax_percentage %>% incl.
                 <% end %>
 
-                <% if subscription.has_both_inclusive_and_exclusive_tax > 0 %>
+                <% if subscription.both_inclusive_and_exclusive_tax? %>
                   +
                 <% end %>
 
@@ -176,17 +176,17 @@
           <% end %>
 
           <!-- Display The Subtotal -->
-          <% if invoice.has_discount || invoice.has_tax || invoice.has_starting_balance %>
+          <% if invoice.discount? || invoice.tax? || invoice.starting_balance? %>
             <tr>
-              <td colspan="<%= invoice.has_tax ? 3 : 2 %>" style="text-align: right;">Subtotal</td>
+              <td colspan="<%= invoice.tax? ? 3 : 2 %>" style="text-align: right;">Subtotal</td>
               <td><%= invoice.subtotal %></td>
             </tr>
           <% end %>
 
           <!-- Display The Discount -->
-          <% if invoice.has_discount %>
+          <% if invoice.discount? %>
             <tr>
-              <td colspan="<%= invoice.has_tax ? 3 : 2 %>" style="text-align: right;">
+              <td colspan="<%= invoice.tax? ? 3 : 2 %>" style="text-align: right;">
                 <% if invoice.discount_is_percentage %>
                   <%= invoice.coupon %> (<%= invoice.percent_off %>% Off)
                 <% else %>
@@ -199,10 +199,10 @@
           <% end %>
 
           <!-- Display The Taxes -->
-          <% unless invoice.is_not_tax_exempt %>
+          <% unless invoice.not_tax_exempt? %>
             <tr>
-              <td colspan="<%= invoice.has_tax ? 3 : 2 %>" style="text-align: right;">
-                <% if invoice.is_tax_exempt %>
+              <td colspan="<%= invoice.tax? ? 3 : 2 %>" style="text-align: right;">
+                <% if invoice.tax_exempt? %>
                   Tax is exempted
                 <% else %>
                   Tax to be paid on reverse charge basis
@@ -215,7 +215,7 @@
               <tr>
                 <td colspan="3" style="text-align: right;">
                   <%= tax.display_name %> <%= tax.jurisdiction ? ' - '.tax.jurisdiction : '' %>
-                  (<%= tax.percentage %>%<%= tax.is_inclusive ? ' incl.' : '' %>)
+                  (<%= tax.percentage %>%<%= tax.inclusive? ? ' incl.' : '' %>)
                 </td>
                 <td><%= tax.amount %></td>
               </tr>
@@ -223,9 +223,9 @@
           <% end %>
 
           <!-- Starting Balance -->
-          <% if invoice.has_starting_balance %>
+          <% if invoice.starting_balance? %>
             <tr>
-              <td colspan="<%= invoice.has_tax ? 3 : 2 %>" style="text-align: right;">
+              <td colspan="<%= invoice.tax? ? 3 : 2 %>" style="text-align: right;">
                 Customer Balance
               </td>
               <td><%= invoice.starting_balance %></td>
@@ -234,7 +234,7 @@
 
           <!-- Display The Final Total -->
           <tr>
-            <td colspan="<%= invoice.has_tax ? 3 : 2 %>" style="text-align: right;">
+            <td colspan="<%= invoice.tax? ? 3 : 2 %>" style="text-align: right;">
               <strong>Total</strong>
             </td>
             <td>

data/config/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.application.routes.draw do
   scope 'stripe', as: 'stripe' do
     get 'payment/:id', to: 'reji/payment#show', as: 'payment'

data/gemfiles/rails_5.0.gemfile

@@ -1,13 +1,13 @@
+# frozen_string_literal: true
+
 # This file was generated by Appraisal
 
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "appraisal"
-gem "money"
-gem "pry", require: false
-gem "rspec-rails", "~> 3.1"
-gem "stripe"
-gem "sqlite3", "~> 1.3.13"
-gem "railties", "~> 5.0"
+gem 'pry', require: false
+gem 'railties', '~> 5.0'
+gem 'rspec-rails', '~> 3.1'
+gem 'rubocop-rails', require: false
+gem 'sqlite3', '~> 1.3.13'
 
-gemspec path: "../"
+gemspec path: '../'

data/gemfiles/rails_5.1.gemfile

@@ -1,13 +1,11 @@
+# frozen_string_literal: true
+
 # This file was generated by Appraisal
 
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "appraisal"
-gem "money"
-gem "pry", require: false
-gem "rspec-rails"
-gem "stripe"
-gem "sqlite3"
-gem "railties", "~> 5.1"
+gem 'pry', require: false
+gem 'railties', '~> 5.1'
+gem 'rubocop-rails', require: false
 
-gemspec path: "../"
+gemspec path: '../'

data/gemfiles/rails_5.2.gemfile

@@ -1,13 +1,11 @@
+# frozen_string_literal: true
+
 # This file was generated by Appraisal
 
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "appraisal"
-gem "money"
-gem "pry", require: false
-gem "rspec-rails"
-gem "stripe"
-gem "sqlite3"
-gem "railties", "~> 5.2"
+gem 'pry', require: false
+gem 'railties', '~> 5.2'
+gem 'rubocop-rails', require: false
 
-gemspec path: "../"
+gemspec path: '../'

data/gemfiles/rails_6.0.gemfile

@@ -1,13 +1,11 @@
+# frozen_string_literal: true
+
 # This file was generated by Appraisal
 
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-gem "appraisal"
-gem "money"
-gem "pry", require: false
-gem "rspec-rails"
-gem "stripe"
-gem "sqlite3"
-gem "railties", "~> 6.0"
+gem 'pry', require: false
+gem 'railties', '~> 6.0'
+gem 'rubocop-rails', require: false
 
-gemspec path: "../"
+gemspec path: '../'

data/lib/generators/reji/install/install_generator.rb

@@ -8,7 +8,7 @@ module Reji
     class InstallGenerator < Rails::Generators::Base
       include Rails::Generators::Migration
 
-      source_root(File.expand_path('../templates', __FILE__))
+      source_root(File.expand_path('templates', __dir__))
 
       def create_reji_initializer
         copy_file('reji.rb', 'config/initializers/reji.rb')
@@ -20,48 +20,44 @@ module Reji
         copy_migration('create_subscription_items')
       end
 
-      private
+      # for generating a timestamp when using `create_migration`
+      def self.next_migration_number(dir)
+        ActiveRecord::Generators::Base.next_migration_number(dir)
+      end
 
-      def copy_migration(migration_name, config = {})
-        unless migration_exists?(migration_name)
-          migration_template(
-            "db/migrate/#{migration_name}.rb.erb",
-            "db/migrate/#{migration_name}.rb",
-            config.merge(migration_version: migration_version),
-          )
-        end
+      private def copy_migration(migration_name, config = {})
+        return if migration_exists?(migration_name)
+
+        migration_template(
+          "db/migrate/#{migration_name}.rb.erb",
+          "db/migrate/#{migration_name}.rb",
+          config.merge(migration_version: migration_version)
+        )
       end
 
-      def migration_exists?(name)
+      private def migration_exists?(name)
         existing_migrations.include?(name)
       end
 
-      def existing_migrations
+      private def existing_migrations
         @existing_migrations ||= Dir.glob('db/migrate/*.rb').map do |file|
           migration_name_without_timestamp(file)
         end
       end
 
-      def migration_name_without_timestamp(file)
+      private def migration_name_without_timestamp(file)
         file.sub(%r{^.*(db/migrate/)(?:\d+_)?}, '')
       end
 
-      # for generating a timestamp when using `create_migration`
-      def self.next_migration_number(dir)
-        ActiveRecord::Generators::Base.next_migration_number(dir)
-      end
-
-      def migration_version
+      private def migration_version
         "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
       end
 
-      def migration_primary_key_type_string
-        if configured_key_type
-          ", id: :#{configured_key_type}"
-        end
+      private def migration_primary_key_type_string
+        ", id: :#{configured_key_type}" if configured_key_type
       end
 
-      def configured_key_type
+      private def configured_key_type
         Rails.configuration.generators.active_record[:primary_key_type]
       end
     end

data/lib/generators/reji/install/templates/reji.rb

@@ -15,8 +15,8 @@ Reji.configure do |config|
   # your Stripe webhook handling controllers. The tolerance setting will
   # check the drift between the current time and the signed request's.
   config.webhook = {
-    :secret => ENV['STRIPE_WEBHOOK_SECRET'],
-    :tolerance => ENV['STRIPE_WEBHOOK_TOLERANCE'] || 300,
+    secret: ENV['STRIPE_WEBHOOK_SECRET'],
+    tolerance: ENV['STRIPE_WEBHOOK_TOLERANCE'] || 300,
   }
 
   # Reji Model

data/lib/reji.rb

@@ -30,11 +30,7 @@ module Reji
   STRIPE_VERSION = '2020-08-27'
 
   # Indicates if Reji will mark past due subscriptions as inactive.
-  @@deactivate_past_due = true
-
-  class << self
-    attr_accessor :deactivate_past_due
-  end
+  @deactivate_past_due = true
 
   # Get the billable entity instance by Stripe ID.
   def self.find_billable(stripe_id)
@@ -47,8 +43,8 @@ module Reji
   # Get the default Stripe API options.
   def self.stripe_options(options = {})
     {
-      :api_key => Reji.configuration.secret,
-      :stripe_version => Reji::STRIPE_VERSION,
+      api_key: Reji.configuration.secret,
+      stripe_version: Reji::STRIPE_VERSION,
     }.merge(options)
   end
 
@@ -66,10 +62,18 @@ module Reji
 
   # Configure to maintain past due subscriptions as active.
   def self.keep_past_due_subscriptions_active
-    @@deactivate_past_due = false
+    @deactivate_past_due = false
 
     self
   end
+
+  def self.deactivate_past_due=(value)
+    @deactivate_past_due = value
+  end
+
+  def self.deactivate_past_due
+    @deactivate_past_due
+  end
 end
 
 Stripe.set_app_info('Rails Reji')

data/lib/reji/concerns/manages_customer.rb

@@ -5,26 +5,24 @@ module Reji
     extend ActiveSupport::Concern
 
     # Determine if the entity has a Stripe customer ID.
-    def has_stripe_id
-      ! self.stripe_id.nil?
+    def stripe_id?
+      !stripe_id.nil?
     end
 
     # Create a Stripe customer for the given model.
     def create_as_stripe_customer(options = {})
-      raise Reji::CustomerAlreadyCreatedError.exists(self) if self.has_stripe_id
+      raise Reji::CustomerAlreadyCreatedError.exists(self) if stripe_id?
 
-      if ! options.key?('email') && self.stripe_email
-        options[:email] = self.stripe_email
-      end
+      options[:email] = stripe_email if !options.key?('email') && stripe_email
 
       # Here we will create the customer instance on Stripe and store the ID of the
       # user from Stripe. This ID will correspond with the Stripe user instances
       # and allow us to retrieve users from Stripe later when we need to work.
       customer = Stripe::Customer.create(
-        options, self.stripe_options
+        options, stripe_options
       )
 
-      self.update({:stripe_id => customer.id})
+      update({ stripe_id: customer.id })
 
       customer
     end
@@ -32,34 +30,34 @@ module Reji
     # Update the underlying Stripe customer information for the model.
     def update_stripe_customer(options = {})
       Stripe::Customer.update(
-        self.stripe_id, options, self.stripe_options
+        stripe_id, options, stripe_options
       )
     end
 
     # Get the Stripe customer instance for the current user or create one.
     def create_or_get_stripe_customer(options = {})
-      return self.as_stripe_customer if self.has_stripe_id
+      return as_stripe_customer if stripe_id?
 
-      self.create_as_stripe_customer(options)
+      create_as_stripe_customer(options)
     end
 
     # Get the Stripe customer for the model.
     def as_stripe_customer
-      self.assert_customer_exists
+      assert_customer_exists
 
-      Stripe::Customer.retrieve(self.stripe_id, self.stripe_options)
+      Stripe::Customer.retrieve(stripe_id, stripe_options)
     end
 
     # Get the email address used to create the customer in Stripe.
     def stripe_email
-      self.email
+      email
     end
 
     # Apply a coupon to the billable entity.
     def apply_coupon(coupon)
-      self.assert_customer_exists
+      assert_customer_exists
 
-      customer = self.as_stripe_customer
+      customer = as_stripe_customer
 
       customer.coupon = coupon
 
@@ -73,29 +71,29 @@ module Reji
 
     # Get the Stripe billing portal for this customer.
     def billing_portal_url(return_url = nil)
-      self.assert_customer_exists
+      assert_customer_exists
 
       session = Stripe::BillingPortal::Session.create({
-        :customer => self.stripe_id,
-        :return_url => return_url || '/',
-      }, self.stripe_options)
+        customer: stripe_id,
+        return_url: return_url || '/',
+      }, stripe_options)
 
       session.url
     end
 
     # Determine if the customer is not exempted from taxes.
-    def is_not_tax_exempt
-      self.as_stripe_customer.tax_exempt == 'none'
+    def not_tax_exempt?
+      as_stripe_customer.tax_exempt == 'none'
     end
 
     # Determine if the customer is exempted from taxes.
-    def is_tax_exempt
-      self.as_stripe_customer.tax_exempt == 'exempt'
+    def tax_exempt?
+      as_stripe_customer.tax_exempt == 'exempt'
     end
 
     # Determine if reverse charge applies to the customer.
     def reverse_charge_applies
-      self.as_stripe_customer.tax_exempt == 'reverse'
+      as_stripe_customer.tax_exempt == 'reverse'
     end
 
     # Get the default Stripe API options for the current Billable model.
@@ -103,11 +101,9 @@ module Reji
       Reji.stripe_options(options)
     end
 
-    protected
-
     # Determine if the entity has a Stripe customer ID and throw an exception if not.
-    def assert_customer_exists
-      raise Reji::InvalidCustomerError.not_yet_created(self) unless self.has_stripe_id
+    protected def assert_customer_exists
+      raise Reji::InvalidCustomerError.not_yet_created(self) unless stripe_id?
     end
   end
 end