Skip to content

Commit a259b43

Browse files
jwaspindependabot[bot]
jwaspin
and
dependabot[bot]
authored
Upgrade to mdTranslator v2.20.0 (#79)
* Bump kramdown from 1.17.0 to 2.3.1 Bumps [kramdown](https://github.com/gettalong/kramdown) from 1.17.0 to 2.3.1. - [Release notes](https://github.com/gettalong/kramdown/releases) - [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page) - [Commits](https://github.com/gettalong/kramdown/commits) --- updated-dependencies: - dependency-name: kramdown dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> * Bump puma from 5.6.7 to 6.4.2 Bumps [puma](https://github.com/puma/puma) from 5.6.7 to 6.4.2. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](puma/puma@v5.6.7...v6.4.2) --- updated-dependencies: - dependency-name: puma dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> * Add git install to Dockerfile * Set config.public_file_server.enabled to true * Bump rack from 2.2.8 to 2.2.8.1 Bumps [rack](https://github.com/rack/rack) from 2.2.8 to 2.2.8.1. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](rack/rack@v2.2.8...v2.2.8.1) --- updated-dependencies: - dependency-name: rack dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> * Update ADIwg gems versions * Update ADIwg gems versions * Update Gemfile.lock to remove duplicate rexml dependency * Update ADIwg gems versions and bump adiwg-mdtranslator to 2.20.0.pre.beta.0 * Update ADIwg gems versions and bump adiwg-mdtranslator to 2.20.0.pre.beta.0 * Update adiwg-mdtranslator gem version to 2.19.0.pre.beta.8 * Update adiwg-mdcodes gem to version 2.9.3.pre.beta.3 and adiwg-mdjson_schemas gem to version 2.9.2.pre.beta.19 * Update adiwg-mdjson_schemas gem to version 2.9.2.pre.beta.20 and adiwg-mdtranslator gem to version 2.19.0.pre.beta.11 * Update adiwg-mdjson_schemas and adiwg-mdtranslator gems versions * Update adiwg-mdtranslator gem version to 2.19.0.pre.beta.13 * Update adiwg-mdcodes, adiwg-mdjson_schemas, and adiwg-mdtranslator gems versions * chore: Update adiwg-mdtranslator gem version to 2.19.0.pre.beta.16 * Update adiwg-mdtranslator gem version to 2.19.0.pre.beta.17 * Update adiwg-mdtranslator gem version to 2.20.0.pre.beta.3 * Add dcat_us option to writer dropdown list (#74) * Update .gitignore * Limited Updates * Full revert - this seems to be working * Gemfile updates * Fix mdTranslator Committed Version * Update Ruby Version to 2.7.7 * Update Dockerfile Update ruby version for container to use 2.7.7. Use bundler v2.4.21. Expose port 8080 instead of 3000. * Update Gemfile.lock * Add DCAT US Option to Writers Dropdown * feat: Add DCAT US Option to Writers Dropdown * chore: Update versions mdTranslator to v2.19.0.pre.beta.19 mdJson-schemas to v2.9.3.pre.beta.3 mdCodes to v2.9.4.pre.beta.4 * chore: Update adiwg-mdtranslator gem version to 2.19.0.pre.beta.21 * Update adiwg-mdtranslator gem version to 2.19.0.pre.beta.22 * Update adiwg-mdcodes, adiwg-mdjson_schemas, and adiwg-mdtranslator gem versions * Update adiwg-mdcodes, adiwg-mdjson_schemas, and adiwg-mdtranslator gem versions * Update adiwg-mdtranslator gem version to 2.20.0.pre.beta.5 * Update adiwg gem versions to 2.10.1 and adiwg-mdtranslator to 2.20.0.pre.beta.10 * Remove obsolete README file * Add GitHub Actions workflow for automated release and versioning * Add mdTranslator version to version.json --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent f0f2a93 commit a259b43

File tree

9 files changed

+100
-93
lines changed

9 files changed

+100
-93
lines changed

‎.github/workflows/create-release.yml

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: Deploy to GitHub Pages
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
8+
jobs:
9+
create-release:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v3
13+
14+
- name: Use Node.js
15+
uses: actions/setup-node@v3
16+
with:
17+
node-version: '20'
18+
19+
- name: Create Tag
20+
id: create_tag
21+
env:
22+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
23+
run: |
24+
# Read version from version.json
25+
version=$(node -p "require('./version.json').version")
26+
version_tag="v$version"
27+
echo "Version from version.json: $version_tag"
28+
echo "version=$version_tag" >> $GITHUB_OUTPUT
29+
git tag $version_tag
30+
git push origin $version_tag
31+
32+
- name: Create GitHub Release
33+
uses: ncipollo/release-action@v1
34+
with:
35+
tag: ${{ steps.create_tag.outputs.version }}
36+
name: Release ${{ steps.create_tag.outputs.version }}
37+
body: Automated release for version ${{ steps.create_tag.outputs.version }}.
38+
draft: false
39+
prerelease: false
40+
env:
41+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
FROM ruby:2.7.7-slim AS base
33

44
RUN apt-get update -q && apt-get install -y --no-install-recommends \
5+
git \
56
nodejs \
67
build-essential
78

@@ -33,4 +34,4 @@ COPY --from=base /usr/local/bundle /usr/local/bundle
3334
EXPOSE 8080
3435

3536
# Start the Rails server
36-
CMD ["rails", "server", "-b", "0.0.0.0", "-e", "production", "-p", "8080"]
37+
CMD ["rails", "server", "-b", "0.0.0.0", "-e", "production", "-p", "8080"]

‎Gemfile

+7-6
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ end
1919
# gem 'pg'
2020
# end
2121

22-
gem 'puma', '~> 5.6.7'
22+
gem 'puma', '~> 6.4.2'
2323

2424
gem 'bootsnap', '>= 1.4.2', require: false
2525

@@ -41,7 +41,7 @@ gem 'jbuilder'
4141
# bundle exec rake doc:rails generates the API under doc/api.
4242
gem 'sdoc', '~> 1.0.0.rc', group: :doc
4343

44-
# gems required for ADIwg mdTranslator ...
44+
# gems required for ADIwg
4545
# Use json as JSON
4646
gem 'json'
4747
# Use build as XML constructor
@@ -52,12 +52,13 @@ gem 'thor'
5252
gem 'uuidtools'
5353
# Use json_schema as schema validator
5454
gem 'json-schema'
55+
56+
# Alaska Data Integration working group metadata code lists
57+
gem 'adiwg-mdcodes', '2.10.1'
5558
# Alaska Data Integration working group schema definition
56-
gem 'adiwg-mdjson_schemas', '2.8.1'
59+
gem 'adiwg-mdjson_schemas', '2.10.1'
5760
# Alaska Data Integration working group metadata translator
58-
gem 'adiwg-mdtranslator', '2.18.4'
59-
# Alaska Data Integration working group metadata code lists
60-
gem 'adiwg-mdcodes', '2.8.4'
61+
gem 'adiwg-mdtranslator', '2.20.0.pre.beta.10'
6162

6263
# Use kramdown to render markdown with help of coderay
6364
gem 'kramdown'

‎Gemfile.lock

+43-56
Original file line numberDiff line numberDiff line change
@@ -56,24 +56,24 @@ GEM
5656
minitest (~> 5.1)
5757
tzinfo (~> 1.1)
5858
zeitwerk (~> 2.2, >= 2.2.2)
59-
addressable (2.8.5)
59+
addressable (2.8.6)
6060
public_suffix (>= 2.0.2, < 6.0)
61-
adiwg-mdcodes (2.8.4)
61+
adiwg-mdcodes (2.10.1)
6262
json (~> 2.0)
63-
adiwg-mdjson_schemas (2.8.1)
64-
adiwg-mdtranslator (2.18.4)
65-
adiwg-mdcodes (= 2.8.4)
66-
adiwg-mdjson_schemas (= 2.8.1)
63+
adiwg-mdjson_schemas (2.10.1)
64+
adiwg-mdtranslator (2.20.0.pre.beta.10)
65+
adiwg-mdcodes (= 2.10.1)
66+
adiwg-mdjson_schemas (= 2.10.1)
6767
builder (~> 3.2)
6868
coderay (~> 1.1)
6969
jbuilder (~> 2.5)
7070
json (~> 2.0)
7171
json-schema (~> 2.7)
7272
kramdown (>= 1.13, < 3.0)
73-
nokogiri (~> 1.7)
73+
nokogiri (~> 1.15)
7474
thor (~> 0.19)
7575
uuidtools (~> 2.1)
76-
bootsnap (1.16.0)
76+
bootsnap (1.18.3)
7777
msgpack (~> 1.2)
7878
builder (3.2.4)
7979
coderay (1.1.3)
@@ -84,69 +84,63 @@ GEM
8484
coffee-script-source
8585
execjs
8686
coffee-script-source (1.12.2)
87-
concurrent-ruby (1.2.2)
87+
concurrent-ruby (1.2.3)
8888
crass (1.0.6)
89-
date (3.3.3)
89+
date (3.3.4)
9090
erubi (1.12.0)
9191
execjs (2.9.1)
9292
ffi (1.16.3)
93-
ffi (1.16.3-x64-mingw32)
94-
ffi (1.16.3-x86-mingw32)
9593
globalid (1.1.0)
9694
activesupport (>= 5.0)
97-
i18n (1.14.1)
95+
i18n (1.14.5)
9896
concurrent-ruby (~> 1.0)
99-
jbuilder (2.11.5)
97+
jbuilder (2.12.0)
10098
actionview (>= 5.0.0)
10199
activesupport (>= 5.0.0)
102100
jquery-rails (4.6.0)
103101
rails-dom-testing (>= 1, < 3)
104102
railties (>= 4.2.0)
105103
thor (>= 0.14, < 2.0)
106-
json (2.6.3)
104+
json (2.7.2)
107105
json-schema (2.8.1)
108106
addressable (>= 2.4)
109107
kgio (2.11.4)
110-
kramdown (1.17.0)
111-
loofah (2.21.4)
108+
kramdown (2.4.0)
109+
rexml
110+
loofah (2.22.0)
112111
crass (~> 1.0.2)
113112
nokogiri (>= 1.12.0)
114113
mail (2.8.1)
115114
mini_mime (>= 0.1.1)
116115
net-imap
117116
net-pop
118117
net-smtp
119-
marcel (1.0.2)
120-
method_source (1.0.0)
118+
marcel (1.0.4)
119+
method_source (1.1.0)
121120
mini_mime (1.1.5)
122-
mini_portile2 (2.8.4)
123-
minitest (5.20.0)
121+
mini_portile2 (2.8.6)
122+
minitest (5.22.3)
124123
msgpack (1.7.2)
125-
net-imap (0.4.2)
124+
net-imap (0.4.11)
126125
date
127126
net-protocol
128127
net-pop (0.1.2)
129128
net-protocol
130-
net-protocol (0.2.1)
129+
net-protocol (0.2.2)
131130
timeout
132-
net-smtp (0.4.0)
131+
net-smtp (0.5.0)
133132
net-protocol
134-
nio4r (2.5.9)
135-
nokogiri (1.15.4)
136-
mini_portile2 (~> 2.8.2)
133+
nio4r (2.7.3)
134+
nokogiri (1.15.6-arm64-darwin)
137135
racc (~> 1.4)
138-
nokogiri (1.15.4-x64-mingw32)
139-
racc (~> 1.4)
140-
nokogiri (1.15.4-x86-mingw32)
141-
racc (~> 1.4)
142-
psych (4.0.3)
136+
psych (5.1.2)
143137
stringio
144-
public_suffix (5.0.4)
145-
puma (5.6.7)
138+
public_suffix (5.0.5)
139+
puma (6.4.2)
146140
nio4r (~> 2.0)
147-
racc (1.7.1)
148-
rack (2.2.8)
149-
rack-cors (2.0.1)
141+
racc (1.7.3)
142+
rack (2.2.9)
143+
rack-cors (2.0.2)
150144
rack (>= 2.0.0)
151145
rack-proxy (0.7.7)
152146
rack
@@ -182,13 +176,12 @@ GEM
182176
rake (>= 0.8.7)
183177
thor (>= 0.20.3, < 2.0)
184178
raindrops (0.20.1)
185-
rake (13.0.6)
186-
rdoc (6.5.0)
179+
rake (13.2.1)
180+
rdoc (6.6.3.1)
187181
psych (>= 4.0.0)
182+
rexml (3.2.6)
188183
sassc (2.4.0)
189184
ffi (~> 1.9)
190-
sassc (2.4.0-x64-mingw32)
191-
ffi (~> 1.9)
192185
sassc-rails (2.1.2)
193186
railties (>= 4.0.0)
194187
sassc (>= 2.0)
@@ -204,21 +197,18 @@ GEM
204197
actionpack (>= 5.2)
205198
activesupport (>= 5.2)
206199
sprockets (>= 3.0.0)
207-
sqlite3 (1.6.7)
200+
sqlite3 (1.7.3)
208201
mini_portile2 (~> 2.8.0)
209-
sqlite3 (1.6.7-x64-mingw32)
210-
stringio (3.0.8)
202+
stringio (3.1.0)
211203
thor (0.20.3)
212204
thread_safe (0.3.6)
213205
tilt (2.3.0)
214-
timeout (0.4.0)
206+
timeout (0.4.1)
215207
turbolinks (5.2.1)
216208
turbolinks-source (~> 5.2)
217209
turbolinks-source (5.2.0)
218210
tzinfo (1.2.11)
219211
thread_safe (~> 0.1)
220-
tzinfo-data (1.2023.3)
221-
tzinfo (>= 1.0.0)
222212
uglifier (4.2.0)
223213
execjs (>= 0.3.0, < 3)
224214
unicorn (6.1.0)
@@ -228,18 +218,15 @@ GEM
228218
websocket-driver (0.7.6)
229219
websocket-extensions (>= 0.1.0)
230220
websocket-extensions (0.1.5)
231-
zeitwerk (2.6.12)
221+
zeitwerk (2.6.13)
232222

233223
PLATFORMS
234-
ruby
235-
x64-mingw32
236-
x86-mingw32
237-
x86-mswin32
224+
arm64-darwin-22
238225

239226
DEPENDENCIES
240-
adiwg-mdcodes (= 2.8.4)
241-
adiwg-mdjson_schemas (= 2.8.1)
242-
adiwg-mdtranslator (= 2.18.4)
227+
adiwg-mdcodes (= 2.10.1)
228+
adiwg-mdjson_schemas (= 2.10.1)
229+
adiwg-mdtranslator (= 2.20.0.pre.beta.10)
243230
bootsnap (>= 1.4.2)
244231
builder
245232
coderay
@@ -249,7 +236,7 @@ DEPENDENCIES
249236
json
250237
json-schema
251238
kramdown
252-
puma (~> 5.6.7)
239+
puma (~> 6.4.2)
253240
rack-cors
254241
rack-proxy
255242
rack-timeout

‎README.rdoc

-28
This file was deleted.

‎app/models/option.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class Option
1212
def self.getOptionList
1313
{
1414
reader: %w[mdJson sbJson fgdc],
15-
writer: %w[iso19115_3 iso19115_2 iso19110 html mdJson sbJson fgdc simple_html],
15+
writer: %w[iso19115_3 iso19115_2 iso19110 html mdJson sbJson fgdc simple_html dcat_us],
1616
format: %w[auto plain json xml],
1717
validate: %w[none normal strict],
1818
showAllTags: %w[true false],

‎app/views/api/v3/demos/show.html.erb

+1
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
<option value="simple_html">Simple HTML</option>
7777
<option value="html" selected="selected">html</option>
7878
<option value="fgdc">fgdc</option>
79+
<option value="dcat_us">dcat_us</option>
7980
<option value="iso19110">iso19110</option>
8081
<option value="iso19115_3">iso19115_1 (alias of iso19115_3)</option>
8182
<option value="iso19115_2">iso19115_2/19139 (deprecated)</option>

‎config/environments/production.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
# Disable serving static files from the `/public` folder by default since
2222
# Apache or NGINX already handles this.
23-
config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
23+
config.public_file_server.enabled = true
2424

2525
config.public_file_server.headers = {
2626
'Cache-Control' => 'public, max-age=15552000',

‎version.json

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"version": "2.20.0-beta.10",
3+
"mdTranslator-version": "2.20.0-beta.10"
4+
}

0 commit comments

Comments
 (0)