metanorma-standoc 1.1.6 → 1.1.7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (10) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +13 -8
  3. data/Gemfile +2 -0
  4. data/Gemfile.lock +18 -11
  5. data/lib/asciidoctor/standoc/biblio.rng +17 -12
  6. data/lib/asciidoctor/standoc/front.rb +6 -5
  7. data/lib/asciidoctor/standoc/inline.rb +1 -1
  8. data/lib/metanorma/standoc/version.rb +1 -1
  9. data/spec/asciidoctor-standoc/base_spec.rb +4 -4
  10. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 6807d9e3f4a2d83494b51c3e0ba76d84e994a85034eec07d4e4d2fea5d21d3c0
4
- data.tar.gz: b668b765fe2a7e2fabac30ec68ed8aef3da144f2e0748ddc8cc94f58307510fc
3
+ metadata.gz: 2989c386041bf221f5c9627ff57765b18b1bd1990891eec48add7dfd3b14ef8e
4
+ data.tar.gz: 4eea2a64da042dcb8bc14d12a74d630a006ae8f7ac79654f95eec64426525427
5
5
  SHA512:
6
- metadata.gz: df993bce7e1e3030c0c8d0ba83197c777c6cb94d1ce66c17c2dc064eae49b8d1616d6e357da733f6276bbfb6702229ac92eee79315f9cd8c0c59d7695260b62c
7
- data.tar.gz: e75ee46b9bccc422672cd681ef7512317453ee6d36cfcf76aa7e73091cc8731b103de29b87024c28e67b00d4c9bd1e9ab03e28bbc558bf5b53359f198f524aca
6
+ metadata.gz: 7e928dc4b5ab62caf6a69a7b17d52f7ac95a67cdec4b957e8b61c3f0bff40840416d7e664d963ade8e6ea82f4d85154f76495ad21acbf8eb102f95da60cc6dd3
7
+ data.tar.gz: 7968ee76f47e1faf852b218652594a815cc36bcf24d2b66389fe032e47f54981c476e1dee212b45485e07003e388a4c327ec61729fa1ad9737f7c716e56af0cb
data/.travis.yml CHANGED
@@ -1,14 +1,19 @@
1
- dist: trusty
2
- sudo: false
3
1
  language: ruby
2
+ cache: bundler
3
+ os:
4
+ - linux
5
+ - osx
4
6
  rvm:
5
- - 2.5
6
- - 2.4
7
- - 2.3
8
- - ruby-head
7
+ - 2.5
8
+ - 2.4
9
+ - 2.3
10
+ - ruby-head
9
11
  before_install:
10
- - gem install bundler -v 2.0.1
11
- - curl -sSL https://raw.githubusercontent.com/metanorma/metanorma-linux-setup/master/ubuntu.sh | sudo bash -s
12
+ - gem install bundler -v 2.0.1
13
+ - bundle update
14
+ - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo bash -c "apt-get update && curl -L https://raw.githubusercontent.com/metanorma/metanorma-linux-setup/master/ubuntu.sh | bash" ; fi
15
+ - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install --HEAD https://raw.githubusercontent.com/metanorma/homebrew-metanorma/master/Formula/metanorma.rb ; fi
12
16
  matrix:
13
17
  allow_failures:
14
18
  - rvm: ruby-head
19
+
data/Gemfile CHANGED
@@ -3,5 +3,7 @@ Encoding.default_internal = Encoding::UTF_8
3
3
 
4
4
  source "https://rubygems.org"
5
5
 
6
+ gem 'vcr', git: 'https://github.com/vcr/vcr.git', ref: 'a0bb140184e8518baad640a705e04155911bf31f'
7
+
6
8
  # Specify your gem's dependencies in gemspec
7
9
  gemspec
data/Gemfile.lock CHANGED
@@ -1,7 +1,14 @@
1
+ GIT
2
+ remote: https://github.com/vcr/vcr.git
3
+ revision: a0bb140184e8518baad640a705e04155911bf31f
4
+ ref: a0bb140184e8518baad640a705e04155911bf31f
5
+ specs:
6
+ vcr (4.0.0)
7
+
1
8
  PATH
2
9
  remote: .
3
10
  specs:
4
- metanorma-standoc (1.1.6)
11
+ metanorma-standoc (1.1.7)
5
12
  asciidoctor (~> 1.5.7)
6
13
  concurrent-ruby
7
14
  html2doc (~> 0.8.0)
@@ -55,13 +62,12 @@ GEM
55
62
  guard-compat (~> 1.1)
56
63
  rspec (>= 2.99.0, < 4.0)
57
64
  hashdiff (0.3.8)
58
- html2doc (0.8.9)
65
+ html2doc (0.8.10)
59
66
  asciimath (~> 1.0.7)
60
67
  htmlentities (~> 4.3.4)
61
68
  image_size
62
69
  mime-types
63
70
  nokogiri
64
- ruby-xslt
65
71
  thread_safe
66
72
  uuidtools
67
73
  htmlentities (4.3.4)
@@ -74,7 +80,7 @@ GEM
74
80
  iev (0.2.2)
75
81
  nokogiri
76
82
  image_size (2.0.0)
77
- iso-bib-item (0.4.4)
83
+ iso-bib-item (0.4.5)
78
84
  isoics (~> 0.1.6)
79
85
  nokogiri (~> 1.8.4)
80
86
  ruby_deep_clone (~> 0.8.0)
@@ -82,7 +88,7 @@ GEM
82
88
  algoliasearch
83
89
  iecbib (~> 0.2.1)
84
90
  iso-bib-item (~> 0.4.2)
85
- isodoc (0.9.20)
91
+ isodoc (0.9.21)
86
92
  asciimath
87
93
  html2doc (~> 0.8.6)
88
94
  htmlentities (~> 4.3.4)
@@ -102,7 +108,7 @@ GEM
102
108
  rb-inotify (~> 0.9, >= 0.9.7)
103
109
  ruby_dep (~> 1.2)
104
110
  lumberjack (1.0.13)
105
- metanorma (0.3.10)
111
+ metanorma (0.3.11)
106
112
  asciidoctor
107
113
  htmlentities
108
114
  method_source (0.9.2)
@@ -111,6 +117,8 @@ GEM
111
117
  mime-types-data (3.2019.0331)
112
118
  mini_portile2 (2.3.0)
113
119
  nenv (0.3.0)
120
+ nistbib (0.1.1)
121
+ iso-bib-item (~> 0.4.2)
114
122
  nokogiri (1.8.5)
115
123
  mini_portile2 (~> 2.3.0)
116
124
  notiffany (0.1.1)
@@ -118,7 +126,7 @@ GEM
118
126
  shellany (~> 0.0)
119
127
  optout (0.0.2)
120
128
  parallel (1.17.0)
121
- parser (2.6.2.0)
129
+ parser (2.6.2.1)
122
130
  ast (~> 2.4.0)
123
131
  powerpack (0.1.2)
124
132
  pry (0.12.2)
@@ -130,13 +138,14 @@ GEM
130
138
  rb-fsevent (0.10.3)
131
139
  rb-inotify (0.10.0)
132
140
  ffi (~> 1.0)
133
- relaton (0.3.3)
141
+ relaton (0.3.4)
134
142
  algoliasearch
135
143
  gbbib (~> 0.4.0)
136
144
  iecbib (~> 0.2.0)
137
145
  ietfbib (~> 0.4.2)
138
146
  iso-bib-item (~> 0.4.2)
139
147
  isobib (~> 0.4.0)
148
+ nistbib (~> 0.1.1)
140
149
  roman-numerals (0.3.0)
141
150
  rspec (3.8.0)
142
151
  rspec-core (~> 3.8.0)
@@ -161,7 +170,6 @@ GEM
161
170
  ruby-jing (0.0.1)
162
171
  optout (>= 0.0.2)
163
172
  ruby-progressbar (1.10.0)
164
- ruby-xslt (0.9.10)
165
173
  ruby_deep_clone (0.8.0)
166
174
  ruby_dep (1.5.0)
167
175
  safe_yaml (1.0.5)
@@ -187,7 +195,6 @@ GEM
187
195
  unicode-display_width (1.5.0)
188
196
  unicode2latex (0.0.2)
189
197
  uuidtools (2.1.5)
190
- vcr (4.0.0)
191
198
  webmock (3.5.1)
192
199
  addressable (>= 2.3.6)
193
200
  crack (>= 0.3.2)
@@ -209,7 +216,7 @@ DEPENDENCIES
209
216
  rubocop (= 0.54.0)
210
217
  simplecov (~> 0.15)
211
218
  timecop (~> 0.9)
212
- vcr
219
+ vcr!
213
220
  webmock
214
221
 
215
222
  BUNDLED WITH
data/lib/asciidoctor/standoc/biblio.rng CHANGED
@@ -636,22 +636,27 @@
636
636
  <ref name="ISO8601Date"/>
637
637
  </optional>
638
638
  </define>
639
+ <define name="BibliographicDateType">
640
+ <choice>
641
+ <value>published</value>
642
+ <value>accessed</value>
643
+ <value>created</value>
644
+ <value>implemented</value>
645
+ <value>obsoleted</value>
646
+ <value>confirmed</value>
647
+ <value>updated</value>
648
+ <value>issued</value>
649
+ <value>transmitted</value>
650
+ <value>copied</value>
651
+ <value>unchanged</value>
652
+ <value>circulated</value>
653
+ </choice>
654
+ </define>
639
655
  <define name="bdate">
640
656
  <element name="date">
641
657
  <attribute name="type">
642
658
  <choice>
643
- <value>published</value>
644
- <value>accessed</value>
645
- <value>created</value>
646
- <value>implemented</value>
647
- <value>obsoleted</value>
648
- <value>confirmed</value>
649
- <value>updated</value>
650
- <value>issued</value>
651
- <value>transmitted</value>
652
- <value>copied</value>
653
- <value>unchanged</value>
654
- <value>circulated</value>
659
+ <ref name="BibliographicDateType"/>
655
660
  <text/>
656
661
  </choice>
657
662
  </attribute>
data/lib/asciidoctor/standoc/front.rb CHANGED
@@ -79,7 +79,7 @@ module Asciidoctor
79
79
  end
80
80
  end
81
81
  node.attr("affiliation#{suffix}") and p.affiliation do |a|
82
- a.org do |o|
82
+ a.organization do |o|
83
83
  o.name node.attr("affiliation#{suffix}")
84
84
  node.attr("address#{suffix}") and o.contact do |c|
85
85
  c.address do |ad|
@@ -155,12 +155,13 @@ module Asciidoctor
155
155
  end
156
156
  end
157
157
 
158
- DATETYPES = %w{ published accessed created implemented obsoleted
159
- confirmed updated issued circulated unchanged received
160
- }.freeze
158
+ def datetypes
159
+ %w{ published accessed created implemented obsoleted
160
+ confirmed updated issued circulated unchanged received }
161
+ end
161
162
 
162
163
  def metadata_date(node, xml)
163
- DATETYPES.each { |t| metadata_date1(node, xml, t) }
164
+ datetypes.each { |t| metadata_date1(node, xml, t) }
164
165
  node.attributes.keys.each do |a|
165
166
  next unless a == "date" || /^date_\d+$/.match(a)
166
167
  type, date = node.attr(a).split(/ /, 2)
data/lib/asciidoctor/standoc/inline.rb CHANGED
@@ -107,7 +107,7 @@ module Asciidoctor
107
107
  xml.stem math, **{ type: "MathML" }
108
108
  elsif style == :latexmath
109
109
  latexmlmath_input = Unicode2LaTeX::unicode2latex(text).gsub(/'/, '\\').gsub(/\n/, " ")
110
- latex = IO.popen('latexmlmath --preload=amsmath -- -', 'r+') do |io|
110
+ latex = IO.popen('latexmlmath --preload=amsmath -- -', 'r+', :external_encoding=>'UTF-8') do |io|
111
111
  io.write(latexmlmath_input)
112
112
  io.close_write
113
113
  io.read
data/lib/metanorma/standoc/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Standoc
3
- VERSION = "1.1.6".freeze
3
+ VERSION = "1.1.7".freeze
4
4
  end
5
5
  end
data/spec/asciidoctor-standoc/base_spec.rb CHANGED
@@ -162,14 +162,14 @@ RSpec.describe Asciidoctor::Standoc do
162
162
  <completename>Fred Flintstone</completename>
163
163
  </name>
164
164
  <affiliation>
165
- <org>
165
+ <organization>
166
166
  <name>Slate Rock and Gravel Company</name>
167
167
  <contact>
168
168
  <address>
169
169
  <formattedAddress>6 Rubble Way, Bedrock</formattedAddress>
170
170
  </address>
171
171
  </contact>
172
- </org>
172
+ </organization>
173
173
  </affiliation>
174
174
  <uri>http://slate.example.com</uri>
175
175
  </person>
@@ -183,14 +183,14 @@ RSpec.describe Asciidoctor::Standoc do
183
183
  <surname>Rubble</surname>
184
184
  </name>
185
185
  <affiliation>
186
- <org>
186
+ <organization>
187
187
  <name>Rockhead and Quarry Cave Construction Company</name>
188
188
  <contact>
189
189
  <address>
190
190
  <formattedAddress>6A Rubble Way, Bedrock</formattedAddress>
191
191
  </address>
192
192
  </contact>
193
- </org>
193
+ </organization>
194
194
  </affiliation>
195
195
  <contact>
196
196
  <email>barney@rockhead.example.com</email>
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-standoc
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.6
4
+ version: 1.1.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-04-04 00:00:00.000000000 Z
11
+ date: 2019-04-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: asciidoctor