From 995c0cfdace2bf7cf2ccc5397fa41f71f335f05f Mon Sep 17 00:00:00 2001 From: Tobias Bohwalli Date: Fri, 23 Jan 2015 17:41:28 +0100 Subject: [PATCH] Fixes most common cop offenses. --- .../spree/admin/captcha_settings_controller.rb | 4 +--- app/controllers/spree/email_sender_controller.rb | 2 +- app/mailers/spree/to_friend_mailer.rb | 1 - app/models/spree/mail_to_friend.rb | 6 +++--- ...ptcha_settings_to_admin_configurations_menu.rb | 10 ++++++---- .../add_email_to_friend_link_to_products.rb | 12 +++++++----- config/routes.rb | 5 ++--- lib/spree_email_to_friend/engine.rb | 15 ++++++--------- lib/spree_email_to_friend/version.rb | 1 - .../admin/captcha_settings_controller_spec.rb | 1 - spec/controllers/email_sender_controller_spec.rb | 2 +- spec/factories/mail_factory.rb | 4 ++-- spec/features/email_sender_spec.rb | 1 - spec/spec_helper.rb | 1 - spec/support/database_cleaner.rb | 1 - 15 files changed, 29 insertions(+), 37 deletions(-) diff --git a/app/controllers/spree/admin/captcha_settings_controller.rb b/app/controllers/spree/admin/captcha_settings_controller.rb index 04a2d18..9e85a74 100644 --- a/app/controllers/spree/admin/captcha_settings_controller.rb +++ b/app/controllers/spree/admin/captcha_settings_controller.rb @@ -5,9 +5,7 @@ def update Spree::Captcha::Config.set(params[:preferences]) respond_to do |format| - format.html { - redirect_to edit_admin_captcha_settings_path - } + format.html { redirect_to edit_admin_captcha_settings_path } end end end diff --git a/app/controllers/spree/email_sender_controller.rb b/app/controllers/spree/email_sender_controller.rb index 2086d78..6ad6456 100644 --- a/app/controllers/spree/email_sender_controller.rb +++ b/app/controllers/spree/email_sender_controller.rb @@ -38,7 +38,7 @@ def mail_to_friend # Extract send message to make easier to override def send_message(object, mail_to_friend) - Spree::ToFriendMailer.mail_to_friend(object,@mail_to_friend).deliver + Spree::ToFriendMailer.mail_to_friend(object, mail_to_friend).deliver end def find_object diff --git a/app/mailers/spree/to_friend_mailer.rb b/app/mailers/spree/to_friend_mailer.rb index f4d5d18..9b832ce 100644 --- a/app/mailers/spree/to_friend_mailer.rb +++ b/app/mailers/spree/to_friend_mailer.rb @@ -1,7 +1,6 @@ class Spree::ToFriendMailer < ActionMailer::Base default from: Spree::Config[:mails_from] || '' - def mail_to_friend(object, mail) @object = object @mail = mail diff --git a/app/models/spree/mail_to_friend.rb b/app/models/spree/mail_to_friend.rb index 125f598..b45252d 100644 --- a/app/models/spree/mail_to_friend.rb +++ b/app/models/spree/mail_to_friend.rb @@ -8,8 +8,8 @@ class Spree::MailToFriend validates :subject, :sender_name, presence: true validates :recipient_name, presence: true, unless: :is_multi validates :sender_email, format: { with: EMAILREGEX } - validates :recipients, length: {minimum: 1, message: Spree.t(:recipients, scope: :validation) } - validates :invalid_recipients, length: {maximum: 0, message: Spree.t(:invalid_recipients, scope: :validation) } + validates :recipients, length: { minimum: 1, message: Spree.t(:recipients, scope: :validation) } + validates :invalid_recipients, length: { maximum: 0, message: Spree.t(:invalid_recipients, scope: :validation) } def initialize(opts = {}) @sender_email = opts[:sender_email] || ' ' @@ -19,7 +19,7 @@ def initialize(opts = {}) @recipients = [] @invalid_recipients = [] - addresses = (opts[:recipient_email] || '').gsub(';', ',').gsub(/\s/ , '') + addresses = (opts[:recipient_email] || '').gsub(';', ',').gsub(/\s/, '') addresses.split(',').each do |address| if address =~ EMAILREGEX @recipients << address diff --git a/app/overrides/add_captcha_settings_to_admin_configurations_menu.rb b/app/overrides/add_captcha_settings_to_admin_configurations_menu.rb index 5a792cc..8cd1a62 100644 --- a/app/overrides/add_captcha_settings_to_admin_configurations_menu.rb +++ b/app/overrides/add_captcha_settings_to_admin_configurations_menu.rb @@ -1,4 +1,6 @@ -Deface::Override.new(virtual_path: "spree/admin/shared/_configuration_menu", - name: "add_captcha_admin_option", - insert_bottom: "[data-hook='admin_configurations_sidebar_menu']", - text: "<%= configurations_sidebar_menu_item Spree.t('captcha.captcha_settings'), edit_admin_captcha_settings_path %>") +Deface::Override.new( + virtual_path: 'spree/admin/shared/_configuration_menu', + name: 'add_captcha_admin_option', + insert_bottom: '[data-hook="admin_configurations_sidebar_menu"]', + text: '<%= configurations_sidebar_menu_item Spree.t(:captcha_settings, scope: :captcha), edit_admin_captcha_settings_path %>' +) diff --git a/app/overrides/add_email_to_friend_link_to_products.rb b/app/overrides/add_email_to_friend_link_to_products.rb index 05a5325..22cfc8b 100644 --- a/app/overrides/add_email_to_friend_link_to_products.rb +++ b/app/overrides/add_email_to_friend_link_to_products.rb @@ -1,5 +1,7 @@ -Deface::Override.new(virtual_path: "spree/products/show", - name: "converted_product_description_351026984", - insert_bottom: "[data-hook='product_description'], #product_description[data-hook]", - text: "

<%= link_to Spree.t('email_to_friend.send_to_friend'), email_to_friend_path('product', @product) %>

", - original: "23a81432df67f93cad7563f7b118d6f901b8e42b") +Deface::Override.new( + virtual_path: 'spree/products/show', + name: 'converted_product_description_351026984', + insert_bottom: '[data-hook="product_description"], #product_description[data-hook]', + text: '

<%= link_to Spree.t(:send_to_friend, scope: :email_to_friend), email_to_friend_path("product", @product) %>

', + original: '23a81432df67f93cad7563f7b118d6f901b8e42b' +) diff --git a/config/routes.rb b/config/routes.rb index dd6a43a..39e0658 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,5 @@ routes = lambda do - - match "/email_to_friend/:type/:id" => 'email_sender#send_mail', as: :email_to_friend, via: [:get, :post] + match '/email_to_friend/:type/:id' => 'email_sender#send_mail', as: :email_to_friend, via: [:get, :post] namespace :admin do resource :captcha_settings @@ -11,4 +10,4 @@ Spree::Core::Engine.add_routes(&routes) else Spree::Core::Engine.routes.draw(&routes) -end \ No newline at end of file +end diff --git a/lib/spree_email_to_friend/engine.rb b/lib/spree_email_to_friend/engine.rb index 31e6844..6da879b 100644 --- a/lib/spree_email_to_friend/engine.rb +++ b/lib/spree_email_to_friend/engine.rb @@ -9,20 +9,17 @@ class Engine < Rails::Engine config.autoload_paths += %W(#{config.root}/lib) - initializer 'spree.email_to_friend.preferences', after: 'spree.environment' do |app| + initializer 'spree.email_to_friend.preferences', after: 'spree.environment' do Spree::Captcha::Config = Spree::CaptchaConfiguration.new end - def self.activate - Dir.glob(File.join(File.dirname(__FILE__), '../../app/**/*_decorator*.rb')) do |c| - Rails.configuration.cache_classes ? require(c) : load(c) - end - - Dir.glob(File.join(File.dirname(__FILE__), '../../app/overrides/*.rb')) do |c| - Rails.configuration.cache_classes ? require(c) : load(c) + def activate + cache_klasses = %W(#{config.root}/app/**/*_decorator*.rb #{config.root}/app/overrides/*.rb) + Dir.glob(cache_klasses) do |klass| + Rails.configuration.cache_classes ? require(klass) : load(klass) end end - config.to_prepare &method(:activate).to_proc + config.to_prepare(&method(:activate).to_proc) end end diff --git a/lib/spree_email_to_friend/version.rb b/lib/spree_email_to_friend/version.rb index 33fe06b..d0d0abd 100644 --- a/lib/spree_email_to_friend/version.rb +++ b/lib/spree_email_to_friend/version.rb @@ -1,5 +1,4 @@ module SpreeEmailToFriend - # Returns the version of the currently loaded SpreeEmailToFriend as a # Gem::Version. def self.version diff --git a/spec/controllers/admin/captcha_settings_controller_spec.rb b/spec/controllers/admin/captcha_settings_controller_spec.rb index 78e5276..f718a8a 100644 --- a/spec/controllers/admin/captcha_settings_controller_spec.rb +++ b/spec/controllers/admin/captcha_settings_controller_spec.rb @@ -17,7 +17,6 @@ private_key: FAKE, public_key: FAKE, use_captcha: false' do - it 'sets preferred_theme to clean' do spree_put :update, preferences: { theme: 'clean' } expect(Spree::Captcha::Config.preferred_theme).to eq 'clean' diff --git a/spec/controllers/email_sender_controller_spec.rb b/spec/controllers/email_sender_controller_spec.rb index 84ebf7d..8bfc2c4 100644 --- a/spec/controllers/email_sender_controller_spec.rb +++ b/spec/controllers/email_sender_controller_spec.rb @@ -8,7 +8,7 @@ context '#send_mail' do # can be different types but no clue what they can be except from product specify do - spree_get :send_mail, { type: 'product', id: product.id } + spree_get :send_mail, type: 'product', id: product.id expect(response).to be_success end end diff --git a/spec/factories/mail_factory.rb b/spec/factories/mail_factory.rb index 3e468bb..73f70bd 100644 --- a/spec/factories/mail_factory.rb +++ b/spec/factories/mail_factory.rb @@ -9,7 +9,7 @@ subject 'Check this out!' message 'Its totally awesome..' - recipients { Array(1..4).sample.times.map{ Faker::Internet.email } } + recipients { Array(1..4).sample.times.map { Faker::Internet.email } } invalid_recipients [] end -end \ No newline at end of file +end diff --git a/spec/features/email_sender_spec.rb b/spec/features/email_sender_spec.rb index 7eef7b6..1718bd3 100644 --- a/spec/features/email_sender_spec.rb +++ b/spec/features/email_sender_spec.rb @@ -1,5 +1,4 @@ RSpec.feature 'Email to friend', :js do - given(:product) { create(:product) } given(:mail) { build(:mail) } diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 74c5036..b5bafa2 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -15,7 +15,6 @@ require 'ffaker' RSpec.configure do |config| - config.fail_fast = false config.filter_run focus: true config.run_all_when_everything_filtered = true diff --git a/spec/support/database_cleaner.rb b/spec/support/database_cleaner.rb index dbfca85..0dbe369 100644 --- a/spec/support/database_cleaner.rb +++ b/spec/support/database_cleaner.rb @@ -1,7 +1,6 @@ require 'database_cleaner' RSpec.configure do |config| - config.before(:suite) do DatabaseCleaner.clean_with :deletion end