Skip to content

Commit d8d159a

Browse files
movermeyermovermeyer
authored
Merge pull request #262 from ruby-i18n/dependabot/bundler/rubocop-shopify-2.15.1
Bump rubocop-shopify from 2.11.1 to 2.15.1
2 parents e97c662 + 67b55ef commit d8d159a

File tree

14 files changed

+76
-83
lines changed

14 files changed

+76
-83
lines changed

‎Gemfile.lock‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ GEM
4040
rake
4141
rdoc
4242
semver2
43-
json (2.6.3)
43+
json (2.8.2)
4444
jwt (2.1.0)
4545
language_server-protocol (3.17.0.3)
4646
method_source (1.0.0)
@@ -58,9 +58,10 @@ GEM
5858
multi_json (~> 1.3)
5959
multi_xml (~> 0.5)
6060
rack (>= 1.2, < 3)
61-
parallel (1.22.1)
62-
parser (3.2.0.0)
61+
parallel (1.26.3)
62+
parser (3.3.6.0)
6363
ast (~> 2.4.1)
64+
racc
6465
power_assert (2.0.3)
6566
prettier_print (1.2.1)
6667
pry (0.14.2)
@@ -76,29 +77,28 @@ GEM
7677
rake (13.0.1)
7778
rchardet (1.8.0)
7879
rdoc (6.3.4.1)
79-
regexp_parser (2.6.1)
80+
regexp_parser (2.9.3)
8081
reline (0.3.3)
8182
io-console (~> 0.5)
82-
rexml (3.3.9)
83-
rubocop (1.42.0)
83+
rubocop (1.69.0)
8484
json (~> 2.3)
85+
language_server-protocol (>= 3.17.0)
8586
parallel (~> 1.10)
86-
parser (>= 3.1.2.1)
87+
parser (>= 3.3.0.2)
8788
rainbow (>= 2.2.2, < 4.0)
88-
regexp_parser (>= 1.8, < 3.0)
89-
rexml (>= 3.2.5, < 4.0)
90-
rubocop-ast (>= 1.24.1, < 2.0)
89+
regexp_parser (>= 2.4, < 3.0)
90+
rubocop-ast (>= 1.36.1, < 2.0)
9191
ruby-progressbar (~> 1.7)
92-
unicode-display_width (>= 1.4.0, < 3.0)
93-
rubocop-ast (1.24.1)
94-
parser (>= 3.1.1.0)
95-
rubocop-shopify (2.11.1)
96-
rubocop (~> 1.42)
92+
unicode-display_width (>= 2.4.0, < 4.0)
93+
rubocop-ast (1.36.2)
94+
parser (>= 3.3.1.0)
95+
rubocop-shopify (2.15.1)
96+
rubocop (~> 1.51)
9797
ruby-lsp (0.7.3)
9898
language_server-protocol (~> 3.17.0)
9999
sorbet-runtime
100100
syntax_tree (>= 6.1.1, < 7)
101-
ruby-progressbar (1.11.0)
101+
ruby-progressbar (1.13.0)
102102
rubyzip (2.3.2)
103103
semver2 (3.4.2)
104104
sorbet-runtime (0.5.10921)
@@ -109,7 +109,9 @@ GEM
109109
power_assert
110110
thor (1.2.1)
111111
thread_safe (0.3.6)
112-
unicode-display_width (2.3.0)
112+
unicode-display_width (3.1.2)
113+
unicode-emoji (~> 4.0, >= 4.0.4)
114+
unicode-emoji (4.0.4)
113115

114116
PLATFORMS
115117
ruby

‎lib/cldr/export/code/numbers.rb‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# frozen_string_literal: true
2+
23
# module Cldr
34
# module Export
45
# module Code

‎lib/cldr/export/data/calendars/gregorian.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ def pattern(node, type)
138138
# That probably means this `fields` method should be moved up to the parent as well.
139139
def fields
140140
select("dates/fields/field").each_with_object({}) do |node, result|
141-
key = node.attribute("type").value.underscore.gsub(/dayperiod/, "day_period").to_sym
141+
key = node.attribute("type").value.underscore.gsub("dayperiod", "day_period").to_sym
142142
name = node.xpath("displayName").first
143143
result[key] = name.content if name
144144
end

‎lib/cldr/export/data/context_transforms.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def context_transforms
1616
usage_type = usage_node.attribute("type").value.underscore.to_sym
1717
result[usage_type] = usage_node.xpath("contextTransform").each_with_object({}) do |transform_node, result|
1818
context_type = transform_node.attribute("type").value.underscore.to_sym
19-
transform_type = transform_node.content.underscore.gsub(/firstword/, "first_word")
19+
transform_type = transform_node.content.underscore.gsub("firstword", "first_word")
2020
result[context_type] = transform_type
2121
end
2222
end

‎lib/cldr/export/data/plurals/rules.rb‎

Lines changed: 35 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# frozen_string_literal: false
1+
# frozen_string_literal: true
22

33
require "rubygems"
44
require "nokogiri"
@@ -105,21 +105,21 @@ def to_ruby
105105
if code
106106
"#{code} ? :#{key} : #{result}"
107107
else
108-
":" << key.to_s
108+
":#{key}"
109109
end
110110
end + " }"
111111
end
112112
end
113113

114114
class Proposition < Array
115-
def initialize(type = nil)
115+
def initialize(type)
116116
super()
117117

118118
@type = type
119119
end
120120

121121
def to_ruby
122-
@ruby ||= "(" << map(&:to_ruby).join(" #{@type} ") << ")"
122+
@ruby ||= "(#{map(&:to_ruby).join(" #{@type} ")})"
123123
end
124124
end
125125

@@ -151,76 +151,80 @@ def initialize(operator = nil, mod = nil, negate = nil, operand = nil, type = ni
151151
#
152152
# http://www.unicode.org/reports/tr35/tr35-numbers.html#Language_Plural_Rules
153153
def to_ruby
154-
@ruby ||= begin
155-
return nil unless @operator
154+
return unless @operator
156155

156+
@ruby ||= begin
157157
enclose = false
158158
fraction = false
159-
case @type
159+
160+
op = case @type
160161
when "i"
161-
op = "n.to_i"
162+
"n.to_i"
162163
when "f"
163-
op = '(f = n.to_s.split(".")[1]) ? f.to_i : 0'
164164
enclose = true
165+
'(f = n.to_s.split(".")[1]) ? f.to_i : 0'
165166
when "t"
166-
op = '(t = n.to_s.split(".")[1]) ? t.gsub(/0+$/, "").to_i : 0'
167167
enclose = true
168+
'(t = n.to_s.split(".")[1]) ? t.gsub(/0+$/, "").to_i : 0'
168169
when "v"
169-
op = '(v = n.to_s.split(".")[1]) ? v.length : 0'
170170
enclose = true
171+
'(v = n.to_s.split(".")[1]) ? v.length : 0'
171172
when "w"
172-
op = '(w = n.to_s.split(".")[1]) ? w.gsub(/0+$/, "").length : 0'
173173
enclose = true
174+
'(w = n.to_s.split(".")[1]) ? w.gsub(/0+$/, "").length : 0'
174175
when "c", "e"
175176
# We don't support numbers in the "compact decimal" format.
176177
# Since `c`/`e` are always 0 for non-"compact decimal" format
177178
# numbers, we just hardcode it to 0 for now.
178179
# TODO: https://github.com/ruby-i18n/ruby-cldr/issues/131
179-
op = "#{@type} = 0"
180180
enclose = true
181+
"#{@type} = 0"
181182
when "n"
182183
fraction = true
183-
op = "n.to_f"
184+
"n.to_f"
184185
else
185186
raise StandardError, "Unknown plural operand `#{@type}`"
186187
end
188+
187189
if @mod
188-
op = "(" << op << ")" if enclose
189-
op << " % " << @mod.to_s
190+
op = "(#{op})" if enclose
191+
op = "#{op} % #{@mod}"
190192
enclose = false
191193
end
194+
192195
case @operator
193196
when :is
194-
op = "(" << op << ")" if enclose
195-
op << (@negate ? " != " : " == ") << @operand.to_s
197+
op = "(#{op})" if enclose
198+
op = "#{op} #{@negate ? "!=" : "=="} #{@operand}"
196199
when :in
197200
values = @operand.first
198201
ranges = @operand.last
199202
prepend = (@negate ? "!" : "")
200203
str = ""
201204
bop = op
202-
bop = "(" << bop << ")" if enclose || @mod
205+
bop = "(#{bop})" if enclose || @mod
203206
if values.count == 1
204-
str = bop + (@negate ? " != " : " == ") << values.first.to_s
207+
str = "#{bop} #{@negate ? "!=" : "=="} #{values.first}"
205208
elsif values.count > 1
206209
str = prepend + "#{values.inspect}.include?(#{op})"
207210
end
208211
enclose = ranges.count > 1 || (values.count > 0 && ranges.count > 0)
209212
if ranges.count > 0
210-
str << " || " if values.count > 0
211-
str << "((#{bop} % 1).zero? && " if fraction
212-
str << "(" if ranges.count > 1
213-
str << prepend + "(#{ranges.shift.inspect}).include?(#{op})"
214-
ranges.each do |range|
215-
str << " || " << prepend + "(#{range.inspect}).include?(#{op})"
216-
end
217-
str << ")" if ranges.count > 0
218-
str << ")" if fraction
213+
str += " || " if values.count > 0
214+
str += "((#{bop} % 1).zero? && " if fraction
215+
216+
ranges_formatted = ranges.map do |range|
217+
"#{prepend}(#{range.inspect}).include?(#{op})"
218+
end.join(" || ")
219+
ranges_formatted = "(#{ranges_formatted})" if ranges.count > 1
220+
str += ranges_formatted
221+
222+
str += ")" if fraction
219223
end
220-
str = "(" << str << ")" if enclose
224+
str = "(#{str})" if enclose
221225
str
222226
when :within
223-
op = "(" << op << ")" if enclose || @mod
227+
op = "(#{op})" if enclose || @mod
224228
(@negate ? "!" : "") + "#{op}.between?(#{@operand.first}, #{@operand.last})"
225229
else
226230
raise "unknown operator '#{@operator}'"

‎lib/cldr/export/data/transforms.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class Transforms < Base
88
attr_reader :transform_file
99

1010
def initialize(transform_file)
11-
super(nil) # no locale
11+
super(nil) # no locale
1212
@transform_file = transform_file
1313
update(transforms: transforms)
1414
end

‎lib/cldr/validate_upstream_assumptions.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def validate_aliases_only_in_root_locale
2929

3030
# Aliases need explicit special handling. Once that handling has been added,
3131
# the element chain covered by the handling gets added to this list.
32-
SUPPORTED_ALIAS_ELEMENT_CHAINS = [
32+
SUPPORTED_ALIAS_ELEMENT_CHAINS = [ # rubocop:disable Metrics/CollectionLiteralLength
3333
"/ldml/dates/calendars/calendar[@type=\"gregorian\"]/dayPeriods/dayPeriodContext[@type=\"format\"]/dayPeriodWidth[@type=\"narrow\"]/alias",
3434
"/ldml/dates/calendars/calendar[@type=\"gregorian\"]/dayPeriods/dayPeriodContext[@type=\"format\"]/dayPeriodWidth[@type=\"wide\"]/alias",
3535
"/ldml/dates/calendars/calendar[@type=\"gregorian\"]/dayPeriods/dayPeriodContext[@type=\"stand-alone\"]/dayPeriodWidth[@type=\"abbreviated\"]/alias",

‎lib/core_ext/hash/deep_sort.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def deep_sort_by!(options = {}, &block)
8080

8181
# comparison for hashes is ill-defined. this performs array or string comparison if the normal comparison fails.
8282
def <=>(other)
83-
super(other) || to_a <=> other.to_a || to_s <=> other.to_s
83+
super || to_a <=> other.to_a || to_s <=> other.to_s
8484
end
8585
end
8686
end

‎lib/core_ext/string/underscore.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
class String
44
def underscore
5-
to_s.gsub(/::/, "/")
5+
to_s.gsub("::", "/")
66
.gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
77
.gsub(/([a-z\d])([A-Z])/, '\1_\2')
88
.tr("-", "_")

‎ruby-cldr.gemspec‎

Lines changed: 11 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -142,29 +142,15 @@ Gem::Specification.new do |s|
142142
s.licenses = ["MIT"]
143143
s.summary = "Ruby library for exporting and using data from CLDR"
144144

145-
if s.respond_to?(:add_runtime_dependency)
146-
s.add_runtime_dependency("i18n", [">= 0"])
147-
s.add_runtime_dependency("nokogiri", [">= 0"])
148-
s.add_runtime_dependency("psych", [">= 4.0.0"])
149-
s.add_runtime_dependency("rubyzip", [">= 0"])
150-
s.add_runtime_dependency("thor", [">= 1.3.0"])
151-
s.add_development_dependency("jeweler", [">= 0"])
152-
s.add_development_dependency("pry", [">= 0"])
153-
s.add_development_dependency("pry-nav", [">= 0"])
154-
s.add_development_dependency("rubocop-shopify", [">= 0"])
155-
s.add_development_dependency("ruby-lsp", [">= 0"])
156-
s.add_development_dependency("test-unit", [">= 0"])
157-
else
158-
s.add_dependency("i18n", [">= 0"])
159-
s.add_dependency("jeweler", [">= 0"])
160-
s.add_dependency("nokogiri", [">= 0"])
161-
s.add_dependency("pry", [">= 0"])
162-
s.add_dependency("pry-nav", [">= 0"])
163-
s.add_dependency("psych", [">= 4.0.0"])
164-
s.add_dependency("rubocop-shopify", [">= 0"])
165-
s.add_dependency("ruby-lsp", [">= 0"])
166-
s.add_dependency("rubyzip", [">= 0"])
167-
s.add_dependency("test-unit", [">= 0"])
168-
s.add_dependency("thor", [">= 1.3.0"])
169-
end
145+
s.add_dependency("i18n", [">= 0"])
146+
s.add_dependency("nokogiri", [">= 0"])
147+
s.add_dependency("psych", [">= 4.0.0"])
148+
s.add_dependency("rubyzip", [">= 0"])
149+
s.add_dependency("thor", [">= 1.3.0"])
150+
s.add_development_dependency("jeweler", [">= 0"])
151+
s.add_development_dependency("pry", [">= 0"])
152+
s.add_development_dependency("pry-nav", [">= 0"])
153+
s.add_development_dependency("rubocop-shopify", [">= 0"])
154+
s.add_development_dependency("ruby-lsp", [">= 0"])
155+
s.add_development_dependency("test-unit", [">= 0"])
170156
end

0 commit comments

Comments
 (0)