提交 da8d0c94 编写于 作者: A Andrew White

Add cop for preferring 'Foo.method' over 'Foo::method'

上级 af4f1a01
......@@ -156,3 +156,7 @@ Style/RedundantReturn:
Style/Semicolon:
Enabled: true
AllowAsExpressionSeparator: true
# Prefer Foo.method over Foo::method
Style/ColonMethodCall:
Enabled: true
......@@ -9,7 +9,7 @@ class DummyDigestController < ActionController::Base
before_action :authenticate_with_request, only: :display
USERS = { "lifo" => "world", "pretty" => "please",
"dhh" => ::Digest::MD5::hexdigest(["dhh", "SuperSecret", "secret"].join(":")) }
"dhh" => ::Digest::MD5.hexdigest(["dhh", "SuperSecret", "secret"].join(":")) }
def index
render plain: "Hello Secret"
......@@ -182,7 +182,7 @@ def authenticate_with_request
test "authentication request with password stored as ha1 digest hash" do
@request.env["HTTP_AUTHORIZATION"] = encode_credentials(username: "dhh",
password: ::Digest::MD5::hexdigest(["dhh", "SuperSecret", "secret"].join(":")),
password: ::Digest::MD5.hexdigest(["dhh", "SuperSecret", "secret"].join(":")),
password_is_ha1: true)
get :display
......
......@@ -676,7 +676,7 @@ def test_route_with_text_default
token = "\321\202\320\265\320\272\321\201\321\202".dup # 'text' in Russian
token.force_encoding(Encoding::BINARY)
escaped_token = CGI::escape(token)
escaped_token = CGI.escape(token)
assert_equal "/page/" + escaped_token, url_for(rs, controller: "content", action: "show_page", id: token)
assert_equal({ controller: "content", action: "show_page", id: token }, rs.recognize_path("/page/#{escaped_token}"))
......
......@@ -24,7 +24,7 @@ module DebugHelper
# created_at:
# </pre>
def debug(object)
Marshal::dump(object)
Marshal.dump(object)
object = ERB::Util.html_escape(object.to_yaml)
content_tag(:pre, object, class: "debug_dump")
rescue # errors from Marshal or YAML
......
......@@ -229,7 +229,7 @@ db_namespace = namespace :db do
base_dir = ActiveRecord::Tasks::DatabaseTasks.fixtures_path
Dir["#{base_dir}/**/*.yml"].each do |file|
if data = YAML::load(ERB.new(IO.read(file)).result)
if data = YAML.load(ERB.new(IO.read(file)).result)
data.each_key do |key|
key_id = ActiveRecord::FixtureSet.identify(key)
......
......@@ -1186,7 +1186,7 @@ def test_named_accessor_for_randomly_named_namespaced_fixture_and_class
end
def test_table_name_is_defined_in_the_model
assert_equal "randomly_named_table2", ActiveRecord::FixtureSet::all_loaded_fixtures["admin/randomly_named_a9"].table_name
assert_equal "randomly_named_table2", ActiveRecord::FixtureSet.all_loaded_fixtures["admin/randomly_named_a9"].table_name
assert_equal "randomly_named_table2", Admin::ClassNameThatDoesNotFollowCONVENTIONS1.table_name
end
end
......
......@@ -83,7 +83,7 @@ def content_type
end,
"boolean" => Proc.new { |boolean| %w(1 true).include?(boolean.to_s.strip) },
"string" => Proc.new { |string| string.to_s },
"yaml" => Proc.new { |yaml| YAML::load(yaml) rescue yaml },
"yaml" => Proc.new { |yaml| YAML.load(yaml) rescue yaml },
"base64Binary" => Proc.new { |bin| ::Base64.decode64(bin) },
"binary" => Proc.new { |bin, entity| _parse_binary(bin, entity) },
"file" => Proc.new { |file, entity| _parse_file(file, entity) }
......
......@@ -58,9 +58,9 @@ def generate_front_matter(html_pages)
end
def generate_sections(html_pages)
FileUtils::rm_rf("sections/")
FileUtils.rm_rf("sections/")
html_pages.each_with_index do |page, section_idx|
FileUtils::mkdir_p("sections/%03d" % section_idx)
FileUtils.mkdir_p("sections/%03d" % section_idx)
doc = Nokogiri::HTML(File.open(page))
title = doc.at("title").inner_text.gsub("Ruby on Rails Guides: ", "")
title = page.capitalize.gsub(".html", "") if title.strip == ""
......
......@@ -13,7 +13,7 @@ def setup
Rails.application = TestApp::Application
super
Kernel::silence_warnings do
Kernel.silence_warnings do
Thor::Base.shell.send(:attr_accessor, :always_force)
@shell = Thor::Base.shell.new
@shell.send(:always_force=, true)
......
......@@ -9,7 +9,7 @@ def setup
super
Rails::Generators::AppGenerator.instance_variable_set("@desc", nil)
Kernel::silence_warnings do
Kernel.silence_warnings do
Thor::Base.shell.send(:attr_accessor, :always_force)
@shell = Thor::Base.shell.new
@shell.send(:always_force=, true)
......
......@@ -14,7 +14,7 @@ class Minitest::RailsPluginTest < ActiveSupport::TestCase
reporter << Minitest::ProgressReporter.new(@output, @options)
reporter << Minitest::Reporter.new(@output, @options)
Minitest::plugin_rails_replace_reporters(reporter, {})
Minitest.plugin_rails_replace_reporters(reporter, {})
assert_equal 3, reporter.reporters.count
assert reporter.reporters.any? { |candidate| candidate.kind_of?(Minitest::SuppressedSummaryReporter) }
......@@ -25,7 +25,7 @@ class Minitest::RailsPluginTest < ActiveSupport::TestCase
test "no custom reporters are added if nothing to replace" do
reporter = Minitest::CompositeReporter.new
Minitest::plugin_rails_replace_reporters(reporter, {})
Minitest.plugin_rails_replace_reporters(reporter, {})
assert_equal 0, reporter.reporters.count
end
......@@ -33,6 +33,6 @@ class Minitest::RailsPluginTest < ActiveSupport::TestCase
test "handle the case when reporter is not CompositeReporter" do
reporter = Minitest::Reporter.new
Minitest::plugin_rails_replace_reporters(reporter, {})
Minitest.plugin_rails_replace_reporters(reporter, {})
end
end
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册