Merge pull request #5602 from coopdevs/fix-style-issues

Fix outstanding Rubocop violations

app/controllers/admin/enterprise_groups_controller.rb

@@ -28,7 +28,9 @@ module Admin
     def build_resource_with_address
       enterprise_group = build_resource_without_address
       enterprise_group.address = Spree::Address.new
-      enterprise_group.address.country = Spree::Country.find_by(id: Spree::Config[:default_country_id])
+      enterprise_group.address.country = Spree::Country.find_by(
+        id: Spree::Config[:default_country_id]
+      )
       enterprise_group
     end
     alias_method_chain :build_resource, :address

app/controllers/admin/enterprises_controller.rb

@@ -211,7 +211,8 @@ module Admin
       # record is persisted. This problem is compounded by the use of calculators.
       @object.transaction do
         tag_rules_attributes.select{ |_i, attrs| attrs[:type].present? }.each do |_i, attrs|
-          rule = @object.tag_rules.find_by(id: attrs.delete(:id)) || attrs[:type].constantize.new(enterprise: @object)
+          rule = @object.tag_rules.find_by(id: attrs.delete(:id)) ||
+                 attrs[:type].constantize.new(enterprise: @object)
           create_calculator_for(rule, attrs) if rule.type == "TagRule::DiscountOrder" && rule.calculator.nil?
           rule.update_attributes(attrs)
         end
@@ -234,7 +235,9 @@ module Admin
     def check_can_change_bulk_sells
       unless spree_current_user.admin?
         params[:enterprise_set][:collection_attributes].each do |_i, enterprise_params|
-          enterprise_params.delete :sells unless spree_current_user == Enterprise.find_by(id: enterprise_params[:id]).owner
+          unless spree_current_user == Enterprise.find_by(id: enterprise_params[:id]).owner
+            enterprise_params.delete :sells
+          end
         end
       end
     end

app/controllers/admin/schedules_controller.rb

@@ -29,9 +29,7 @@ module Admin
     end
 
     def create
-      if params[:order_cycle_ids].blank?
-        return respond_with(@schedule)
-      end
+      return respond_with(@schedule) if params[:order_cycle_ids].blank?
 
       @schedule.attributes = permitted_resource_params
 
@@ -42,10 +40,9 @@ module Admin
         sync_subscriptions_for_create
 
         flash[:success] = flash_message_for(@schedule, :successfully_created)
-        respond_with(@schedule)
-      else
-        respond_with(@schedule)
       end
+
+      respond_with(@schedule)
     end
 
     private
@@ -69,7 +66,8 @@ module Admin
       [:index]
     end
 
-    # In this controller, params like params[:name] are moved into params[:schedule] becoming params[:schedule][:name]
+    # In this controller, params like params[:name] are moved into
+    #   params[:schedule] becoming params[:schedule][:name].
     # For some reason in rails 4, this is not happening for params[:order_cycle_ids]
     #   We do it manually in this filter
     def adapt_params

app/controllers/api/enterprise_attachment_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'api/admin/enterprise_serializer'
 
 module Api

app/controllers/spree/admin/countries_controller.rb

@@ -1,7 +1,6 @@
 module Spree
   module Admin
     class CountriesController < ResourceController
-
       protected
 
       def permitted_resource_params

app/controllers/spree/admin/products_controller.rb

@@ -159,7 +159,7 @@ module Spree
 
       private
 
-      def product_set_from_params(params)
+      def product_set_from_params(_params)
         collection_hash = Hash[products_params.each_with_index.map { |p, i| [i, p] }]
         Spree::ProductSet.new(collection_attributes: collection_hash)
       end

app/controllers/spree/admin/shipping_categories_controller.rb

@@ -1,7 +1,6 @@
 module Spree
   module Admin
     class ShippingCategoriesController < ResourceController
-
       protected
 
       def permitted_resource_params

app/models/product_import/entry_processor.rb

@@ -160,7 +160,9 @@ module ProductImport
       end
 
       product = Spree::Product.new
-      product.assign_attributes(entry.assignable_attributes.except('id', 'on_hand', 'on_demand', 'display_name'))
+      product.assign_attributes(
+        entry.assignable_attributes.except('id', 'on_hand', 'on_demand', 'display_name')
+      )
       product.supplier_id = entry.producer_id
 
       if product.save

app/models/product_import/entry_validator.rb

@@ -299,7 +299,9 @@ module ProductImport
 
     def mark_as_new_product(entry)
       new_product = Spree::Product.new
-      new_product.assign_attributes(entry.assignable_attributes.except('id', 'on_hand', 'on_demand', 'display_name'))
+      new_product.assign_attributes(
+        entry.assignable_attributes.except('id', 'on_hand', 'on_demand', 'display_name')
+      )
       new_product.supplier_id = entry.producer_id
       entry.on_hand = 0 if entry.on_hand.nil?
 

app/models/spree/adjustment_decorator.rb

@@ -12,7 +12,6 @@ module Spree
     belongs_to :tax_rate, -> { where spree_adjustments: { originator_type: 'Spree::TaxRate' } },
                foreign_key: 'originator_id'
 
-
     scope :enterprise_fee, -> { where(originator_type: 'EnterpriseFee') }
     scope :admin,          -> { where(source_type: nil, originator_type: nil) }
     scope :included_tax,   -> {

app/models/spree/line_item_decorator.rb

@@ -75,11 +75,12 @@ Spree::LineItem.class_eval do
       where('spree_adjustments.id IS NULL')
   }
 
-  # Overridden so that LineItems always have access to soft-deleted Variant attributes
-  # In some situations, unscoped super will be nil, in these cases we fetch the variant using the variant_id
-  # See isssue #4946 for more details
+  # Overridden so that LineItems always have access to soft-deleted Variant
+  # attributes. In some situations, unscoped super will be nil, in these cases
+  # we fetch the variant using the variant_id. See isssue #4946 for more
+  # details
   def variant
-    Spree::Variant.unscoped { super } || Spree::Variant.unscoped.find(self.variant_id)
+    Spree::Variant.unscoped { super } || Spree::Variant.unscoped.find(variant_id)
   end
 
   def cap_quantity_at_stock!

app/models/spree/order_decorator.rb

@@ -36,7 +36,8 @@ Spree::Order.class_eval do
       callback.raw_filter.attributes.delete :email
     end
   end
-  validates :email, presence: true, format: /\A([\w\.%\+\-']+)@([\w\-]+\.)+([\w]{2,})\z/i, if: :require_email
+  validates :email, presence: true, format: /\A([\w\.%\+\-']+)@([\w\-]+\.)+([\w]{2,})\z/i,
+                    if: :require_email
 
   before_validation :associate_customer, unless: :customer_id?
   before_validation :ensure_customer, unless: :customer_is_valid?

app/models/spree/order_updater_decorator.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 Spree::OrderUpdater.class_eval do
   # Override spree method to make it update all adjustments as in Spree v2.0.4
   def update_shipping_adjustments
-    order.adjustments.reload.each { |adjustment| adjustment.update! }
+    order.adjustments.reload.each(&:update!)
   end
 end

app/models/spree/payment_decorator.rb

@@ -15,9 +15,7 @@ module Spree
     # We bypass this after_rollback callback that is setup in Spree::Payment
     # The issues the callback fixes are not experienced in OFN:
     #   if a payment fails on checkout the state "failed" is persisted correctly
-    def persist_invalid
-      return
-    end
+    def persist_invalid; end
 
     def ensure_correct_adjustment
       revoke_adjustment_eligibility if ['failed', 'invalid'].include?(state)
@@ -64,12 +62,12 @@ module Spree
         record_response(response)
 
         if response.success?
-          self.class.create({ order: order,
-                              source: self,
-                              payment_method: payment_method,
-                              amount: refund_amount.abs * -1,
-                              response_code: response.authorization,
-                              state: 'completed' })
+          self.class.create(order: order,
+                            source: self,
+                            payment_method: payment_method,
+                            amount: refund_amount.abs * -1,
+                            response_code: response.authorization,
+                            state: 'completed')
         else
           gateway_error(response)
         end

app/models/spree/user.rb

@@ -10,7 +10,6 @@ module Spree
     before_validation :set_login
     before_destroy :check_completed_orders
 
-    users_table_name = User.table_name
     roles_table_name = Role.table_name
 
     scope :admin, lambda { includes(:spree_roles).where("#{roles_table_name}.name" => "admin") }

app/services/permitted_attributes/checkout.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PermittedAttributes
   class Checkout
     def initialize(params)

app/services/permitted_attributes/order_cycle.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PermittedAttributes
   class OrderCycle
     def initialize(params)
@@ -22,9 +24,10 @@ module PermittedAttributes
         :id, :sender_id, :receiver_id, :enterprise_id, :incoming, :active,
         :select_all_variants, :receival_instructions,
         :pickup_time, :pickup_instructions,
-        :tag_list, :tags => [:text],
-        :enterprise_fee_ids => [],
-        :variants => permitted_variant_ids
+        :tag_list,
+        tags: [:text],
+        enterprise_fee_ids: [],
+        variants: permitted_variant_ids
       ]
     end
 

engines/order_management/spec/services/order_management/subscriptions/proxy_order_syncer_spec.rb

@@ -24,22 +24,28 @@ module OrderManagement
           create(:simple_order_cycle, orders_open_at: now - 1.minute, orders_close_at: now)
         }
         let(:open_oc_closes_before_begins_at_oc) { # Open, but closes before begins at
-          create(:simple_order_cycle, orders_open_at: now - 1.minute, orders_close_at: now + 59.seconds)
+          create(:simple_order_cycle,
+                 orders_open_at: now - 1.minute, orders_close_at: now + 59.seconds)
         }
         let(:open_oc) { # Open & closes between begins at and ends at
-          create(:simple_order_cycle, orders_open_at: now - 1.minute, orders_close_at: now + 90.seconds)
+          create(:simple_order_cycle,
+                 orders_open_at: now - 1.minute, orders_close_at: now + 90.seconds)
         }
         let(:upcoming_closes_before_begins_at_oc) { # Upcoming, but closes before begins at
-          create(:simple_order_cycle, orders_open_at: now + 30.seconds, orders_close_at: now + 59.seconds)
+          create(:simple_order_cycle,
+                 orders_open_at: now + 30.seconds, orders_close_at: now + 59.seconds)
         }
         let(:upcoming_closes_on_begins_at_oc) { # Upcoming & closes on begins at
-          create(:simple_order_cycle, orders_open_at: now + 30.seconds, orders_close_at: now + 1.minute)
+          create(:simple_order_cycle,
+                 orders_open_at: now + 30.seconds, orders_close_at: now + 1.minute)
         }
         let(:upcoming_closes_on_ends_at_oc) { # Upcoming & closes on ends at
-          create(:simple_order_cycle, orders_open_at: now + 30.seconds, orders_close_at: now + 2.minutes)
+          create(:simple_order_cycle,
+                 orders_open_at: now + 30.seconds, orders_close_at: now + 2.minutes)
         }
         let(:upcoming_closes_after_ends_at_oc) { # Upcoming & closes after ends at
-          create(:simple_order_cycle, orders_open_at: now + 30.seconds, orders_close_at: now + 121.seconds)
+          create(:simple_order_cycle,
+                 orders_open_at: now + 30.seconds, orders_close_at: now + 121.seconds)
         }
 
         let(:subscription) {

lib/open_food_network/order_cycle_form_applicator.rb

@@ -142,7 +142,7 @@ module OpenFoodNetwork
 
     def find_exchange(sender_id, receiver_id, incoming)
       @order_cycle.exchanges.
-        find_by(sender_id:sender_id, receiver_id: receiver_id, incoming: incoming)
+        find_by(sender_id: sender_id, receiver_id: receiver_id, incoming: incoming)
     end
 
     def incoming_exchange_variant_ids(attrs)

lib/open_food_network/permalink_generator.rb

@@ -41,6 +41,6 @@ module PermalinkGenerator
       self.class.with_deleted
     else
       self.class.where(nil)
-end
+    end
   end
 end

lib/open_food_network/variant_and_line_item_naming.rb

@@ -59,7 +59,8 @@ module OpenFoodNetwork
       option_type = product.variant_unit_option_type
       if option_type
         name = option_value_name
-        ov = Spree::OptionValue.where(option_type_id: option_type, name: name, presentation: name).first || Spree::OptionValue.create!({ option_type: option_type, name: name, presentation: name })
+        ov = Spree::OptionValue.where(option_type_id: option_type, name: name, presentation: name).first ||
+             Spree::OptionValue.create!(option_type: option_type, name: name, presentation: name)
         option_values << ov
       end
     end