bundle exec rubocop --fix

Author: jarednorman

app/controllers/solidus_subscriptions/api/v1/subscriptions_controller.rb

@@ -22,7 +22,7 @@ def create
           else
             error_message = I18n.t('solidus_subscriptions.subscription.invalid_payment_details')
 
-            render json: { payment_source_type: [error_message] }.to_json, status: :unprocessable_entity
+            render json: {payment_source_type: [error_message]}.to_json, status: :unprocessable_entity
           end
         end
 

app/controllers/spree/admin/installments_controller.rb

@@ -10,9 +10,9 @@ class InstallmentsController < ResourceController
       def index
         @search = collection.ransack((params[:q] || {}).reverse_merge(s: 'created_at desc'))
 
-        @installments = @search.result(distinct: true).
-                        page(params[:page]).
-                        per(params[:per_page] || Spree::Config[:orders_per_page])
+        @installments = @search.result(distinct: true)
+          .page(params[:page])
+          .per(params[:per_page] || Spree::Config[:orders_per_page])
       end
 
       private

app/controllers/spree/admin/subscription_events_controller.rb

@@ -10,9 +10,9 @@ class SubscriptionEventsController < ResourceController
       def index
         @search = collection.ransack((params[:q] || {}).reverse_merge(s: 'created_at desc'))
 
-        @subscription_events = @search.result(distinct: true).
-                               page(params[:page]).
-                               per(params[:per_page] || 20)
+        @subscription_events = @search.result(distinct: true)
+          .page(params[:page])
+          .per(params[:per_page] || 20)
       end
 
       private

app/controllers/spree/admin/subscription_orders_controller.rb

@@ -8,9 +8,9 @@ class SubscriptionOrdersController < ResourceController
       def index
         @search = collection.ransack((params[:q] || {}).reverse_merge(s: 'created_at desc'))
 
-        @subscription_orders = @search.result(distinct: true).
-                               page(params[:page]).
-                               per(params[:per_page] || 20)
+        @subscription_orders = @search.result(distinct: true)
+          .page(params[:page])
+          .per(params[:per_page] || 20)
       end
 
       private

app/controllers/spree/admin/subscriptions_controller.rb

@@ -7,10 +7,10 @@ class SubscriptionsController < ResourceController
 
       def index
         @search = SolidusSubscriptions::Subscription.accessible_by(current_ability).ransack(params[:q])
-        @subscriptions = @search.result(distinct: true).
-                         includes(:line_items, :user).
-                         page(params[:page]).
-                         per(params[:per_page] || Spree::Config[:orders_per_page])
+        @subscriptions = @search.result(distinct: true)
+          .includes(:line_items, :user)
+          .page(params[:page])
+          .per(params[:per_page] || Spree::Config[:orders_per_page])
       end
 
       def new
@@ -28,9 +28,9 @@ def update
 
         if @subscription.payment_method&.source_required?
           @subscription.payment_source = @subscription
-                                         .payment_method
-                                         .payment_source_class
-                                         .find_by(id: params[:subscription][:payment_source_id])
+            .payment_method
+            .payment_source_class
+            .find_by(id: params[:subscription][:payment_source_id])
         else
           @subscription.payment_source = nil
         end
@@ -45,10 +45,10 @@ def cancel
         end
 
         notice = if @subscription.errors.none?
-                   I18n.t('spree.admin.subscriptions.successfully_canceled')
-                 else
-                   @subscription.errors.full_messages.to_sentence
-                 end
+          I18n.t('spree.admin.subscriptions.successfully_canceled')
+        else
+          @subscription.errors.full_messages.to_sentence
+        end
 
         redirect_back(fallback_location: spree.admin_subscriptions_path, notice: notice)
       end
@@ -57,10 +57,10 @@ def activate
         @subscription.activate
 
         notice = if @subscription.errors.none?
-                   I18n.t('spree.admin.subscriptions.successfully_activated')
-                 else
-                   @subscription.errors.full_messages.to_sentence
-                 end
+          I18n.t('spree.admin.subscriptions.successfully_activated')
+        else
+          @subscription.errors.full_messages.to_sentence
+        end
 
         redirect_back(fallback_location: spree.admin_subscriptions_path, notice: notice)
       end
@@ -69,13 +69,13 @@ def skip
         @subscription.skip(check_skip_limits: false)
 
         notice = if @subscription.errors.none?
-                   I18n.t(
-                     'spree.admin.subscriptions.successfully_skipped',
-                     date: @subscription.actionable_date
-                   )
-                 else
-                   @subscription.errors.full_messages.to_sentence
-                 end
+          I18n.t(
+            'spree.admin.subscriptions.successfully_skipped',
+            date: @subscription.actionable_date
+          )
+        else
+          @subscription.errors.full_messages.to_sentence
+        end
 
         redirect_back(fallback_location: spree.admin_subscriptions_path, notice: notice)
       end
@@ -84,10 +84,10 @@ def pause
         @subscription.pause(actionable_date: nil)
 
         notice = if @subscription.errors.none?
-                   I18n.t('spree.admin.subscriptions.successfully_paused')
-                 else
-                   @subscription.errors.full_messages.to_sentence
-                 end
+          I18n.t('spree.admin.subscriptions.successfully_paused')
+        else
+          @subscription.errors.full_messages.to_sentence
+        end
 
         redirect_back(fallback_location: spree.admin_subscriptions_path, notice: notice)
       end
@@ -96,10 +96,10 @@ def resume
         @subscription.resume(actionable_date: nil)
 
         notice = if @subscription.errors.none?
-                   I18n.t('spree.admin.subscriptions.successfully_resumed')
-                 else
-                   @subscription.errors.full_messages.to_sentence
-                 end
+          I18n.t('spree.admin.subscriptions.successfully_resumed')
+        else
+          @subscription.errors.full_messages.to_sentence
+        end
 
         redirect_back(fallback_location: spree.admin_subscriptions_path, notice: notice)
       end

app/models/solidus_subscriptions/installment.rb

@@ -15,15 +15,15 @@ class Installment < ApplicationRecord
     validates :subscription, presence: true
 
     scope :fulfilled, (lambda do
-      joins(:details).where(InstallmentDetail.table_name => { success: true }).distinct
+      joins(:details).where(InstallmentDetail.table_name => {success: true}).distinct
     end)
 
     scope :unfulfilled, (lambda do
       where.not(id: Installment.fulfilled).distinct
     end)
 
     scope :with_active_subscription, (lambda do
-      joins(:subscription).where.not(Subscription.table_name => { state: "canceled" })
+      joins(:subscription).where.not(Subscription.table_name => {state: "canceled"})
     end)
 
     scope :actionable, (lambda do

app/models/solidus_subscriptions/interval.rb

@@ -20,7 +20,7 @@ def self.included(base)
     #
     # @return [Integer] The number of seconds.
     def interval
-      ActiveSupport::Duration.new(interval_length, { interval_units.pluralize.to_sym => interval_length })
+      ActiveSupport::Duration.new(interval_length, {interval_units.pluralize.to_sym => interval_length})
     end
   end
 end

app/models/solidus_subscriptions/line_item.rb

@@ -36,8 +36,8 @@ class LineItem < ApplicationRecord
     belongs_to :subscribable, class_name: "::#{SolidusSubscriptions.configuration.subscribable_class}"
 
     validates :subscribable_id, presence: true
-    validates :quantity, numericality: { greater_than: 0 }
-    validates :interval_length, numericality: { greater_than: 0 }, unless: -> { subscription }
+    validates :quantity, numericality: {greater_than: 0}
+    validates :interval_length, numericality: {greater_than: 0}, unless: -> { subscription }
     validate :ensure_subscribable_valid
 
     def ensure_subscribable_valid

app/models/solidus_subscriptions/subscription.rb

@@ -22,11 +22,11 @@ class Subscription < ApplicationRecord
     belongs_to :payment_source, polymorphic: true, optional: true
 
     validates :user, presence: true
-    validates :skip_count, :successive_skip_count, presence: true, numericality: { greater_than_or_equal_to: 0 }
-    validates :interval_length, numericality: { greater_than: 0 }
+    validates :skip_count, :successive_skip_count, presence: true, numericality: {greater_than_or_equal_to: 0}
+    validates :interval_length, numericality: {greater_than: 0}
     validates :payment_method, presence: true, if: -> { payment_source }
     validates :payment_source, presence: true, if: -> { payment_method&.source_required? }
-    validates :currency, inclusion: { in: ::Money::Currency.all.map(&:iso_code) }
+    validates :currency, inclusion: {in: ::Money::Currency.all.map(&:iso_code)}
 
     validate :validate_payment_source_ownership
 
@@ -44,8 +44,8 @@ class Subscription < ApplicationRecord
     # Find all subscriptions that are "actionable"; that is, ones that have an
     # actionable_date in the past and are not invalid or canceled.
     scope :actionable, (lambda do
-      where("#{table_name}.actionable_date <= ?", Time.zone.today).
-        where.not(state: ["canceled", "inactive"])
+      where("#{table_name}.actionable_date <= ?", Time.zone.today)
+        .where.not(state: ["canceled", "inactive"])
     end)
 
     # Find subscriptions based on their processing state. This state is not a
@@ -64,7 +64,7 @@ class Subscription < ApplicationRecord
         fulfilled_ids = fulfilled.pluck(:id)
         where.not(id: fulfilled_ids)
       when :pending
-        includes(:installments).where(solidus_subscriptions_installments: { id: nil })
+        includes(:installments).where(solidus_subscriptions_installments: {id: nil})
       else
         raise ArgumentError, "state must be one of: :success, :failed, :pending"
       end
@@ -85,7 +85,7 @@ class Subscription < ApplicationRecord
 
     # Scope for finding subscription with a specific item
     scope :with_subscribable, (lambda do |id|
-      joins(line_items: :subscribable).where(spree_variants: { id: id })
+      joins(line_items: :subscribable).where(spree_variants: {id: id})
     end)
 
     def self.ransackable_scopes(_auth_object = nil)
@@ -288,9 +288,9 @@ def failing_since
       failing_details = installment_details.failed.order('solidus_subscriptions_installment_details.created_at ASC')
 
       last_successful_detail = installment_details
-                               .succeeded
-                               .order('solidus_subscriptions_installment_details.created_at DESC')
-                               .first
+        .succeeded
+        .order('solidus_subscriptions_installment_details.created_at DESC')
+        .first
       if last_successful_detail
         failing_details = failing_details.where(
           'solidus_subscriptions_installment_details.created_at > ?',
@@ -320,7 +320,7 @@ def validate_payment_source_ownership
       return if payment_source.blank?
 
       if payment_source.respond_to?(:user_id) &&
-         payment_source.user_id != user_id
+          payment_source.user_id != user_id
         errors.add(:payment_source, :not_owned_by_user)
       end
     end
@@ -361,10 +361,10 @@ def tomorrow_or_after(date)
     def update_actionable_date_if_interval_changed
       if persisted? && (interval_length_previously_changed? || interval_units_previously_changed?)
         base_date = if installments.any?
-                      installments.last.created_at
-                    else
-                      created_at
-                    end
+          installments.last.created_at
+        else
+          created_at
+        end
 
         new_date = interval.since(base_date)
 

config/routes.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 SolidusSubscriptions::Engine.routes.draw do
-  namespace :api, defaults: { format: :json } do
+  namespace :api, defaults: {format: :json} do
     namespace :v1 do
       resources :line_items, only: [:update, :destroy]
       resources :subscriptions, only: [:create, :update] do