Skip to content

Commit 995dec7

Browse files
authored
Merge pull request #70 from icelab/upgrade-rom
Upgrade to rom v3.0.0, rom-repository 1.0.0, rom-sql 1.0.0, rom-mapper 0.5.0, bump Ruby to 2.4.0
2 parents bff2091 + 11d65f4 commit 995dec7

File tree

5 files changed

+63
-56
lines changed

5 files changed

+63
-56
lines changed

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.3.1
1+
2.4.0

Gemfile

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source "https://rubygems.org"
22

3-
ruby "2.3.1"
3+
ruby "2.4.0"
44

55
gem "rake"
66

@@ -13,11 +13,10 @@ gem "shotgun"
1313

1414
# Database persistence
1515
gem "pg"
16-
gem "rom"
17-
gem "rom-mapper"
18-
gem "rom-repository"
19-
gem "rom-sql"
20-
gem "rom-support"
16+
gem "rom", "~> 3.0.0"
17+
gem "rom-mapper", "~> 0.5.0"
18+
gem "rom-repository", "~> 1.0.0"
19+
gem "rom-sql", "~> 1.0.0"
2120

2221
# Background jobs
2322
gem "que"
@@ -32,7 +31,7 @@ gem "dry-validation"
3231
gem "dry-view"
3332
gem "i18n"
3433
gem "slim"
35-
gem "transproc", git: "https://github.com/solnic/transproc"
34+
gem "transproc"
3635

3736
# 3rd party services
3837
gem "bugsnag"

Gemfile.lock

Lines changed: 47 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
GIT
2-
remote: https://github.com/solnic/transproc
3-
revision: ffe27d1d807bac6a9a47c0778eef4b3344284fb1
4-
specs:
5-
transproc (0.4.0)
6-
71
GEM
82
remote: https://rubygems.org/
93
specs:
@@ -22,24 +16,33 @@ GEM
2216
launchy
2317
cliver (0.3.2)
2418
coderay (1.1.1)
25-
concurrent-ruby (1.0.2)
19+
concurrent-ruby (1.0.4)
2620
database_cleaner (1.5.3)
2721
diff-lcs (1.2.5)
2822
dry-auto_inject (0.4.1)
2923
dry-container (>= 0.3.4)
30-
dry-configurable (0.1.7)
24+
dry-configurable (0.5.0)
3125
concurrent-ruby (~> 1.0)
32-
dry-container (0.5.0)
26+
dry-container (0.6.0)
3327
concurrent-ruby (~> 1.0)
3428
dry-configurable (~> 0.1, >= 0.1.3)
29+
dry-core (0.2.4)
30+
concurrent-ruby (~> 1.0)
3531
dry-equalizer (0.2.0)
36-
dry-logic (0.3.0)
32+
dry-initializer (0.11.0)
33+
dry-logic (0.4.1)
3734
dry-container (~> 0.2, >= 0.2.6)
35+
dry-core (~> 0.2)
3836
dry-equalizer (~> 0.2)
3937
dry-matcher (0.5.0)
4038
dry-monads (0.0.2)
4139
dry-result_matcher (0.4.0)
4240
dry-monads (~> 0.0.0)
41+
dry-struct (0.1.1)
42+
dry-configurable (~> 0.1)
43+
dry-equalizer (~> 0.2)
44+
dry-types (~> 0.9, >= 0.9.0)
45+
ice_nine (~> 0.11)
4346
dry-system (0.5.1)
4447
concurrent-ruby (~> 1.0)
4548
dry-auto_inject (>= 0.4.0)
@@ -52,22 +55,21 @@ GEM
5255
dry-matcher (>= 0.5.0)
5356
dry-monads (>= 0.0.1)
5457
wisper (>= 1.6.0)
55-
dry-types (0.8.1)
58+
dry-types (0.9.4)
5659
concurrent-ruby (~> 1.0)
5760
dry-configurable (~> 0.1)
5861
dry-container (~> 0.3)
62+
dry-core (~> 0.2, >= 0.2.1)
5963
dry-equalizer (~> 0.2)
60-
dry-logic (~> 0.3, >= 0.3.0)
61-
dry-monads (>= 0.0.1)
62-
ice_nine (~> 0.11)
64+
dry-logic (~> 0.4, >= 0.4.0)
6365
inflecto (~> 0.0.0, >= 0.0.2)
64-
dry-validation (0.9.5)
66+
dry-validation (0.10.5)
6567
concurrent-ruby (~> 1.0)
6668
dry-configurable (~> 0.1, >= 0.1.3)
67-
dry-container (~> 0.2, >= 0.2.8)
69+
dry-core (~> 0.2, >= 0.2.1)
6870
dry-equalizer (~> 0.2)
69-
dry-logic (~> 0.3, >= 0.3.0)
70-
dry-types (~> 0.8, >= 0.8.1)
71+
dry-logic (~> 0.4, >= 0.4.0)
72+
dry-types (~> 0.9, >= 0.9.0)
7173
dry-view (0.1.1)
7274
dry-configurable (~> 0.1)
7375
dry-equalizer (~> 0.2)
@@ -151,31 +153,28 @@ GEM
151153
roda (2.18.0)
152154
rack
153155
roda-flow (0.3.0)
154-
rom (2.0.0)
156+
rom (3.0.1)
155157
concurrent-ruby (~> 1.0)
158+
dry-core (~> 0.2, >= 0.2.3)
156159
dry-equalizer (~> 0.2)
157-
dry-types (~> 0.8)
158-
rom-mapper (~> 0.4.0)
159-
rom-support (~> 2.0)
160-
rom-mapper (0.4.0)
160+
dry-initializer (~> 0.10, >= 0.10.2)
161+
dry-types (~> 0.9, >= 0.9.4)
162+
rom-mapper (~> 0.5)
163+
rom-mapper (0.5.0)
164+
dry-core (~> 0.2.3)
161165
dry-equalizer (~> 0.2)
162-
rom-support (~> 2.0.0)
163-
transproc (~> 0.4.0)
164-
rom-repository (0.3.1)
165-
rom (~> 2.0)
166-
rom-mapper (~> 0.4)
167-
rom-support (~> 2.0)
168-
rom-sql (0.8.0)
169-
dry-equalizer (~> 0.2)
170-
dry-types (~> 0.8)
171-
rom (~> 2.0)
172-
rom-support (~> 2.0)
173-
sequel (~> 4.25)
174-
rom-support (2.0.0)
175-
concurrent-ruby (~> 1.0)
166+
transproc (~> 1.0)
167+
rom-repository (1.0.1)
168+
dry-core (~> 0.2, >= 0.2.1)
169+
dry-struct (~> 0.1)
170+
rom (~> 3.0)
171+
rom-mapper (~> 0.5)
172+
rom-sql (1.0.0)
173+
dry-core (~> 0.2, >= 0.2.3)
176174
dry-equalizer (~> 0.2)
177-
transproc (~> 0.4.0)
178-
wisper (~> 1.6, >= 1.6.0)
175+
dry-types (~> 0.9, >= 0.9.4)
176+
rom (~> 3.0)
177+
sequel (~> 4.42)
179178
rspec (3.5.0)
180179
rspec-core (~> 3.5.0)
181180
rspec-expectations (~> 3.5.0)
@@ -190,7 +189,7 @@ GEM
190189
rspec-support (~> 3.5.0)
191190
rspec-support (3.5.0)
192191
ruby_dep (1.4.0)
193-
sequel (4.38.0)
192+
sequel (4.43.0)
194193
shellany (0.0.1)
195194
shotgun (0.9.2)
196195
rack (>= 1.0)
@@ -204,6 +203,7 @@ GEM
204203
temple (0.7.7)
205204
thor (0.19.1)
206205
tilt (2.0.5)
206+
transproc (1.0.0)
207207
websocket-driver (0.6.4)
208208
websocket-extensions (>= 0.1.0)
209209
websocket-extensions (0.1.2)
@@ -239,19 +239,18 @@ DEPENDENCIES
239239
que
240240
rack_csrf
241241
rake
242-
rom
243-
rom-mapper
244-
rom-repository
245-
rom-sql
246-
rom-support
242+
rom (~> 3.0.0)
243+
rom-mapper (~> 0.5.0)
244+
rom-repository (~> 1.0.0)
245+
rom-sql (~> 1.0.0)
247246
rspec
248247
shotgun
249248
site_prism
250249
slim
251-
transproc!
250+
transproc
252251

253252
RUBY VERSION
254-
ruby 2.3.1p112
253+
ruby 2.4.0p0
255254

256255
BUNDLED WITH
257-
1.12.5
256+
1.14.3

lib/functions.rb

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
require "transproc/all"
2+
3+
module Functions
4+
extend Transproc::Registry
5+
6+
import Transproc::HashTransformations
7+
import Transproc::ArrayTransformations
8+
end

lib/types.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
require "dry-types"
2+
require "dry-struct"
23

34
module Types
45
include Dry::Types.module

0 commit comments

Comments
 (0)