Skip to content

Commit 184b08c

Browse files
techgiquetechgique
authored
Merge pull request #88 from CDRH/gem_update
updates gems
2 parents 44d1dc5 + bc3f88e commit 184b08c

8 files changed

Lines changed: 61 additions & 57 deletions

File tree

‎.ruby-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ruby-2.5.1
1+
ruby-2.5.3

‎Gemfile.lock‎

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,53 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (5.2.0)
5-
actionpack (= 5.2.0)
4+
actioncable (5.2.1)
5+
actionpack (= 5.2.1)
66
nio4r (~> 2.0)
77
websocket-driver (>= 0.6.1)
8-
actionmailer (5.2.0)
9-
actionpack (= 5.2.0)
10-
actionview (= 5.2.0)
11-
activejob (= 5.2.0)
8+
actionmailer (5.2.1)
9+
actionpack (= 5.2.1)
10+
actionview (= 5.2.1)
11+
activejob (= 5.2.1)
1212
mail (~> 2.5, >= 2.5.4)
1313
rails-dom-testing (~> 2.0)
14-
actionpack (5.2.0)
15-
actionview (= 5.2.0)
16-
activesupport (= 5.2.0)
14+
actionpack (5.2.1)
15+
actionview (= 5.2.1)
16+
activesupport (= 5.2.1)
1717
rack (~> 2.0)
1818
rack-test (>= 0.6.3)
1919
rails-dom-testing (~> 2.0)
2020
rails-html-sanitizer (~> 1.0, >= 1.0.2)
21-
actionview (5.2.0)
22-
activesupport (= 5.2.0)
21+
actionview (5.2.1)
22+
activesupport (= 5.2.1)
2323
builder (~> 3.1)
2424
erubi (~> 1.4)
2525
rails-dom-testing (~> 2.0)
2626
rails-html-sanitizer (~> 1.0, >= 1.0.3)
27-
activejob (5.2.0)
28-
activesupport (= 5.2.0)
27+
activejob (5.2.1)
28+
activesupport (= 5.2.1)
2929
globalid (>= 0.3.6)
30-
activemodel (5.2.0)
31-
activesupport (= 5.2.0)
32-
activerecord (5.2.0)
33-
activemodel (= 5.2.0)
34-
activesupport (= 5.2.0)
30+
activemodel (5.2.1)
31+
activesupport (= 5.2.1)
32+
activerecord (5.2.1)
33+
activemodel (= 5.2.1)
34+
activesupport (= 5.2.1)
3535
arel (>= 9.0)
36-
activestorage (5.2.0)
37-
actionpack (= 5.2.0)
38-
activerecord (= 5.2.0)
36+
activestorage (5.2.1)
37+
actionpack (= 5.2.1)
38+
activerecord (= 5.2.1)
3939
marcel (~> 0.3.1)
40-
activesupport (5.2.0)
40+
activesupport (5.2.1)
4141
concurrent-ruby (~> 1.0, >= 1.0.2)
4242
i18n (>= 0.7, < 2)
4343
minitest (~> 5.1)
4444
tzinfo (~> 1.1)
4545
arel (9.0.0)
46-
bootsnap (1.3.0)
46+
bootsnap (1.3.2)
4747
msgpack (~> 1.0)
4848
builder (3.2.3)
4949
byebug (10.0.2)
50-
concurrent-ruby (1.0.5)
50+
concurrent-ruby (1.1.3)
5151
crass (1.0.4)
5252
domain_name (0.5.20180417)
5353
unf (>= 0.0.5, < 1.0.0)
@@ -58,60 +58,60 @@ GEM
5858
http-accept (1.7.0)
5959
http-cookie (1.0.3)
6060
domain_name (~> 0.5)
61-
i18n (1.0.1)
61+
i18n (1.1.1)
6262
concurrent-ruby (~> 1.0)
6363
listen (3.1.5)
6464
rb-fsevent (~> 0.9, >= 0.9.4)
6565
rb-inotify (~> 0.9, >= 0.9.7)
6666
ruby_dep (~> 1.2)
67-
loofah (2.2.2)
67+
loofah (2.2.3)
6868
crass (~> 1.0.2)
6969
nokogiri (>= 1.5.9)
70-
mail (2.7.0)
70+
mail (2.7.1)
7171
mini_mime (>= 0.1.1)
72-
marcel (0.3.2)
72+
marcel (0.3.3)
7373
mimemagic (~> 0.3.2)
74-
method_source (0.9.0)
75-
mime-types (3.1)
74+
method_source (0.9.2)
75+
mime-types (3.2.2)
7676
mime-types-data (~> 3.2015)
77-
mime-types-data (3.2016.0521)
77+
mime-types-data (3.2018.0812)
7878
mimemagic (0.3.2)
79-
mini_mime (1.0.0)
79+
mini_mime (1.0.1)
8080
mini_portile2 (2.3.0)
8181
minitest (5.11.3)
8282
msgpack (1.2.4)
8383
netrc (0.11.0)
8484
nio4r (2.3.1)
85-
nokogiri (1.8.3)
85+
nokogiri (1.8.5)
8686
mini_portile2 (~> 2.3.0)
87-
puma (3.11.4)
88-
rack (2.0.5)
89-
rack-test (1.0.0)
87+
puma (3.12.0)
88+
rack (2.0.6)
89+
rack-test (1.1.0)
9090
rack (>= 1.0, < 3)
91-
rails (5.2.0)
92-
actioncable (= 5.2.0)
93-
actionmailer (= 5.2.0)
94-
actionpack (= 5.2.0)
95-
actionview (= 5.2.0)
96-
activejob (= 5.2.0)
97-
activemodel (= 5.2.0)
98-
activerecord (= 5.2.0)
99-
activestorage (= 5.2.0)
100-
activesupport (= 5.2.0)
91+
rails (5.2.1)
92+
actioncable (= 5.2.1)
93+
actionmailer (= 5.2.1)
94+
actionpack (= 5.2.1)
95+
actionview (= 5.2.1)
96+
activejob (= 5.2.1)
97+
activemodel (= 5.2.1)
98+
activerecord (= 5.2.1)
99+
activestorage (= 5.2.1)
100+
activesupport (= 5.2.1)
101101
bundler (>= 1.3.0)
102-
railties (= 5.2.0)
102+
railties (= 5.2.1)
103103
sprockets-rails (>= 2.0.0)
104104
rails-dom-testing (2.0.3)
105105
activesupport (>= 4.2.0)
106106
nokogiri (>= 1.6)
107107
rails-html-sanitizer (1.0.4)
108108
loofah (~> 2.2, >= 2.2.2)
109-
railties (5.2.0)
110-
actionpack (= 5.2.0)
111-
activesupport (= 5.2.0)
109+
railties (5.2.1)
110+
actionpack (= 5.2.1)
111+
activesupport (= 5.2.1)
112112
method_source
113113
rake (>= 0.8.7)
114-
thor (>= 0.18.1, < 2.0)
114+
thor (>= 0.19.0, < 2.0)
115115
rake (12.3.1)
116116
rb-fsevent (0.10.3)
117117
rb-inotify (0.9.10)
@@ -135,7 +135,7 @@ GEM
135135
activesupport (>= 4.0)
136136
sprockets (>= 3.0.0)
137137
sqlite3 (1.3.13)
138-
thor (0.20.0)
138+
thor (0.20.3)
139139
thread_safe (0.3.6)
140140
tzinfo (1.2.5)
141141
thread_safe (~> 0.1)

‎app/controllers/default_controller.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def root
2626
"index_updated" => "TODO",
2727
"license" => METADATA["license"],
2828
"terms_of_service" => METADATA["terms_of_service"],
29-
"version" => VERSION,
29+
"version" => Api::Application::VERSION,
3030
# TODO should we be obtaining these from
3131
# Rails.application.routes or similar?
3232
"endpoints" => [

‎config/application.rb‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
module Api
2121
class Application < Rails::Application
22+
2223
# Initialize configuration defaults for originally generated Rails version.
2324
config.load_defaults 5.0
2425

‎config/config.example.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ default: &default
77
documentation: "https://cdrhapi.unl.edu/docs"
88
license: "TODO"
99
terms_of_service: "TODO"
10-
version: 1.0.0
1110

1211
settings:
1312
# regex for (encoded) characters separating filters: |

‎config/initializers/config.rb‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@
22
config = YAML.load_file(config_path)[Rails.env]
33

44
ES_URI = "#{config['es_path']}/#{config['es_index']}"
5-
VERSION = config["metadata"]["version"]
65
METADATA = config["metadata"]
76
SETTINGS = config["settings"]

‎config/initializers/version.rb‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
module Api
2+
class Application < Rails::Application
3+
VERSION = "1.0.1"
4+
end
5+
end

‎openapi/cdrh_api.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ swagger: "2.0"
33
info:
44
title: CDRH API
55
description: API to access all public Center for Digital Research in the Humanities resources
6-
version: 0.1.0
6+
version: 1.0.1
77
contact:
88
name: CDRH Dev Team
99
url: https://cdrhapi.unl.edu/contact

0 commit comments

Comments
 (0)