Skip to content

Commit c27dd7f

Browse files
committed
update ci
1 parent f6045fa commit c27dd7f

File tree

9 files changed

+96
-71
lines changed

9 files changed

+96
-71
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
strategy:
3131
fail-fast: false
3232
matrix:
33-
ruby: ["2.7", "3.0", "3.1", "3.2"]
33+
ruby: ["3.0", "3.1", "3.2", "3.3"]
3434

3535
name: ${{ matrix.ruby }}
3636

.rubocop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ inherit_gem:
33

44
AllCops:
55
DisplayCopNames: true
6-
TargetRubyVersion: 2.7
6+
TargetRubyVersion: 3.0
77

88
Naming/FileName:
99
Exclude:

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ gem "rspec"
1313
gem "rubocop-config-umbrellio"
1414
gem "simplecov"
1515
gem "simplecov-lcov"
16+
gem "symbiont-ruby"

Gemfile.lock

Lines changed: 80 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -3,102 +3,126 @@ PATH
33
specs:
44
umbrellio-sequel-plugins (0.15.0)
55
sequel
6-
symbiont-ruby
76

87
GEM
98
remote: https://rubygems.org/
109
specs:
11-
activesupport (7.0.6)
12-
concurrent-ruby (~> 1.0, >= 1.0.2)
10+
activesupport (7.2.1)
11+
base64
12+
bigdecimal
13+
concurrent-ruby (~> 1.0, >= 1.3.1)
14+
connection_pool (>= 2.2.5)
15+
drb
1316
i18n (>= 1.6, < 2)
17+
logger (>= 1.4.2)
1418
minitest (>= 5.1)
15-
tzinfo (~> 2.0)
19+
securerandom (>= 0.3)
20+
tzinfo (~> 2.0, >= 2.0.5)
1621
ast (2.4.2)
1722
async (1.31.0)
1823
console (~> 1.10)
1924
nio4r (~> 2.3)
2025
timers (~> 4.1)
26+
base64 (0.2.0)
27+
bigdecimal (3.1.8)
2128
coderay (1.1.3)
22-
concurrent-ruby (1.2.2)
23-
console (1.17.2)
29+
concurrent-ruby (1.3.4)
30+
connection_pool (2.4.1)
31+
console (1.27.0)
2432
fiber-annotation
25-
fiber-local
26-
diff-lcs (1.5.0)
27-
docile (1.4.0)
33+
fiber-local (~> 1.1)
34+
json
35+
diff-lcs (1.5.1)
36+
docile (1.4.1)
37+
drb (2.2.1)
2838
fiber-annotation (0.2.0)
29-
fiber-local (1.0.0)
30-
i18n (1.14.1)
39+
fiber-local (1.1.0)
40+
fiber-storage
41+
fiber-storage (1.0.0)
42+
i18n (1.14.5)
3143
concurrent-ruby (~> 1.0)
32-
json (2.6.3)
33-
method_source (1.0.0)
34-
minitest (5.18.1)
35-
money (6.16.0)
44+
json (2.7.2)
45+
language_server-protocol (3.17.0.3)
46+
logger (1.6.1)
47+
method_source (1.1.0)
48+
minitest (5.25.1)
49+
money (6.19.0)
3650
i18n (>= 0.6.4, <= 2)
37-
nio4r (2.5.9)
38-
parallel (1.23.0)
39-
parser (3.2.2.3)
51+
nio4r (2.7.3)
52+
parallel (1.26.3)
53+
parser (3.3.5.0)
4054
ast (~> 2.4.1)
4155
racc
42-
pg (1.5.3)
56+
pg (1.5.7)
4357
pry (0.14.2)
4458
coderay (~> 1.1)
4559
method_source (~> 1.0)
46-
racc (1.7.1)
47-
rack (3.0.8)
60+
racc (1.8.1)
61+
rack (3.1.7)
4862
rainbow (3.1.1)
49-
rake (13.0.6)
50-
regexp_parser (2.8.1)
51-
rexml (3.2.5)
52-
rspec (3.12.0)
53-
rspec-core (~> 3.12.0)
54-
rspec-expectations (~> 3.12.0)
55-
rspec-mocks (~> 3.12.0)
56-
rspec-core (3.12.2)
57-
rspec-support (~> 3.12.0)
58-
rspec-expectations (3.12.3)
63+
rake (13.2.1)
64+
regexp_parser (2.9.2)
65+
rexml (3.3.7)
66+
rspec (3.13.0)
67+
rspec-core (~> 3.13.0)
68+
rspec-expectations (~> 3.13.0)
69+
rspec-mocks (~> 3.13.0)
70+
rspec-core (3.13.1)
71+
rspec-support (~> 3.13.0)
72+
rspec-expectations (3.13.2)
5973
diff-lcs (>= 1.2.0, < 2.0)
60-
rspec-support (~> 3.12.0)
61-
rspec-mocks (3.12.6)
74+
rspec-support (~> 3.13.0)
75+
rspec-mocks (3.13.1)
6276
diff-lcs (>= 1.2.0, < 2.0)
63-
rspec-support (~> 3.12.0)
64-
rspec-support (3.12.1)
65-
rubocop (1.50.2)
77+
rspec-support (~> 3.13.0)
78+
rspec-support (3.13.1)
79+
rubocop (1.63.5)
6680
json (~> 2.3)
81+
language_server-protocol (>= 3.17.0)
6782
parallel (~> 1.10)
68-
parser (>= 3.2.0.0)
83+
parser (>= 3.3.0.2)
6984
rainbow (>= 2.2.2, < 4.0)
7085
regexp_parser (>= 1.8, < 3.0)
7186
rexml (>= 3.2.5, < 4.0)
72-
rubocop-ast (>= 1.28.0, < 2.0)
87+
rubocop-ast (>= 1.31.1, < 2.0)
7388
ruby-progressbar (~> 1.7)
7489
unicode-display_width (>= 2.4.0, < 3.0)
75-
rubocop-ast (1.29.0)
76-
parser (>= 3.2.1.0)
77-
rubocop-capybara (2.18.0)
90+
rubocop-ast (1.32.3)
91+
parser (>= 3.3.1.0)
92+
rubocop-capybara (2.21.0)
7893
rubocop (~> 1.41)
79-
rubocop-config-umbrellio (1.50.0.85)
80-
rubocop (~> 1.50.0)
81-
rubocop-performance (~> 1.17.0)
82-
rubocop-rails (~> 2.19.0)
94+
rubocop-config-umbrellio (1.63.0.93)
95+
rubocop (~> 1.63.0)
96+
rubocop-performance (~> 1.21.0)
97+
rubocop-rails (~> 2.24.0)
8398
rubocop-rake (~> 0.6.0)
84-
rubocop-rspec (~> 2.20.0)
99+
rubocop-rspec (~> 2.29.0)
85100
rubocop-sequel (~> 0.3.3)
86-
rubocop-performance (1.17.1)
87-
rubocop (>= 1.7.0, < 2.0)
88-
rubocop-ast (>= 0.4.0)
89-
rubocop-rails (2.19.1)
101+
rubocop-factory_bot (2.26.1)
102+
rubocop (~> 1.61)
103+
rubocop-performance (1.21.1)
104+
rubocop (>= 1.48.1, < 2.0)
105+
rubocop-ast (>= 1.31.1, < 2.0)
106+
rubocop-rails (2.24.1)
90107
activesupport (>= 4.2.0)
91108
rack (>= 1.1)
92109
rubocop (>= 1.33.0, < 2.0)
110+
rubocop-ast (>= 1.31.1, < 2.0)
93111
rubocop-rake (0.6.0)
94112
rubocop (~> 1.0)
95-
rubocop-rspec (2.20.0)
96-
rubocop (~> 1.33)
113+
rubocop-rspec (2.29.2)
114+
rubocop (~> 1.40)
97115
rubocop-capybara (~> 2.17)
116+
rubocop-factory_bot (~> 2.22)
117+
rubocop-rspec_rails (~> 2.28)
118+
rubocop-rspec_rails (2.29.1)
119+
rubocop (~> 1.61)
98120
rubocop-sequel (0.3.4)
99121
rubocop (~> 1.0)
100122
ruby-progressbar (1.13.0)
101-
sequel (5.70.0)
123+
securerandom (0.3.1)
124+
sequel (5.84.0)
125+
bigdecimal
102126
simplecov (0.22.0)
103127
docile (~> 1.1)
104128
simplecov-html (~> 0.11)
@@ -110,10 +134,10 @@ GEM
110134
timers (4.3.5)
111135
tzinfo (2.0.6)
112136
concurrent-ruby (~> 1.0)
113-
unicode-display_width (2.4.2)
137+
unicode-display_width (2.5.0)
114138

115139
PLATFORMS
116-
ruby
140+
arm64-darwin-23
117141

118142
DEPENDENCIES
119143
async (= 1.31.0)
@@ -125,6 +149,7 @@ DEPENDENCIES
125149
rubocop-config-umbrellio
126150
simplecov
127151
simplecov-lcov
152+
symbiont-ruby
128153
umbrellio-sequel-plugins!
129154

130155
BUNDLED WITH

lib/sequel/plugins/attr_encrypted.rb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,22 +48,22 @@ def attr_encrypted(*attrs, key:)
4848

4949
def define_encrypted_setter(attr, key)
5050
@_attr_encrypted_module.module_eval do
51-
define_method("#{attr}=") do |value|
52-
instance_variable_set("@#{attr}", value)
51+
define_method(:"#{attr}=") do |value|
52+
instance_variable_set(:"@#{attr}", value)
5353

54-
send("encrypted_#{attr}=", SimpleCrypt.encrypt(value.to_json, key))
54+
send(:"encrypted_#{attr}=", SimpleCrypt.encrypt(value.to_json, key))
5555
end
5656
end
5757
end
5858

5959
def define_encrypted_getter(attr, key)
6060
@_attr_encrypted_module.module_eval do
6161
define_method(attr.to_s) do
62-
instance_variable_get("@#{attr}") || begin
63-
decrypted = SimpleCrypt.decrypt(send("encrypted_#{attr}"), key)
62+
instance_variable_get(:"@#{attr}") || begin
63+
decrypted = SimpleCrypt.decrypt(send(:"encrypted_#{attr}"), key)
6464

6565
result = decrypted.nil? ? decrypted : JSON.parse(decrypted)
66-
instance_variable_set("@#{attr}", result)
66+
instance_variable_set(:"@#{attr}", result)
6767
end
6868
end
6969
end
@@ -91,7 +91,7 @@ def refresh(*)
9191

9292
def _reset_encrypted_attrs_ivars
9393
self.class.instance_variable_get(:@_encrypted_attributes)&.each do |attr|
94-
instance_variable_set("@#{attr}", nil)
94+
instance_variable_set(:"@#{attr}", nil)
9595
end
9696
end
9797
end

lib/sequel/plugins/money_accessors.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def money_getter(amount_column, currency_column)
4040
def money_setter(amount_column, currency_column)
4141
include_accessors_module!
4242
@_money_accessors_module.module_eval do
43-
define_method("#{amount_column}=") do |value|
43+
define_method(:"#{amount_column}=") do |value|
4444
case value
4545
when Money
4646
amount = value.to_d
@@ -52,7 +52,7 @@ def money_setter(amount_column, currency_column)
5252
end
5353

5454
super(amount)
55-
send("#{currency_column}=", currency)
55+
send(:"#{currency_column}=", currency)
5656
end
5757
end
5858
end

lib/sequel/plugins/store_accessors.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ def define_store_getter(column, field)
5252

5353
def define_store_setter(column, field)
5454
@_store_accessors_module.module_eval do
55-
define_method("#{field}=") do |value|
56-
send("#{column}=", send(column).to_h.merge(field.to_s => value))
55+
define_method(:"#{field}=") do |value|
56+
send(:"#{column}=", send(column).to_h.merge(field.to_s => value))
5757
end
5858
end
5959
end

spec/spec_helper.rb

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

2525
require_relative "../utils/database"
2626

27-
Dir["#{__dir__}/../lib/sequel/**/*.rb"].sort.each { |f| require f }
27+
Dir["#{__dir__}/../lib/sequel/**/*.rb"].each { |f| require f }
2828

2929
RSpec.configure do |config|
3030
config.example_status_persistence_file_path = ".rspec_status"

umbrellio-sequel-plugins.gemspec

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
1212

1313
spec.name = "umbrellio-sequel-plugins"
1414
spec.version = release_version || gem_version
15-
spec.required_ruby_version = ">= 2.7"
15+
spec.required_ruby_version = ">= 3.0"
1616

1717
spec.authors = ["Team Umbrellio"]
1818
spec.email = ["[email protected]"]
@@ -25,5 +25,4 @@ Gem::Specification.new do |spec|
2525
spec.require_paths = ["lib"]
2626

2727
spec.add_runtime_dependency "sequel"
28-
spec.add_runtime_dependency "symbiont-ruby"
2928
end

0 commit comments

Comments
 (0)