From e40f515a75a67f49ca70a6ea8f0a7d5d7ae1bfea Mon Sep 17 00:00:00 2001 From: Vijay Dev Date: Thu, 11 Oct 2012 01:48:37 +0530 Subject: Fixing build failures Build failed with an error "invalid multibyte char (US-ASCII)" in these files. Apparently, some UTF-8 char disguised as whitespace causes this. Thanks @rafaelfranca --- .../lib/rails/generators/erb/controller/controller_generator.rb | 6 +++--- railties/lib/rails/generators/erb/mailer/mailer_generator.rb | 6 +++--- railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'railties/lib/rails/generators/erb') diff --git a/railties/lib/rails/generators/erb/controller/controller_generator.rb b/railties/lib/rails/generators/erb/controller/controller_generator.rb index e14cb09ff7..89e6361f93 100644 --- a/railties/lib/rails/generators/erb/controller/controller_generator.rb +++ b/railties/lib/rails/generators/erb/controller/controller_generator.rb @@ -1,8 +1,8 @@ require 'rails/generators/erb' -module Erb # :nodoc: - module Generators # :nodoc: - class ControllerGenerator < Base # :nodoc: +module Erb # :nodoc: + module Generators # :nodoc: + class ControllerGenerator < Base # :nodoc: argument :actions, :type => :array, :default => [], :banner => "action action" def copy_view_files diff --git a/railties/lib/rails/generators/erb/mailer/mailer_generator.rb b/railties/lib/rails/generators/erb/mailer/mailer_generator.rb index 89de2a4be5..7bcac30dde 100644 --- a/railties/lib/rails/generators/erb/mailer/mailer_generator.rb +++ b/railties/lib/rails/generators/erb/mailer/mailer_generator.rb @@ -1,8 +1,8 @@ require 'rails/generators/erb/controller/controller_generator' -module Erb # :nodoc: - module Generators # :nodoc: - class MailerGenerator < ControllerGenerator # :nodoc: +module Erb # :nodoc: + module Generators # :nodoc: + class MailerGenerator < ControllerGenerator # :nodoc: protected def format diff --git a/railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb index 19fc53aeee..54ed648df4 100644 --- a/railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb +++ b/railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb @@ -1,9 +1,9 @@ require 'rails/generators/erb' require 'rails/generators/resource_helpers' -module Erb # :nodoc: - module Generators # :nodoc: - class ScaffoldGenerator < Base # :nodoc: +module Erb # :nodoc: + module Generators # :nodoc: + class ScaffoldGenerator < Base # :nodoc: include Rails::Generators::ResourceHelpers argument :attributes, :type => :array, :default => [], :banner => "field:type field:type" -- cgit v1.2.3 From 5ad7f8ab418f0c760dbb584f7c78d94ce32e9ee3 Mon Sep 17 00:00:00 2001 From: Robin Dupret Date: Sun, 14 Oct 2012 12:03:39 +0200 Subject: Use Ruby 1.9 Hash syntax in railties --- railties/lib/rails/generators/erb/controller/controller_generator.rb | 2 +- railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'railties/lib/rails/generators/erb') diff --git a/railties/lib/rails/generators/erb/controller/controller_generator.rb b/railties/lib/rails/generators/erb/controller/controller_generator.rb index 89e6361f93..5f06734ab8 100644 --- a/railties/lib/rails/generators/erb/controller/controller_generator.rb +++ b/railties/lib/rails/generators/erb/controller/controller_generator.rb @@ -3,7 +3,7 @@ require 'rails/generators/erb' module Erb # :nodoc: module Generators # :nodoc: class ControllerGenerator < Base # :nodoc: - argument :actions, :type => :array, :default => [], :banner => "action action" + argument :actions, type: :array, default: [], banner: "action action" def copy_view_files base_path = File.join("app/views", class_path, file_name) diff --git a/railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb index 54ed648df4..bacbc2d280 100644 --- a/railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb +++ b/railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb @@ -6,7 +6,7 @@ module Erb # :nodoc: class ScaffoldGenerator < Base # :nodoc: include Rails::Generators::ResourceHelpers - argument :attributes, :type => :array, :default => [], :banner => "field:type field:type" + argument :attributes, type: :array, default: [], banner: "field:type field:type" def create_root_folder empty_directory File.join("app/views", controller_file_path) -- cgit v1.2.3