Skip to content

Commit aa721a1

Browse files
marcorothmarcoroth
committed
Upgrade Herb to v0.9
1 parent 2464499 commit aa721a1

12 files changed

Lines changed: 88 additions & 92 deletions

File tree

‎Gemfile.lock‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ PATH
33
specs:
44
reactionview (0.2.1)
55
actionview (>= 7.0)
6-
herb (>= 0.8.0, < 1.0.0)
6+
herb (>= 0.9.0, < 1.0.0)
77

88
GEM
99
remote: https://rubygems.org/
@@ -107,14 +107,14 @@ GEM
107107
erubi (1.13.1)
108108
globalid (1.3.0)
109109
activesupport (>= 6.1)
110-
herb (0.8.10-aarch64-linux-gnu)
111-
herb (0.8.10-aarch64-linux-musl)
112-
herb (0.8.10-arm-linux-gnu)
113-
herb (0.8.10-arm-linux-musl)
114-
herb (0.8.10-arm64-darwin)
115-
herb (0.8.10-x86_64-darwin)
116-
herb (0.8.10-x86_64-linux-gnu)
117-
herb (0.8.10-x86_64-linux-musl)
110+
herb (0.9.1-aarch64-linux-gnu)
111+
herb (0.9.1-aarch64-linux-musl)
112+
herb (0.9.1-arm-linux-gnu)
113+
herb (0.9.1-arm-linux-musl)
114+
herb (0.9.1-arm64-darwin)
115+
herb (0.9.1-x86_64-darwin)
116+
herb (0.9.1-x86_64-linux-gnu)
117+
herb (0.9.1-x86_64-linux-musl)
118118
i18n (1.14.7)
119119
concurrent-ruby (~> 1.0)
120120
io-console (0.8.1)

‎gemfiles/rails_7_0.gemfile.lock‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ PATH
33
specs:
44
reactionview (0.2.1)
55
actionview (>= 7.0)
6-
herb (>= 0.8.0, < 1.0.0)
6+
herb (>= 0.9.0, < 1.0.0)
77

88
GEM
99
remote: https://rubygems.org/
@@ -63,14 +63,14 @@ GEM
6363
drb (2.2.3)
6464
erb (5.0.2)
6565
erubi (1.13.1)
66-
herb (0.8.10-aarch64-linux-gnu)
67-
herb (0.8.10-aarch64-linux-musl)
68-
herb (0.8.10-arm-linux-gnu)
69-
herb (0.8.10-arm-linux-musl)
70-
herb (0.8.10-arm64-darwin)
71-
herb (0.8.10-x86_64-darwin)
72-
herb (0.8.10-x86_64-linux-gnu)
73-
herb (0.8.10-x86_64-linux-musl)
66+
herb (0.9.1-aarch64-linux-gnu)
67+
herb (0.9.1-aarch64-linux-musl)
68+
herb (0.9.1-arm-linux-gnu)
69+
herb (0.9.1-arm-linux-musl)
70+
herb (0.9.1-arm64-darwin)
71+
herb (0.9.1-x86_64-darwin)
72+
herb (0.9.1-x86_64-linux-gnu)
73+
herb (0.9.1-x86_64-linux-musl)
7474
i18n (1.14.7)
7575
concurrent-ruby (~> 1.0)
7676
io-console (0.8.1)

‎gemfiles/rails_7_1.gemfile.lock‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ PATH
33
specs:
44
reactionview (0.2.1)
55
actionview (>= 7.0)
6-
herb (>= 0.8.0, < 1.0.0)
6+
herb (>= 0.9.0, < 1.0.0)
77

88
GEM
99
remote: https://rubygems.org/
@@ -63,14 +63,14 @@ GEM
6363
drb (2.2.3)
6464
erb (5.0.2)
6565
erubi (1.13.1)
66-
herb (0.8.10-aarch64-linux-gnu)
67-
herb (0.8.10-aarch64-linux-musl)
68-
herb (0.8.10-arm-linux-gnu)
69-
herb (0.8.10-arm-linux-musl)
70-
herb (0.8.10-arm64-darwin)
71-
herb (0.8.10-x86_64-darwin)
72-
herb (0.8.10-x86_64-linux-gnu)
73-
herb (0.8.10-x86_64-linux-musl)
66+
herb (0.9.1-aarch64-linux-gnu)
67+
herb (0.9.1-aarch64-linux-musl)
68+
herb (0.9.1-arm-linux-gnu)
69+
herb (0.9.1-arm-linux-musl)
70+
herb (0.9.1-arm64-darwin)
71+
herb (0.9.1-x86_64-darwin)
72+
herb (0.9.1-x86_64-linux-gnu)
73+
herb (0.9.1-x86_64-linux-musl)
7474
i18n (1.14.7)
7575
concurrent-ruby (~> 1.0)
7676
io-console (0.8.1)

‎gemfiles/rails_7_2.gemfile.lock‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ PATH
33
specs:
44
reactionview (0.2.1)
55
actionview (>= 7.0)
6-
herb (>= 0.8.0, < 1.0.0)
6+
herb (>= 0.9.0, < 1.0.0)
77

88
GEM
99
remote: https://rubygems.org/
@@ -63,14 +63,14 @@ GEM
6363
drb (2.2.3)
6464
erb (5.0.2)
6565
erubi (1.13.1)
66-
herb (0.8.10-aarch64-linux-gnu)
67-
herb (0.8.10-aarch64-linux-musl)
68-
herb (0.8.10-arm-linux-gnu)
69-
herb (0.8.10-arm-linux-musl)
70-
herb (0.8.10-arm64-darwin)
71-
herb (0.8.10-x86_64-darwin)
72-
herb (0.8.10-x86_64-linux-gnu)
73-
herb (0.8.10-x86_64-linux-musl)
66+
herb (0.9.1-aarch64-linux-gnu)
67+
herb (0.9.1-aarch64-linux-musl)
68+
herb (0.9.1-arm-linux-gnu)
69+
herb (0.9.1-arm-linux-musl)
70+
herb (0.9.1-arm64-darwin)
71+
herb (0.9.1-x86_64-darwin)
72+
herb (0.9.1-x86_64-linux-gnu)
73+
herb (0.9.1-x86_64-linux-musl)
7474
i18n (1.14.7)
7575
concurrent-ruby (~> 1.0)
7676
io-console (0.8.1)

‎gemfiles/rails_8_0.gemfile.lock‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ PATH
33
specs:
44
reactionview (0.2.1)
55
actionview (>= 7.0)
6-
herb (>= 0.8.0, < 1.0.0)
6+
herb (>= 0.9.0, < 1.0.0)
77

88
GEM
99
remote: https://rubygems.org/
@@ -63,14 +63,14 @@ GEM
6363
drb (2.2.3)
6464
erb (5.0.2)
6565
erubi (1.13.1)
66-
herb (0.8.10-aarch64-linux-gnu)
67-
herb (0.8.10-aarch64-linux-musl)
68-
herb (0.8.10-arm-linux-gnu)
69-
herb (0.8.10-arm-linux-musl)
70-
herb (0.8.10-arm64-darwin)
71-
herb (0.8.10-x86_64-darwin)
72-
herb (0.8.10-x86_64-linux-gnu)
73-
herb (0.8.10-x86_64-linux-musl)
66+
herb (0.9.1-aarch64-linux-gnu)
67+
herb (0.9.1-aarch64-linux-musl)
68+
herb (0.9.1-arm-linux-gnu)
69+
herb (0.9.1-arm-linux-musl)
70+
herb (0.9.1-arm64-darwin)
71+
herb (0.9.1-x86_64-darwin)
72+
herb (0.9.1-x86_64-linux-gnu)
73+
herb (0.9.1-x86_64-linux-musl)
7474
i18n (1.14.7)
7575
concurrent-ruby (~> 1.0)
7676
io-console (0.8.1)

‎gemfiles/rails_8_1.gemfile.lock‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ PATH
33
specs:
44
reactionview (0.2.1)
55
actionview (>= 7.0)
6-
herb (>= 0.8.0, < 1.0.0)
6+
herb (>= 0.9.0, < 1.0.0)
77

88
GEM
99
remote: https://rubygems.org/
@@ -62,14 +62,14 @@ GEM
6262
drb (2.2.3)
6363
erb (5.0.2)
6464
erubi (1.13.1)
65-
herb (0.8.10-aarch64-linux-gnu)
66-
herb (0.8.10-aarch64-linux-musl)
67-
herb (0.8.10-arm-linux-gnu)
68-
herb (0.8.10-arm-linux-musl)
69-
herb (0.8.10-arm64-darwin)
70-
herb (0.8.10-x86_64-darwin)
71-
herb (0.8.10-x86_64-linux-gnu)
72-
herb (0.8.10-x86_64-linux-musl)
65+
herb (0.9.1-aarch64-linux-gnu)
66+
herb (0.9.1-aarch64-linux-musl)
67+
herb (0.9.1-arm-linux-gnu)
68+
herb (0.9.1-arm-linux-musl)
69+
herb (0.9.1-arm64-darwin)
70+
herb (0.9.1-x86_64-darwin)
71+
herb (0.9.1-x86_64-linux-gnu)
72+
herb (0.9.1-x86_64-linux-musl)
7373
i18n (1.14.7)
7474
concurrent-ruby (~> 1.0)
7575
io-console (0.8.1)

‎gemfiles/rails_8_2.gemfile.lock‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ PATH
4646
specs:
4747
reactionview (0.2.1)
4848
actionview (>= 7.0)
49-
herb (>= 0.8.0, < 1.0.0)
49+
herb (>= 0.9.0, < 1.0.0)
5050

5151
GEM
5252
remote: https://rubygems.org/
@@ -76,14 +76,14 @@ GEM
7676
drb (2.2.3)
7777
erb (5.1.1)
7878
erubi (1.13.1)
79-
herb (0.8.10-aarch64-linux-gnu)
80-
herb (0.8.10-aarch64-linux-musl)
81-
herb (0.8.10-arm-linux-gnu)
82-
herb (0.8.10-arm-linux-musl)
83-
herb (0.8.10-arm64-darwin)
84-
herb (0.8.10-x86_64-darwin)
85-
herb (0.8.10-x86_64-linux-gnu)
86-
herb (0.8.10-x86_64-linux-musl)
79+
herb (0.9.1-aarch64-linux-gnu)
80+
herb (0.9.1-aarch64-linux-musl)
81+
herb (0.9.1-arm-linux-gnu)
82+
herb (0.9.1-arm-linux-musl)
83+
herb (0.9.1-arm64-darwin)
84+
herb (0.9.1-x86_64-darwin)
85+
herb (0.9.1-x86_64-linux-gnu)
86+
herb (0.9.1-x86_64-linux-musl)
8787
i18n (1.14.7)
8888
concurrent-ruby (~> 1.0)
8989
io-console (0.8.1)

‎javascript/packages/dev-tools/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
}
2222
},
2323
"dependencies": {
24-
"@herb-tools/dev-tools": "0.8.10"
24+
"@herb-tools/dev-tools": "0.9.1"
2525
},
2626
"devDependencies": {
2727
"@rollup/plugin-node-resolve": "^16.0.1",

‎lib/reactionview/template/handlers/herb/herb.rb‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -48,31 +48,27 @@ def add_text(text)
4848
end
4949

5050
def add_expression(indicator, code)
51-
add_rails_expression(indicator, code, wrap_parentheses: true)
52-
end
53-
54-
def add_expression_block(indicator, code)
55-
add_rails_expression(indicator, code, wrap_parentheses: false)
56-
end
57-
58-
def add_rails_expression(indicator, code, wrap_parentheses:)
5951
flush_newline_if_pending(@src)
6052

6153
with_buffer do
62-
@src << if (indicator == "==") || @escape
63-
".safe_expr_append="
64-
else
65-
".append="
66-
end
54+
@src << expression_append_method(indicator)
6755

68-
if wrap_parentheses
69-
@src << "(" << code << ")"
70-
else
56+
if expression_block?
7157
@src << " " << code
58+
else
59+
@src << "(" << code << ")"
7260
end
7361
end
7462
end
7563

64+
def expression_append_method(indicator)
65+
if (indicator == "==") || @escape
66+
".safe_expr_append="
67+
else
68+
".append="
69+
end
70+
end
71+
7672
def add_code(code)
7773
flush_newline_if_pending(@src)
7874
super

‎reactionview.gemspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,5 @@ Gem::Specification.new do |spec|
3636
spec.require_paths = ["lib"]
3737

3838
spec.add_dependency "actionview", ">= 7.0"
39-
spec.add_dependency "herb", ">= 0.8.0", "< 1.0.0"
39+
spec.add_dependency "herb", ">= 0.9.0", "< 1.0.0"
4040
end

0 commit comments

Comments
 (0)