Hello community,
here is the log from the commit of package rubygem-actionview-6.0 for
openSUSE:Factory checked in at 2020-05-11 13:38:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-actionview-6.0 (Old)
and /work/SRC/openSUSE:Factory/.rubygem-actionview-6.0.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-actionview-6.0"
Mon May 11 13:38:17 2020 rev:6 rq:802314 version:6.0.3
Changes:
--------
---
/work/SRC/openSUSE:Factory/rubygem-actionview-6.0/rubygem-actionview-6.0.changes
2020-04-27 23:40:31.747775163 +0200
+++
/work/SRC/openSUSE:Factory/.rubygem-actionview-6.0.new.2738/rubygem-actionview-6.0.changes
2020-05-11 13:38:21.692741229 +0200
@@ -1,0 +2,26 @@
+Thu May 7 19:59:43 UTC 2020 - Stephan Kulow <[email protected]>
+
+- updated to version 6.0.3
+ see installed CHANGELOG.md
+
+ ## Rails 6.0.3 (May 06, 2020) ##
+
+ * annotated_source_code returns an empty array so TemplateErrors without a
+ template in the backtrace are surfaced properly by DebugExceptions.
+
+ *Guilherme Mansur*, *Kasper Timm Hansen*
+
+ * Add autoload for SyntaxErrorInTemplate so syntax errors are correctly
raised by DebugExceptions.
+
+ *Guilherme Mansur*, *Gannon McGibbon*
+
+
+ ## Rails 6.0.2.2 (March 19, 2020) ##
+
+ * Fix possible XSS vector in escape_javascript helper
+
+ CVE-2020-5267
+
+ *Aaron Patterson*
+
+-------------------------------------------------------------------
Old:
----
actionview-6.0.2.2.gem
New:
----
actionview-6.0.3.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-actionview-6.0.spec ++++++
--- /var/tmp/diff_new_pack.jB37c8/_old 2020-05-11 13:38:22.472742864 +0200
+++ /var/tmp/diff_new_pack.jB37c8/_new 2020-05-11 13:38:22.476742873 +0200
@@ -24,7 +24,7 @@
#
Name: rubygem-actionview-6.0
-Version: 6.0.2.2
+Version: 6.0.3
Release: 0
%define mod_name actionview
%define mod_full_name %{mod_name}-%{version}
++++++ actionview-6.0.2.2.gem -> actionview-6.0.3.gem ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/CHANGELOG.md new/CHANGELOG.md
--- old/CHANGELOG.md 2020-03-19 17:42:36.000000000 +0100
+++ new/CHANGELOG.md 2020-05-06 20:00:05.000000000 +0200
@@ -1,3 +1,24 @@
+## Rails 6.0.3 (May 06, 2020) ##
+
+* annotated_source_code returns an empty array so TemplateErrors without a
+ template in the backtrace are surfaced properly by DebugExceptions.
+
+ *Guilherme Mansur*, *Kasper Timm Hansen*
+
+* Add autoload for SyntaxErrorInTemplate so syntax errors are correctly
raised by DebugExceptions.
+
+ *Guilherme Mansur*, *Gannon McGibbon*
+
+
+## Rails 6.0.2.2 (March 19, 2020) ##
+
+* Fix possible XSS vector in escape_javascript helper
+
+ CVE-2020-5267
+
+ *Aaron Patterson*
+
+
## Rails 6.0.2.1 (December 18, 2019) ##
* No changes.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/README.rdoc new/README.rdoc
--- old/README.rdoc 2020-03-19 17:42:36.000000000 +0100
+++ new/README.rdoc 2020-05-06 20:00:05.000000000 +0200
@@ -37,4 +37,4 @@
Feature requests should be discussed on the rails-core mailing list here:
-* https://groups.google.com/forum/?fromgroups#!forum/rubyonrails-core
+* https://discuss.rubyonrails.org/c/rubyonrails-core
Binary files old/checksums.yaml.gz and new/checksums.yaml.gz differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/cache_expiry.rb
new/lib/action_view/cache_expiry.rb
--- old/lib/action_view/cache_expiry.rb 2020-03-19 17:42:36.000000000 +0100
+++ new/lib/action_view/cache_expiry.rb 2020-05-06 20:00:05.000000000 +0200
@@ -41,7 +41,6 @@
end
private
-
def dirs_to_watch
fs_paths = all_view_paths.grep(FileSystemResolver)
fs_paths.map(&:path).sort.uniq
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/flows.rb new/lib/action_view/flows.rb
--- old/lib/action_view/flows.rb 2020-03-19 17:42:36.000000000 +0100
+++ new/lib/action_view/flows.rb 2020-05-06 20:00:05.000000000 +0200
@@ -68,7 +68,6 @@
end
private
-
def inside_fiber?
Fiber.current.object_id != @root
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/gem_version.rb
new/lib/action_view/gem_version.rb
--- old/lib/action_view/gem_version.rb 2020-03-19 17:42:36.000000000 +0100
+++ new/lib/action_view/gem_version.rb 2020-05-06 20:00:05.000000000 +0200
@@ -9,8 +9,8 @@
module VERSION
MAJOR = 6
MINOR = 0
- TINY = 2
- PRE = "2"
+ TINY = 3
+ PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/helpers/active_model_helper.rb
new/lib/action_view/helpers/active_model_helper.rb
--- old/lib/action_view/helpers/active_model_helper.rb 2020-03-19
17:42:36.000000000 +0100
+++ new/lib/action_view/helpers/active_model_helper.rb 2020-05-06
20:00:05.000000000 +0200
@@ -38,7 +38,6 @@
end
private
-
def object_has_errors?
object.respond_to?(:errors) && object.errors.respond_to?(:[]) &&
error_message.present?
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/helpers/asset_tag_helper.rb
new/lib/action_view/helpers/asset_tag_helper.rb
--- old/lib/action_view/helpers/asset_tag_helper.rb 2020-03-19
17:42:36.000000000 +0100
+++ new/lib/action_view/helpers/asset_tag_helper.rb 2020-05-06
20:00:05.000000000 +0200
@@ -274,7 +274,7 @@
crossorigin = "anonymous" if crossorigin == true ||
(crossorigin.blank? && as_type == "font")
nopush = options.delete(:nopush) || false
- link_tag = tag.link({
+ link_tag = tag.link(**{
rel: "preload",
href: href,
as: as_type,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/helpers/cache_helper.rb
new/lib/action_view/helpers/cache_helper.rb
--- old/lib/action_view/helpers/cache_helper.rb 2020-03-19 17:42:36.000000000
+0100
+++ new/lib/action_view/helpers/cache_helper.rb 2020-05-06 20:00:05.000000000
+0200
@@ -166,7 +166,7 @@
def cache(name = {}, options = {}, &block)
if controller.respond_to?(:perform_caching) &&
controller.perform_caching
name_options = options.slice(:skip_digest, :virtual_path)
- safe_concat(fragment_for(cache_fragment_name(name, name_options),
options, &block))
+ safe_concat(fragment_for(cache_fragment_name(name, **name_options),
options, &block))
else
yield
end
@@ -227,7 +227,6 @@
end
private
-
def fragment_name_with_digest(name, virtual_path, digest_path)
virtual_path ||= @virtual_path
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/helpers/date_helper.rb
new/lib/action_view/helpers/date_helper.rb
--- old/lib/action_view/helpers/date_helper.rb 2020-03-19 17:42:36.000000000
+0100
+++ new/lib/action_view/helpers/date_helper.rb 2020-05-06 20:00:05.000000000
+0200
@@ -688,7 +688,6 @@
end
private
-
def normalize_distance_of_time_argument_to_time(value)
if value.is_a?(Numeric)
Time.at(value)
@@ -831,7 +830,7 @@
end
def select_year
- if !@datetime || @datetime == 0
+ if !year || @datetime == 0
val = "1"
middle_year = Date.today.year
else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/helpers/form_helper.rb
new/lib/action_view/helpers/form_helper.rb
--- old/lib/action_view/helpers/form_helper.rb 2020-03-19 17:42:36.000000000
+0100
+++ new/lib/action_view/helpers/form_helper.rb 2020-05-06 20:00:05.000000000
+0200
@@ -755,10 +755,10 @@
output = capture(builder, &block)
options[:multipart] ||= builder.multipart?
- html_options = html_options_for_form_with(url, model, options)
+ html_options = html_options_for_form_with(url, model, **options)
form_tag_with_body(html_options, output)
else
- html_options = html_options_for_form_with(url, model, options)
+ html_options = html_options_for_form_with(url, model, **options)
form_tag_html(html_options)
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/helpers/javascript_helper.rb
new/lib/action_view/helpers/javascript_helper.rb
--- old/lib/action_view/helpers/javascript_helper.rb 2020-03-19
17:42:36.000000000 +0100
+++ new/lib/action_view/helpers/javascript_helper.rb 2020-05-06
20:00:05.000000000 +0200
@@ -31,7 +31,7 @@
if javascript.empty?
result = ""
else
- result =
javascript.gsub(/(\\|<\/|\r\n|\342\200\250|\342\200\251|[\n\r"']|[`]|[$])/u) {
|match| JS_ESCAPE_MAP[match] }
+ result =
javascript.gsub(/(\\|<\/|\r\n|\342\200\250|\342\200\251|[\n\r"']|[`]|[$])/u,
JS_ESCAPE_MAP)
end
javascript.html_safe? ? result.html_safe : result
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/helpers/number_helper.rb
new/lib/action_view/helpers/number_helper.rb
--- old/lib/action_view/helpers/number_helper.rb 2020-03-19
17:42:36.000000000 +0100
+++ new/lib/action_view/helpers/number_helper.rb 2020-05-06
20:00:05.000000000 +0200
@@ -57,7 +57,7 @@
#
# number_to_phone(75561234567, pattern: /(\d{1,4})(\d{4})(\d{4})$/,
area_code: true)
# # => "(755) 6123-4567"
- # number_to_phone(13312345678, pattern: /(\d{3})(\d{4})(\d{4})$/))
+ # number_to_phone(13312345678, pattern: /(\d{3})(\d{4})(\d{4})$/)
# # => "133-1234-5678"
def number_to_phone(number, options = {})
return unless number
@@ -114,6 +114,8 @@
#
# number_to_currency("123a456", raise: true) # =>
InvalidNumberError
#
+ # number_to_currency(-0.456789, precision: 0)
+ # # => "$0"
# number_to_currency(-1234567890.50, negative_format: "(%u%n)")
# # => ($1,234,567,890.50)
# number_to_currency(1234567890.50, unit: "R$", separator: ",",
delimiter: "")
@@ -403,7 +405,6 @@
end
private
-
def delegate_number_helper_method(method, number, options)
return unless number
options = escape_unsafe_options(options.symbolize_keys)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/helpers/tag_helper.rb
new/lib/action_view/helpers/tag_helper.rb
--- old/lib/action_view/helpers/tag_helper.rb 2020-03-19 17:42:36.000000000
+0100
+++ new/lib/action_view/helpers/tag_helper.rb 2020-05-06 20:00:05.000000000
+0200
@@ -107,8 +107,8 @@
true
end
- def method_missing(called, *args, &block)
- tag_string(called, *args, &block)
+ def method_missing(called, *args, **options, &block)
+ tag_string(called, *args, **options, &block)
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/helpers/tags/base.rb
new/lib/action_view/helpers/tags/base.rb
--- old/lib/action_view/helpers/tags/base.rb 2020-03-19 17:42:36.000000000
+0100
+++ new/lib/action_view/helpers/tags/base.rb 2020-05-06 20:00:05.000000000
+0200
@@ -34,7 +34,6 @@
end
private
-
def value
if @allow_method_names_outside_object
object.public_send @method_name if object &&
object.respond_to?(@method_name)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/helpers/tags/check_box.rb
new/lib/action_view/helpers/tags/check_box.rb
--- old/lib/action_view/helpers/tags/check_box.rb 2020-03-19
17:42:36.000000000 +0100
+++ new/lib/action_view/helpers/tags/check_box.rb 2020-05-06
20:00:05.000000000 +0200
@@ -39,7 +39,6 @@
end
private
-
def checked?(value)
case value
when TrueClass, FalseClass
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/lib/action_view/helpers/tags/collection_check_boxes.rb
new/lib/action_view/helpers/tags/collection_check_boxes.rb
--- old/lib/action_view/helpers/tags/collection_check_boxes.rb 2020-03-19
17:42:36.000000000 +0100
+++ new/lib/action_view/helpers/tags/collection_check_boxes.rb 2020-05-06
20:00:05.000000000 +0200
@@ -22,7 +22,6 @@
end
private
-
def render_component(builder)
builder.check_box + builder.label
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/helpers/tags/collection_helpers.rb
new/lib/action_view/helpers/tags/collection_helpers.rb
--- old/lib/action_view/helpers/tags/collection_helpers.rb 2020-03-19
17:42:36.000000000 +0100
+++ new/lib/action_view/helpers/tags/collection_helpers.rb 2020-05-06
20:00:05.000000000 +0200
@@ -37,7 +37,6 @@
end
private
-
def instantiate_builder(builder_class, item, value, text,
html_options)
builder_class.new(@template_object, @object_name, @method_name,
item,
sanitize_attribute_name(value), text, value,
html_options)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/lib/action_view/helpers/tags/collection_radio_buttons.rb
new/lib/action_view/helpers/tags/collection_radio_buttons.rb
--- old/lib/action_view/helpers/tags/collection_radio_buttons.rb
2020-03-19 17:42:36.000000000 +0100
+++ new/lib/action_view/helpers/tags/collection_radio_buttons.rb
2020-05-06 20:00:05.000000000 +0200
@@ -21,7 +21,6 @@
end
private
-
def render_component(builder)
builder.radio_button + builder.label
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/helpers/tags/color_field.rb
new/lib/action_view/helpers/tags/color_field.rb
--- old/lib/action_view/helpers/tags/color_field.rb 2020-03-19
17:42:36.000000000 +0100
+++ new/lib/action_view/helpers/tags/color_field.rb 2020-05-06
20:00:05.000000000 +0200
@@ -12,7 +12,6 @@
end
private
-
def validate_color_string(string)
regex = /#[0-9a-fA-F]{6}/
if regex.match?(string)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/helpers/tags/date_field.rb
new/lib/action_view/helpers/tags/date_field.rb
--- old/lib/action_view/helpers/tags/date_field.rb 2020-03-19
17:42:36.000000000 +0100
+++ new/lib/action_view/helpers/tags/date_field.rb 2020-05-06
20:00:05.000000000 +0200
@@ -5,7 +5,6 @@
module Tags # :nodoc:
class DateField < DatetimeField # :nodoc:
private
-
def format_date(value)
value.try(:strftime, "%Y-%m-%d")
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/helpers/tags/date_select.rb
new/lib/action_view/helpers/tags/date_select.rb
--- old/lib/action_view/helpers/tags/date_select.rb 2020-03-19
17:42:36.000000000 +0100
+++ new/lib/action_view/helpers/tags/date_select.rb 2020-05-06
20:00:05.000000000 +0200
@@ -23,7 +23,6 @@
end
private
-
def select_type
self.class.select_type
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/helpers/tags/datetime_field.rb
new/lib/action_view/helpers/tags/datetime_field.rb
--- old/lib/action_view/helpers/tags/datetime_field.rb 2020-03-19
17:42:36.000000000 +0100
+++ new/lib/action_view/helpers/tags/datetime_field.rb 2020-05-06
20:00:05.000000000 +0200
@@ -14,7 +14,6 @@
end
private
-
def format_date(value)
raise NotImplementedError
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/helpers/tags/datetime_local_field.rb
new/lib/action_view/helpers/tags/datetime_local_field.rb
--- old/lib/action_view/helpers/tags/datetime_local_field.rb 2020-03-19
17:42:36.000000000 +0100
+++ new/lib/action_view/helpers/tags/datetime_local_field.rb 2020-05-06
20:00:05.000000000 +0200
@@ -11,7 +11,6 @@
end
private
-
def format_date(value)
value.try(:strftime, "%Y-%m-%dT%T")
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/helpers/tags/label.rb
new/lib/action_view/helpers/tags/label.rb
--- old/lib/action_view/helpers/tags/label.rb 2020-03-19 17:42:36.000000000
+0100
+++ new/lib/action_view/helpers/tags/label.rb 2020-05-06 20:00:05.000000000
+0200
@@ -71,7 +71,6 @@
end
private
-
def render_component(builder)
builder.translation
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/helpers/tags/month_field.rb
new/lib/action_view/helpers/tags/month_field.rb
--- old/lib/action_view/helpers/tags/month_field.rb 2020-03-19
17:42:36.000000000 +0100
+++ new/lib/action_view/helpers/tags/month_field.rb 2020-05-06
20:00:05.000000000 +0200
@@ -5,7 +5,6 @@
module Tags # :nodoc:
class MonthField < DatetimeField # :nodoc:
private
-
def format_date(value)
value.try(:strftime, "%Y-%m")
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/helpers/tags/radio_button.rb
new/lib/action_view/helpers/tags/radio_button.rb
--- old/lib/action_view/helpers/tags/radio_button.rb 2020-03-19
17:42:36.000000000 +0100
+++ new/lib/action_view/helpers/tags/radio_button.rb 2020-05-06
20:00:05.000000000 +0200
@@ -23,7 +23,6 @@
end
private
-
def checked?(value)
value.to_s == @tag_value.to_s
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/helpers/tags/select.rb
new/lib/action_view/helpers/tags/select.rb
--- old/lib/action_view/helpers/tags/select.rb 2020-03-19 17:42:36.000000000
+0100
+++ new/lib/action_view/helpers/tags/select.rb 2020-05-06 20:00:05.000000000
+0200
@@ -29,7 +29,6 @@
end
private
-
# Grouped choices look like this:
#
# [nil, []]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/helpers/tags/text_field.rb
new/lib/action_view/helpers/tags/text_field.rb
--- old/lib/action_view/helpers/tags/text_field.rb 2020-03-19
17:42:36.000000000 +0100
+++ new/lib/action_view/helpers/tags/text_field.rb 2020-05-06
20:00:05.000000000 +0200
@@ -24,7 +24,6 @@
end
private
-
def field_type
self.class.field_type
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/helpers/tags/time_field.rb
new/lib/action_view/helpers/tags/time_field.rb
--- old/lib/action_view/helpers/tags/time_field.rb 2020-03-19
17:42:36.000000000 +0100
+++ new/lib/action_view/helpers/tags/time_field.rb 2020-05-06
20:00:05.000000000 +0200
@@ -5,7 +5,6 @@
module Tags # :nodoc:
class TimeField < DatetimeField # :nodoc:
private
-
def format_date(value)
value.try(:strftime, "%T.%L")
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/helpers/tags/week_field.rb
new/lib/action_view/helpers/tags/week_field.rb
--- old/lib/action_view/helpers/tags/week_field.rb 2020-03-19
17:42:36.000000000 +0100
+++ new/lib/action_view/helpers/tags/week_field.rb 2020-05-06
20:00:05.000000000 +0200
@@ -5,7 +5,6 @@
module Tags # :nodoc:
class WeekField < DatetimeField # :nodoc:
private
-
def format_date(value)
value.try(:strftime, "%Y-W%V")
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/helpers/text_helper.rb
new/lib/action_view/helpers/text_helper.rb
--- old/lib/action_view/helpers/text_helper.rb 2020-03-19 17:42:36.000000000
+0100
+++ new/lib/action_view/helpers/text_helper.rb 2020-05-06 20:00:05.000000000
+0200
@@ -426,7 +426,6 @@
end
private
-
def next_index
step_index(1)
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/helpers/translation_helper.rb
new/lib/action_view/helpers/translation_helper.rb
--- old/lib/action_view/helpers/translation_helper.rb 2020-03-19
17:42:36.000000000 +0100
+++ new/lib/action_view/helpers/translation_helper.rb 2020-05-06
20:00:05.000000000 +0200
@@ -57,8 +57,7 @@
# that include HTML tags so that you know what kind of output to expect
# when you call translate in a template and translators know which keys
# they can provide HTML values for.
- def translate(key, options = {})
- options = options.dup
+ def translate(key, **options)
if options.has_key?(:default)
remaining_defaults = Array.wrap(options.delete(:default)).compact
options[:default] = remaining_defaults unless
remaining_defaults.first.kind_of?(Symbol)
@@ -82,18 +81,18 @@
html_safe_options[name] = ERB::Util.html_escape(value.to_s)
end
end
- translation = I18n.translate(scope_key_by_partial(key),
html_safe_options.merge(raise: i18n_raise))
+ translation = I18n.translate(scope_key_by_partial(key),
**html_safe_options.merge(raise: i18n_raise))
if translation.respond_to?(:map)
translation.map { |element| element.respond_to?(:html_safe) ?
element.html_safe : element }
else
translation.respond_to?(:html_safe) ? translation.html_safe :
translation
end
else
- I18n.translate(scope_key_by_partial(key), options.merge(raise:
i18n_raise))
+ I18n.translate(scope_key_by_partial(key), **options.merge(raise:
i18n_raise))
end
rescue I18n::MissingTranslationData => e
if remaining_defaults.present?
- translate remaining_defaults.shift, options.merge(default:
remaining_defaults)
+ translate remaining_defaults.shift, **options.merge(default:
remaining_defaults)
else
raise e if raise_error
@@ -116,8 +115,8 @@
#
# See
https://www.rubydoc.info/github/svenfuchs/i18n/master/I18n/Backend/Base:localize
# for more information.
- def localize(*args)
- I18n.localize(*args)
+ def localize(object, **options)
+ I18n.localize(object, **options)
end
alias :l :localize
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/layouts.rb
new/lib/action_view/layouts.rb
--- old/lib/action_view/layouts.rb 2020-03-19 17:42:36.000000000 +0100
+++ new/lib/action_view/layouts.rb 2020-05-06 20:00:05.000000000 +0200
@@ -224,7 +224,6 @@
# that if no layout conditions are used, this method is not used
module LayoutConditions # :nodoc:
private
-
# Determines whether the current action has a layout definition by
# checking the action name against the :only and :except conditions
# set by the <tt>layout</tt> method.
@@ -334,7 +333,6 @@
end
private
-
# If no layout is supplied, look for a template named the return
# value of this method.
#
@@ -372,7 +370,6 @@
end
private
-
def _conditional_layout?
true
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/log_subscriber.rb
new/lib/action_view/log_subscriber.rb
--- old/lib/action_view/log_subscriber.rb 2020-03-19 17:42:36.000000000
+0100
+++ new/lib/action_view/log_subscriber.rb 2020-05-06 20:00:05.000000000
+0200
@@ -54,7 +54,6 @@
end
private
-
EMPTY = ""
def from_rails_root(string) # :doc:
string = string.sub(rails_root, EMPTY)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/lookup_context.rb
new/lib/action_view/lookup_context.rb
--- old/lib/action_view/lookup_context.rb 2020-03-19 17:42:36.000000000
+0100
+++ new/lib/action_view/lookup_context.rb 2020-05-06 20:00:05.000000000
+0200
@@ -61,6 +61,7 @@
@details_keys = Concurrent::Map.new
@digest_cache = Concurrent::Map.new
+ @view_context_mutex = Mutex.new
def self.digest_cache(details)
@digest_cache[details_cache_key(details)] ||= Concurrent::Map.new
@@ -89,7 +90,9 @@
end
def self.view_context_class(klass)
- @view_context_class ||= klass.with_empty_template_cache
+ @view_context_mutex.synchronize do
+ @view_context_class ||= klass.with_empty_template_cache
+ end
end
end
@@ -112,7 +115,6 @@
end
private
-
def _set_detail(key, value) # :doc:
@details = @details.dup if @digest_cache || @details_key
@digest_cache = nil
@@ -171,7 +173,6 @@
end
private
-
# Whenever setting view paths, makes a copy so that we can manipulate
them in
# instance objects as we wish.
def build_view_paths(paths)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/path_set.rb
new/lib/action_view/path_set.rb
--- old/lib/action_view/path_set.rb 2020-03-19 17:42:36.000000000 +0100
+++ new/lib/action_view/path_set.rb 2020-05-06 20:00:05.000000000 +0200
@@ -69,7 +69,6 @@
end
private
-
def _find_all(path, prefixes, args)
prefixes = [prefixes] if String === prefixes
prefixes.each do |prefix|
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/record_identifier.rb
new/lib/action_view/record_identifier.rb
--- old/lib/action_view/record_identifier.rb 2020-03-19 17:42:36.000000000
+0100
+++ new/lib/action_view/record_identifier.rb 2020-05-06 20:00:05.000000000
+0200
@@ -95,7 +95,6 @@
end
private
-
# Returns a string representation of the key attribute(s) that is suitable
for use in an HTML DOM id.
# This can be overwritten to customize the default generated string
representation if desired.
# If you need to read back a key from a dom_id in order to query for the
underlying database record,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/renderer/abstract_renderer.rb
new/lib/action_view/renderer/abstract_renderer.rb
--- old/lib/action_view/renderer/abstract_renderer.rb 2020-03-19
17:42:36.000000000 +0100
+++ new/lib/action_view/renderer/abstract_renderer.rb 2020-05-06
20:00:05.000000000 +0200
@@ -75,7 +75,6 @@
end
private
-
def extract_details(options) # :doc:
@lookup_context.registered_details.each_with_object({}) do |key,
details|
value = options[key]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/lib/action_view/renderer/partial_renderer/collection_caching.rb
new/lib/action_view/renderer/partial_renderer/collection_caching.rb
--- old/lib/action_view/renderer/partial_renderer/collection_caching.rb
2020-03-19 17:42:36.000000000 +0100
+++ new/lib/action_view/renderer/partial_renderer/collection_caching.rb
2020-05-06 20:00:05.000000000 +0200
@@ -12,7 +12,7 @@
private
def cache_collection_render(instrumentation_payload, view, template)
- return yield unless @options[:cached]
+ return yield unless @options[:cached] &&
view.controller.respond_to?(:perform_caching) && view.controller.perform_caching
# Result is a hash with the key represents the
# key used for cache lookup and the value is the item
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/renderer/partial_renderer.rb
new/lib/action_view/renderer/partial_renderer.rb
--- old/lib/action_view/renderer/partial_renderer.rb 2020-03-19
17:42:36.000000000 +0100
+++ new/lib/action_view/renderer/partial_renderer.rb 2020-05-06
20:00:05.000000000 +0200
@@ -319,7 +319,6 @@
end
private
-
def render_collection(view, template)
identifier = (template && template.identifier) || @path
instrument(:collection, identifier: identifier, count:
@collection.size) do |payload|
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/lib/action_view/renderer/streaming_template_renderer.rb
new/lib/action_view/renderer/streaming_template_renderer.rb
--- old/lib/action_view/renderer/streaming_template_renderer.rb 2020-03-19
17:42:36.000000000 +0100
+++ new/lib/action_view/renderer/streaming_template_renderer.rb 2020-05-06
20:00:05.000000000 +0200
@@ -27,7 +27,6 @@
end
private
-
# This is the same logging logic as in ShowExceptions middleware.
def log_error(exception)
logger = ActionView::Base.logger
@@ -55,7 +54,6 @@
end
private
-
def delayed_render(buffer, template, layout, view, locals)
# Wrap the given buffer in the StreamingBuffer and pass it to the
# underlying template handler. Now, every time something is
concatenated
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/renderer/template_renderer.rb
new/lib/action_view/renderer/template_renderer.rb
--- old/lib/action_view/renderer/template_renderer.rb 2020-03-19
17:42:36.000000000 +0100
+++ new/lib/action_view/renderer/template_renderer.rb 2020-05-06
20:00:05.000000000 +0200
@@ -14,7 +14,6 @@
end
private
-
# Determine the template to be rendered using the given options.
def determine_template(options)
keys = options.has_key?(:locals) ? options[:locals].keys : []
@@ -96,7 +95,7 @@
end
rescue ActionView::MissingTemplate
all_details = @details.merge(formats:
@lookup_context.default_formats)
- raise unless template_exists?(layout, nil, false, [], all_details)
+ raise unless template_exists?(layout, nil, false, [],
**all_details)
end
when Proc
resolve_layout(layout.call(@lookup_context, formats), keys, formats)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/rendering.rb
new/lib/action_view/rendering.rb
--- old/lib/action_view/rendering.rb 2020-03-19 17:42:36.000000000 +0100
+++ new/lib/action_view/rendering.rb 2020-05-06 20:00:05.000000000 +0200
@@ -104,7 +104,6 @@
end
private
-
# Find and render a template based on the options given.
def _render_template(options)
variant = options.delete(:variant)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/template/error.rb
new/lib/action_view/template/error.rb
--- old/lib/action_view/template/error.rb 2020-03-19 17:42:36.000000000
+0100
+++ new/lib/action_view/template/error.rb 2020-05-06 20:00:05.000000000
+0200
@@ -81,19 +81,19 @@
end
end
- def source_extract(indentation = 0, output = :console)
- return unless num = line_number
+ def source_extract(indentation = 0)
+ return [] unless num = line_number
num = num.to_i
- source_code = @template.source.split("\n")
+ source_code = @template.encode!.split("\n")
start_on_line = [ num - SOURCE_CODE_RADIUS - 1, 0 ].max
end_on_line = [ num + SOURCE_CODE_RADIUS - 1, source_code.length].min
indent = end_on_line.to_s.size + indentation
- return unless source_code = source_code[start_on_line..end_on_line]
+ return [] unless source_code = source_code[start_on_line..end_on_line]
- formatted_code_for(source_code, start_on_line, indent, output)
+ formatted_code_for(source_code, start_on_line, indent)
end
def sub_template_of(template_path)
@@ -114,7 +114,6 @@
end
private
-
def source_location
if line_number
"on line ##{line_number} of "
@@ -123,15 +122,11 @@
end + file_name
end
- def formatted_code_for(source_code, line_counter, indent, output)
- start_value = (output == :html) ? {} : []
- source_code.inject(start_value) do |result, line|
+ def formatted_code_for(source_code, line_counter, indent)
+ indent_template = "%#{indent}s: %s"
+ source_code.map do |line|
line_counter += 1
- if output == :html
- result.update(line_counter.to_s => "%#{indent}s %s\n" % ["",
line])
- else
- result << "%#{indent}s: %s" % [line_counter, line]
- end
+ indent_template % [line_counter, line]
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/template/handlers/erb.rb
new/lib/action_view/template/handlers/erb.rb
--- old/lib/action_view/template/handlers/erb.rb 2020-03-19
17:42:36.000000000 +0100
+++ new/lib/action_view/template/handlers/erb.rb 2020-05-06
20:00:05.000000000 +0200
@@ -63,7 +63,6 @@
end
private
-
def valid_encoding(string, encoding)
# If a magic encoding comment was found, tag the
# String with this encoding. This is for a case
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/template/resolver.rb
new/lib/action_view/template/resolver.rb
--- old/lib/action_view/template/resolver.rb 2020-03-19 17:42:36.000000000
+0100
+++ new/lib/action_view/template/resolver.rb 2020-05-06 20:00:05.000000000
+0200
@@ -93,7 +93,6 @@
end
private
-
def canonical_no_templates(templates)
templates.empty? ? NO_TEMPLATES : templates
end
@@ -130,7 +129,6 @@
end
private
-
def _find_all(name, prefix, partial, details, key, locals)
find_templates(name, prefix, partial, details, locals)
end
@@ -183,7 +181,6 @@
end
private
-
def _find_all(name, prefix, partial, details, key, locals)
path = Path.build(name, prefix, partial)
query(path, details, details[:formats], locals, cache: !!key)
@@ -323,7 +320,6 @@
end
private
-
def find_template_paths_from_details(path, details)
# Instead of checking for every possible path, as our other globs would
# do, scan the directory for files with the right prefix.
@@ -358,7 +354,7 @@
end
def build_regex(path, details)
- query = escape_entry(File.join(@path, path))
+ query = Regexp.escape(File.join(@path, path))
exts = EXTENSIONS.map do |ext, prefix|
match =
if ext == :variants && details[ext] == :any
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/template.rb
new/lib/action_view/template.rb
--- old/lib/action_view/template.rb 2020-03-19 17:42:36.000000000 +0100
+++ new/lib/action_view/template.rb 2020-05-06 20:00:05.000000000 +0200
@@ -264,7 +264,6 @@
end
private
-
# Compile a template. This method ensures a template is compiled
# just once and removes the source after it is compiled.
def compile!(view)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/test_case.rb
new/lib/action_view/test_case.rb
--- old/lib/action_view/test_case.rb 2020-03-19 17:42:36.000000000 +0100
+++ new/lib/action_view/test_case.rb 2020-05-06 20:00:05.000000000 +0200
@@ -75,8 +75,9 @@
methods.flatten.each do |method|
_helpers.module_eval <<-end_eval, __FILE__, __LINE__ + 1
def #{method}(*args, &block) # def
current_user(*args, &block)
- _test_case.send(%(#{method}), *args, &block) #
_test_case.send(%(current_user), *args, &block)
+ _test_case.send(:'#{method}', *args, &block) #
_test_case.send(:'current_user', *args, &block)
end # end
+ ruby2_keywords(:'#{method}') if respond_to?(:ruby2_keywords,
true)
end_eval
end
end
@@ -93,7 +94,6 @@
end
private
-
def include_helper_modules!
helper(helper_class) if helper_class
include _helpers
@@ -163,7 +163,6 @@
end
private
-
# Need to experiment if this priority is the best one: rendered =>
output_buffer
def document_root_element
Nokogiri::HTML::Document.parse(@rendered.blank? ? @output_buffer :
@rendered).root
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/testing/resolvers.rb
new/lib/action_view/testing/resolvers.rb
--- old/lib/action_view/testing/resolvers.rb 2020-03-19 17:42:36.000000000
+0100
+++ new/lib/action_view/testing/resolvers.rb 2020-05-06 20:00:05.000000000
+0200
@@ -27,7 +27,6 @@
end
private
-
def query(path, exts, _, locals, cache:)
regex = build_regex(path, exts)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/unbound_template.rb
new/lib/action_view/unbound_template.rb
--- old/lib/action_view/unbound_template.rb 2020-03-19 17:42:36.000000000
+0100
+++ new/lib/action_view/unbound_template.rb 2020-05-06 20:00:05.000000000
+0200
@@ -18,14 +18,13 @@
end
private
-
def build_template(locals)
options = @options.merge(locals: locals)
Template.new(
@source,
@identifer,
@handler,
- options
+ **options
)
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view/view_paths.rb
new/lib/action_view/view_paths.rb
--- old/lib/action_view/view_paths.rb 2020-03-19 17:42:36.000000000 +0100
+++ new/lib/action_view/view_paths.rb 2020-05-06 20:00:05.000000000 +0200
@@ -29,7 +29,6 @@
end
private
-
# Override this method in your controller if you want to change paths
prefixes for finding views.
# Prefixes defined here will still be added to parents'
<tt>._prefixes</tt>.
def local_prefixes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/lib/action_view.rb new/lib/action_view.rb
--- old/lib/action_view.rb 2020-03-19 17:42:36.000000000 +0100
+++ new/lib/action_view.rb 2020-05-06 20:00:05.000000000 +0200
@@ -77,6 +77,7 @@
autoload :ActionViewError
autoload :EncodingError
autoload :TemplateError
+ autoload :SyntaxErrorInTemplate
autoload :WrongEncodingError
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/metadata new/metadata
--- old/metadata 2020-03-19 17:42:36.000000000 +0100
+++ new/metadata 2020-05-06 20:00:05.000000000 +0200
@@ -1,14 +1,14 @@
--- !ruby/object:Gem::Specification
name: actionview
version: !ruby/object:Gem::Version
- version: 6.0.2.2
+ version: 6.0.3
platform: ruby
authors:
- David Heinemeier Hansson
autorequire:
bindir: bin
cert_chain: []
-date: 2020-03-19 00:00:00.000000000 Z
+date: 2020-05-06 00:00:00.000000000 Z
dependencies:
- !ruby/object:Gem::Dependency
name: activesupport
@@ -16,14 +16,14 @@
requirements:
- - '='
- !ruby/object:Gem::Version
- version: 6.0.2.2
+ version: 6.0.3
type: :runtime
prerelease: false
version_requirements: !ruby/object:Gem::Requirement
requirements:
- - '='
- !ruby/object:Gem::Version
- version: 6.0.2.2
+ version: 6.0.3
- !ruby/object:Gem::Dependency
name: builder
requirement: !ruby/object:Gem::Requirement
@@ -92,28 +92,28 @@
requirements:
- - '='
- !ruby/object:Gem::Version
- version: 6.0.2.2
+ version: 6.0.3
type: :development
prerelease: false
version_requirements: !ruby/object:Gem::Requirement
requirements:
- - '='
- !ruby/object:Gem::Version
- version: 6.0.2.2
+ version: 6.0.3
- !ruby/object:Gem::Dependency
name: activemodel
requirement: !ruby/object:Gem::Requirement
requirements:
- - '='
- !ruby/object:Gem::Version
- version: 6.0.2.2
+ version: 6.0.3
type: :development
prerelease: false
version_requirements: !ruby/object:Gem::Requirement
requirements:
- - '='
- !ruby/object:Gem::Version
- version: 6.0.2.2
+ version: 6.0.3
description: Simple, battle-tested conventions and helpers for building web
pages.
email: [email protected]
executables: []
@@ -236,10 +236,10 @@
- MIT
metadata:
bug_tracker_uri: https://github.com/rails/rails/issues
- changelog_uri:
https://github.com/rails/rails/blob/v6.0.2.2/actionview/CHANGELOG.md
- documentation_uri: https://api.rubyonrails.org/v6.0.2.2/
- mailing_list_uri: https://groups.google.com/forum/#!forum/rubyonrails-talk
- source_code_uri: https://github.com/rails/rails/tree/v6.0.2.2/actionview
+ changelog_uri:
https://github.com/rails/rails/blob/v6.0.3/actionview/CHANGELOG.md
+ documentation_uri: https://api.rubyonrails.org/v6.0.3/
+ mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
+ source_code_uri: https://github.com/rails/rails/tree/v6.0.3/actionview
post_install_message:
rdoc_options: []
require_paths:
@@ -256,7 +256,7 @@
version: '0'
requirements:
- none
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
signing_key:
specification_version: 4
summary: Rendering framework putting the V in MVC (part of Rails).
++++++ gem2rpm.yml ++++++
--- /var/tmp/diff_new_pack.jB37c8/_old 2020-05-11 13:38:22.608743149 +0200
+++ /var/tmp/diff_new_pack.jB37c8/_new 2020-05-11 13:38:22.612743158 +0200
@@ -9,7 +9,7 @@
# ## used by gem2rpm
# :license: MIT or Ruby
# ## used by gem2rpm and gem_packages
-# :version_suffix: -x_y
+:version_suffix: '-6.0'
# ## used by gem2rpm and gem_packages
# :disable_docs: true
# ## used by gem2rpm
