changeset 331:7c7b7906ebd9

Some more coding style.
author edogawaconan <me@myconan.net>
date Mon, 14 Apr 2014 17:21:16 +0900
parents 96631607785f
children a999250e57c4
files Gemfile app/helpers/application_helper.rb app/helpers/pastes_helper.rb config/application.rb test/test_helper.rb
diffstat 5 files changed, 15 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/Gemfile	Mon Apr 14 17:17:32 2014 +0900
+++ b/Gemfile	Mon Apr 14 17:21:16 2014 +0900
@@ -26,7 +26,7 @@
 
 gem "unicorn", :groups => [:standalone, :development], :platforms => :mri
 gem "hooves",
-  :groups => :development, :platforms => :mri, :require => "hooves/default"
+    :groups => :development, :platforms => :mri, :require => "hooves/default"
 gem "puma", :groups => :standalone, :platforms => [:rbx, :jruby]
 
 # Deploy with Capistrano
--- a/app/helpers/application_helper.rb	Mon Apr 14 17:17:32 2014 +0900
+++ b/app/helpers/application_helper.rb	Mon Apr 14 17:21:16 2014 +0900
@@ -1,6 +1,6 @@
 module ApplicationHelper
   def html_title
-    base_title = 'Zeropaste'
+    base_title = "Zeropaste"
     if content_for? :title
       "#{content_for(:title)} | #{h base_title}".html_safe
     else
--- a/app/helpers/pastes_helper.rb	Mon Apr 14 17:17:32 2014 +0900
+++ b/app/helpers/pastes_helper.rb	Mon Apr 14 17:21:16 2014 +0900
@@ -1,14 +1,14 @@
 module PastesHelper
   def print_txt_create_result
-    unless @paste.errors.any?
+    if @paste.errors.any?
+      "Failed"
+    else
       url =  paste_path @paste, :only_path => false
       if @fresh
         "#{url} (key: #{@paste.key})"
       else
         url
       end
-    else
-      'Failed'
     end
   end
 end
--- a/config/application.rb	Mon Apr 14 17:17:32 2014 +0900
+++ b/config/application.rb	Mon Apr 14 17:21:16 2014 +0900
@@ -1,4 +1,4 @@
-require File.expand_path('../boot', __FILE__)
+require File.expand_path("../boot", __FILE__)
 
 require "active_record/railtie"
 require "action_controller/railtie"
@@ -7,14 +7,14 @@
 require "sprockets/railtie"
 require "rails/test_unit/railtie"
 
-require File.expand_path('../init_config', __FILE__)
-require File.expand_path('../local_config', __FILE__)
-require File.expand_path('../default_config', __FILE__)
+require File.expand_path("../init_config", __FILE__)
+require File.expand_path("../local_config", __FILE__)
+require File.expand_path("../default_config", __FILE__)
 
 # Pick the frameworks you want:
 if defined?(Bundler)
   # If you precompile assets before deploying to production, use this line
-  Bundler.require(*CONFIG['bundler_groups'])
+  Bundler.require(*CONFIG["bundler_groups"])
   # If you want your assets lazily compiled in production, use this line
   # Bundler.require(:default, :assets, Rails.env)
 end
@@ -37,10 +37,10 @@
 
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
+    # config.time_zone = "Central Time (US & Canada)"
 
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+    # config.i18n.load_path += Dir[Rails.root.join("my", "locales", "*.{rb,yml}").to_s]
     # config.i18n.default_locale = :de
 
     # Configure the default encoding used in templates for Ruby 1.9.
@@ -61,7 +61,7 @@
     config.assets.enabled = true
 
     # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.0'
+    config.assets.version = "1.0"
 
     # No need to initialize application when precompiling assets
     config.assets.initialize_on_precompile = false
--- a/test/test_helper.rb	Mon Apr 14 17:17:32 2014 +0900
+++ b/test/test_helper.rb	Mon Apr 14 17:21:16 2014 +0900
@@ -1,6 +1,6 @@
 ENV["RAILS_ENV"] ||= "test"
-require File.expand_path('../../config/environment', __FILE__)
-require 'rails/test_help'
+require File.expand_path("../../config/environment", __FILE__)
+require "rails/test_help"
 
 class ActiveSupport::TestCase
   ActiveRecord::Migration.check_pending!