mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
systematic revision of =~ usage in AV
Where appropriate, prefer the more concise Regexp#match?, String#include?, String#start_with?, or String#end_with?
This commit is contained in:
parent
11b463d8cb
commit
7ebef567ce
11 changed files with 39 additions and 28 deletions
|
@ -1,5 +1,6 @@
|
|||
require 'active_support/core_ext/array/extract_options'
|
||||
require 'active_support/core_ext/hash/keys'
|
||||
require 'active_support/core_ext/regexp'
|
||||
require 'action_view/helpers/asset_url_helper'
|
||||
require 'action_view/helpers/tag_helper'
|
||||
|
||||
|
@ -213,7 +214,7 @@ module ActionView
|
|||
|
||||
src = options[:src] = path_to_image(source)
|
||||
|
||||
unless src =~ /^(?:cid|data):/ || src.blank?
|
||||
unless src.start_with?('cid:') || src.start_with?('data:') || src.blank?
|
||||
options[:alt] = options.fetch(:alt) { image_alt(src) }
|
||||
end
|
||||
|
||||
|
@ -322,9 +323,9 @@ module ActionView
|
|||
|
||||
def extract_dimensions(size)
|
||||
size = size.to_s
|
||||
if size =~ %r{\A\d+x\d+\z}
|
||||
if /\A\d+x\d+\z/.match?(size)
|
||||
size.split('x')
|
||||
elsif size =~ %r{\A\d+\z}
|
||||
elsif /\A\d+\z/.match?(size)
|
||||
[size, size]
|
||||
end
|
||||
end
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
require 'zlib'
|
||||
require 'active_support/core_ext/regexp'
|
||||
|
||||
module ActionView
|
||||
# = Action View Asset URL Helpers
|
||||
|
@ -131,8 +132,8 @@ module ActionView
|
|||
raise ArgumentError, "nil is not a valid asset source" if source.nil?
|
||||
|
||||
source = source.to_s
|
||||
return "" unless source.present?
|
||||
return source if source =~ URI_REGEXP
|
||||
return '' if source.blank?
|
||||
return source if URI_REGEXP.match?(source)
|
||||
|
||||
tail, source = source[/([\?#].+)$/], source.sub(/([\?#].+)$/, ''.freeze)
|
||||
|
||||
|
@ -213,19 +214,21 @@ module ActionView
|
|||
host = options[:host]
|
||||
host ||= config.asset_host if defined? config.asset_host
|
||||
|
||||
if host
|
||||
if host.respond_to?(:call)
|
||||
arity = host.respond_to?(:arity) ? host.arity : host.method(:call).arity
|
||||
args = [source]
|
||||
args << request if request && (arity > 1 || arity < 0)
|
||||
host = host.call(*args)
|
||||
elsif host =~ /%d/
|
||||
elsif host.include?('%d')
|
||||
host = host % (Zlib.crc32(source) % 4)
|
||||
end
|
||||
end
|
||||
|
||||
host ||= request.base_url if request && options[:protocol] == :request
|
||||
return unless host
|
||||
|
||||
if host =~ URI_REGEXP
|
||||
if URI_REGEXP.match?(host)
|
||||
host
|
||||
else
|
||||
protocol = options[:protocol] || config.default_asset_host_protocol || (request ? :request : :relative)
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
require 'action_view/helpers/tag_helper'
|
||||
require 'active_support/core_ext/string/access'
|
||||
require 'active_support/core_ext/regexp'
|
||||
require 'i18n/exceptions'
|
||||
|
||||
module ActionView
|
||||
|
@ -133,7 +134,7 @@ module ActionView
|
|||
end
|
||||
|
||||
def html_safe_translation_key?(key)
|
||||
key.to_s =~ /(\b|_|\.)html$/
|
||||
/(\b|_|\.)html$/.match?(key.to_s)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -2,6 +2,7 @@ require 'action_view/helpers/javascript_helper'
|
|||
require 'active_support/core_ext/array/access'
|
||||
require 'active_support/core_ext/hash/keys'
|
||||
require 'active_support/core_ext/string/output_safety'
|
||||
require 'active_support/core_ext/regexp'
|
||||
|
||||
module ActionView
|
||||
# = Action View URL Helpers
|
||||
|
@ -550,7 +551,7 @@ module ActionView
|
|||
|
||||
url_string.chomp!("/") if url_string.start_with?("/") && url_string != "/"
|
||||
|
||||
if url_string =~ /^\w+:\/\//
|
||||
if %r{^\w+://}.match?(url_string)
|
||||
url_string == "#{request.protocol}#{request.host_with_port}#{request_uri}"
|
||||
else
|
||||
url_string == request_uri
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
require "action_view/rendering"
|
||||
require "active_support/core_ext/module/remove_method"
|
||||
require 'action_view/rendering'
|
||||
require 'active_support/core_ext/module/remove_method'
|
||||
require 'active_support/core_ext/regexp'
|
||||
|
||||
module ActionView
|
||||
# Layouts reverse the common pattern of including shared headers and footers in many templates to isolate changes in
|
||||
|
@ -279,7 +280,7 @@ module ActionView
|
|||
def _write_layout_method # :nodoc:
|
||||
remove_possible_method(:_layout)
|
||||
|
||||
prefixes = _implied_layout_name =~ /\blayouts/ ? [] : ["layouts"]
|
||||
prefixes = /\blayouts/.match?(_implied_layout_name) ? [] : ["layouts"]
|
||||
default_behavior = "lookup_context.find_all('#{_implied_layout_name}', #{prefixes.inspect}, false, [], { formats: formats }).first || super"
|
||||
name_clause = if name
|
||||
default_behavior
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
require 'action_view/renderer/partial_renderer/collection_caching'
|
||||
require 'concurrent/map'
|
||||
require 'active_support/core_ext/regexp'
|
||||
require 'action_view/renderer/partial_renderer/collection_caching'
|
||||
|
||||
module ActionView
|
||||
class PartialIteration
|
||||
|
@ -386,7 +387,7 @@ module ActionView
|
|||
end
|
||||
|
||||
if as = options[:as]
|
||||
raise_invalid_option_as(as) unless as.to_s =~ /\A[a-z_]\w*\z/
|
||||
raise_invalid_option_as(as) unless /\A[a-z_]\w*\z/.match?(as.to_s)
|
||||
as = as.to_sym
|
||||
end
|
||||
|
||||
|
|
|
@ -83,7 +83,7 @@ module ActionView
|
|||
case layout
|
||||
when String
|
||||
begin
|
||||
if layout =~ /^\//
|
||||
if layout.start_with?('/')
|
||||
with_fallbacks { find_template(layout, nil, false, [], details) }
|
||||
else
|
||||
find_template(layout, nil, false, [], details)
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
require "active_support/core_ext/enumerable"
|
||||
require 'active_support/core_ext/regexp'
|
||||
|
||||
module ActionView
|
||||
# = Action View Errors
|
||||
|
@ -35,7 +36,7 @@ module ActionView
|
|||
prefixes = Array(prefixes)
|
||||
template_type = if partial
|
||||
"partial"
|
||||
elsif path =~ /layouts/i
|
||||
elsif /layouts/i.match?(path)
|
||||
'layout'
|
||||
else
|
||||
'template'
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
require 'erubis'
|
||||
require 'active_support/core_ext/regexp'
|
||||
|
||||
module ActionView
|
||||
class Template
|
||||
|
@ -39,7 +40,7 @@ module ActionView
|
|||
|
||||
def add_expr_literal(src, code)
|
||||
flush_newline_if_pending(src)
|
||||
if code =~ BLOCK_EXPR
|
||||
if BLOCK_EXPR.match?(code)
|
||||
src << '@output_buffer.append= ' << code
|
||||
else
|
||||
src << '@output_buffer.append=(' << code << ');'
|
||||
|
@ -48,7 +49,7 @@ module ActionView
|
|||
|
||||
def add_expr_escaped(src, code)
|
||||
flush_newline_if_pending(src)
|
||||
if code =~ BLOCK_EXPR
|
||||
if BLOCK_EXPR.match?(code)
|
||||
src << "@output_buffer.safe_expr_append= " << code
|
||||
else
|
||||
src << "@output_buffer.safe_expr_append=(" << code << ");"
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
require 'active_support/core_ext/regexp'
|
||||
require 'action_view/template/resolver'
|
||||
|
||||
module ActionView #:nodoc:
|
||||
|
@ -29,7 +30,7 @@ module ActionView #:nodoc:
|
|||
templates = []
|
||||
@hash.each do |_path, array|
|
||||
source, updated_at = array
|
||||
next unless _path =~ query
|
||||
next unless query.match?(_path)
|
||||
handler, format, variant = extract_handler_and_format_and_variant(_path, formats)
|
||||
templates << Template.new(source, _path, handler,
|
||||
:virtual_path => path.virtual,
|
||||
|
@ -50,4 +51,3 @@ module ActionView #:nodoc:
|
|||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
require 'abstract_unit'
|
||||
require 'active_support/core_ext/array/extract_options'
|
||||
require 'active_support/core_ext/regexp'
|
||||
|
||||
# The view_paths array must be set on Base and not LayoutTest so that LayoutTest's inherited
|
||||
# method has access to the view_paths array when looking for a layout to automatically assign.
|
||||
|
@ -252,7 +253,7 @@ class LayoutStatusIsRenderedTest < ActionController::TestCase
|
|||
end
|
||||
end
|
||||
|
||||
unless RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
|
||||
unless /mswin|mingw/.match?(RbConfig::CONFIG['host_os'])
|
||||
class LayoutSymlinkedTest < LayoutTest
|
||||
layout "symlinked/symlinked_layout"
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue