Skip to content

Commit

Permalink
upgrade dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Martin Fenner committed Jun 19, 2020
1 parent 027d2da commit ae2b790
Show file tree
Hide file tree
Showing 9 changed files with 329 additions and 75 deletions.
43 changes: 24 additions & 19 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
bolognese (1.6.3)
bolognese (1.6.5)
activesupport (>= 4.2.5)
benchmark_methods (~> 0.7)
bibtex-ruby (>= 5.1.0)
Expand All @@ -11,10 +11,10 @@ PATH
concurrent-ruby (~> 1.1, >= 1.1.5)
csl-styles (~> 1.0, >= 1.0.1.8)
edtf (~> 3.0, >= 3.0.4)
faraday (= 0.17.0)
faraday (~> 1.0, >= 1.0.1)
gender_detector (~> 0.1.2)
iso8601 (~> 0.9.1)
json-ld (~> 2.2, >= 2.2.1)
json-ld (~> 3.1, >= 3.1.4)
jsonlint (~> 0.3.0)
loofah (~> 2.0, >= 2.0.3)
maremma (>= 4.3, < 5)
Expand All @@ -25,12 +25,12 @@ PATH
postrank-uri (~> 1.0, >= 1.0.18)
rdf-rdfxml (~> 3.1)
rdf-turtle (~> 3.1)
thor (~> 0.19)
thor (~> 1.0, >= 1.0.1)

GEM
remote: https://rubygems.org/
specs:
activesupport (6.0.3.1)
activesupport (6.0.3.2)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
Expand Down Expand Up @@ -64,12 +64,12 @@ GEM
edtf (3.0.5)
activesupport (>= 3.0, < 7.0)
excon (0.71.1)
faraday (0.17.0)
faraday (1.0.1)
multipart-post (>= 1.2, < 3)
faraday-encoding (0.0.5)
faraday
faraday_middleware (0.13.1)
faraday (>= 0.7.4, < 1.0)
faraday_middleware (1.0.0)
faraday (~> 1.0)
gender_detector (0.1.2)
unicode_utils (>= 1.3.0)
haml (5.1.2)
Expand All @@ -79,28 +79,33 @@ GEM
concurrent-ruby (~> 1.0)
hashdiff (1.0.1)
htmlentities (4.3.4)
i18n (1.8.2)
i18n (1.8.3)
concurrent-ruby (~> 1.0)
iso8601 (0.9.1)
json-ld (2.2.1)
multi_json (~> 1.12)
rdf (>= 2.2.8, < 4.0)
json-canonicalization (0.2.0)
json-ld (3.1.4)
htmlentities (~> 4.3)
json-canonicalization (~> 0.2)
link_header (~> 0.0, >= 0.0.8)
multi_json (~> 1.14)
rack (~> 2.0)
rdf (~> 3.1)
jsonlint (0.3.0)
oj (~> 3)
optimist (~> 3)
latex-decode (0.3.1)
link_header (0.0.8)
loofah (2.5.0)
loofah (2.6.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
maremma (4.7)
maremma (4.8)
activesupport (>= 4.2.5)
addressable (>= 2.3.6)
builder (~> 3.2, >= 3.2.2)
excon (~> 0.71.0)
faraday (= 0.17.0)
faraday (~> 1.0, >= 1.0.1)
faraday-encoding (~> 0.0.4)
faraday_middleware (~> 0.13.1)
faraday_middleware (~> 1.0)
nokogiri (~> 1.10.4)
oj (>= 2.8.3)
oj_mimic_json (~> 1.0, >= 1.0.1)
Expand All @@ -119,11 +124,11 @@ GEM
nokogiri (>= 1.8.0)
public_suffix (>= 2.0.0, < 2.1)
public_suffix (2.0.5)
rack (2.2.2)
rack (2.2.3)
rack-test (0.8.3)
rack (>= 1.0, < 3)
rake (12.3.3)
rdf (3.1.2)
rdf (3.1.3)
hamster (~> 3.0)
link_header (~> 0.0, >= 0.0.8)
rdf-aggregate-repo (3.1.0)
Expand Down Expand Up @@ -171,7 +176,7 @@ GEM
sxp (1.1.0)
rdf (~> 3.1)
temple (0.8.2)
thor (0.20.3)
thor (1.0.1)
thread_safe (0.3.6)
tilt (2.0.10)
tzinfo (1.2.7)
Expand Down
6 changes: 3 additions & 3 deletions bolognese.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,21 @@ Gem::Specification.new do |s|

# Declary dependencies here, rather than in the Gemfile
s.add_dependency 'maremma', '>= 4.3', '< 5'
s.add_dependency 'faraday', '0.17.0'
s.add_dependency 'faraday', '~> 1.0', '>= 1.0.1'
s.add_dependency 'nokogiri', '~> 1.10.4'
s.add_dependency 'loofah', '~> 2.0', '>= 2.0.3'
s.add_dependency 'builder', '~> 3.2', '>= 3.2.2'
s.add_dependency 'activesupport', '>= 4.2.5'
s.add_dependency 'bibtex-ruby', '>= 5.1.0'
s.add_dependency 'thor', '~> 0.19'
s.add_dependency 'thor', '~> 1.0', '>= 1.0.1'
s.add_dependency 'colorize', '~> 0.8.1'
s.add_dependency 'namae', '~> 1.0'
s.add_dependency 'edtf', '~> 3.0', '>= 3.0.4'
s.add_dependency 'citeproc-ruby', '~> 1.1', '>= 1.1.10'
s.add_dependency 'csl-styles', '~> 1.0', '>= 1.0.1.8'
s.add_dependency 'iso8601', '~> 0.9.1'
s.add_dependency 'postrank-uri', '~> 1.0', '>= 1.0.18'
s.add_dependency 'json-ld', '~> 2.2', '>= 2.2.1'
s.add_dependency 'json-ld', '~> 3.1', '>= 3.1.4'
s.add_dependency 'jsonlint', '~> 0.3.0'
s.add_dependency 'oj', '~> 3.10'
s.add_dependency "oj_mimic_json", "~> 1.0", ">= 1.0.1"
Expand Down
3 changes: 2 additions & 1 deletion lib/bolognese/metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@ def initialize(input: nil, from: nil, **options)

@regenerate = options[:regenerate] || read_options.present?
# generate name for method to call dynamically
@meta = @from.present? ? send("read_" + @from, { string: string, sandbox: options[:sandbox], doi: options[:doi], id: id, ra: ra }.merge(read_options)) : {}
opts = { string: string, sandbox: options[:sandbox], doi: options[:doi], id: id, ra: ra }.merge(read_options)
@meta = @from.present? ? send("read_" + @from, **opts) : {}
end

def id
Expand Down
2 changes: 1 addition & 1 deletion lib/bolognese/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Bolognese
VERSION = "1.6.4"
VERSION = "1.6.5"
end

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit ae2b790

Please sign in to comment.