Skip to content

Commit ab6d48a

Browse files
dylanwolffdylanwolff
authored
Merge pull request #54 from icelab/update-dry-libraries
Update dry-* libraries
2 parents 8c57edf + c374764 commit ab6d48a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+199
-235
lines changed

‎.gitignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# RSpec artifacts
22
/spec/examples.txt
33

4-
# Local config
5-
/config/application.yml
4+
# Local settings
5+
/config/settings.yml
66

77
# Asset artifacts
88
/assets/build

‎.ruby-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.2.3
1+
2.3.0

‎Gemfile

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
source "https://rubygems.org"
22

3-
ruby "2.2.3"
3+
ruby "2.3.0"
44

55
gem "rake"
66

77
# Web framework
88
gem "puma"
9-
gem "dry-component", git: "https://github.com/timriley/dry-component", branch: "import-containers-for-import-module" # temporary
10-
gem "dry-web"
9+
gem "dry-web", "~> 0.2"
10+
gem "dry-web-roda", "~> 0.1"
1111
gem "rack_csrf"
1212
gem "shotgun"
1313

@@ -24,10 +24,12 @@ gem "que"
2424

2525
# Application dependencies
2626
gem "dry-equalizer"
27+
gem "dry-logic"
2728
gem "dry-result_matcher"
2829
gem "dry-transaction"
2930
gem "dry-types"
30-
gem "dry-validation", git: "https://github.com/dryrb/dry-validation"
31+
gem "dry-validation"
32+
gem "dry-view"
3133
gem "i18n"
3234
gem "slim"
3335
gem "transproc", git: "https://github.com/solnic/transproc"

‎Gemfile.lock

+94-119
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,17 @@
1-
GIT
2-
remote: https://github.com/dryrb/dry-validation
3-
revision: 727c1fb5448c47c0fa7490559269dbd21fe6b1c5
4-
specs:
5-
dry-validation (0.2.0)
6-
dry-configurable (~> 0.1)
7-
dry-container (~> 0.2, >= 0.2.6)
8-
dry-data (~> 0.2, >= 0.2.1)
9-
dry-equalizer (~> 0.2)
10-
111
GIT
122
remote: https://github.com/rom-rb/rom
13-
revision: 794d5d9649b7d6a76535e635095dc4f80394e8fa
3+
revision: cc6df90a5ce18ddc41059d0f75aeb9e8b0549951
144
specs:
15-
rom (1.0.0)
5+
rom (2.0.0)
6+
concurrent-ruby (~> 1.0)
167
dry-equalizer (~> 0.2)
178
dry-types (~> 0.7)
189
rom-mapper (~> 0.3.0)
1910
rom-support (~> 1.0.0)
2011

2112
GIT
2213
remote: https://github.com/rom-rb/rom-mapper
23-
revision: 5fecb06bd0cdf227b9f0289c2870ebc4a88f0502
14+
revision: 5cc3714c9c7a7e9bc676f5d0760f3e3de2e8bff9
2415
specs:
2516
rom-mapper (0.3.0)
2617
dry-equalizer (~> 0.2)
@@ -29,23 +20,22 @@ GIT
2920

3021
GIT
3122
remote: https://github.com/rom-rb/rom-repository
32-
revision: 7a3cc43d6539dba9a6ffb71c66501da23ddc6c11
23+
revision: 9a702eb5de93d730cb6fb102e6d1aa9a63fd1c5f
3324
specs:
34-
rom-repository (0.2.0)
35-
anima (~> 0.2, >= 0.2)
25+
rom-repository (0.3.0)
3626
concurrent-ruby (~> 1.0)
37-
rom (~> 1.0.0)
27+
rom (~> 2.0)
3828
rom-mapper (~> 0.3.0)
3929
rom-support (~> 1.0.0)
4030

4131
GIT
4232
remote: https://github.com/rom-rb/rom-sql
43-
revision: 79001cfcc0a8beced7bd2675c16cddcf7b36684d
33+
revision: 98e20842939b482c2103536703aeaa64383078e9
4434
specs:
45-
rom-sql (0.7.0)
35+
rom-sql (0.8.0)
4636
dry-equalizer (~> 0.2)
4737
dry-types (~> 0.7)
48-
rom (~> 1.0.0)
38+
rom (~> 2.0)
4939
sequel (~> 4.18)
5040

5141
GIT
@@ -63,139 +53,121 @@ GIT
6353
specs:
6454
transproc (0.4.0)
6555

66-
GIT
67-
remote: https://github.com/timriley/dry-component
68-
revision: a7bb18a0d89f87b0d5ddb1a7dd40f126d777c614
69-
branch: import-containers-for-import-module
70-
specs:
71-
dry-component (0.0.2)
72-
dry-auto_inject (~> 0.1)
73-
dry-configurable (~> 0.1)
74-
dry-container (~> 0.2, >= 0.2.7)
75-
inflecto (>= 0.0.2)
76-
7756
GEM
7857
remote: https://rubygems.org/
7958
specs:
80-
abstract_type (0.0.7)
81-
adamantium (0.2.0)
82-
ice_nine (~> 0.11.0)
83-
memoizable (~> 0.4.0)
84-
addressable (2.3.8)
85-
anima (0.3.0)
86-
abstract_type (~> 0.0.7)
87-
adamantium (~> 0.2)
88-
equalizer (~> 0.0.11)
89-
bugsnag (2.8.12)
90-
json (~> 1.7, >= 1.7.7)
91-
byebug (5.0.0)
92-
columnize (= 0.9.0)
93-
capybara (2.5.0)
59+
addressable (2.4.0)
60+
bugsnag (4.2.1)
61+
byebug (9.0.5)
62+
capybara (2.7.1)
63+
addressable
9464
mime-types (>= 1.16)
9565
nokogiri (>= 1.3.3)
9666
rack (>= 1.0.0)
9767
rack-test (>= 0.5.4)
9868
xpath (~> 2.0)
99-
capybara-screenshot (1.0.11)
69+
capybara-screenshot (1.0.13)
10070
capybara (>= 1.0, < 3)
10171
launchy
10272
cliver (0.3.2)
103-
coderay (1.1.0)
104-
columnize (0.9.0)
105-
concurrent-ruby (1.0.1)
106-
database_cleaner (1.5.1)
73+
coderay (1.1.1)
74+
concurrent-ruby (1.0.2)
75+
database_cleaner (1.5.3)
10776
diff-lcs (1.2.5)
108-
dry-auto_inject (0.2.0)
109-
dry-configurable (0.1.4)
77+
dry-auto_inject (0.3.0)
78+
dry-container (~> 0.3.4)
79+
dry-component (0.3.0)
80+
dry-auto_inject (~> 0.3)
81+
dry-configurable (~> 0.1)
82+
dry-container (~> 0.3, >= 0.3.4)
83+
inflecto (>= 0.0.2)
84+
dry-configurable (0.1.6)
11085
concurrent-ruby (~> 1.0)
111-
dry-container (0.3.1)
86+
dry-container (0.3.4)
11287
concurrent-ruby (~> 1.0)
11388
dry-configurable (~> 0.1, >= 0.1.3)
114-
dry-data (0.5.1)
115-
dry-configurable (~> 0.1)
116-
dry-container (~> 0.2)
117-
dry-equalizer (~> 0.2)
118-
dry-logic (~> 0.1)
119-
inflecto (~> 0.0.0, >= 0.0.2)
120-
kleisli (~> 0.2)
121-
thread_safe (~> 0.3)
12289
dry-equalizer (0.2.0)
123-
dry-logic (0.2.2)
90+
dry-logic (0.2.3)
12491
dry-container (~> 0.2, >= 0.2.6)
12592
dry-equalizer (~> 0.2)
126-
dry-result_matcher (0.3.0)
127-
kleisli
128-
dry-transaction (0.6.0)
93+
dry-monads (0.0.2)
94+
dry-result_matcher (0.4.0)
95+
dry-monads (~> 0.0.0)
96+
dry-transaction (0.7.0)
12997
dry-container (>= 0.2.8)
130-
kleisli
98+
dry-monads (~> 0.0.1)
13199
wisper (>= 1.6.0)
132-
dry-types (0.7.1)
100+
dry-types (0.7.2)
133101
concurrent-ruby (~> 1.0)
134102
dry-configurable (~> 0.1)
135103
dry-container (~> 0.3)
136104
dry-equalizer (~> 0.2)
137-
dry-logic (~> 0.2, >= 0.2.0)
105+
dry-logic (~> 0.2, >= 0.2.3)
106+
dry-monads (>= 0.0.1)
138107
inflecto (~> 0.0.0, >= 0.0.2)
139-
kleisli (~> 0.2)
108+
dry-validation (0.7.4)
109+
concurrent-ruby (~> 1.0)
110+
dry-configurable (~> 0.1, >= 0.1.3)
111+
dry-container (~> 0.2, >= 0.2.8)
112+
dry-equalizer (~> 0.2)
113+
dry-logic (~> 0.2, >= 0.2.2)
114+
dry-types (~> 0.6, >= 0.6.0)
140115
dry-view (0.1.0)
141116
dry-configurable (~> 0.1)
142117
dry-equalizer (~> 0.2)
143118
inflecto (~> 0)
144119
tilt (~> 2.0)
145-
dry-web (0.1.0)
146-
dry-component (~> 0)
120+
dry-web (0.3.1)
121+
dry-component (~> 0.3.0)
122+
dry-web-roda (0.2.1)
147123
dry-configurable (~> 0.1)
148-
dry-equalizer (~> 0.2)
149-
dry-transaction (~> 0.5)
150-
dry-view (~> 0.1)
151-
inflecto (~> 0)
152-
roda (~> 2.7)
153-
tilt (~> 2.0)
154-
equalizer (0.0.11)
124+
inflecto (~> 0.0)
125+
roda (~> 2.14)
126+
roda-flow (~> 0.3)
127+
thor (~> 0.19)
155128
ffi (1.9.10)
156129
formatador (0.2.5)
157-
guard (2.13.0)
130+
guard (2.14.0)
158131
formatador (>= 0.2.4)
159-
listen (>= 2.7, <= 4.0)
132+
listen (>= 2.7, < 4.0)
160133
lumberjack (~> 1.0)
161134
nenv (~> 0.1)
162135
notiffany (~> 0.0)
163136
pry (>= 0.9.12)
164137
shellany (~> 0.0)
165138
thor (>= 0.18.1)
166139
guard-compat (1.2.1)
167-
guard-rspec (4.6.4)
140+
guard-rspec (4.7.2)
168141
guard (~> 2.1)
169142
guard-compat (~> 1.1)
170143
rspec (>= 2.99.0, < 4.0)
171144
i18n (0.7.0)
172-
ice_nine (0.11.2)
173145
inflecto (0.0.2)
174146
json (1.8.3)
175-
kleisli (0.2.7)
176147
launchy (2.4.3)
177148
addressable (~> 2.3)
178-
listen (3.0.3)
179-
rb-fsevent (>= 0.9.3)
180-
rb-inotify (>= 0.9)
181-
lumberjack (1.0.9)
182-
memoizable (0.4.2)
183-
thread_safe (~> 0.3, >= 0.3.1)
149+
listen (3.1.5)
150+
rb-fsevent (~> 0.9, >= 0.9.4)
151+
rb-inotify (~> 0.9, >= 0.9.7)
152+
ruby_dep (~> 1.2)
153+
lumberjack (1.0.10)
184154
method_source (0.8.2)
185-
mime-types (2.6.2)
186-
mini_portile (0.6.2)
187-
multi_json (1.11.3)
188-
nenv (0.2.0)
189-
nokogiri (1.6.6.2)
190-
mini_portile (~> 0.6.0)
191-
notiffany (0.0.8)
155+
mime-types (3.1)
156+
mime-types-data (~> 3.2015)
157+
mime-types-data (3.2016.0521)
158+
mini_portile2 (2.1.0)
159+
nenv (0.3.0)
160+
nokogiri (1.6.8)
161+
mini_portile2 (~> 2.1.0)
162+
pkg-config (~> 1.1.7)
163+
notiffany (0.1.0)
192164
nenv (~> 0.1)
193165
shellany (~> 0.0)
194-
pg (0.18.3)
195-
poltergeist (1.9.0)
166+
pg (0.18.4)
167+
pkg-config (1.1.7)
168+
poltergeist (1.10.0)
196169
capybara (~> 2.1)
197170
cliver (~> 0.3.1)
198-
multi_json (~> 1.0)
199171
websocket-driver (>= 0.2.0)
200172
postmark (1.7.1)
201173
json
@@ -204,22 +176,23 @@ GEM
204176
coderay (~> 1.1.0)
205177
method_source (~> 0.8.1)
206178
slop (~> 3.4)
207-
pry-byebug (3.2.0)
208-
byebug (~> 5.0)
179+
pry-byebug (3.4.0)
180+
byebug (~> 9.0)
209181
pry (~> 0.10)
210-
puma (2.14.0)
211-
que (0.11.4)
182+
puma (3.4.0)
183+
que (0.11.5)
212184
rack (1.6.4)
213185
rack-test (0.6.3)
214186
rack (>= 1.0)
215187
rack_csrf (2.5.0)
216188
rack (>= 1.1.0)
217-
rake (11.1.2)
218-
rb-fsevent (0.9.6)
219-
rb-inotify (0.9.5)
189+
rake (11.2.2)
190+
rb-fsevent (0.9.7)
191+
rb-inotify (0.9.7)
220192
ffi (>= 0.5.0)
221-
roda (2.13.0)
193+
roda (2.15.0)
222194
rack
195+
roda-flow (0.3.0)
223196
rspec (3.4.0)
224197
rspec-core (~> 3.4.0)
225198
rspec-expectations (~> 3.4.0)
@@ -233,22 +206,22 @@ GEM
233206
diff-lcs (>= 1.2.0, < 2.0)
234207
rspec-support (~> 3.4.0)
235208
rspec-support (3.4.1)
236-
sequel (4.33.0)
209+
ruby_dep (1.3.1)
210+
sequel (4.35.0)
237211
shellany (0.0.1)
238212
shotgun (0.9.1)
239213
rack (>= 1.0)
240-
site_prism (2.8)
214+
site_prism (2.9)
241215
addressable (>= 2.3.3, < 3.0)
242216
capybara (>= 2.1, < 3.0)
243-
slim (3.0.6)
244-
temple (~> 0.7.3)
217+
slim (3.0.7)
218+
temple (~> 0.7.6)
245219
tilt (>= 1.3.3, < 2.1)
246220
slop (3.6.0)
247-
temple (0.7.6)
221+
temple (0.7.7)
248222
thor (0.19.1)
249-
thread_safe (0.3.5)
250-
tilt (2.0.2)
251-
websocket-driver (0.6.3)
223+
tilt (2.0.5)
224+
websocket-driver (0.6.4)
252225
websocket-extensions (>= 0.1.0)
253226
websocket-extensions (0.1.2)
254227
wisper (1.6.1)
@@ -263,13 +236,15 @@ DEPENDENCIES
263236
capybara
264237
capybara-screenshot
265238
database_cleaner
266-
dry-component!
267239
dry-equalizer
240+
dry-logic
268241
dry-result_matcher
269242
dry-transaction
270243
dry-types
271-
dry-validation!
272-
dry-web
244+
dry-validation
245+
dry-view
246+
dry-web (~> 0.2)
247+
dry-web-roda (~> 0.1)
273248
guard-rspec
274249
i18n
275250
inflecto
@@ -293,4 +268,4 @@ DEPENDENCIES
293268
transproc!
294269

295270
BUNDLED WITH
296-
1.11.2
271+
1.12.5

0 commit comments

Comments
 (0)