Use Ruby 1.9 Hash syntax in railties
This commit is contained in:
parent
ca618d473d
commit
5ad7f8ab41
@ -106,7 +106,7 @@ def cache=(cache)
|
||||
# * The environment variable RAILS_GROUPS;
|
||||
# * The optional envs given as argument and the hash with group dependencies;
|
||||
#
|
||||
# groups :assets => [:development, :test]
|
||||
# groups assets: [:development, :test]
|
||||
#
|
||||
# # Returns
|
||||
# # => [:default, :development, :assets] for Rails.env == "development"
|
||||
|
@ -71,7 +71,7 @@ def inherited(base)
|
||||
attr_reader :reloaders
|
||||
attr_writer :queue
|
||||
|
||||
delegate :default_url_options, :default_url_options=, :to => :routes
|
||||
delegate :default_url_options, :default_url_options=, to: :routes
|
||||
|
||||
def initialize
|
||||
super
|
||||
@ -106,7 +106,7 @@ def reload_routes!
|
||||
def key_generator
|
||||
# number of iterations selected based on consultation with the google security
|
||||
# team. Details at https://github.com/rails/rails/pull/6952#issuecomment-7661220
|
||||
@key_generator ||= ActiveSupport::KeyGenerator.new(config.secret_token, :iterations=>1000)
|
||||
@key_generator ||= ActiveSupport::KeyGenerator.new(config.secret_token, iterations: 1000)
|
||||
end
|
||||
|
||||
# Stores some of the Rails initial environment parameters which
|
||||
@ -296,9 +296,9 @@ def default_middleware_stack #:nodoc:
|
||||
|
||||
if rack_cache == true
|
||||
rack_cache = {
|
||||
:metastore => "rails:/",
|
||||
:entitystore => "rails:/",
|
||||
:verbose => false
|
||||
metastore: "rails:/",
|
||||
entitystore: "rails:/",
|
||||
verbose: false
|
||||
}
|
||||
end
|
||||
|
||||
|
@ -7,13 +7,13 @@ class Application
|
||||
module Bootstrap
|
||||
include Initializable
|
||||
|
||||
initializer :load_environment_hook, :group => :all do end
|
||||
initializer :load_environment_hook, group: :all do end
|
||||
|
||||
initializer :load_active_support, :group => :all do
|
||||
initializer :load_active_support, group: :all do
|
||||
require "active_support/all" unless config.active_support.bare
|
||||
end
|
||||
|
||||
initializer :set_eager_load, :group => :all do
|
||||
initializer :set_eager_load, group: :all do
|
||||
if config.eager_load.nil?
|
||||
warn <<-INFO
|
||||
config.eager_load is set to nil. Please update your config/environments/*.rb files accordingly:
|
||||
@ -28,7 +28,7 @@ module Bootstrap
|
||||
end
|
||||
|
||||
# Initialize the logger early in the stack in case we need to log some deprecation.
|
||||
initializer :initialize_logger, :group => :all do
|
||||
initializer :initialize_logger, group: :all do
|
||||
Rails.logger ||= config.logger || begin
|
||||
path = config.paths["log"].first
|
||||
unless File.exist? File.dirname path
|
||||
@ -56,7 +56,7 @@ module Bootstrap
|
||||
end
|
||||
|
||||
# Initialize cache early in the stack so railties can make use of it.
|
||||
initializer :initialize_cache, :group => :all do
|
||||
initializer :initialize_cache, group: :all do
|
||||
unless Rails.cache
|
||||
Rails.cache = ActiveSupport::Cache.lookup_store(config.cache_store)
|
||||
|
||||
@ -67,11 +67,11 @@ module Bootstrap
|
||||
end
|
||||
|
||||
# Sets the dependency loading mechanism.
|
||||
initializer :initialize_dependency_mechanism, :group => :all do
|
||||
initializer :initialize_dependency_mechanism, group: :all do
|
||||
ActiveSupport::Dependencies.mechanism = config.cache_classes ? :require : :load
|
||||
end
|
||||
|
||||
initializer :bootstrap_hook, :group => :all do |app|
|
||||
initializer :bootstrap_hook, group: :all do |app|
|
||||
ActiveSupport.run_load_hooks(:before_initialize, app)
|
||||
end
|
||||
end
|
||||
|
@ -79,10 +79,10 @@ def encoding=(value)
|
||||
def paths
|
||||
@paths ||= begin
|
||||
paths = super
|
||||
paths.add "config/database", :with => "config/database.yml"
|
||||
paths.add "config/environment", :with => "config/environment.rb"
|
||||
paths.add "config/database", with: "config/database.yml"
|
||||
paths.add "config/environment", with: "config/environment.rb"
|
||||
paths.add "lib/templates"
|
||||
paths.add "log", :with => "log/#{Rails.env}.log"
|
||||
paths.add "log", with: "log/#{Rails.env}.log"
|
||||
paths.add "public"
|
||||
paths.add "public/javascripts"
|
||||
paths.add "public/stylesheets"
|
||||
|
@ -72,7 +72,7 @@ module Finisher
|
||||
|
||||
# Set app reload just after the finisher hook to ensure
|
||||
# paths added in the hook are still loaded.
|
||||
initializer :set_clear_dependencies_hook, :group => :all do
|
||||
initializer :set_clear_dependencies_hook, group: :all do
|
||||
callback = lambda do
|
||||
ActiveSupport::DescendantsTracker.clear
|
||||
ActiveSupport::Dependencies.clear
|
||||
@ -83,7 +83,7 @@ module Finisher
|
||||
self.reloaders << reloader
|
||||
# We need to set a to_prepare callback regardless of the reloader result, i.e.
|
||||
# models should be reloaded if any of the reloaders (i18n, routes) were updated.
|
||||
ActionDispatch::Reloader.to_prepare(:prepend => true){ reloader.execute }
|
||||
ActionDispatch::Reloader.to_prepare(prepend: true){ reloader.execute }
|
||||
else
|
||||
ActionDispatch::Reloader.to_cleanup(&callback)
|
||||
end
|
||||
|
@ -4,7 +4,7 @@ module Rails
|
||||
class Application
|
||||
class RoutesReloader
|
||||
attr_reader :route_sets, :paths
|
||||
delegate :execute_if_updated, :execute, :updated?, :to => :updater
|
||||
delegate :execute_if_updated, :execute, :updated?, to: :updater
|
||||
|
||||
def initialize
|
||||
@paths = []
|
||||
|
@ -6,4 +6,4 @@
|
||||
end
|
||||
|
||||
name = ARGV.shift
|
||||
Rails::Generators.invoke name, ARGV, :behavior => :revoke, :destination_root => Rails.root
|
||||
Rails::Generators.invoke name, ARGV, behavior: :revoke, destination_root: Rails.root
|
||||
|
@ -8,4 +8,4 @@
|
||||
name = ARGV.shift
|
||||
|
||||
root = defined?(ENGINE_ROOT) ? ENGINE_ROOT : Rails.root
|
||||
Rails::Generators.invoke name, ARGV, :behavior => :invoke, :destination_root => root
|
||||
Rails::Generators.invoke name, ARGV, behavior: :invoke, destination_root: root
|
||||
|
@ -1,7 +1,7 @@
|
||||
require 'optparse'
|
||||
require 'rbconfig'
|
||||
|
||||
options = { :environment => (ENV['RAILS_ENV'] || "development").dup }
|
||||
options = { environment: (ENV['RAILS_ENV'] || "development").dup }
|
||||
code_or_file = nil
|
||||
|
||||
if ARGV.first.nil?
|
||||
|
@ -105,13 +105,13 @@ def log_path
|
||||
|
||||
def default_options
|
||||
super.merge({
|
||||
:Port => 3000,
|
||||
:DoNotReverseLookup => true,
|
||||
:environment => (ENV['RAILS_ENV'] || "development").dup,
|
||||
:daemonize => false,
|
||||
:debugger => false,
|
||||
:pid => File.expand_path("tmp/pids/server.pid"),
|
||||
:config => File.expand_path("config.ru")
|
||||
Port: 3000,
|
||||
DoNotReverseLookup: true,
|
||||
environment: (ENV['RAILS_ENV'] || "development").dup,
|
||||
daemonize: false,
|
||||
debugger: false,
|
||||
pid: File.expand_path("tmp/pids/server.pid"),
|
||||
config: File.expand_path("config.ru")
|
||||
})
|
||||
end
|
||||
end
|
||||
|
@ -6,4 +6,4 @@
|
||||
end
|
||||
|
||||
name = ARGV.shift
|
||||
Rails::Generators.invoke name, ARGV, :behavior => :skip
|
||||
Rails::Generators.invoke name, ARGV, behavior: :skip
|
||||
|
@ -251,7 +251,7 @@ module Rails
|
||||
#
|
||||
# # config/routes.rb
|
||||
# MyApplication::Application.routes.draw do
|
||||
# mount MyEngine::Engine => "/my_engine", :as => "my_engine"
|
||||
# mount MyEngine::Engine => "/my_engine", as: "my_engine"
|
||||
# get "/foo" => "foo#index"
|
||||
# end
|
||||
#
|
||||
@ -368,7 +368,7 @@ def endpoint(endpoint = nil)
|
||||
def isolate_namespace(mod)
|
||||
engine_name(generate_railtie_name(mod))
|
||||
|
||||
self.routes.default_scope = { :module => ActiveSupport::Inflector.underscore(mod.name) }
|
||||
self.routes.default_scope = { module: ActiveSupport::Inflector.underscore(mod.name) }
|
||||
self.isolated = true
|
||||
|
||||
unless mod.respond_to?(:railtie_namespace)
|
||||
@ -407,8 +407,8 @@ def find(path)
|
||||
end
|
||||
end
|
||||
|
||||
delegate :middleware, :root, :paths, :to => :config
|
||||
delegate :engine_name, :isolated?, :to => "self.class"
|
||||
delegate :middleware, :root, :paths, to: :config
|
||||
delegate :engine_name, :isolated?, to: "self.class"
|
||||
|
||||
def initialize
|
||||
@_all_autoload_paths = nil
|
||||
@ -536,7 +536,7 @@ def load_seed
|
||||
end
|
||||
|
||||
# Add configured load paths to ruby load paths and remove duplicates.
|
||||
initializer :set_load_path, :before => :bootstrap_hook do
|
||||
initializer :set_load_path, before: :bootstrap_hook do
|
||||
_all_load_paths.reverse_each do |path|
|
||||
$LOAD_PATH.unshift(path) if File.directory?(path)
|
||||
end
|
||||
@ -548,7 +548,7 @@ def load_seed
|
||||
#
|
||||
# This needs to be an initializer, since it needs to run once
|
||||
# per engine and get the engine as a block parameter
|
||||
initializer :set_autoload_paths, :before => :bootstrap_hook do |app|
|
||||
initializer :set_autoload_paths, before: :bootstrap_hook do |app|
|
||||
ActiveSupport::Dependencies.autoload_paths.unshift(*_all_autoload_paths)
|
||||
ActiveSupport::Dependencies.autoload_once_paths.unshift(*_all_autoload_once_paths)
|
||||
|
||||
@ -581,13 +581,13 @@ def load_seed
|
||||
end
|
||||
end
|
||||
|
||||
initializer :load_environment_config, :before => :load_environment_hook, :group => :all do
|
||||
initializer :load_environment_config, before: :load_environment_hook, group: :all do
|
||||
paths["config/environments"].existent.each do |environment|
|
||||
require environment
|
||||
end
|
||||
end
|
||||
|
||||
initializer :append_assets_path, :group => :all do |app|
|
||||
initializer :append_assets_path, group: :all do |app|
|
||||
app.config.assets.paths.unshift(*paths["vendor/assets"].existent_directories)
|
||||
app.config.assets.paths.unshift(*paths["lib/assets"].existent_directories)
|
||||
app.config.assets.paths.unshift(*paths["app/assets"].existent_directories)
|
||||
|
@ -20,7 +20,7 @@ def middleware
|
||||
# Holds generators configuration:
|
||||
#
|
||||
# config.generators do |g|
|
||||
# g.orm :data_mapper, :migration => true
|
||||
# g.orm :data_mapper, migration: true
|
||||
# g.template_engine :haml
|
||||
# g.test_framework :rspec
|
||||
# end
|
||||
@ -38,26 +38,26 @@ def generators #:nodoc:
|
||||
def paths
|
||||
@paths ||= begin
|
||||
paths = Rails::Paths::Root.new(@root)
|
||||
paths.add "app", :eager_load => true, :glob => "*"
|
||||
paths.add "app/assets", :glob => "*"
|
||||
paths.add "app/controllers", :eager_load => true
|
||||
paths.add "app/helpers", :eager_load => true
|
||||
paths.add "app/models", :eager_load => true
|
||||
paths.add "app/mailers", :eager_load => true
|
||||
paths.add "app", eager_load: true, glob: "*"
|
||||
paths.add "app/assets", glob: "*"
|
||||
paths.add "app/controllers", eager_load: true
|
||||
paths.add "app/helpers", eager_load: true
|
||||
paths.add "app/models", eager_load: true
|
||||
paths.add "app/mailers", eager_load: true
|
||||
paths.add "app/views"
|
||||
paths.add "lib", :load_path => true
|
||||
paths.add "lib/assets", :glob => "*"
|
||||
paths.add "lib/tasks", :glob => "**/*.rake"
|
||||
paths.add "lib", load_path: true
|
||||
paths.add "lib/assets", glob: "*"
|
||||
paths.add "lib/tasks", glob: "**/*.rake"
|
||||
paths.add "config"
|
||||
paths.add "config/environments", :glob => "#{Rails.env}.rb"
|
||||
paths.add "config/initializers", :glob => "**/*.rb"
|
||||
paths.add "config/locales", :glob => "*.{rb,yml}"
|
||||
paths.add "config/environments", glob: "#{Rails.env}.rb"
|
||||
paths.add "config/initializers", glob: "**/*.rb"
|
||||
paths.add "config/locales", glob: "*.{rb,yml}"
|
||||
paths.add "config/routes.rb"
|
||||
paths.add "db"
|
||||
paths.add "db/migrate"
|
||||
paths.add "db/seeds.rb"
|
||||
paths.add "vendor", :load_path => true
|
||||
paths.add "vendor/assets", :glob => "*"
|
||||
paths.add "vendor", load_path: true
|
||||
paths.add "vendor/assets", glob: "*"
|
||||
paths
|
||||
end
|
||||
end
|
||||
|
@ -23,41 +23,41 @@ module Generators
|
||||
mattr_accessor :namespace
|
||||
|
||||
DEFAULT_ALIASES = {
|
||||
:rails => {
|
||||
:actions => '-a',
|
||||
:orm => '-o',
|
||||
:javascripts => '-j',
|
||||
:javascript_engine => '-je',
|
||||
:resource_controller => '-c',
|
||||
:scaffold_controller => '-c',
|
||||
:stylesheets => '-y',
|
||||
:stylesheet_engine => '-se',
|
||||
:template_engine => '-e',
|
||||
:test_framework => '-t'
|
||||
rails: {
|
||||
actions: '-a',
|
||||
orm: '-o',
|
||||
javascripts: '-j',
|
||||
javascript_engine: '-je',
|
||||
resource_controller: '-c',
|
||||
scaffold_controller: '-c',
|
||||
stylesheets: '-y',
|
||||
stylesheet_engine: '-se',
|
||||
template_engine: '-e',
|
||||
test_framework: '-t'
|
||||
},
|
||||
|
||||
:test_unit => {
|
||||
:fixture_replacement => '-r',
|
||||
test_unit: {
|
||||
fixture_replacement: '-r',
|
||||
}
|
||||
}
|
||||
|
||||
DEFAULT_OPTIONS = {
|
||||
:rails => {
|
||||
:assets => true,
|
||||
:force_plural => false,
|
||||
:helper => true,
|
||||
:integration_tool => nil,
|
||||
:javascripts => true,
|
||||
:javascript_engine => :js,
|
||||
:orm => false,
|
||||
:performance_tool => nil,
|
||||
:resource_controller => :controller,
|
||||
:resource_route => true,
|
||||
:scaffold_controller => :scaffold_controller,
|
||||
:stylesheets => true,
|
||||
:stylesheet_engine => :css,
|
||||
:test_framework => false,
|
||||
:template_engine => :erb
|
||||
rails: {
|
||||
assets: true,
|
||||
force_plural: false,
|
||||
helper: true,
|
||||
integration_tool: nil,
|
||||
javascripts: true,
|
||||
javascript_engine: :js,
|
||||
orm: false,
|
||||
performance_tool: nil,
|
||||
resource_controller: :controller,
|
||||
resource_route: true,
|
||||
scaffold_controller: :scaffold_controller,
|
||||
stylesheets: true,
|
||||
stylesheet_engine: :css,
|
||||
test_framework: false,
|
||||
template_engine: :erb
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -7,9 +7,9 @@ module Actions
|
||||
|
||||
# Adds an entry into Gemfile for the supplied gem.
|
||||
#
|
||||
# gem "rspec", :group => :test
|
||||
# gem "technoweenie-restful-authentication", :lib => "restful-authentication", :source => "http://gems.github.com/"
|
||||
# gem "rails", "3.0", :git => "git://github.com/rails/rails"
|
||||
# gem "rspec", group: :test
|
||||
# gem "technoweenie-restful-authentication", lib: "restful-authentication", source: "http://gems.github.com/"
|
||||
# gem "rails", "3.0", git: "git://github.com/rails/rails"
|
||||
def gem(*args)
|
||||
options = args.extract_options!
|
||||
name, version = args
|
||||
@ -33,7 +33,7 @@ def gem(*args)
|
||||
str = "gem #{parts.join(", ")}"
|
||||
str = " " + str if @in_group
|
||||
str = "\n" + str
|
||||
append_file "Gemfile", str, :verbose => false
|
||||
append_file "Gemfile", str, verbose: false
|
||||
end
|
||||
end
|
||||
|
||||
@ -47,13 +47,13 @@ def gem_group(*names, &block)
|
||||
log :gemfile, "group #{name}"
|
||||
|
||||
in_root do
|
||||
append_file "Gemfile", "\ngroup #{name} do", :force => true
|
||||
append_file "Gemfile", "\ngroup #{name} do", force: true
|
||||
|
||||
@in_group = true
|
||||
instance_eval(&block)
|
||||
@in_group = false
|
||||
|
||||
append_file "Gemfile", "\nend\n", :force => true
|
||||
append_file "Gemfile", "\nend\n", force: true
|
||||
end
|
||||
end
|
||||
|
||||
@ -64,7 +64,7 @@ def add_source(source, options={})
|
||||
log :source, source
|
||||
|
||||
in_root do
|
||||
prepend_file "Gemfile", "source #{source.inspect}\n", :verbose => false
|
||||
prepend_file "Gemfile", "source #{source.inspect}\n", verbose: false
|
||||
end
|
||||
end
|
||||
|
||||
@ -77,7 +77,7 @@ def add_source(source, options={})
|
||||
# "config.autoload_paths += %W(#{config.root}/extras)"
|
||||
# end
|
||||
#
|
||||
# environment(nil, :env => "development") do
|
||||
# environment(nil, env: "development") do
|
||||
# "config.active_record.observers = :cacher"
|
||||
# end
|
||||
def environment(data=nil, options={}, &block)
|
||||
@ -87,10 +87,10 @@ def environment(data=nil, options={}, &block)
|
||||
|
||||
in_root do
|
||||
if options[:env].nil?
|
||||
inject_into_file 'config/application.rb', "\n #{data}", :after => sentinel, :verbose => false
|
||||
inject_into_file 'config/application.rb', "\n #{data}", after: sentinel, verbose: false
|
||||
else
|
||||
Array(options[:env]).each do |env|
|
||||
inject_into_file "config/environments/#{env}.rb", "\n #{data}", :after => env_file_sentinel, :verbose => false
|
||||
inject_into_file "config/environments/#{env}.rb", "\n #{data}", after: env_file_sentinel, verbose: false
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -100,8 +100,8 @@ def environment(data=nil, options={}, &block)
|
||||
# Run a command in git.
|
||||
#
|
||||
# git :init
|
||||
# git :add => "this.file that.rb"
|
||||
# git :add => "onefile.rb", :rm => "badfile.cxx"
|
||||
# git add: "this.file that.rb"
|
||||
# git add: "onefile.rb", rm: "badfile.cxx"
|
||||
def git(commands={})
|
||||
if commands.is_a?(Symbol)
|
||||
run "git #{commands}"
|
||||
@ -123,7 +123,7 @@ def git(commands={})
|
||||
# vendor("foreign.rb", "# Foreign code is fun")
|
||||
def vendor(filename, data=nil, &block)
|
||||
log :vendor, filename
|
||||
create_file("vendor/#{filename}", data, :verbose => false, &block)
|
||||
create_file("vendor/#{filename}", data, verbose: false, &block)
|
||||
end
|
||||
|
||||
# Create a new file in the lib/ directory. Code can be specified
|
||||
@ -136,7 +136,7 @@ def vendor(filename, data=nil, &block)
|
||||
# lib("foreign.rb", "# Foreign code is fun")
|
||||
def lib(filename, data=nil, &block)
|
||||
log :lib, filename
|
||||
create_file("lib/#{filename}", data, :verbose => false, &block)
|
||||
create_file("lib/#{filename}", data, verbose: false, &block)
|
||||
end
|
||||
|
||||
# Create a new Rakefile with the provided code (either in a block or a string).
|
||||
@ -156,7 +156,7 @@ def lib(filename, data=nil, &block)
|
||||
# rakefile('seed.rake', 'puts "Planting seeds"')
|
||||
def rakefile(filename, data=nil, &block)
|
||||
log :rakefile, filename
|
||||
create_file("lib/tasks/#{filename}", data, :verbose => false, &block)
|
||||
create_file("lib/tasks/#{filename}", data, verbose: false, &block)
|
||||
end
|
||||
|
||||
# Create a new initializer with the provided code (either in a block or a string).
|
||||
@ -174,7 +174,7 @@ def rakefile(filename, data=nil, &block)
|
||||
# initializer("api.rb", "API_KEY = '123456'")
|
||||
def initializer(filename, data=nil, &block)
|
||||
log :initializer, filename
|
||||
create_file("config/initializers/#{filename}", data, :verbose => false, &block)
|
||||
create_file("config/initializers/#{filename}", data, verbose: false, &block)
|
||||
end
|
||||
|
||||
# Generate something using a generator from Rails or a plugin.
|
||||
@ -186,19 +186,19 @@ def generate(what, *args)
|
||||
log :generate, what
|
||||
argument = args.map {|arg| arg.to_s }.flatten.join(" ")
|
||||
|
||||
in_root { run_ruby_script("script/rails generate #{what} #{argument}", :verbose => false) }
|
||||
in_root { run_ruby_script("script/rails generate #{what} #{argument}", verbose: false) }
|
||||
end
|
||||
|
||||
# Runs the supplied rake task
|
||||
#
|
||||
# rake("db:migrate")
|
||||
# rake("db:migrate", :env => "production")
|
||||
# rake("gems:install", :sudo => true)
|
||||
# rake("db:migrate", env: "production")
|
||||
# rake("gems:install", sudo: true)
|
||||
def rake(command, options={})
|
||||
log :rake, command
|
||||
env = options[:env] || ENV["RAILS_ENV"] || 'development'
|
||||
sudo = options[:sudo] && RbConfig::CONFIG['host_os'] !~ /mswin|mingw/ ? 'sudo ' : ''
|
||||
in_root { run("#{sudo}#{extify(:rake)} #{command} RAILS_ENV=#{env}", :verbose => false) }
|
||||
in_root { run("#{sudo}#{extify(:rake)} #{command} RAILS_ENV=#{env}", verbose: false) }
|
||||
end
|
||||
|
||||
# Just run the capify command in root
|
||||
@ -206,7 +206,7 @@ def rake(command, options={})
|
||||
# capify!
|
||||
def capify!
|
||||
log :capify, ""
|
||||
in_root { run("#{extify(:capify)} .", :verbose => false) }
|
||||
in_root { run("#{extify(:capify)} .", verbose: false) }
|
||||
end
|
||||
|
||||
# Make an entry in Rails routing file config/routes.rb
|
||||
@ -217,7 +217,7 @@ def route(routing_code)
|
||||
sentinel = /\.routes\.draw do\s*$/
|
||||
|
||||
in_root do
|
||||
inject_into_file 'config/routes.rb', "\n #{routing_code}", { :after => sentinel, :verbose => false }
|
||||
inject_into_file 'config/routes.rb', "\n #{routing_code}", { after: sentinel, verbose: false }
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -61,7 +61,7 @@ def self.hide!
|
||||
#
|
||||
# module Rails::Generators
|
||||
# class ControllerGenerator < Base
|
||||
# hook_for :test_framework, :aliases => "-t"
|
||||
# hook_for :test_framework, aliases: "-t"
|
||||
# end
|
||||
# end
|
||||
#
|
||||
@ -102,7 +102,7 @@ def self.hide!
|
||||
# :as option:
|
||||
#
|
||||
# class AwesomeGenerator < Rails::Generators::Base
|
||||
# hook_for :test_framework, :as => :controller
|
||||
# hook_for :test_framework, as: :controller
|
||||
# end
|
||||
#
|
||||
# And now it will lookup at:
|
||||
@ -113,7 +113,7 @@ def self.hide!
|
||||
# need to provide the :base value:
|
||||
#
|
||||
# class AwesomeGenerator < Rails::Generators::Base
|
||||
# hook_for :test_framework, :in => :rails, :as => :controller
|
||||
# hook_for :test_framework, in: :rails, as: :controller
|
||||
# end
|
||||
#
|
||||
# And the lookup is exactly the same as previously:
|
||||
@ -137,7 +137,7 @@ def self.hide!
|
||||
# developers might want to have webrat available on controller generator.
|
||||
# This can be achieved as:
|
||||
#
|
||||
# Rails::Generators::ControllerGenerator.hook_for :webrat, :type => :boolean
|
||||
# Rails::Generators::ControllerGenerator.hook_for :webrat, type: :boolean
|
||||
#
|
||||
# Then, if you want webrat to be invoked, just supply:
|
||||
#
|
||||
@ -171,9 +171,9 @@ def self.hook_for(*names, &block)
|
||||
defaults = if options[:type] == :boolean
|
||||
{ }
|
||||
elsif [true, false].include?(default_value_for_option(name, options))
|
||||
{ :banner => "" }
|
||||
{ banner: "" }
|
||||
else
|
||||
{ :desc => "#{name.to_s.humanize} to be invoked", :banner => "NAME" }
|
||||
{ desc: "#{name.to_s.humanize} to be invoked", banner: "NAME" }
|
||||
end
|
||||
|
||||
unless class_options.key?(name)
|
||||
@ -343,8 +343,8 @@ def self.prepare_for_invocation(name, value) #:nodoc:
|
||||
# Small macro to add ruby as an option to the generator with proper
|
||||
# default value plus an instance helper method called shebang.
|
||||
def self.add_shebang_option!
|
||||
class_option :ruby, :type => :string, :aliases => "-r", :default => Thor::Util.ruby_command,
|
||||
:desc => "Path to the Ruby binary of your choice", :banner => "PATH"
|
||||
class_option :ruby, type: :string, aliases: "-r", default: Thor::Util.ruby_command,
|
||||
desc: "Path to the Ruby binary of your choice", banner: "PATH"
|
||||
|
||||
no_tasks {
|
||||
define_method :shebang do
|
||||
|
@ -3,7 +3,7 @@
|
||||
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)
|
||||
|
@ -6,7 +6,7 @@ module Generators # :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)
|
||||
|
@ -23,7 +23,7 @@ def parse(column_definition)
|
||||
type = type.to_sym if type
|
||||
|
||||
if type && reference?(type)
|
||||
references_index = UNIQ_INDEX_OPTIONS.include?(has_index) ? { :unique => true } : true
|
||||
references_index = UNIQ_INDEX_OPTIONS.include?(has_index) ? { unique: true } : true
|
||||
attr_options[:index] = references_index
|
||||
end
|
||||
|
||||
@ -41,11 +41,11 @@ def reference?(type)
|
||||
def parse_type_and_options(type)
|
||||
case type
|
||||
when /(string|text|binary|integer)\{(\d+)\}/
|
||||
return $1, :limit => $2.to_i
|
||||
return $1, limit: $2.to_i
|
||||
when /decimal\{(\d+)[,.-](\d+)\}/
|
||||
return :decimal, :precision => $1.to_i, :scale => $2.to_i
|
||||
return :decimal, precision: $1.to_i, scale: $2.to_i
|
||||
when /(references|belongs_to)\{polymorphic\}/
|
||||
return $1, :polymorphic => true
|
||||
return $1, polymorphic: true
|
||||
else
|
||||
return type, {}
|
||||
end
|
||||
|
@ -5,9 +5,9 @@
|
||||
module Rails
|
||||
module Generators
|
||||
class NamedBase < Base
|
||||
argument :name, :type => :string
|
||||
class_option :skip_namespace, :type => :boolean, :default => false,
|
||||
:desc => "Skip namespace (affects only isolated applications)"
|
||||
argument :name, type: :string
|
||||
class_option :skip_namespace, type: :boolean, default: false,
|
||||
desc: "Skip namespace (affects only isolated applications)"
|
||||
|
||||
def initialize(args, *options) #:nodoc:
|
||||
@inside_template = nil
|
||||
@ -169,7 +169,7 @@ def pluralize_table_names?
|
||||
#
|
||||
# ==== Examples
|
||||
#
|
||||
# check_class_collision :suffix => "Observer"
|
||||
# check_class_collision suffix: "Observer"
|
||||
#
|
||||
# If the generator is invoked with class name Admin, it will check for
|
||||
# the presence of "AdminObserver".
|
||||
|
@ -96,7 +96,7 @@ def log
|
||||
end
|
||||
|
||||
def public_directory
|
||||
directory "public", "public", :recursive => false
|
||||
directory "public", "public", recursive: false
|
||||
if options[:skip_index_html]
|
||||
remove_file "public/index.html"
|
||||
remove_file 'app/assets/images/rails.png'
|
||||
@ -108,7 +108,7 @@ def script
|
||||
directory "script" do |content|
|
||||
"#{shebang}\n" + content
|
||||
end
|
||||
chmod "script", 0755, :verbose => false
|
||||
chmod "script", 0755, verbose: false
|
||||
end
|
||||
|
||||
def test
|
||||
@ -152,8 +152,8 @@ class AppGenerator < AppBase # :nodoc:
|
||||
add_shared_options_for "application"
|
||||
|
||||
# Add bin/rails options
|
||||
class_option :version, :type => :boolean, :aliases => "-v", :group => :rails,
|
||||
:desc => "Show Rails version number and quit"
|
||||
class_option :version, type: :boolean, aliases: "-v", group: :rails,
|
||||
desc: "Show Rails version number and quit"
|
||||
|
||||
def initialize(*args)
|
||||
raise Error, "Options should be given after the application name. For details run: rails --help" if args[0].blank?
|
||||
|
@ -1,11 +1,11 @@
|
||||
module Rails
|
||||
module Generators
|
||||
class AssetsGenerator < NamedBase # :nodoc:
|
||||
class_option :javascripts, :type => :boolean, :desc => "Generate JavaScripts"
|
||||
class_option :stylesheets, :type => :boolean, :desc => "Generate Stylesheets"
|
||||
class_option :javascripts, type: :boolean, desc: "Generate JavaScripts"
|
||||
class_option :stylesheets, type: :boolean, desc: "Generate Stylesheets"
|
||||
|
||||
class_option :javascript_engine, :desc => "Engine for JavaScripts"
|
||||
class_option :stylesheet_engine, :desc => "Engine for Stylesheets"
|
||||
class_option :javascript_engine, desc: "Engine for JavaScripts"
|
||||
class_option :stylesheet_engine, desc: "Engine for Stylesheets"
|
||||
|
||||
protected
|
||||
|
||||
|
@ -1,8 +1,8 @@
|
||||
module Rails
|
||||
module Generators
|
||||
class ControllerGenerator < NamedBase # :nodoc:
|
||||
argument :actions, :type => :array, :default => [], :banner => "action action"
|
||||
check_class_collision :suffix => "Controller"
|
||||
argument :actions, type: :array, default: [], banner: "action action"
|
||||
check_class_collision suffix: "Controller"
|
||||
|
||||
def create_controller_files
|
||||
template 'controller.rb', File.join('app/controllers', class_path, "#{file_name}_controller.rb")
|
||||
|
@ -1,10 +1,10 @@
|
||||
module Rails
|
||||
module Generators
|
||||
class GeneratorGenerator < NamedBase # :nodoc:
|
||||
check_class_collision :suffix => "Generator"
|
||||
check_class_collision suffix: "Generator"
|
||||
|
||||
class_option :namespace, :type => :boolean, :default => true,
|
||||
:desc => "Namespace generator under lib/generators/name"
|
||||
class_option :namespace, type: :boolean, default: true,
|
||||
desc: "Namespace generator under lib/generators/name"
|
||||
|
||||
def create_generator_files
|
||||
directory '.', generator_dir
|
||||
|
@ -1,7 +1,7 @@
|
||||
module Rails
|
||||
module Generators
|
||||
class HelperGenerator < NamedBase # :nodoc:
|
||||
check_class_collision :suffix => "Helper"
|
||||
check_class_collision suffix: "Helper"
|
||||
|
||||
def create_helper_files
|
||||
template 'helper.rb', File.join('app/helpers', class_path, "#{file_name}_helper.rb")
|
||||
|
@ -1,7 +1,7 @@
|
||||
module Rails
|
||||
module Generators
|
||||
class IntegrationTestGenerator < NamedBase # :nodoc:
|
||||
hook_for :integration_tool, :as => :integration
|
||||
hook_for :integration_tool, as: :integration
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -1,8 +1,8 @@
|
||||
module Rails
|
||||
module Generators
|
||||
class MigrationGenerator < NamedBase # :nodoc:
|
||||
argument :attributes, :type => :array, :default => [], :banner => "field[:type][:index] field[:type][:index]"
|
||||
hook_for :orm, :required => true
|
||||
argument :attributes, type: :array, default: [], banner: "field[:type][:index] field[:type][:index]"
|
||||
hook_for :orm, required: true
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -1,8 +1,8 @@
|
||||
module Rails
|
||||
module Generators
|
||||
class ModelGenerator < NamedBase # :nodoc:
|
||||
argument :attributes, :type => :array, :default => [], :banner => "field[:type][:index] field[:type][:index]"
|
||||
hook_for :orm, :required => true
|
||||
argument :attributes, type: :array, default: [], banner: "field[:type][:index] field[:type][:index]"
|
||||
hook_for :orm, required: true
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -1,7 +1,7 @@
|
||||
module Rails
|
||||
module Generators
|
||||
class ObserverGenerator < NamedBase # :nodoc:
|
||||
hook_for :orm, :required => true
|
||||
hook_for :orm, required: true
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -1,7 +1,7 @@
|
||||
module Rails
|
||||
module Generators
|
||||
class PerformanceTestGenerator < NamedBase # :nodoc:
|
||||
hook_for :performance_tool, :as => :performance
|
||||
hook_for :performance_tool, as: :performance
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -68,7 +68,7 @@ def test
|
||||
append_file "Rakefile", <<-EOF
|
||||
#{rakefile_test_tasks}
|
||||
|
||||
task :default => :test
|
||||
task default: :test
|
||||
EOF
|
||||
if full?
|
||||
template "test/integration/navigation_test.rb"
|
||||
@ -89,10 +89,10 @@ def generate_test_dummy(force = false)
|
||||
end
|
||||
|
||||
def test_dummy_config
|
||||
template "rails/boot.rb", "#{dummy_path}/config/boot.rb", :force => true
|
||||
template "rails/application.rb", "#{dummy_path}/config/application.rb", :force => true
|
||||
template "rails/boot.rb", "#{dummy_path}/config/boot.rb", force: true
|
||||
template "rails/application.rb", "#{dummy_path}/config/application.rb", force: true
|
||||
if mountable?
|
||||
template "rails/routes.rb", "#{dummy_path}/config/routes.rb", :force => true
|
||||
template "rails/routes.rb", "#{dummy_path}/config/routes.rb", force: true
|
||||
end
|
||||
end
|
||||
|
||||
@ -135,10 +135,10 @@ def javascripts
|
||||
def script(force = false)
|
||||
return unless full?
|
||||
|
||||
directory "script", :force => force do |content|
|
||||
directory "script", force: force do |content|
|
||||
"#{shebang}\n" + content
|
||||
end
|
||||
chmod "script", 0755, :verbose => false
|
||||
chmod "script", 0755, verbose: false
|
||||
end
|
||||
|
||||
def gemfile_entry
|
||||
@ -158,20 +158,20 @@ class PluginNewGenerator < AppBase # :nodoc:
|
||||
|
||||
alias_method :plugin_path, :app_path
|
||||
|
||||
class_option :dummy_path, :type => :string, :default => "test/dummy",
|
||||
:desc => "Create dummy application at given path"
|
||||
class_option :dummy_path, type: :string, default: "test/dummy",
|
||||
desc: "Create dummy application at given path"
|
||||
|
||||
class_option :full, :type => :boolean, :default => false,
|
||||
:desc => "Generate a rails engine with bundled Rails application for testing"
|
||||
class_option :full, type: :boolean, default: false,
|
||||
desc: "Generate a rails engine with bundled Rails application for testing"
|
||||
|
||||
class_option :mountable, :type => :boolean, :default => false,
|
||||
:desc => "Generate mountable isolated application"
|
||||
class_option :mountable, type: :boolean, default: false,
|
||||
desc: "Generate mountable isolated application"
|
||||
|
||||
class_option :skip_gemspec, :type => :boolean, :default => false,
|
||||
:desc => "Skip gemspec file"
|
||||
class_option :skip_gemspec, type: :boolean, default: false,
|
||||
desc: "Skip gemspec file"
|
||||
|
||||
class_option :skip_gemfile_entry, :type => :boolean, :default => false,
|
||||
:desc => "If creating plugin in application's directory " +
|
||||
class_option :skip_gemfile_entry, type: :boolean, default: false,
|
||||
desc: "If creating plugin in application's directory " +
|
||||
"skip adding entry to Gemfile"
|
||||
|
||||
def initialize(*args)
|
||||
|
@ -2,7 +2,7 @@
|
||||
<html>
|
||||
<head>
|
||||
<title><%= camelized %></title>
|
||||
<%%= stylesheet_link_tag "<%= name %>/application", :media => "all" %>
|
||||
<%%= stylesheet_link_tag "<%= name %>/application", media: "all" %>
|
||||
<%%= javascript_include_tag "<%= name %>/application" %>
|
||||
<%%= csrf_meta_tags %>
|
||||
</head>
|
||||
|
@ -7,14 +7,14 @@ module Generators
|
||||
class ResourceGenerator < ModelGenerator # :nodoc:
|
||||
include ResourceHelpers
|
||||
|
||||
hook_for :resource_controller, :required => true do |controller|
|
||||
hook_for :resource_controller, required: true do |controller|
|
||||
invoke controller, [ controller_name, options[:actions] ]
|
||||
end
|
||||
|
||||
class_option :actions, :type => :array, :banner => "ACTION ACTION", :default => [],
|
||||
:desc => "Actions for the resource controller"
|
||||
class_option :actions, type: :array, banner: "ACTION ACTION", default: [],
|
||||
desc: "Actions for the resource controller"
|
||||
|
||||
hook_for :resource_route, :required => true
|
||||
hook_for :resource_route, required: true
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -6,10 +6,10 @@ class ScaffoldGenerator < ResourceGenerator # :nodoc:
|
||||
remove_hook_for :resource_controller
|
||||
remove_class_option :actions
|
||||
|
||||
class_option :stylesheets, :type => :boolean, :desc => "Generate Stylesheets"
|
||||
class_option :stylesheet_engine, :desc => "Engine for Stylesheets"
|
||||
class_option :stylesheets, type: :boolean, desc: "Generate Stylesheets"
|
||||
class_option :stylesheet_engine, desc: "Engine for Stylesheets"
|
||||
|
||||
hook_for :scaffold_controller, :required => true
|
||||
hook_for :scaffold_controller, required: true
|
||||
|
||||
hook_for :assets do |assets|
|
||||
invoke assets, [controller_name]
|
||||
|
@ -5,21 +5,21 @@ module Generators
|
||||
class ScaffoldControllerGenerator < NamedBase # :nodoc:
|
||||
include ResourceHelpers
|
||||
|
||||
check_class_collision :suffix => "Controller"
|
||||
check_class_collision suffix: "Controller"
|
||||
|
||||
class_option :orm, :banner => "NAME", :type => :string, :required => true,
|
||||
:desc => "ORM to generate the controller for"
|
||||
class_option :orm, banner: "NAME", type: :string, required: true,
|
||||
desc: "ORM to generate the controller for"
|
||||
|
||||
argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
|
||||
argument :attributes, type: :array, default: [], banner: "field:type field:type"
|
||||
|
||||
def create_controller_files
|
||||
template "controller.rb", File.join('app/controllers', class_path, "#{controller_file_name}_controller.rb")
|
||||
end
|
||||
|
||||
hook_for :template_engine, :test_framework, :as => :scaffold
|
||||
hook_for :template_engine, :test_framework, as: :scaffold
|
||||
|
||||
# Invoke the helper using the controller name (pluralized)
|
||||
hook_for :helper, :as => :scaffold do |invoked|
|
||||
hook_for :helper, as: :scaffold do |invoked|
|
||||
invoke invoked, [ controller_name ]
|
||||
end
|
||||
end
|
||||
|
@ -1,7 +1,7 @@
|
||||
module Rails
|
||||
module Generators
|
||||
class TaskGenerator < NamedBase # :nodoc:
|
||||
argument :actions, :type => :array, :default => [], :banner => "action action"
|
||||
argument :actions, type: :array, default: [], banner: "action action"
|
||||
|
||||
def create_task_files
|
||||
template 'task.rb', File.join('lib/tasks', "#{file_name}.rake")
|
||||
|
@ -1,7 +1,7 @@
|
||||
namespace :<%= file_name %> do
|
||||
<% actions.each do |action| -%>
|
||||
desc "TODO"
|
||||
task :<%= action %> => :environment do
|
||||
task <%= action %>: :environment do
|
||||
end
|
||||
|
||||
<% end -%>
|
||||
|
@ -8,7 +8,7 @@ module ResourceHelpers # :nodoc:
|
||||
mattr_accessor :skip_warn
|
||||
|
||||
def self.included(base) #:nodoc:
|
||||
base.class_option :force_plural, :type => :boolean, :desc => "Forces the use of a plural ModelName"
|
||||
base.class_option :force_plural, type: :boolean, desc: "Forces the use of a plural ModelName"
|
||||
end
|
||||
|
||||
# Set controller variables on initialization.
|
||||
|
@ -200,12 +200,12 @@ def assert_field_default_value(attribute_type, value)
|
||||
# You can provide a configuration hash as second argument. This method returns the output
|
||||
# printed by the generator.
|
||||
def run_generator(args=self.default_arguments, config={})
|
||||
capture(:stdout) { self.generator_class.start(args, config.reverse_merge(:destination_root => destination_root)) }
|
||||
capture(:stdout) { self.generator_class.start(args, config.reverse_merge(destination_root: destination_root)) }
|
||||
end
|
||||
|
||||
# Instantiate the generator.
|
||||
def generator(args=self.default_arguments, options={}, config={})
|
||||
@generator ||= self.generator_class.new(args, options, config.reverse_merge(:destination_root => destination_root))
|
||||
@generator ||= self.generator_class.new(args, options, config.reverse_merge(destination_root: destination_root))
|
||||
end
|
||||
|
||||
# Create a Rails::Generators::GeneratedAttribute by supplying the
|
||||
|
@ -3,8 +3,8 @@
|
||||
module TestUnit # :nodoc:
|
||||
module Generators # :nodoc:
|
||||
class ControllerGenerator < Base # :nodoc:
|
||||
argument :actions, :type => :array, :default => [], :banner => "action action"
|
||||
check_class_collision :suffix => "ControllerTest"
|
||||
argument :actions, type: :array, default: [], banner: "action action"
|
||||
check_class_collision suffix: "ControllerTest"
|
||||
|
||||
def create_test_files
|
||||
template 'functional_test.rb',
|
||||
|
@ -3,7 +3,7 @@
|
||||
module TestUnit # :nodoc:
|
||||
module Generators # :nodoc:
|
||||
class HelperGenerator < Base # :nodoc:
|
||||
check_class_collision :suffix => "HelperTest"
|
||||
check_class_collision suffix: "HelperTest"
|
||||
|
||||
def create_helper_files
|
||||
template 'helper_test.rb', File.join('test/helpers', class_path, "#{file_name}_helper_test.rb")
|
||||
|
@ -3,7 +3,7 @@
|
||||
module TestUnit # :nodoc:
|
||||
module Generators # :nodoc:
|
||||
class IntegrationGenerator < Base # :nodoc:
|
||||
check_class_collision :suffix => "Test"
|
||||
check_class_collision suffix: "Test"
|
||||
|
||||
def create_test_files
|
||||
template 'integration_test.rb', File.join('test/integration', class_path, "#{file_name}_test.rb")
|
||||
|
@ -3,8 +3,8 @@
|
||||
module TestUnit # :nodoc:
|
||||
module Generators # :nodoc:
|
||||
class MailerGenerator < Base # :nodoc:
|
||||
argument :actions, :type => :array, :default => [], :banner => "method method"
|
||||
check_class_collision :suffix => "Test"
|
||||
argument :actions, type: :array, default: [], banner: "method method"
|
||||
check_class_collision suffix: "Test"
|
||||
|
||||
def create_test_files
|
||||
template "functional_test.rb", File.join('test/mailers', class_path, "#{file_name}_test.rb")
|
||||
|
@ -3,10 +3,10 @@
|
||||
module TestUnit # :nodoc:
|
||||
module Generators # :nodoc:
|
||||
class ModelGenerator < Base # :nodoc:
|
||||
argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
|
||||
class_option :fixture, :type => :boolean
|
||||
argument :attributes, type: :array, default: [], banner: "field:type field:type"
|
||||
class_option :fixture, type: :boolean
|
||||
|
||||
check_class_collision :suffix => "Test"
|
||||
check_class_collision suffix: "Test"
|
||||
|
||||
def create_test_file
|
||||
template 'unit_test.rb', File.join('test/models', class_path, "#{file_name}_test.rb")
|
||||
|
@ -3,7 +3,7 @@
|
||||
module TestUnit # :nodoc:
|
||||
module Generators # :nodoc:
|
||||
class ObserverGenerator < Base # :nodoc:
|
||||
check_class_collision :suffix => "ObserverTest"
|
||||
check_class_collision suffix: "ObserverTest"
|
||||
|
||||
def create_test_files
|
||||
template 'unit_test.rb', File.join('test/models', class_path, "#{file_name}_observer_test.rb")
|
||||
|
@ -3,7 +3,7 @@
|
||||
module TestUnit # :nodoc:
|
||||
module Generators # :nodoc:
|
||||
class PerformanceGenerator < Base # :nodoc:
|
||||
check_class_collision :suffix => "Test"
|
||||
check_class_collision suffix: "Test"
|
||||
|
||||
def create_test_files
|
||||
template 'performance_test.rb', File.join('test/performance', class_path, "#{file_name}_test.rb")
|
||||
|
@ -3,8 +3,8 @@
|
||||
|
||||
class <%= class_name %>Test < ActionDispatch::PerformanceTest
|
||||
# Refer to the documentation for all available options
|
||||
# self.profile_options = { :runs => 5, :metrics => [:wall_time, :memory],
|
||||
# :output => 'tmp/performance', :formats => [:flat] }
|
||||
# self.profile_options = { runs: 5, metrics: [:wall_time, :memory],
|
||||
# output: 'tmp/performance', formats: [:flat] }
|
||||
|
||||
test "homepage" do
|
||||
get '/'
|
||||
|
@ -3,7 +3,7 @@
|
||||
module TestUnit # :nodoc:
|
||||
module Generators # :nodoc:
|
||||
class PluginGenerator < Base # :nodoc:
|
||||
check_class_collision :suffix => "Test"
|
||||
check_class_collision suffix: "Test"
|
||||
|
||||
def create_test_files
|
||||
directory '.', 'test'
|
||||
|
@ -6,9 +6,9 @@ module Generators # :nodoc:
|
||||
class ScaffoldGenerator < Base # :nodoc:
|
||||
include Rails::Generators::ResourceHelpers
|
||||
|
||||
check_class_collision :suffix => "ControllerTest"
|
||||
check_class_collision suffix: "ControllerTest"
|
||||
|
||||
argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
|
||||
argument :attributes, type: :array, default: [], banner: "field:type field:type"
|
||||
|
||||
def create_test_files
|
||||
template "functional_test.rb",
|
||||
|
@ -23,7 +23,7 @@ def routes
|
||||
|
||||
def require_local!
|
||||
unless local_request?
|
||||
render :text => '<p>For security purposes, this information is only available to local requests.</p>', :status => :forbidden
|
||||
render text: '<p>For security purposes, this information is only available to local requests.</p>', status: :forbidden
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -5,7 +5,7 @@ module Paths
|
||||
# paths by a Hash like API. It requires you to give a physical path on initialization.
|
||||
#
|
||||
# root = Root.new "/rails"
|
||||
# root.add "app/controllers", :eager_load => true
|
||||
# root.add "app/controllers", eager_load: true
|
||||
#
|
||||
# The command above creates a new root object and add "app/controllers" as a path.
|
||||
# This means we can get a <tt>Rails::Paths::Path</tt> object back like below:
|
||||
@ -26,7 +26,7 @@ module Paths
|
||||
# contains the path with the same path value given to +add+. In some situations,
|
||||
# you may not want this behavior, so you can give :with as option.
|
||||
#
|
||||
# root.add "config/routes", :with => "config/routes.rb"
|
||||
# root.add "config/routes", with: "config/routes.rb"
|
||||
# root["config/routes"].inspect # => ["config/routes.rb"]
|
||||
#
|
||||
# The +add+ method accepts the following options as arguments:
|
||||
@ -52,7 +52,7 @@ def initialize(path)
|
||||
|
||||
def []=(path, value)
|
||||
glob = self[path] ? self[path].glob : nil
|
||||
add(path, :with => value, :glob => glob)
|
||||
add(path, with: value, glob: glob)
|
||||
end
|
||||
|
||||
def add(path, options={})
|
||||
|
@ -172,7 +172,7 @@ def generate_railtie_name(class_or_module)
|
||||
end
|
||||
end
|
||||
|
||||
delegate :railtie_name, :to => "self.class"
|
||||
delegate :railtie_name, to: "self.class"
|
||||
|
||||
def config
|
||||
@config ||= Railtie::Configuration.new
|
||||
|
@ -6,7 +6,7 @@ module Configurable
|
||||
extend ActiveSupport::Concern
|
||||
|
||||
module ClassMethods
|
||||
delegate :config, :to => :instance
|
||||
delegate :config, to: :instance
|
||||
|
||||
def inherited(base)
|
||||
raise "You cannot inherit from a #{self.superclass.name} child"
|
||||
|
@ -50,23 +50,23 @@ def app_generators
|
||||
|
||||
# First configurable block to run. Called before any initializers are run.
|
||||
def before_configuration(&block)
|
||||
ActiveSupport.on_load(:before_configuration, :yield => true, &block)
|
||||
ActiveSupport.on_load(:before_configuration, yield: true, &block)
|
||||
end
|
||||
|
||||
# Third configurable block to run. Does not run if +config.cache_classes+
|
||||
# set to false.
|
||||
def before_eager_load(&block)
|
||||
ActiveSupport.on_load(:before_eager_load, :yield => true, &block)
|
||||
ActiveSupport.on_load(:before_eager_load, yield: true, &block)
|
||||
end
|
||||
|
||||
# Second configurable block to run. Called before frameworks initialize.
|
||||
def before_initialize(&block)
|
||||
ActiveSupport.on_load(:before_initialize, :yield => true, &block)
|
||||
ActiveSupport.on_load(:before_initialize, yield: true, &block)
|
||||
end
|
||||
|
||||
# Last configurable block to run. Called after frameworks initialize.
|
||||
def after_initialize(&block)
|
||||
ActiveSupport.on_load(:after_initialize, :yield => true, &block)
|
||||
ActiveSupport.on_load(:after_initialize, yield: true, &block)
|
||||
end
|
||||
|
||||
# Array of callbacks defined by #to_prepare.
|
||||
|
@ -2,7 +2,7 @@ require 'rails/source_annotation_extractor'
|
||||
|
||||
desc "Enumerate all annotations (use notes:optimize, :fixme, :todo for focus)"
|
||||
task :notes do
|
||||
SourceAnnotationExtractor.enumerate "OPTIMIZE|FIXME|TODO", :tag => true
|
||||
SourceAnnotationExtractor.enumerate "OPTIMIZE|FIXME|TODO", tag: true
|
||||
end
|
||||
|
||||
namespace :notes do
|
||||
|
@ -1,6 +1,6 @@
|
||||
namespace :rails do
|
||||
desc "Update configs and some other initially generated files (or use just update:configs, update:scripts, or update:application_controller)"
|
||||
task :update => [ "update:configs", "update:scripts", "update:application_controller" ]
|
||||
task update: [ "update:configs", "update:scripts", "update:application_controller" ]
|
||||
|
||||
desc "Applies the template supplied by LOCATION=(/path/to/template) or URL"
|
||||
task :template do
|
||||
@ -9,8 +9,8 @@ namespace :rails do
|
||||
template = File.expand_path(template) if template !~ %r{\A[A-Za-z][A-Za-z0-9+\-\.]*://}
|
||||
require 'rails/generators'
|
||||
require 'rails/generators/rails/app/app_generator'
|
||||
generator = Rails::Generators::AppGenerator.new [Rails.root], {}, :destination_root => Rails.root
|
||||
generator.apply template, :verbose => false
|
||||
generator = Rails::Generators::AppGenerator.new [Rails.root], {}, destination_root: Rails.root
|
||||
generator.apply template, verbose: false
|
||||
end
|
||||
|
||||
namespace :templates do
|
||||
@ -44,8 +44,8 @@ namespace :rails do
|
||||
@app_generator ||= begin
|
||||
require 'rails/generators'
|
||||
require 'rails/generators/rails/app/app_generator'
|
||||
gen = Rails::Generators::AppGenerator.new ["rails"], { :with_dispatchers => true },
|
||||
:destination_root => Rails.root
|
||||
gen = Rails::Generators::AppGenerator.new ["rails"], { with_dispatchers: true },
|
||||
destination_root: Rails.root
|
||||
File.exists?(Rails.root.join("config", "application.rb")) ?
|
||||
gen.send(:app_const) : gen.send(:valid_app_const?)
|
||||
gen
|
||||
|
@ -1,5 +1,5 @@
|
||||
desc 'Prints out your Rack middleware stack'
|
||||
task :middleware => :environment do
|
||||
task middleware: :environment do
|
||||
Rails.configuration.middleware.each do |middleware|
|
||||
puts "use #{middleware.inspect}"
|
||||
end
|
||||
|
@ -5,7 +5,7 @@ task :secret do
|
||||
end
|
||||
|
||||
desc 'List versions of all Rails frameworks and the environment'
|
||||
task :about => :environment do
|
||||
task about: :environment do
|
||||
puts Rails::Info
|
||||
end
|
||||
|
||||
@ -26,7 +26,7 @@ namespace :time do
|
||||
require 'active_support'
|
||||
require 'active_support/time'
|
||||
jan_offset = Time.now.beginning_of_year.utc_offset
|
||||
jul_offset = Time.now.beginning_of_year.change(:month => 7).utc_offset
|
||||
jul_offset = Time.now.beginning_of_year.change(month: 7).utc_offset
|
||||
offset = jan_offset < jul_offset ? jan_offset : jul_offset
|
||||
build_time_zone_list(:all, offset)
|
||||
end
|
||||
|
@ -1,5 +1,5 @@
|
||||
desc 'Print out all defined routes in match order, with names. Target specific controller with CONTROLLER=x.'
|
||||
task :routes => :environment do
|
||||
task routes: :environment do
|
||||
all_routes = Rails.application.routes.routes
|
||||
require 'action_dispatch/routing/inspector'
|
||||
inspector = ActionDispatch::Routing::RoutesInspector.new
|
||||
|
@ -1,6 +1,6 @@
|
||||
namespace :tmp do
|
||||
desc "Clear session, cache, and socket files from tmp/ (narrow w/ tmp:sessions:clear, tmp:cache:clear, tmp:sockets:clear)"
|
||||
task :clear => [ "tmp:sessions:clear", "tmp:cache:clear", "tmp:sockets:clear"]
|
||||
task clear: [ "tmp:sessions:clear", "tmp:cache:clear", "tmp:sockets:clear"]
|
||||
|
||||
tmp_dirs = [ 'tmp/sessions',
|
||||
'tmp/cache',
|
||||
@ -13,7 +13,7 @@ namespace :tmp do
|
||||
tmp_dirs.each { |d| directory d }
|
||||
|
||||
desc "Creates tmp directories for sessions, cache, sockets, and pids"
|
||||
task :create => tmp_dirs
|
||||
task create: tmp_dirs
|
||||
|
||||
namespace :sessions do
|
||||
# desc "Clears all files in tmp/sessions"
|
||||
|
@ -1,8 +1,8 @@
|
||||
module Rails
|
||||
class TestUnitRailtie < Rails::Railtie
|
||||
config.app_generators do |c|
|
||||
c.test_framework :test_unit, :fixture => true,
|
||||
:fixture_replacement => nil
|
||||
c.test_framework :test_unit, fixture: true,
|
||||
fixture_replacement: nil
|
||||
|
||||
c.integration_tool :test_unit
|
||||
c.performance_tool :test_unit
|
||||
|
@ -43,7 +43,7 @@ module Kernel
|
||||
end
|
||||
end
|
||||
|
||||
task :default => :test
|
||||
task default: :test
|
||||
|
||||
desc 'Runs test:units, test:functionals, test:integration together (also available: test:benchmark, test:profile)'
|
||||
task :test do
|
||||
@ -61,7 +61,7 @@ namespace :test do
|
||||
Rake::Task[task].invoke
|
||||
nil
|
||||
rescue => e
|
||||
{ :task => task, :exception => e }
|
||||
{ task: task, exception: e }
|
||||
end
|
||||
end.compact
|
||||
|
||||
@ -71,7 +71,7 @@ namespace :test do
|
||||
end
|
||||
end
|
||||
|
||||
Rake::TestTask.new(:recent => "test:prepare") do |t|
|
||||
Rake::TestTask.new(recent: "test:prepare") do |t|
|
||||
since = TEST_CHANGES_SINCE
|
||||
touched = FileList['test/**/*_test.rb'].select { |path| File.mtime(path) > since } +
|
||||
recent_tests('app/models/**/*.rb', 'test/models', since) +
|
||||
@ -84,7 +84,7 @@ namespace :test do
|
||||
end
|
||||
Rake::Task['test:recent'].comment = "Test recent changes"
|
||||
|
||||
Rake::TestTask.new(:uncommitted => "test:prepare") do |t|
|
||||
Rake::TestTask.new(uncommitted: "test:prepare") do |t|
|
||||
def t.file_list
|
||||
if File.directory?(".svn")
|
||||
changed_since_checkin = silence_stderr { `svn status` }.split.map { |path| path.chomp[7 .. -1] }
|
||||
@ -108,52 +108,52 @@ namespace :test do
|
||||
end
|
||||
Rake::Task['test:uncommitted'].comment = "Test changes since last checkin (only Subversion and Git)"
|
||||
|
||||
Rake::TestTask.new(:single => "test:prepare") do |t|
|
||||
Rake::TestTask.new(single: "test:prepare") do |t|
|
||||
t.libs << "test"
|
||||
end
|
||||
|
||||
Rails::SubTestTask.new(:models => "test:prepare") do |t|
|
||||
Rails::SubTestTask.new(models: "test:prepare") do |t|
|
||||
t.libs << "test"
|
||||
t.pattern = 'test/models/**/*_test.rb'
|
||||
end
|
||||
|
||||
Rails::SubTestTask.new(:helpers => "test:prepare") do |t|
|
||||
Rails::SubTestTask.new(helpers: "test:prepare") do |t|
|
||||
t.libs << "test"
|
||||
t.pattern = 'test/helpers/**/*_test.rb'
|
||||
end
|
||||
|
||||
Rails::SubTestTask.new(:units => "test:prepare") do |t|
|
||||
Rails::SubTestTask.new(units: "test:prepare") do |t|
|
||||
t.libs << "test"
|
||||
t.pattern = 'test/{models,helpers,unit}/**/*_test.rb'
|
||||
end
|
||||
|
||||
Rails::SubTestTask.new(:controllers => "test:prepare") do |t|
|
||||
Rails::SubTestTask.new(controllers: "test:prepare") do |t|
|
||||
t.libs << "test"
|
||||
t.pattern = 'test/controllers/**/*_test.rb'
|
||||
end
|
||||
|
||||
Rails::SubTestTask.new(:mailers => "test:prepare") do |t|
|
||||
Rails::SubTestTask.new(mailers: "test:prepare") do |t|
|
||||
t.libs << "test"
|
||||
t.pattern = 'test/mailers/**/*_test.rb'
|
||||
end
|
||||
|
||||
Rails::SubTestTask.new(:functionals => "test:prepare") do |t|
|
||||
Rails::SubTestTask.new(functionals: "test:prepare") do |t|
|
||||
t.libs << "test"
|
||||
t.pattern = 'test/{controllers,mailers,functional}/**/*_test.rb'
|
||||
end
|
||||
|
||||
Rails::SubTestTask.new(:integration => "test:prepare") do |t|
|
||||
Rails::SubTestTask.new(integration: "test:prepare") do |t|
|
||||
t.libs << "test"
|
||||
t.pattern = 'test/integration/**/*_test.rb'
|
||||
end
|
||||
|
||||
Rails::SubTestTask.new(:benchmark => 'test:prepare') do |t|
|
||||
Rails::SubTestTask.new(benchmark: 'test:prepare') do |t|
|
||||
t.libs << 'test'
|
||||
t.pattern = 'test/performance/**/*_test.rb'
|
||||
t.options = '-- --benchmark'
|
||||
end
|
||||
|
||||
Rails::SubTestTask.new(:profile => 'test:prepare') do |t|
|
||||
Rails::SubTestTask.new(profile: 'test:prepare') do |t|
|
||||
t.libs << 'test'
|
||||
t.pattern = 'test/performance/**/*_test.rb'
|
||||
end
|
||||
|
@ -7,7 +7,7 @@ class AssetDebuggingTest < ActiveSupport::TestCase
|
||||
include Rack::Test::Methods
|
||||
|
||||
def setup
|
||||
build_app(:initializers => true)
|
||||
build_app(initializers: true)
|
||||
|
||||
app_file "app/assets/javascripts/application.js", "//= require_tree ."
|
||||
app_file "app/assets/javascripts/xmlhr.js", "function f1() { alert(); }"
|
||||
@ -15,7 +15,7 @@ def setup
|
||||
|
||||
app_file "config/routes.rb", <<-RUBY
|
||||
AppTemplate::Application.routes.draw do
|
||||
get '/posts', :to => "posts#index"
|
||||
get '/posts', to: "posts#index"
|
||||
end
|
||||
RUBY
|
||||
|
||||
|
@ -8,7 +8,7 @@ class AssetsTest < ActiveSupport::TestCase
|
||||
include Rack::Test::Methods
|
||||
|
||||
def setup
|
||||
build_app(:initializers => true)
|
||||
build_app(initializers: true)
|
||||
boot_rails
|
||||
end
|
||||
|
||||
@ -44,7 +44,7 @@ def assert_no_file_exists(filename)
|
||||
|
||||
app_file 'config/routes.rb', <<-RUBY
|
||||
AppTemplate::Application.routes.draw do
|
||||
get '*path', :to => lambda { |env| [200, { "Content-Type" => "text/html" }, "Not an asset"] }
|
||||
get '*path', to: lambda { |env| [200, { "Content-Type" => "text/html" }, "Not an asset"] }
|
||||
end
|
||||
RUBY
|
||||
|
||||
@ -353,7 +353,7 @@ def show_detailed_exceptions?() true end
|
||||
class ::OmgController < ActionController::Base
|
||||
def index
|
||||
flash[:cool_story] = true
|
||||
render :text => "ok"
|
||||
render text: "ok"
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -239,7 +239,7 @@ def assert_utf8
|
||||
class ::OmgController < ActionController::Base
|
||||
def index
|
||||
cookies.signed[:some_key] = "some_value"
|
||||
render :text => env["action_dispatch.secret_token"]
|
||||
render text: env["action_dispatch.secret_token"]
|
||||
end
|
||||
end
|
||||
|
||||
@ -252,7 +252,7 @@ def index
|
||||
|
||||
class ::OmgController < ActionController::Base
|
||||
def index
|
||||
render :inline => "<%= csrf_meta_tags %>"
|
||||
render inline: "<%= csrf_meta_tags %>"
|
||||
end
|
||||
end
|
||||
|
||||
@ -272,11 +272,11 @@ def persisted?; true; end
|
||||
app_file 'app/controllers/posts_controller.rb', <<-RUBY
|
||||
class PostsController < ApplicationController
|
||||
def show
|
||||
render :inline => "<%= begin; form_for(Post.new) {}; rescue => e; e.to_s; end %>"
|
||||
render inline: "<%= begin; form_for(Post.new) {}; rescue => e; e.to_s; end %>"
|
||||
end
|
||||
|
||||
def update
|
||||
render :text => "update"
|
||||
render text: "update"
|
||||
end
|
||||
end
|
||||
RUBY
|
||||
@ -291,7 +291,7 @@ def update
|
||||
|
||||
token = "cf50faa3fe97702ca1ae"
|
||||
PostsController.any_instance.stubs(:form_authenticity_token).returns(token)
|
||||
params = {:authenticity_token => token}
|
||||
params = {authenticity_token: token}
|
||||
|
||||
get "/posts/1"
|
||||
assert_match(/patch/, last_response.body)
|
||||
@ -316,7 +316,7 @@ def update
|
||||
|
||||
class ::OmgController < ActionController::Base
|
||||
def index
|
||||
render :inline => "<%= csrf_meta_tags %>"
|
||||
render inline: "<%= csrf_meta_tags %>"
|
||||
end
|
||||
end
|
||||
|
||||
@ -440,7 +440,7 @@ def index
|
||||
|
||||
class ::OmgController < ActionController::Base
|
||||
def index
|
||||
render :inline => "<%= image_path('foo.jpg') %>"
|
||||
render inline: "<%= image_path('foo.jpg') %>"
|
||||
end
|
||||
end
|
||||
|
||||
@ -493,7 +493,7 @@ def index
|
||||
|
||||
class ::OmgController < ActionController::Base
|
||||
def index
|
||||
render :text => env["action_dispatch.show_exceptions"]
|
||||
render text: env["action_dispatch.show_exceptions"]
|
||||
end
|
||||
end
|
||||
|
||||
@ -503,7 +503,7 @@ def index
|
||||
|
||||
test "config.action_controller.wrap_parameters is set in ActionController::Base" do
|
||||
app_file 'config/initializers/wrap_parameters.rb', <<-RUBY
|
||||
ActionController::Base.wrap_parameters :format => [:json]
|
||||
ActionController::Base.wrap_parameters format: [:json]
|
||||
RUBY
|
||||
|
||||
app_file 'app/models/post.rb', <<-RUBY
|
||||
@ -523,7 +523,7 @@ class ApplicationController < ActionController::Base
|
||||
app_file 'app/controllers/posts_controller.rb', <<-RUBY
|
||||
class PostsController < ApplicationController
|
||||
def create
|
||||
render :text => params[:post].inspect
|
||||
render text: params[:post].inspect
|
||||
end
|
||||
end
|
||||
RUBY
|
||||
@ -544,7 +544,7 @@ def create
|
||||
app_file 'app/controllers/posts_controller.rb', <<-RUBY
|
||||
class PostsController < ActionController::Base
|
||||
def create
|
||||
render :text => params[:post].permitted? ? "permitted" : "forbidden"
|
||||
render text: params[:post].permitted? ? "permitted" : "forbidden"
|
||||
end
|
||||
end
|
||||
RUBY
|
||||
@ -558,7 +558,7 @@ def create
|
||||
|
||||
require "#{app_path}/config/environment"
|
||||
|
||||
post "/posts", {:post => {"title" =>"zomg"}}
|
||||
post "/posts", {post: {"title" =>"zomg"}}
|
||||
assert_equal 'permitted', last_response.body
|
||||
end
|
||||
|
||||
@ -570,8 +570,8 @@ def create
|
||||
class ::OmgController < ActionController::Base
|
||||
def index
|
||||
respond_to do |format|
|
||||
format.html { render :text => "HTML" }
|
||||
format.xml { render :text => "XML" }
|
||||
format.html { render text: "HTML" }
|
||||
format.xml { render text: "XML" }
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -579,7 +579,7 @@ def index
|
||||
get "/", {}, "HTTP_ACCEPT" => "application/xml"
|
||||
assert_equal 'HTML', last_response.body
|
||||
|
||||
get "/", { :format => :xml }, "HTTP_ACCEPT" => "application/xml"
|
||||
get "/", { format: :xml }, "HTTP_ACCEPT" => "application/xml"
|
||||
assert_equal 'XML', last_response.body
|
||||
end
|
||||
|
||||
|
@ -48,22 +48,22 @@ def with_bare_config
|
||||
c.generators.orm = :data_mapper
|
||||
c.generators.test_framework = :rspec
|
||||
c.generators.helper = false
|
||||
expected = { :rails => { :orm => :data_mapper, :test_framework => :rspec, :helper => false } }
|
||||
expected = { rails: { orm: :data_mapper, test_framework: :rspec, helper: false } }
|
||||
assert_equal(expected, c.generators.options)
|
||||
end
|
||||
end
|
||||
|
||||
test "generators set rails aliases" do
|
||||
with_config do |c|
|
||||
c.generators.aliases = { :rails => { :test_framework => "-w" } }
|
||||
expected = { :rails => { :test_framework => "-w" } }
|
||||
c.generators.aliases = { rails: { test_framework: "-w" } }
|
||||
expected = { rails: { test_framework: "-w" } }
|
||||
assert_equal expected, c.generators.aliases
|
||||
end
|
||||
end
|
||||
|
||||
test "generators aliases, options, templates and fallbacks on initialization" do
|
||||
add_to_config <<-RUBY
|
||||
config.generators.rails :aliases => { :test_framework => "-w" }
|
||||
config.generators.rails aliases: { test_framework: "-w" }
|
||||
config.generators.orm :data_mapper
|
||||
config.generators.test_framework :rspec
|
||||
config.generators.fallbacks[:shoulda] = :test_unit
|
||||
@ -76,7 +76,7 @@ def with_bare_config
|
||||
|
||||
assert_equal :rspec, Rails::Generators.options[:rails][:test_framework]
|
||||
assert_equal "-w", Rails::Generators.aliases[:rails][:test_framework]
|
||||
assert_equal Hash[:shoulda => :test_unit], Rails::Generators.fallbacks
|
||||
assert_equal Hash[shoulda: :test_unit], Rails::Generators.fallbacks
|
||||
assert_equal ["some/where"], Rails::Generators.templates_path
|
||||
end
|
||||
|
||||
@ -95,31 +95,31 @@ def with_bare_config
|
||||
test "generators with hashes for options and aliases" do
|
||||
with_bare_config do |c|
|
||||
c.generators do |g|
|
||||
g.orm :data_mapper, :migration => false
|
||||
g.plugin :aliases => { :generator => "-g" },
|
||||
:generator => true
|
||||
g.orm :data_mapper, migration: false
|
||||
g.plugin aliases: { generator: "-g" },
|
||||
generator: true
|
||||
end
|
||||
|
||||
expected = {
|
||||
:rails => { :orm => :data_mapper },
|
||||
:plugin => { :generator => true },
|
||||
:data_mapper => { :migration => false }
|
||||
rails: { orm: :data_mapper },
|
||||
plugin: { generator: true },
|
||||
data_mapper: { migration: false }
|
||||
}
|
||||
|
||||
assert_equal expected, c.generators.options
|
||||
assert_equal({ :plugin => { :generator => "-g" } }, c.generators.aliases)
|
||||
assert_equal({ plugin: { generator: "-g" } }, c.generators.aliases)
|
||||
end
|
||||
end
|
||||
|
||||
test "generators with string and hash for options should generate symbol keys" do
|
||||
with_bare_config do |c|
|
||||
c.generators do |g|
|
||||
g.orm 'data_mapper', :migration => false
|
||||
g.orm 'data_mapper', migration: false
|
||||
end
|
||||
|
||||
expected = {
|
||||
:rails => { :orm => :data_mapper },
|
||||
:data_mapper => { :migration => false }
|
||||
rails: { orm: :data_mapper },
|
||||
data_mapper: { migration: false }
|
||||
}
|
||||
|
||||
assert_equal expected, c.generators.options
|
||||
|
@ -143,7 +143,7 @@ class Foo < ActiveRecord::Base
|
||||
I18n::Railtie.config.i18n.fallbacks = true
|
||||
load_app
|
||||
assert I18n.backend.class.included_modules.include?(I18n::Backend::Fallbacks)
|
||||
assert_fallbacks :de => [:de, :en]
|
||||
assert_fallbacks de: [:de, :en]
|
||||
end
|
||||
|
||||
test "config.i18n.fallbacks = true initializes I18n.fallbacks with default settings even when backend changes" do
|
||||
@ -151,37 +151,37 @@ class Foo < ActiveRecord::Base
|
||||
I18n::Railtie.config.i18n.backend = Class.new(I18n::Backend::Simple).new
|
||||
load_app
|
||||
assert I18n.backend.class.included_modules.include?(I18n::Backend::Fallbacks)
|
||||
assert_fallbacks :de => [:de, :en]
|
||||
assert_fallbacks de: [:de, :en]
|
||||
end
|
||||
|
||||
test "config.i18n.fallbacks.defaults = [:'en-US'] initializes fallbacks with en-US as a fallback default" do
|
||||
I18n::Railtie.config.i18n.fallbacks.defaults = [:'en-US']
|
||||
load_app
|
||||
assert_fallbacks :de => [:de, :'en-US', :en]
|
||||
assert_fallbacks de: [:de, :'en-US', :en]
|
||||
end
|
||||
|
||||
test "config.i18n.fallbacks.map = { :ca => :'es-ES' } initializes fallbacks with a mapping ca => es-ES" do
|
||||
I18n::Railtie.config.i18n.fallbacks.map = { :ca => :'es-ES' }
|
||||
load_app
|
||||
assert_fallbacks :ca => [:ca, :"es-ES", :es, :en]
|
||||
assert_fallbacks ca: [:ca, :"es-ES", :es, :en]
|
||||
end
|
||||
|
||||
test "[shortcut] config.i18n.fallbacks = [:'en-US'] initializes fallbacks with en-US as a fallback default" do
|
||||
I18n::Railtie.config.i18n.fallbacks = [:'en-US']
|
||||
load_app
|
||||
assert_fallbacks :de => [:de, :'en-US', :en]
|
||||
assert_fallbacks de: [:de, :'en-US', :en]
|
||||
end
|
||||
|
||||
test "[shortcut] config.i18n.fallbacks = [{ :ca => :'es-ES' }] initializes fallbacks with a mapping de-AT => de-DE" do
|
||||
I18n::Railtie.config.i18n.fallbacks.map = { :ca => :'es-ES' }
|
||||
load_app
|
||||
assert_fallbacks :ca => [:ca, :"es-ES", :es, :en]
|
||||
assert_fallbacks ca: [:ca, :"es-ES", :es, :en]
|
||||
end
|
||||
|
||||
test "[shortcut] config.i18n.fallbacks = [:'en-US', { :ca => :'es-ES' }] initializes fallbacks with the given arguments" do
|
||||
I18n::Railtie.config.i18n.fallbacks = [:'en-US', { :ca => :'es-ES' }]
|
||||
load_app
|
||||
assert_fallbacks :ca => [:ca, :"es-ES", :es, :'en-US', :en]
|
||||
assert_fallbacks ca: [:ca, :"es-ES", :es, :'en-US', :en]
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -33,7 +33,7 @@ def wait
|
||||
ActiveRecord::Base.logger = logger
|
||||
|
||||
# Mimic Active Record notifications
|
||||
instrument "sql.active_record", :name => "SQL", :sql => "SHOW tables"
|
||||
instrument "sql.active_record", name: "SQL", sql: "SHOW tables"
|
||||
wait
|
||||
|
||||
assert_equal 1, logger.logged(:debug).size
|
||||
|
@ -19,14 +19,14 @@ def app
|
||||
test "constants in app are autoloaded" do
|
||||
app_file "app/models/post.rb", <<-MODEL
|
||||
class Post < ActiveRecord::Base
|
||||
validates_acceptance_of :title, :accept => "omg"
|
||||
validates_acceptance_of :title, accept: "omg"
|
||||
end
|
||||
MODEL
|
||||
|
||||
require "#{rails_root}/config/environment"
|
||||
setup_ar!
|
||||
|
||||
p = Post.create(:title => 'omg')
|
||||
p = Post.create(title: 'omg')
|
||||
assert_equal 1, Post.count
|
||||
assert_equal 'omg', p.title
|
||||
p = Post.first
|
||||
@ -36,7 +36,7 @@ class Post < ActiveRecord::Base
|
||||
test "models without table do not panic on scope definitions when loaded" do
|
||||
app_file "app/models/user.rb", <<-MODEL
|
||||
class User < ActiveRecord::Base
|
||||
default_scope where(:published => true)
|
||||
default_scope where(published: true)
|
||||
end
|
||||
MODEL
|
||||
|
||||
@ -76,8 +76,8 @@ class Post < ActiveRecord::Base
|
||||
|
||||
app_file 'config/routes.rb', <<-RUBY
|
||||
AppTemplate::Application.routes.draw do
|
||||
get '/load', :to => lambda { |env| [200, {}, Post.all] }
|
||||
get '/unload', :to => lambda { |env| [200, {}, []] }
|
||||
get '/load', to: lambda { |env| [200, {}, Post.all] }
|
||||
get '/unload', to: lambda { |env| [200, {}, []] }
|
||||
end
|
||||
RUBY
|
||||
|
||||
@ -106,7 +106,7 @@ class Post < ActiveRecord::Base
|
||||
|
||||
app_file 'config/routes.rb', <<-RUBY
|
||||
AppTemplate::Application.routes.draw do
|
||||
get '/c', :to => lambda { |env| [200, {"Content-Type" => "text/plain"}, [User.counter.to_s]] }
|
||||
get '/c', to: lambda { |env| [200, {"Content-Type" => "text/plain"}, [User.counter.to_s]] }
|
||||
end
|
||||
RUBY
|
||||
|
||||
@ -145,7 +145,7 @@ def updated?; false; end
|
||||
|
||||
app_file 'config/routes.rb', <<-RUBY
|
||||
AppTemplate::Application.routes.draw do
|
||||
get '/c', :to => lambda { |env| [200, {"Content-Type" => "text/plain"}, [User.counter.to_s]] }
|
||||
get '/c', to: lambda { |env| [200, {"Content-Type" => "text/plain"}, [User.counter.to_s]] }
|
||||
end
|
||||
RUBY
|
||||
|
||||
@ -181,7 +181,7 @@ def self.counter; 2; end
|
||||
app_file 'config/routes.rb', <<-RUBY
|
||||
$counter = 0
|
||||
AppTemplate::Application.routes.draw do
|
||||
get '/c', :to => lambda { |env| User; [200, {"Content-Type" => "text/plain"}, [$counter.to_s]] }
|
||||
get '/c', to: lambda { |env| User; [200, {"Content-Type" => "text/plain"}, [$counter.to_s]] }
|
||||
end
|
||||
RUBY
|
||||
|
||||
@ -212,8 +212,8 @@ class User
|
||||
|
||||
app_file 'config/routes.rb', <<-RUBY
|
||||
AppTemplate::Application.routes.draw do
|
||||
get '/title', :to => lambda { |env| [200, {"Content-Type" => "text/plain"}, [Post.new.title]] }
|
||||
get '/body', :to => lambda { |env| [200, {"Content-Type" => "text/plain"}, [Post.new.body]] }
|
||||
get '/title', to: lambda { |env| [200, {"Content-Type" => "text/plain"}, [Post.new.title]] }
|
||||
get '/body', to: lambda { |env| [200, {"Content-Type" => "text/plain"}, [Post.new.body]] }
|
||||
end
|
||||
RUBY
|
||||
|
||||
@ -229,7 +229,7 @@ class Post < ActiveRecord::Base
|
||||
class CreatePosts < ActiveRecord::Migration
|
||||
def change
|
||||
create_table :posts do |t|
|
||||
t.string :title, :default => "TITLE"
|
||||
t.string :title, default: "TITLE"
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -244,7 +244,7 @@ def change
|
||||
app_file "db/migrate/2_add_body_to_posts.rb", <<-MIGRATION
|
||||
class AddBodyToPosts < ActiveRecord::Migration
|
||||
def change
|
||||
add_column :posts, :body, :text, :default => "BODY"
|
||||
add_column :posts, :body, :text, default: "BODY"
|
||||
end
|
||||
end
|
||||
MIGRATION
|
||||
@ -297,9 +297,9 @@ def test_initialize_can_be_called_at_any_time
|
||||
protected
|
||||
|
||||
def setup_ar!
|
||||
ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
|
||||
ActiveRecord::Base.establish_connection(adapter: "sqlite3", database: ":memory:")
|
||||
ActiveRecord::Migration.verbose = false
|
||||
ActiveRecord::Schema.define(:version => 1) do
|
||||
ActiveRecord::Schema.define(version: 1) do
|
||||
create_table :posts do |t|
|
||||
t.string :title
|
||||
end
|
||||
|
@ -19,17 +19,17 @@ def simple_controller
|
||||
controller :expires, <<-RUBY
|
||||
class ExpiresController < ApplicationController
|
||||
def expires_header
|
||||
expires_in 10, :public => !params[:private]
|
||||
render :text => SecureRandom.hex(16)
|
||||
expires_in 10, public: !params[:private]
|
||||
render text: SecureRandom.hex(16)
|
||||
end
|
||||
|
||||
def expires_etag
|
||||
render_conditionally(:etag => "1")
|
||||
render_conditionally(etag: "1")
|
||||
end
|
||||
|
||||
def expires_last_modified
|
||||
$last_modified ||= Time.now.utc
|
||||
render_conditionally(:last_modified => $last_modified)
|
||||
render_conditionally(last_modified: $last_modified)
|
||||
end
|
||||
|
||||
def keeps_if_modified_since
|
||||
@ -37,8 +37,8 @@ def keeps_if_modified_since
|
||||
end
|
||||
private
|
||||
def render_conditionally(headers)
|
||||
if stale?(headers.merge(:public => !params[:private]))
|
||||
render :text => SecureRandom.hex(16)
|
||||
if stale?(headers.merge(public: !params[:private]))
|
||||
render text: SecureRandom.hex(16)
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -96,13 +96,13 @@ def test_cache_works_with_expires
|
||||
def test_cache_works_with_expires_private
|
||||
simple_controller
|
||||
|
||||
get "/expires/expires_header", :private => true
|
||||
get "/expires/expires_header", private: true
|
||||
assert_equal "miss", last_response.headers["X-Rack-Cache"]
|
||||
assert_equal "private, max-age=10", last_response.headers["Cache-Control"]
|
||||
|
||||
body = last_response.body
|
||||
|
||||
get "/expires/expires_header", :private => true
|
||||
get "/expires/expires_header", private: true
|
||||
assert_equal "miss", last_response.headers["X-Rack-Cache"]
|
||||
assert_not_equal body, last_response.body
|
||||
end
|
||||
@ -125,14 +125,14 @@ def test_cache_works_with_etags
|
||||
def test_cache_works_with_etags_private
|
||||
simple_controller
|
||||
|
||||
get "/expires/expires_etag", :private => true
|
||||
get "/expires/expires_etag", private: true
|
||||
assert_equal "miss", last_response.headers["X-Rack-Cache"]
|
||||
assert_equal "must-revalidate, private, max-age=0", last_response.headers["Cache-Control"]
|
||||
|
||||
body = last_response.body
|
||||
etag = last_response.headers["ETag"]
|
||||
|
||||
get "/expires/expires_etag", {:private => true}, "If-None-Match" => etag
|
||||
get "/expires/expires_etag", {private: true}, "If-None-Match" => etag
|
||||
assert_equal "miss", last_response.headers["X-Rack-Cache"]
|
||||
assert_not_equal body, last_response.body
|
||||
end
|
||||
@ -155,14 +155,14 @@ def test_cache_works_with_last_modified
|
||||
def test_cache_works_with_last_modified_private
|
||||
simple_controller
|
||||
|
||||
get "/expires/expires_last_modified", :private => true
|
||||
get "/expires/expires_last_modified", private: true
|
||||
assert_equal "miss", last_response.headers["X-Rack-Cache"]
|
||||
assert_equal "must-revalidate, private, max-age=0", last_response.headers["Cache-Control"]
|
||||
|
||||
body = last_response.body
|
||||
last = last_response.headers["Last-Modified"]
|
||||
|
||||
get "/expires/expires_last_modified", {:private => true}, "If-Modified-Since" => last
|
||||
get "/expires/expires_last_modified", {private: true}, "If-Modified-Since" => last
|
||||
assert_equal "miss", last_response.headers["X-Rack-Cache"]
|
||||
assert_not_equal body, last_response.body
|
||||
end
|
||||
|
@ -36,7 +36,7 @@ def index
|
||||
flash[:notice] = "notice"
|
||||
end
|
||||
|
||||
render :nothing => true
|
||||
render nothing: true
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -81,10 +81,10 @@ def app
|
||||
|
||||
test "ActionDispatch::SSL is configured with options when given" do
|
||||
add_to_config "config.force_ssl = true"
|
||||
add_to_config "config.ssl_options = { :host => 'example.com' }"
|
||||
add_to_config "config.ssl_options = { host: 'example.com' }"
|
||||
boot!
|
||||
|
||||
assert_equal AppTemplate::Application.middleware.first.args, [{:host => 'example.com'}]
|
||||
assert_equal AppTemplate::Application.middleware.first.args, [{host: 'example.com'}]
|
||||
end
|
||||
|
||||
test "removing Active Record omits its middleware" do
|
||||
@ -169,9 +169,9 @@ def app
|
||||
class ::OmgController < ActionController::Base
|
||||
def index
|
||||
if params[:nothing]
|
||||
render :text => ""
|
||||
render text: ""
|
||||
else
|
||||
render :text => "OMG"
|
||||
render text: "OMG"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -46,7 +46,7 @@ def test_initializers_are_executed_in_rake_tasks
|
||||
end
|
||||
|
||||
rake_tasks do
|
||||
task :do_nothing => :environment do
|
||||
task do_nothing: :environment do
|
||||
end
|
||||
end
|
||||
RUBY
|
||||
@ -60,7 +60,7 @@ def test_does_not_explode_when_accessing_a_model_with_eager_load
|
||||
config.eager_load = true
|
||||
|
||||
rake_tasks do
|
||||
task :do_nothing => :environment do
|
||||
task do_nothing: :environment do
|
||||
Hello.new.world
|
||||
end
|
||||
end
|
||||
@ -109,7 +109,7 @@ def test_rake_test_error_output
|
||||
def test_rake_routes_calls_the_route_inspector
|
||||
app_file "config/routes.rb", <<-RUBY
|
||||
AppTemplate::Application.routes.draw do
|
||||
get '/cart', :to => 'cart#show'
|
||||
get '/cart', to: 'cart#show'
|
||||
end
|
||||
RUBY
|
||||
assert_equal "cart GET /cart(.:format) cart#show\n", Dir.chdir(app_path){ `rake routes` }
|
||||
@ -118,7 +118,7 @@ def test_rake_routes_calls_the_route_inspector
|
||||
def test_logger_is_flushed_when_exiting_production_rake_tasks
|
||||
add_to_config <<-RUBY
|
||||
rake_tasks do
|
||||
task :log_something => :environment do
|
||||
task log_something: :environment do
|
||||
Rails.logger.error("Sample log message")
|
||||
end
|
||||
end
|
||||
@ -233,7 +233,7 @@ def test_load_activerecord_base_when_we_use_observers
|
||||
|
||||
app_file "lib/tasks/count_user.rake", <<-RUBY
|
||||
namespace :user do
|
||||
task :count => :environment do
|
||||
task count: :environment do
|
||||
puts User.count
|
||||
end
|
||||
end
|
||||
|
@ -50,7 +50,7 @@ def teardown
|
||||
controller :foo, <<-RUBY
|
||||
class FooController < ApplicationController
|
||||
def index
|
||||
render :inline => "<%= foo_or_bar? %>"
|
||||
render inline: "<%= foo_or_bar? %>"
|
||||
end
|
||||
end
|
||||
RUBY
|
||||
@ -76,7 +76,7 @@ def foo_or_bar?
|
||||
test "mount rack app" do
|
||||
app_file 'config/routes.rb', <<-RUBY
|
||||
AppTemplate::Application.routes.draw do
|
||||
mount lambda { |env| [200, {}, [env["PATH_INFO"]]] }, :at => "/blog"
|
||||
mount lambda { |env| [200, {}, [env["PATH_INFO"]]] }, at: "/blog"
|
||||
# The line below is required because mount sometimes
|
||||
# fails when a resource route is added.
|
||||
resource :user
|
||||
@ -91,7 +91,7 @@ def foo_or_bar?
|
||||
controller :foo, <<-RUBY
|
||||
class FooController < ApplicationController
|
||||
def index
|
||||
render :text => "foo"
|
||||
render text: "foo"
|
||||
end
|
||||
end
|
||||
RUBY
|
||||
@ -99,7 +99,7 @@ def index
|
||||
controller :bar, <<-RUBY
|
||||
class BarController < ActionController::Base
|
||||
def index
|
||||
render :text => "bar"
|
||||
render text: "bar"
|
||||
end
|
||||
end
|
||||
RUBY
|
||||
@ -121,7 +121,7 @@ def index
|
||||
controller 'foo', <<-RUBY
|
||||
class FooController < ApplicationController
|
||||
def index
|
||||
render :text => "foo"
|
||||
render text: "foo"
|
||||
end
|
||||
end
|
||||
RUBY
|
||||
@ -130,7 +130,7 @@ def index
|
||||
module Admin
|
||||
class FooController < ApplicationController
|
||||
def index
|
||||
render :text => "admin::foo"
|
||||
render text: "admin::foo"
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -138,8 +138,8 @@ def index
|
||||
|
||||
app_file 'config/routes.rb', <<-RUBY
|
||||
AppTemplate::Application.routes.draw do
|
||||
get 'admin/foo', :to => 'admin/foo#index'
|
||||
get 'foo', :to => 'foo#index'
|
||||
get 'admin/foo', to: 'admin/foo#index'
|
||||
get 'foo', to: 'foo#index'
|
||||
end
|
||||
RUBY
|
||||
|
||||
@ -183,18 +183,18 @@ def index
|
||||
controller :foo, <<-RUBY
|
||||
class FooController < ApplicationController
|
||||
def bar
|
||||
render :text => "bar"
|
||||
render text: "bar"
|
||||
end
|
||||
|
||||
def baz
|
||||
render :text => "baz"
|
||||
render text: "baz"
|
||||
end
|
||||
end
|
||||
RUBY
|
||||
|
||||
app_file 'config/routes.rb', <<-RUBY
|
||||
AppTemplate::Application.routes.draw do
|
||||
get 'foo', :to => 'foo#bar'
|
||||
get 'foo', to: 'foo#bar'
|
||||
end
|
||||
RUBY
|
||||
|
||||
@ -205,7 +205,7 @@ def baz
|
||||
|
||||
app_file 'config/routes.rb', <<-RUBY
|
||||
AppTemplate::Application.routes.draw do
|
||||
get 'foo', :to => 'foo#baz'
|
||||
get 'foo', to: 'foo#baz'
|
||||
end
|
||||
RUBY
|
||||
|
||||
@ -226,7 +226,7 @@ def baz
|
||||
|
||||
app_file 'config/routes.rb', <<-RUBY
|
||||
AppTemplate::Application.routes.draw do
|
||||
get 'foo', :to => ::InitializeRackApp
|
||||
get 'foo', to: ::InitializeRackApp
|
||||
end
|
||||
RUBY
|
||||
|
||||
@ -257,7 +257,7 @@ def baz
|
||||
controller 'yazilar', <<-RUBY
|
||||
class YazilarController < ApplicationController
|
||||
def index
|
||||
render :text => 'yazilar#index'
|
||||
render text: 'yazilar#index'
|
||||
end
|
||||
end
|
||||
RUBY
|
||||
|
@ -15,7 +15,7 @@ def app
|
||||
|
||||
class MyApp < Rails::Application
|
||||
config.secret_token = "3b7cd727ee24e8444053437c36cc66c4"
|
||||
config.session_store :cookie_store, :key => "_myapp_session"
|
||||
config.session_store :cookie_store, key: "_myapp_session"
|
||||
config.active_support.deprecation = :log
|
||||
end
|
||||
|
||||
@ -26,12 +26,12 @@ class ::ApplicationController < ActionController::Base
|
||||
|
||||
class ::OmgController < ::ApplicationController
|
||||
def index
|
||||
render :text => omg_path
|
||||
render text: omg_path
|
||||
end
|
||||
end
|
||||
|
||||
MyApp.routes.draw do
|
||||
get "/" => "omg#index", :as => :omg
|
||||
get "/" => "omg#index", as: :omg
|
||||
end
|
||||
|
||||
require 'rack/test'
|
||||
|
@ -58,8 +58,8 @@ def test_console_with_environment
|
||||
end
|
||||
|
||||
def test_console_defaults_to_IRB
|
||||
config = mock("config", :console => nil)
|
||||
app = mock("app", :config => config)
|
||||
config = mock("config", console: nil)
|
||||
app = mock("app", config: config)
|
||||
app.expects(:load_console).returns(nil)
|
||||
|
||||
assert_equal IRB, Rails::Console.new(app).console
|
||||
@ -115,8 +115,8 @@ def start(argv = [])
|
||||
|
||||
def app
|
||||
@app ||= begin
|
||||
config = mock("config", :console => FakeConsole)
|
||||
app = mock("app", :config => config)
|
||||
config = mock("config", console: FakeConsole)
|
||||
app = mock("app", config: config)
|
||||
app.stubs(:sandbox=).returns(nil)
|
||||
app.expects(:load_console)
|
||||
app
|
||||
|
@ -4,7 +4,7 @@ def test
|
||||
append_file "Rakefile", <<-EOF
|
||||
# spec tasks in rakefile
|
||||
|
||||
task :default => :spec
|
||||
task default: :spec
|
||||
EOF
|
||||
end
|
||||
|
||||
|
@ -99,7 +99,7 @@ def test_environment_should_include_data_in_environment_initializer_block
|
||||
def test_environment_should_include_data_in_environment_initializer_block_with_env_option
|
||||
run_generator
|
||||
autoload_paths = 'config.autoload_paths += %w["#{Rails.root}/app/extras"]'
|
||||
action :environment, autoload_paths, :env => 'development'
|
||||
action :environment, autoload_paths, env: 'development'
|
||||
assert_file "config/environments/development.rb", /Application\.configure do\n #{Regexp.escape(autoload_paths)}/
|
||||
end
|
||||
|
||||
@ -124,7 +124,7 @@ def test_git_with_symbol_should_run_command_using_git_scm
|
||||
|
||||
def test_git_with_hash_should_run_each_command_using_git_scm
|
||||
generator.expects(:run).times(2)
|
||||
action :git, :rm => 'README', :add => '.'
|
||||
action :git, rm: 'README', add: '.'
|
||||
end
|
||||
|
||||
def test_vendor_should_write_data_to_file_in_vendor
|
||||
@ -138,8 +138,8 @@ def test_lib_should_write_data_to_file_in_lib
|
||||
end
|
||||
|
||||
def test_rakefile_should_write_date_to_file_in_lib_tasks
|
||||
action :rakefile, 'myapp.rake', 'task :run => [:environment]'
|
||||
assert_file 'lib/tasks/myapp.rake', 'task :run => [:environment]'
|
||||
action :rakefile, 'myapp.rake', 'task run: [:environment]'
|
||||
assert_file 'lib/tasks/myapp.rake', 'task run: [:environment]'
|
||||
end
|
||||
|
||||
def test_initializer_should_write_date_to_file_in_config_initializers
|
||||
@ -148,12 +148,12 @@ def test_initializer_should_write_date_to_file_in_config_initializers
|
||||
end
|
||||
|
||||
def test_generate_should_run_script_generate_with_argument_and_options
|
||||
generator.expects(:run_ruby_script).once.with('script/rails generate model MyModel', :verbose => false)
|
||||
generator.expects(:run_ruby_script).once.with('script/rails generate model MyModel', verbose: false)
|
||||
action :generate, 'model', 'MyModel'
|
||||
end
|
||||
|
||||
def test_rake_should_run_rake_command_with_default_env
|
||||
generator.expects(:run).once.with("rake log:clear RAILS_ENV=development", :verbose => false)
|
||||
generator.expects(:run).once.with("rake log:clear RAILS_ENV=development", verbose: false)
|
||||
old_env, ENV['RAILS_ENV'] = ENV["RAILS_ENV"], nil
|
||||
action :rake, 'log:clear'
|
||||
ensure
|
||||
@ -161,12 +161,12 @@ def test_rake_should_run_rake_command_with_default_env
|
||||
end
|
||||
|
||||
def test_rake_with_env_option_should_run_rake_command_in_env
|
||||
generator.expects(:run).once.with('rake log:clear RAILS_ENV=production', :verbose => false)
|
||||
action :rake, 'log:clear', :env => 'production'
|
||||
generator.expects(:run).once.with('rake log:clear RAILS_ENV=production', verbose: false)
|
||||
action :rake, 'log:clear', env: 'production'
|
||||
end
|
||||
|
||||
def test_rake_with_rails_env_variable_should_run_rake_command_in_env
|
||||
generator.expects(:run).once.with('rake log:clear RAILS_ENV=production', :verbose => false)
|
||||
generator.expects(:run).once.with('rake log:clear RAILS_ENV=production', verbose: false)
|
||||
old_env, ENV["RAILS_ENV"] = ENV["RAILS_ENV"], "production"
|
||||
action :rake, 'log:clear'
|
||||
ensure
|
||||
@ -174,29 +174,29 @@ def test_rake_with_rails_env_variable_should_run_rake_command_in_env
|
||||
end
|
||||
|
||||
def test_env_option_should_win_over_rails_env_variable_when_running_rake
|
||||
generator.expects(:run).once.with('rake log:clear RAILS_ENV=production', :verbose => false)
|
||||
generator.expects(:run).once.with('rake log:clear RAILS_ENV=production', verbose: false)
|
||||
old_env, ENV["RAILS_ENV"] = ENV["RAILS_ENV"], "staging"
|
||||
action :rake, 'log:clear', :env => 'production'
|
||||
action :rake, 'log:clear', env: 'production'
|
||||
ensure
|
||||
ENV["RAILS_ENV"] = old_env
|
||||
end
|
||||
|
||||
def test_rake_with_sudo_option_should_run_rake_command_with_sudo
|
||||
generator.expects(:run).once.with("sudo rake log:clear RAILS_ENV=development", :verbose => false)
|
||||
generator.expects(:run).once.with("sudo rake log:clear RAILS_ENV=development", verbose: false)
|
||||
old_env, ENV['RAILS_ENV'] = ENV["RAILS_ENV"], nil
|
||||
action :rake, 'log:clear', :sudo => true
|
||||
action :rake, 'log:clear', sudo: true
|
||||
ensure
|
||||
ENV["RAILS_ENV"] = old_env
|
||||
end
|
||||
|
||||
def test_capify_should_run_the_capify_command
|
||||
generator.expects(:run).once.with('capify .', :verbose => false)
|
||||
generator.expects(:run).once.with('capify .', verbose: false)
|
||||
action :capify!
|
||||
end
|
||||
|
||||
def test_route_should_add_data_to_the_routes_block_in_config_routes
|
||||
run_generator
|
||||
route_command = "route '/login', :controller => 'sessions', :action => 'new'"
|
||||
route_command = "route '/login', controller: 'sessions', action: 'new'"
|
||||
action :route, route_command
|
||||
assert_file 'config/routes.rb', /#{Regexp.escape(route_command)}/
|
||||
end
|
||||
@ -208,7 +208,7 @@ def test_readme
|
||||
end
|
||||
|
||||
def test_readme_with_quiet
|
||||
generator(default_arguments, :quiet => true)
|
||||
generator(default_arguments, quiet: true)
|
||||
run_generator
|
||||
Rails::Generators::AppGenerator.expects(:source_root).times(2).returns(destination_root)
|
||||
assert_no_match(/Welcome to Rails/, action(:readme, "README.rdoc"))
|
||||
@ -223,12 +223,12 @@ def test_log_with_status
|
||||
end
|
||||
|
||||
def test_log_with_quiet
|
||||
generator(default_arguments, :quiet => true)
|
||||
generator(default_arguments, quiet: true)
|
||||
assert_equal("", action(:log, "YES"))
|
||||
end
|
||||
|
||||
def test_log_with_status_with_quiet
|
||||
generator(default_arguments, :quiet => true)
|
||||
generator(default_arguments, quiet: true)
|
||||
assert_equal("", action(:log, :yes, "YES"))
|
||||
end
|
||||
|
||||
|
@ -107,8 +107,8 @@ def test_application_name_is_detected_if_it_exists_and_app_folder_renamed
|
||||
|
||||
FileUtils.mv(app_root, app_moved_root)
|
||||
|
||||
generator = Rails::Generators::AppGenerator.new ["rails"], { :with_dispatchers => true },
|
||||
:destination_root => app_moved_root, :shell => @shell
|
||||
generator = Rails::Generators::AppGenerator.new ["rails"], { with_dispatchers: true },
|
||||
destination_root: app_moved_root, shell: @shell
|
||||
generator.send(:app_const)
|
||||
quietly { generator.send(:create_config_files) }
|
||||
assert_file "myapp_moved/config/environment.rb", /Myapp::Application\.initialize!/
|
||||
@ -123,7 +123,7 @@ def test_rails_update_generates_correct_session_key
|
||||
Rails.application.class.stubs(:name).returns("Myapp")
|
||||
Rails.application.stubs(:is_a?).returns(Rails::Application)
|
||||
|
||||
generator = Rails::Generators::AppGenerator.new ["rails"], { :with_dispatchers => true }, :destination_root => app_root, :shell => @shell
|
||||
generator = Rails::Generators::AppGenerator.new ["rails"], { with_dispatchers: true }, destination_root: app_root, shell: @shell
|
||||
generator.send(:app_const)
|
||||
quietly { generator.send(:create_config_files) }
|
||||
assert_file "myapp/config/initializers/session_store.rb", /_myapp_session/
|
||||
|
@ -242,19 +242,19 @@ def test_migration_is_ignored_as_identical_with_skip_option
|
||||
|
||||
def test_migration_is_skipped_on_skip_behavior
|
||||
run_generator
|
||||
output = run_generator ["Account"], :behavior => :skip
|
||||
output = run_generator ["Account"], behavior: :skip
|
||||
assert_match %r{skip\s+db/migrate/\d+_create_accounts.rb}, output
|
||||
end
|
||||
|
||||
def test_migration_error_is_not_shown_on_revoke
|
||||
run_generator
|
||||
error = capture(:stderr){ run_generator ["Account"], :behavior => :revoke }
|
||||
error = capture(:stderr){ run_generator ["Account"], behavior: :revoke }
|
||||
assert_no_match(/Another migration is already named create_accounts/, error)
|
||||
end
|
||||
|
||||
def test_migration_is_removed_on_revoke
|
||||
run_generator
|
||||
run_generator ["Account"], :behavior => :revoke
|
||||
run_generator ["Account"], behavior: :revoke
|
||||
assert_no_migration "db/migrate/create_accounts.rb"
|
||||
end
|
||||
|
||||
|
@ -263,7 +263,7 @@ def test_scaffold_on_invoke
|
||||
|
||||
def test_scaffold_on_revoke
|
||||
run_generator
|
||||
run_generator ["product_line"], :behavior => :revoke
|
||||
run_generator ["product_line"], behavior: :revoke
|
||||
|
||||
# Model
|
||||
assert_no_file "app/models/test_app/product_line.rb"
|
||||
@ -335,7 +335,7 @@ def test_scaffold_with_namespace_on_invoke
|
||||
|
||||
def test_scaffold_with_namespace_on_revoke
|
||||
run_generator [ "admin/role", "name:string", "description:string" ]
|
||||
run_generator [ "admin/role" ], :behavior => :revoke
|
||||
run_generator [ "admin/role" ], behavior: :revoke
|
||||
|
||||
# Model
|
||||
assert_file "app/models/test_app/admin.rb" # ( should not be remove )
|
||||
@ -408,7 +408,7 @@ def test_scaffold_with_nested_namespace_on_invoke
|
||||
|
||||
def test_scaffold_with_nested_namespace_on_revoke
|
||||
run_generator [ "admin/user/special/role", "name:string", "description:string" ]
|
||||
run_generator [ "admin/user/special/role" ], :behavior => :revoke
|
||||
run_generator [ "admin/user/special/role" ], behavior: :revoke
|
||||
|
||||
# Model
|
||||
assert_file "app/models/test_app/admin/user/special.rb" # ( should not be remove )
|
||||
|
@ -20,12 +20,12 @@ class OrmTest < Rails::Generators::TestCase
|
||||
tests Rails::Generators::ScaffoldControllerGenerator
|
||||
|
||||
def test_orm_class_returns_custom_generator_if_supported_custom_orm_set
|
||||
g = generator ["Foo"], :orm => "ORMWithGenerators"
|
||||
g = generator ["Foo"], orm: "ORMWithGenerators"
|
||||
assert_equal ORMWithGenerators::Generators::ActiveModel, g.send(:orm_class)
|
||||
end
|
||||
|
||||
def test_orm_class_returns_rails_generator_if_unsupported_custom_orm_set
|
||||
g = generator ["Foo"], :orm => "ORMWithoutGenerators"
|
||||
g = generator ["Foo"], orm: "ORMWithoutGenerators"
|
||||
assert_equal Rails::Generators::ActiveModel, g.send(:orm_class)
|
||||
end
|
||||
|
||||
|
@ -379,7 +379,7 @@ def test_overriding_test_framework
|
||||
run_generator([destination_root, "-b", "#{Rails.root}/lib/plugin_builders/spec_builder.rb"])
|
||||
assert_file 'spec/spec_helper.rb'
|
||||
assert_file 'spec/dummy'
|
||||
assert_file 'Rakefile', /task :default => :spec/
|
||||
assert_file 'Rakefile', /task default: :spec/
|
||||
assert_file 'Rakefile', /# spec tasks in rakefile/
|
||||
end
|
||||
|
||||
|
@ -80,7 +80,7 @@ def test_mass_nouns_do_not_throw_warnings
|
||||
|
||||
def test_route_is_removed_on_revoke
|
||||
run_generator
|
||||
run_generator ["account"], :behavior => :revoke
|
||||
run_generator ["account"], behavior: :revoke
|
||||
|
||||
assert_file "config/routes.rb" do |route|
|
||||
assert_no_match(/resources :accounts$/, route)
|
||||
|
@ -99,7 +99,7 @@ def test_functional_tests_without_attributes
|
||||
|
||||
def test_scaffold_on_revoke
|
||||
run_generator
|
||||
run_generator ["product_line"], :behavior => :revoke
|
||||
run_generator ["product_line"], behavior: :revoke
|
||||
|
||||
# Model
|
||||
assert_no_file "app/models/product_line.rb"
|
||||
|
@ -87,7 +87,7 @@ def test_template_is_executed_when_supplied
|
||||
template = %{ say "It works!" }
|
||||
template.instance_eval "def read; self; end" # Make the string respond to read
|
||||
|
||||
generator([destination_root], :template => path).expects(:open).with(path, 'Accept' => 'application/x-thor-template').returns(template)
|
||||
generator([destination_root], template: path).expects(:open).with(path, 'Accept' => 'application/x-thor-template').returns(template)
|
||||
assert_match(/It works!/, capture(:stdout) { generator.invoke_all })
|
||||
end
|
||||
|
||||
@ -96,31 +96,31 @@ def test_template_is_executed_when_supplied_an_https_path
|
||||
template = %{ say "It works!" }
|
||||
template.instance_eval "def read; self; end" # Make the string respond to read
|
||||
|
||||
generator([destination_root], :template => path).expects(:open).with(path, 'Accept' => 'application/x-thor-template').returns(template)
|
||||
generator([destination_root], template: path).expects(:open).with(path, 'Accept' => 'application/x-thor-template').returns(template)
|
||||
assert_match(/It works!/, capture(:stdout) { generator.invoke_all })
|
||||
end
|
||||
|
||||
def test_dev_option
|
||||
generator([destination_root], :dev => true).expects(:bundle_command).with('install').once
|
||||
generator([destination_root], dev: true).expects(:bundle_command).with('install').once
|
||||
quietly { generator.invoke_all }
|
||||
rails_path = File.expand_path('../../..', Rails.root)
|
||||
assert_file 'Gemfile', /^gem\s+["']rails["'],\s+path:\s+["']#{Regexp.escape(rails_path)}["']$/
|
||||
end
|
||||
|
||||
def test_edge_option
|
||||
generator([destination_root], :edge => true).expects(:bundle_command).with('install').once
|
||||
generator([destination_root], edge: true).expects(:bundle_command).with('install').once
|
||||
quietly { generator.invoke_all }
|
||||
assert_file 'Gemfile', %r{^gem\s+["']rails["'],\s+github:\s+["']#{Regexp.escape("rails/rails")}["']$}
|
||||
end
|
||||
|
||||
def test_skip_gemfile
|
||||
generator([destination_root], :skip_gemfile => true).expects(:bundle_command).never
|
||||
generator([destination_root], skip_gemfile: true).expects(:bundle_command).never
|
||||
quietly { generator.invoke_all }
|
||||
assert_no_file 'Gemfile'
|
||||
end
|
||||
|
||||
def test_skip_bundle
|
||||
generator([destination_root], :skip_bundle => true).expects(:bundle_command).never
|
||||
generator([destination_root], skip_bundle: true).expects(:bundle_command).never
|
||||
quietly { generator.invoke_all }
|
||||
|
||||
# skip_bundle is only about running bundle install, ensure the Gemfile is still
|
||||
@ -192,7 +192,7 @@ def test_builder_option_with_http
|
||||
template = "class #{builder_class}; end"
|
||||
template.instance_eval "def read; self; end" # Make the string respond to read
|
||||
|
||||
generator([destination_root], :builder => url).expects(:open).with(url, 'Accept' => 'application/x-thor-template').returns(template)
|
||||
generator([destination_root], builder: url).expects(:open).with(url, 'Accept' => 'application/x-thor-template').returns(template)
|
||||
quietly { generator.invoke_all }
|
||||
|
||||
default_files.each{ |path| assert_no_file(path) }
|
||||
|
@ -43,8 +43,8 @@ def test_invoke_with_default_values
|
||||
end
|
||||
|
||||
def test_invoke_with_config_values
|
||||
Rails::Generators::ModelGenerator.expects(:start).with(["Account"], :behavior => :skip)
|
||||
Rails::Generators.invoke :model, ["Account"], :behavior => :skip
|
||||
Rails::Generators::ModelGenerator.expects(:start).with(["Account"], behavior: :skip)
|
||||
Rails::Generators.invoke :model, ["Account"], behavior: :skip
|
||||
end
|
||||
|
||||
def test_find_by_namespace
|
||||
@ -165,7 +165,7 @@ def test_nested_fallbacks_for_generators
|
||||
end
|
||||
|
||||
def test_developer_options_are_overwriten_by_user_options
|
||||
Rails::Generators.options[:with_options] = { :generate => false }
|
||||
Rails::Generators.options[:with_options] = { generate: false }
|
||||
|
||||
self.class.class_eval(<<-end_eval, __FILE__, __LINE__ + 1)
|
||||
class WithOptionsGenerator < Rails::Generators::Base
|
||||
@ -186,7 +186,7 @@ def test_rails_root_templates
|
||||
File.open(template, 'w'){ |f| f.write "empty" }
|
||||
|
||||
capture(:stdout) do
|
||||
Rails::Generators.invoke :model, ["user"], :destination_root => destination_root
|
||||
Rails::Generators.invoke :model, ["user"], destination_root: destination_root
|
||||
end
|
||||
|
||||
assert_file "app/models/user.rb" do |content|
|
||||
|
@ -43,17 +43,17 @@ class Parent
|
||||
class Child < Parent
|
||||
include Rails::Initializable
|
||||
|
||||
initializer :three, :before => :one do
|
||||
initializer :three, before: :one do
|
||||
$arr << 3
|
||||
end
|
||||
|
||||
initializer :four, :after => :one, :before => :two do
|
||||
initializer :four, after: :one, before: :two do
|
||||
$arr << 4
|
||||
end
|
||||
end
|
||||
|
||||
class Parent
|
||||
initializer :five, :before => :one do
|
||||
initializer :five, before: :one do
|
||||
$arr << 5
|
||||
end
|
||||
end
|
||||
@ -61,7 +61,7 @@ class Parent
|
||||
class Instance
|
||||
include Rails::Initializable
|
||||
|
||||
initializer :one, :group => :assets do
|
||||
initializer :one, group: :assets do
|
||||
$arr << 1
|
||||
end
|
||||
|
||||
@ -69,7 +69,7 @@ class Instance
|
||||
$arr << 2
|
||||
end
|
||||
|
||||
initializer :three, :group => :all do
|
||||
initializer :three, group: :all do
|
||||
$arr << 3
|
||||
end
|
||||
|
||||
@ -90,11 +90,11 @@ class OverriddenInitializer
|
||||
class MoreInitializers
|
||||
include Rails::Initializable
|
||||
|
||||
initializer :startup, :before => :last do
|
||||
initializer :startup, before: :last do
|
||||
$arr << 3
|
||||
end
|
||||
|
||||
initializer :terminate, :after => :first, :before => :startup do
|
||||
initializer :terminate, after: :first, before: :startup do
|
||||
$arr << two
|
||||
end
|
||||
|
||||
@ -134,11 +134,11 @@ class PluginA
|
||||
class PluginB
|
||||
include Rails::Initializable
|
||||
|
||||
initializer "plugin_b.startup", :after => "plugin_a.startup" do
|
||||
initializer "plugin_b.startup", after: "plugin_a.startup" do
|
||||
$arr << 2
|
||||
end
|
||||
|
||||
initializer "plugin_b.terminate", :before => "plugin_a.terminate" do
|
||||
initializer "plugin_b.terminate", before: "plugin_a.terminate" do
|
||||
$arr << 3
|
||||
end
|
||||
end
|
||||
|
@ -113,14 +113,14 @@ def build_app(options = {})
|
||||
routes = File.read("#{app_path}/config/routes.rb")
|
||||
if routes =~ /(\n\s*end\s*)\Z/
|
||||
File.open("#{app_path}/config/routes.rb", 'w') do |f|
|
||||
f.puts $` + "\nmatch ':controller(/:action(/:id))(.:format)', :via => :all\n" + $1
|
||||
f.puts $` + "\nmatch ':controller(/:action(/:id))(.:format)', via: :all\n" + $1
|
||||
end
|
||||
end
|
||||
|
||||
add_to_config <<-RUBY
|
||||
config.eager_load = false
|
||||
config.secret_token = "3b7cd727ee24e8444053437c36cc66c4"
|
||||
config.session_store :cookie_store, :key => "_myapp_session"
|
||||
config.session_store :cookie_store, key: "_myapp_session"
|
||||
config.active_support.deprecation = :log
|
||||
config.action_controller.allow_forgery_protection = false
|
||||
RUBY
|
||||
@ -139,7 +139,7 @@ def make_basic_app
|
||||
app = Class.new(Rails::Application)
|
||||
app.config.eager_load = false
|
||||
app.config.secret_token = "3b7cd727ee24e8444053437c36cc66c4"
|
||||
app.config.session_store :cookie_store, :key => "_myapp_session"
|
||||
app.config.session_store :cookie_store, key: "_myapp_session"
|
||||
app.config.active_support.deprecation = :log
|
||||
|
||||
yield app if block_given?
|
||||
@ -157,7 +157,7 @@ def simple_controller
|
||||
controller :foo, <<-RUBY
|
||||
class FooController < ApplicationController
|
||||
def index
|
||||
render :text => "foo"
|
||||
render text: "foo"
|
||||
end
|
||||
end
|
||||
RUBY
|
||||
|
@ -32,7 +32,7 @@ def setup
|
||||
end
|
||||
|
||||
test "creating a root level path with options" do
|
||||
@root.add "app", :with => "/foo/bar"
|
||||
@root.add "app", with: "/foo/bar"
|
||||
assert_equal ["/foo/bar"], @root["app"].to_a
|
||||
end
|
||||
|
||||
@ -52,18 +52,18 @@ def setup
|
||||
|
||||
test "creating a child level path with option" do
|
||||
@root.add "app"
|
||||
@root.add "app/models", :with => "/foo/bar/baz"
|
||||
@root.add "app/models", with: "/foo/bar/baz"
|
||||
assert_equal ["/foo/bar/baz"], @root["app/models"].to_a
|
||||
end
|
||||
|
||||
test "child level paths are relative from the root" do
|
||||
@root.add "app"
|
||||
@root.add "app/models", :with => "baz"
|
||||
@root.add "app/models", with: "baz"
|
||||
assert_equal ["/foo/bar/baz"], @root["app/models"].to_a
|
||||
end
|
||||
|
||||
test "adding multiple physical paths as an array" do
|
||||
@root.add "app", :with => ["/app", "/app2"]
|
||||
@root.add "app", with: ["/app", "/app2"]
|
||||
assert_equal ["/app", "/app2"], @root["app"].to_a
|
||||
end
|
||||
|
||||
@ -92,7 +92,7 @@ def setup
|
||||
end
|
||||
|
||||
test "it is possible to add a path that should be autoloaded only once" do
|
||||
@root.add "app", :with => "/app"
|
||||
@root.add "app", with: "/app"
|
||||
@root["app"].autoload_once!
|
||||
assert @root["app"].autoload_once?
|
||||
assert @root.autoload_once.include?(@root["app"].expanded.first)
|
||||
@ -109,13 +109,13 @@ def setup
|
||||
end
|
||||
|
||||
test "it is possible to add a path without assignment and specify it should be loaded only once" do
|
||||
@root.add "app", :with => "/app", :autoload_once => true
|
||||
@root.add "app", with: "/app", autoload_once: true
|
||||
assert @root["app"].autoload_once?
|
||||
assert @root.autoload_once.include?("/app")
|
||||
end
|
||||
|
||||
test "it is possible to add multiple paths without assignment and specify it should be loaded only once" do
|
||||
@root.add "app", :with => ["/app", "/app2"], :autoload_once => true
|
||||
@root.add "app", with: ["/app", "/app2"], autoload_once: true
|
||||
assert @root["app"].autoload_once?
|
||||
assert @root.autoload_once.include?("/app")
|
||||
assert @root.autoload_once.include?("/app2")
|
||||
@ -153,20 +153,20 @@ def setup
|
||||
end
|
||||
|
||||
test "it is possible to add a path without assignment and mark it as eager" do
|
||||
@root.add "app", :with => "/app", :eager_load => true
|
||||
@root.add "app", with: "/app", eager_load: true
|
||||
assert @root["app"].eager_load?
|
||||
assert @root.eager_load.include?("/app")
|
||||
end
|
||||
|
||||
test "it is possible to add multiple paths without assignment and mark them as eager" do
|
||||
@root.add "app", :with => ["/app", "/app2"], :eager_load => true
|
||||
@root.add "app", with: ["/app", "/app2"], eager_load: true
|
||||
assert @root["app"].eager_load?
|
||||
assert @root.eager_load.include?("/app")
|
||||
assert @root.eager_load.include?("/app2")
|
||||
end
|
||||
|
||||
test "it is possible to create a path without assignment and mark it both as eager and load once" do
|
||||
@root.add "app", :with => "/app", :eager_load => true, :autoload_once => true
|
||||
@root.add "app", with: "/app", eager_load: true, autoload_once: true
|
||||
assert @root["app"].eager_load?
|
||||
assert @root["app"].autoload_once?
|
||||
assert @root.eager_load.include?("/app")
|
||||
@ -194,12 +194,12 @@ def setup
|
||||
end
|
||||
|
||||
test "it should be possible to override a path's default glob without assignment" do
|
||||
@root.add "app", :with => "/app", :glob => "*.rb"
|
||||
@root.add "app", with: "/app", glob: "*.rb"
|
||||
assert_equal "*.rb", @root["app"].glob
|
||||
end
|
||||
|
||||
test "it should be possible to replace a path and persist the original paths glob" do
|
||||
@root.add "app", :glob => "*.rb"
|
||||
@root.add "app", glob: "*.rb"
|
||||
@root["app"] = "app2"
|
||||
assert_equal ["/foo/bar/app2"], @root["app"].to_a
|
||||
assert_equal "*.rb", @root["app"].glob
|
||||
@ -213,7 +213,7 @@ def setup
|
||||
end
|
||||
|
||||
test "a path can be added to the load path on creation" do
|
||||
@root.add "app", :with => "/app", :load_path => true
|
||||
@root.add "app", with: "/app", load_path: true
|
||||
assert @root["app"].load_path?
|
||||
assert_equal ["/app"], @root.load_paths
|
||||
end
|
||||
@ -226,7 +226,7 @@ def setup
|
||||
end
|
||||
|
||||
test "a path can be marked as autoload on creation" do
|
||||
@root.add "app", :with => "/app", :autoload => true
|
||||
@root.add "app", with: "/app", autoload: true
|
||||
assert @root["app"].autoload?
|
||||
assert_equal ["/app"], @root.autoload_paths
|
||||
end
|
||||
|
@ -21,19 +21,19 @@ def setup
|
||||
end
|
||||
|
||||
test "info controller does not allow remote requests" do
|
||||
@controller.stubs(:local_request? => false)
|
||||
@controller.stubs(local_request?: false)
|
||||
get :properties
|
||||
assert_response :forbidden
|
||||
end
|
||||
|
||||
test "info controller renders an error message when request was forbidden" do
|
||||
@controller.stubs(:local_request? => false)
|
||||
@controller.stubs(local_request?: false)
|
||||
get :properties
|
||||
assert_select 'p'
|
||||
end
|
||||
|
||||
test "info controller allows requests when all requests are considered local" do
|
||||
@controller.stubs(:local_request? => true)
|
||||
@controller.stubs(local_request?: true)
|
||||
get :properties
|
||||
assert_response :success
|
||||
end
|
||||
|
@ -285,8 +285,8 @@ def index
|
||||
|
||||
@plugin.write "config/routes.rb", <<-RUBY
|
||||
Rails.application.routes.draw do
|
||||
get 'foo', :to => 'bar#index'
|
||||
get 'bar', :to => 'bar#index'
|
||||
get 'foo', to: 'bar#index'
|
||||
get 'bar', to: 'bar#index'
|
||||
end
|
||||
RUBY
|
||||
|
||||
@ -366,7 +366,7 @@ def index
|
||||
Rails.application.routes.draw do
|
||||
namespace :admin do
|
||||
namespace :foo do
|
||||
get "bar", :to => "bar#index"
|
||||
get "bar", to: "bar#index"
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -375,7 +375,7 @@ def index
|
||||
@plugin.write "app/controllers/admin/foo/bar_controller.rb", <<-RUBY
|
||||
class Admin::Foo::BarController < ApplicationController
|
||||
def index
|
||||
render :text => "Rendered from namespace"
|
||||
render text: "Rendered from namespace"
|
||||
end
|
||||
end
|
||||
RUBY
|
||||
@ -487,14 +487,14 @@ class Engine < ::Rails::Engine
|
||||
controller "foo", <<-RUBY
|
||||
class FooController < ActionController::Base
|
||||
def index
|
||||
render :text => params[:username]
|
||||
render text: params[:username]
|
||||
end
|
||||
end
|
||||
RUBY
|
||||
|
||||
@plugin.write "config/routes.rb", <<-RUBY
|
||||
Bukkits::Engine.routes.draw do
|
||||
root :to => "foo#index"
|
||||
root to: "foo#index"
|
||||
end
|
||||
RUBY
|
||||
|
||||
@ -608,14 +608,14 @@ def to_param
|
||||
|
||||
app_file "config/routes.rb", <<-RUBY
|
||||
AppTemplate::Application.routes.draw do
|
||||
get "/bar" => "bar#index", :as => "bar"
|
||||
mount Bukkits::Engine => "/bukkits", :as => "bukkits"
|
||||
get "/bar" => "bar#index", as: "bar"
|
||||
mount Bukkits::Engine => "/bukkits", as: "bukkits"
|
||||
end
|
||||
RUBY
|
||||
|
||||
@plugin.write "config/routes.rb", <<-RUBY
|
||||
Bukkits::Engine.routes.draw do
|
||||
get "/foo" => "foo#index", :as => "foo"
|
||||
get "/foo" => "foo#index", as: "foo"
|
||||
get "/foo/show" => "foo#show"
|
||||
get "/from_app" => "foo#from_app"
|
||||
get "/routes_helpers_in_view" => "foo#routes_helpers_in_view"
|
||||
@ -643,23 +643,23 @@ def help_the_engine
|
||||
@plugin.write "app/controllers/bukkits/foo_controller.rb", <<-RUBY
|
||||
class Bukkits::FooController < ActionController::Base
|
||||
def index
|
||||
render :inline => "<%= help_the_engine %>"
|
||||
render inline: "<%= help_the_engine %>"
|
||||
end
|
||||
|
||||
def show
|
||||
render :text => foo_path
|
||||
render text: foo_path
|
||||
end
|
||||
|
||||
def from_app
|
||||
render :inline => "<%= (self.respond_to?(:bar_path) || self.respond_to?(:something)) %>"
|
||||
render inline: "<%= (self.respond_to?(:bar_path) || self.respond_to?(:something)) %>"
|
||||
end
|
||||
|
||||
def routes_helpers_in_view
|
||||
render :inline => "<%= foo_path %>, <%= main_app.bar_path %>"
|
||||
render :inline "<%= foo_path %>, <%= main_app.bar_path %>"
|
||||
end
|
||||
|
||||
def polymorphic_path_without_namespace
|
||||
render :text => polymorphic_path(Post.new)
|
||||
render text: polymorphic_path(Post.new)
|
||||
end
|
||||
end
|
||||
RUBY
|
||||
@ -726,7 +726,7 @@ def persisted?
|
||||
|
||||
app_file "config/routes.rb", <<-RUBY
|
||||
AppTemplate::Application.routes.draw do
|
||||
mount Bukkits::Engine => "/bukkits", :as => "bukkits"
|
||||
mount Bukkits::Engine => "/bukkits", as: "bukkits"
|
||||
end
|
||||
RUBY
|
||||
|
||||
@ -1033,11 +1033,11 @@ class Engine < ::Rails::Engine
|
||||
controller "main", <<-RUBY
|
||||
class MainController < ActionController::Base
|
||||
def foo
|
||||
render :inline => '<%= render :partial => "shared/foo" %>'
|
||||
render inline: '<%= render :partial => "shared/foo" %>'
|
||||
end
|
||||
|
||||
def bar
|
||||
render :inline => '<%= render :partial => "shared/bar" %>'
|
||||
render inline: '<%= render :partial => "shared/bar" %>'
|
||||
end
|
||||
end
|
||||
RUBY
|
||||
@ -1113,7 +1113,7 @@ class Engine < ::Rails::Engine
|
||||
controller "main", <<-RUBY
|
||||
class MainController < ActionController::Base
|
||||
def foo
|
||||
render :inline => '<%= render :partial => "shared/foo" %>'
|
||||
render inline: '<%= render :partial => "shared/foo" %>'
|
||||
end
|
||||
end
|
||||
RUBY
|
||||
@ -1167,7 +1167,7 @@ def index
|
||||
fullpath: \#{request.fullpath}
|
||||
path: \#{request.path}
|
||||
TEXT
|
||||
render :text => text
|
||||
render text: text
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -1205,7 +1205,7 @@ class Engine < ::Rails::Engine
|
||||
app_file "app/controllers/bar_controller.rb", <<-RUBY
|
||||
class BarController < ApplicationController
|
||||
def index
|
||||
render :text => bukkits.bukkit_path
|
||||
render text: bukkits.bukkit_path
|
||||
end
|
||||
end
|
||||
RUBY
|
||||
@ -1227,7 +1227,7 @@ def index
|
||||
@plugin.write "app/controllers/bukkits/bukkit_controller.rb", <<-RUBY
|
||||
class Bukkits::BukkitController < ActionController::Base
|
||||
def index
|
||||
render :text => main_app.bar_path
|
||||
render text: main_app.bar_path
|
||||
end
|
||||
end
|
||||
RUBY
|
||||
|
@ -46,7 +46,7 @@ def build_engine(is_mountable=false)
|
||||
f.write <<-GEMFILE.gsub(/^ {12}/, '')
|
||||
source "http://rubygems.org"
|
||||
|
||||
gem 'rails', :path => '#{RAILS_FRAMEWORK_ROOT}'
|
||||
gem 'rails', path: '#{RAILS_FRAMEWORK_ROOT}'
|
||||
gem 'sqlite3'
|
||||
GEMFILE
|
||||
end
|
||||
|
@ -42,14 +42,14 @@ class Engine < ::Rails::Engine
|
||||
|
||||
@simple_plugin.write "config/routes.rb", <<-RUBY
|
||||
Weblog::Engine.routes.draw do
|
||||
get '/weblog' => "weblogs#index", :as => 'weblogs'
|
||||
get '/weblog' => "weblogs#index", as: 'weblogs'
|
||||
end
|
||||
RUBY
|
||||
|
||||
@simple_plugin.write "app/controllers/weblogs_controller.rb", <<-RUBY
|
||||
class WeblogsController < ActionController::Base
|
||||
def index
|
||||
render :text => request.url
|
||||
render text: request.url
|
||||
end
|
||||
end
|
||||
RUBY
|
||||
@ -86,9 +86,9 @@ class Engine < ::Rails::Engine
|
||||
@plugin.write "config/routes.rb", <<-RUBY
|
||||
Blog::Engine.routes.draw do
|
||||
resources :posts
|
||||
get '/generate_application_route', :to => 'posts#generate_application_route'
|
||||
get '/application_route_in_view', :to => 'posts#application_route_in_view'
|
||||
get '/engine_polymorphic_path', :to => 'posts#engine_polymorphic_path'
|
||||
get '/generate_application_route', to: 'posts#generate_application_route'
|
||||
get '/application_route_in_view', to: 'posts#application_route_in_view'
|
||||
get '/engine_polymorphic_path', to: 'posts#engine_polymorphic_path'
|
||||
end
|
||||
RUBY
|
||||
|
||||
@ -96,22 +96,22 @@ class Engine < ::Rails::Engine
|
||||
module Blog
|
||||
class PostsController < ActionController::Base
|
||||
def index
|
||||
render :text => blog.post_path(1)
|
||||
render text: blog.post_path(1)
|
||||
end
|
||||
|
||||
def generate_application_route
|
||||
path = main_app.url_for(:controller => "/main",
|
||||
:action => "index",
|
||||
:only_path => true)
|
||||
render :text => path
|
||||
path = main_app.url_for(controller: "/main",
|
||||
action: "index",
|
||||
only_path: true)
|
||||
render text: path
|
||||
end
|
||||
|
||||
def application_route_in_view
|
||||
render :inline => "<%= main_app.root_path %>"
|
||||
render inline: "<%= main_app.root_path %>"
|
||||
end
|
||||
|
||||
def engine_polymorphic_path
|
||||
render :text => polymorphic_path(Post.new)
|
||||
render text: polymorphic_path(Post.new)
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -120,31 +120,31 @@ def engine_polymorphic_path
|
||||
app_file "app/controllers/application_generating_controller.rb", <<-RUBY
|
||||
class ApplicationGeneratingController < ActionController::Base
|
||||
def engine_route
|
||||
render :text => blog.posts_path
|
||||
render text: blog.posts_path
|
||||
end
|
||||
|
||||
def engine_route_in_view
|
||||
render :inline => "<%= blog.posts_path %>"
|
||||
render inline: "<%= blog.posts_path %>"
|
||||
end
|
||||
|
||||
def weblog_engine_route
|
||||
render :text => weblog.weblogs_path
|
||||
render text: weblog.weblogs_path
|
||||
end
|
||||
|
||||
def weblog_engine_route_in_view
|
||||
render :inline => "<%= weblog.weblogs_path %>"
|
||||
render inline: "<%= weblog.weblogs_path %>"
|
||||
end
|
||||
|
||||
def url_for_engine_route
|
||||
render :text => blog.url_for(:controller => "blog/posts", :action => "index", :user => "john", :only_path => true)
|
||||
render text: blog.url_for(controller: "blog/posts", action: "index", user: "john", only_path: true)
|
||||
end
|
||||
|
||||
def polymorphic_route
|
||||
render :text => polymorphic_url([blog, Blog::Post.new])
|
||||
render text: polymorphic_url([blog, Blog::Post.new])
|
||||
end
|
||||
|
||||
def application_polymorphic_path
|
||||
render :text => polymorphic_path(Blog::Post.new)
|
||||
render text: polymorphic_path(Blog::Post.new)
|
||||
end
|
||||
end
|
||||
RUBY
|
||||
|
Loading…
Reference in New Issue
Block a user