kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #29791 from yui-knk/at_object

Browse source 
Do not pass an instance variable to a private method
This commit is contained in:
Ryuta Kamizono 2017-09-05 18:57:32 +09:00 committed by GitHub
commit 6c4a32e27d
13 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
actionview/lib/action_view/helpers/tags/base.rb
View file

@ -35,7 +35,7 @@ module ActionView
private
def value(object)
def value
if @allow_method_names_outside_object
object.public_send @method_name if object && object.respond_to?(@method_name)
else
@ -43,19 +43,19 @@ module ActionView
end
end
def value_before_type_cast(object)
def value_before_type_cast
unless object.nil?
method_before_type_cast = @method_name + "_before_type_cast"
if value_came_from_user?(object) && object.respond_to?(method_before_type_cast)
if value_came_from_user? && object.respond_to?(method_before_type_cast)
object.public_send(method_before_type_cast)
else
value(object)
value
end
end
end
def value_came_from_user?(object)
def value_came_from_user?
method_name = "#{@method_name}_came_from_user?"
!object.respond_to?(method_name) || object.public_send(method_name)
end
@ -150,7 +150,7 @@ module ActionView
options[:include_blank] ||= true unless options[:prompt]
end
value = options.fetch(:selected) { value(object) }
value = options.fetch(:selected) { value() }
select = content_tag("select", add_options(option_tags, options, value), html_options)
if html_options["multiple"] && options.fetch(:include_hidden, true)

2
actionview/lib/action_view/helpers/tags/check_box.rb
View file

@ -18,7 +18,7 @@ module ActionView
options = @options.stringify_keys
options["type"] = "checkbox"
options["value"] = @checked_value
options["checked"] = "checked" if input_checked?(object, options)
options["checked"] = "checked" if input_checked?(options)
if options["multiple"]
add_default_name_and_id_for_value(@checked_value, options)

4
actionview/lib/action_view/helpers/tags/checkable.rb
View file

@ -4,12 +4,12 @@ module ActionView
module Helpers
module Tags # :nodoc:
module Checkable # :nodoc:
def input_checked?(object, options)
def input_checked?(options)
if options.has_key?("checked")
checked = options.delete "checked"
checked == true || checked == "checked"
else
checked?(value(object))
checked?(value)
end
end
end

2
actionview/lib/action_view/helpers/tags/collection_select.rb
View file

@ -15,7 +15,7 @@ module ActionView
def render
option_tags_options = {
selected: @options.fetch(:selected) { value(@object) },
selected: @options.fetch(:selected) { value },
disabled: @options[:disabled]
}

2
actionview/lib/action_view/helpers/tags/color_field.rb
View file

@ -6,7 +6,7 @@ module ActionView
class ColorField < TextField # :nodoc:
def render
options = @options.stringify_keys
options["value"] ||= validate_color_string(value(object))
options["value"] ||= validate_color_string(value)
@options = options
super
end

2
actionview/lib/action_view/helpers/tags/date_select.rb
View file

@ -29,7 +29,7 @@ module ActionView
end
def datetime_selector(options, html_options)
datetime = options.fetch(:selected) { value(object) || default_datetime(options) }
datetime = options.fetch(:selected) { value || default_datetime(options) }
@auto_index ||= nil
options = options.dup

2
actionview/lib/action_view/helpers/tags/datetime_field.rb
View file

@ -6,7 +6,7 @@ module ActionView
class DatetimeField < TextField # :nodoc:
def render
options = @options.stringify_keys
options["value"] ||= format_date(value(object))
options["value"] ||= format_date(value)
options["min"] = format_date(datetime_value(options["min"]))
options["max"] = format_date(datetime_value(options["max"]))
@options = options

2
actionview/lib/action_view/helpers/tags/grouped_collection_select.rb
View file

@ -17,7 +17,7 @@ module ActionView
def render
option_tags_options = {
selected: @options.fetch(:selected) { value(@object) },
selected: @options.fetch(:selected) { value },
disabled: @options[:disabled]
}

2
actionview/lib/action_view/helpers/tags/radio_button.rb
View file

@ -17,7 +17,7 @@ module ActionView
options = @options.stringify_keys
options["type"] = "radio"
options["value"] = @tag_value
options["checked"] = "checked" if input_checked?(object, options)
options["checked"] = "checked" if input_checked?(options)
add_default_name_and_id_for_value(@tag_value, options)
tag("input", options)
end

2
actionview/lib/action_view/helpers/tags/select.rb
View file

@ -15,7 +15,7 @@ module ActionView
def render
option_tags_options = {
selected: @options.fetch(:selected) { value(@object) },
selected: @options.fetch(:selected) { value },
disabled: @options[:disabled]
}

2
actionview/lib/action_view/helpers/tags/text_area.rb
View file

@ -16,7 +16,7 @@ module ActionView
options["cols"], options["rows"] = size.split("x") if size.respond_to?(:split)
end
content_tag("textarea", options.delete("value") { value_before_type_cast(object) }, options)
content_tag("textarea", options.delete("value") { value_before_type_cast }, options)
end
end
end

2
actionview/lib/action_view/helpers/tags/text_field.rb
View file

@ -12,7 +12,7 @@ module ActionView
options = @options.stringify_keys
options["size"] = options["maxlength"] unless options.key?("size")
options["type"] ||= field_type
options["value"] = options.fetch("value") { value_before_type_cast(object) } unless field_type == "file"
options["value"] = options.fetch("value") { value_before_type_cast } unless field_type == "file"
add_default_name_and_id(options)
tag("input", options)
end

2
actionview/lib/action_view/helpers/tags/time_zone_select.rb
View file

@ -13,7 +13,7 @@ module ActionView
def render
select_content_tag(
time_zone_options_for_select(value(@object) || @options[:default], @priority_zones, @options[:model] || ActiveSupport::TimeZone), @options, @html_options
time_zone_options_for_select(value || @options[:default], @priority_zones, @options[:model] || ActiveSupport::TimeZone), @options, @html_options
)
end
end