diff --git a/Gemfile b/Gemfile index 5487332..c620ac1 100644 --- a/Gemfile +++ b/Gemfile @@ -1,36 +1,36 @@ -source "https://rubygems.org" +source 'https://rubygems.org' group :development, :test do gem 'pry-byebug' end group :development do gem 'rubocop', '0.35', require: false gem 'guard-minitest', require: false gem 'guard', require: false gem 'capistrano', '3.2.1', require: false # pkg:capistrano end # Lock jessie versions # gem 'rails', '4.1.8' gem 'i18n', '0.6.9' gem 'json', '1.8.1' gem 'mail', '2.6.1' gem 'mime-types', '1.25' gem 'minitest', '5.4.2' gem 'rack', '1.5.2' gem 'rack-test', '0.6.2' gem 'rake', '10.3.2' gem 'sprockets', '2.12.3' gem 'sprockets-rails', '2.1.3' gem 'thread_safe', '0.3.3' gem 'tzinfo', '1.1.0' gem 'mysql2', '0.3.16' gem 'jquery-rails', '3.1.2' group :test do gem 'factory_girl_rails', '4.4.1' # pkg:ruby-factory-girl-rails end diff --git a/app/helpers/flash_helper.rb b/app/helpers/flash_helper.rb index 9868beb..805d878 100644 --- a/app/helpers/flash_helper.rb +++ b/app/helpers/flash_helper.rb @@ -1,24 +1,24 @@ module FlashHelper - def bootstrap_class_for flash_type + def bootstrap_class_for(flash_type) { success: 'alert-success', error: 'alert-danger', alert: 'alert-warning', notice: 'alert-info' }.fetch(flash_type.to_sym, flash_type.to_s) end def flash_messages flash.each do |msg_type, message| concat( - content_tag(:div, message, class: "alert #{bootstrap_class_for(msg_type)} fade in") do + content_tag(:div, message, class: "alert #{bootstrap_class_for(msg_type)} fade in") do concat content_tag(:button, 'x', class: 'close', data: { dismiss: 'alert' }) - concat message + concat message end ) end nil end end diff --git a/bin/rails b/bin/rails index 728cd85..5191e69 100755 --- a/bin/rails +++ b/bin/rails @@ -1,4 +1,4 @@ #!/usr/bin/env ruby -APP_PATH = File.expand_path('../../config/application', __FILE__) +APP_PATH = File.expand_path('../../config/application', __FILE__) require_relative '../config/boot' require 'rails/commands' diff --git a/config.ru b/config.ru index 5bc2a61..bd83b25 100644 --- a/config.ru +++ b/config.ru @@ -1,4 +1,4 @@ # This file is used by Rack-based servers to start the application. -require ::File.expand_path('../config/environment', __FILE__) +require ::File.expand_path('../config/environment', __FILE__) run Rails.application diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb index 7a06a89..7f70458 100644 --- a/config/initializers/cookies_serializer.rb +++ b/config/initializers/cookies_serializer.rb @@ -1,3 +1,3 @@ # Be sure to restart your server when you modify this file. -Rails.application.config.action_dispatch.cookies_serializer = :json \ No newline at end of file +Rails.application.config.action_dispatch.cookies_serializer = :json diff --git a/test/test_helper.rb b/test/test_helper.rb index 4c96402..315306f 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -1,9 +1,11 @@ ENV['RAILS_ENV'] ||= 'test' require File.expand_path('../../config/environment', __FILE__) require 'rails/test_help' -Dir[Rails.root.join("test/support/*.rb")].each {|f| require f } +Dir[Rails.root.join('test/support/*.rb')].each { |f| require f } -class ActiveSupport::TestCase - include FactoryGirl::Syntax::Methods +module ActiveSupport + class TestCase + include FactoryGirl::Syntax::Methods + end end