isodoc 0.9.20 → 0.9.21

Sign up to get free protection for your applications and to get access to all the features.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +12 -8
  3. data/Gemfile.lock +5 -7
  4. data/lib/isodoc/function/xref_sect_gen.rb +1 -2
  5. data/lib/isodoc/metadata.rb +2 -2
  6. data/lib/isodoc/version.rb +1 -1
  7. data/lib/isodoc.rb +0 -1
  8. data/spec/isodoc/metadata_spec.rb +2 -2
  9. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 55728058640cb9c26a315460436606766b1cf09796a64e301bb8081ee325ed31
4
- data.tar.gz: 40317b9fbed10a3d553eca0f0ebbf6e268195757aebde5429fa8565fda2fe1ab
3
+ metadata.gz: c8d6a328ec654bc09eb32877b7fdaa77eeb3a29d9801314c3217e379dd2b1ab0
4
+ data.tar.gz: 44458471ad66d02c9a624f2db2802728093e093263ec579b3d7a58eb38c24561
5
5
  SHA512:
6
- metadata.gz: e69af0fcd60d7fd7f6f52318d29d4a603172d018d1f926f0bae2aeb4cfa32a099d782acf4d0876e83bbcef06dcb3099824a2751d887187c8ebccf050d1468eab
7
- data.tar.gz: 47cb08b0e0fd6f560d119f16fb5070b4b4153ea7f02b5adfb603e42cec1a159b1540950be2351628f315a551f68514e30b7ef782eb0f950a5d1acc0b879e790c
6
+ metadata.gz: a5291949f4106b7786c76f906dc2feea4f00eb647a51c939fd3a0001071b6d2f0e583789fa327d8f88ce4c02fa431833ce82bfbbe87f4978fddde05eb9a310d1
7
+ data.tar.gz: 41bdb19fda29e0dc3096c350161c07f0d59f2c63c4b4dc062a591b94e8e92e0f07c8c1f8b0d0ac351f8c824844113a7bfb02c8728c9c3a11e540a9fcecd4988d
data/.travis.yml CHANGED
@@ -1,14 +1,18 @@
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
- - travis_retry sudo apt-get update
11
- - curl -L https://raw.githubusercontent.com/metanorma/metanorma-linux-setup/master/ubuntu-install-puppeteer.sh | bash
12
+ - nvm install 8
13
+ - npm install -g puppeteer
14
+ - gem install bundler -v 2.0.1
15
+ - bundle update
12
16
  matrix:
13
17
  allow_failures:
14
18
  - rvm: ruby-head
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- isodoc (0.9.20)
4
+ isodoc (0.9.21)
5
5
  asciimath
6
6
  html2doc (~> 0.8.6)
7
7
  htmlentities (~> 4.3.4)
@@ -17,7 +17,7 @@ PATH
17
17
  GEM
18
18
  remote: https://rubygems.org/
19
19
  specs:
20
- asciidoctor (2.0.5)
20
+ asciidoctor (2.0.7)
21
21
  asciimath (1.0.8)
22
22
  ast (2.4.0)
23
23
  byebug (9.1.0)
@@ -42,13 +42,12 @@ GEM
42
42
  guard (~> 2.1)
43
43
  guard-compat (~> 1.1)
44
44
  rspec (>= 2.99.0, < 4.0)
45
- html2doc (0.8.9)
45
+ html2doc (0.8.10)
46
46
  asciimath (~> 1.0.7)
47
47
  htmlentities (~> 4.3.4)
48
48
  image_size
49
49
  mime-types
50
50
  nokogiri
51
- ruby-xslt
52
51
  thread_safe
53
52
  uuidtools
54
53
  htmlentities (4.3.4)
@@ -60,7 +59,7 @@ GEM
60
59
  rb-inotify (~> 0.9, >= 0.9.7)
61
60
  ruby_dep (~> 1.2)
62
61
  lumberjack (1.0.13)
63
- metanorma (0.3.10)
62
+ metanorma (0.3.11)
64
63
  asciidoctor
65
64
  htmlentities
66
65
  method_source (0.9.2)
@@ -75,7 +74,7 @@ GEM
75
74
  nenv (~> 0.1)
76
75
  shellany (~> 0.0)
77
76
  parallel (1.17.0)
78
- parser (2.6.2.0)
77
+ parser (2.6.2.1)
79
78
  ast (~> 2.4.0)
80
79
  powerpack (0.1.2)
81
80
  pry (0.12.2)
@@ -108,7 +107,6 @@ GEM
108
107
  ruby-progressbar (~> 1.7)
109
108
  unicode-display_width (~> 1.0, >= 1.0.1)
110
109
  ruby-progressbar (1.10.0)
111
- ruby-xslt (0.9.10)
112
110
  ruby_dep (1.5.0)
113
111
  sass (3.7.4)
114
112
  sass-listen (~> 4.0.0)
data/lib/isodoc/function/xref_sect_gen.rb CHANGED
@@ -66,8 +66,7 @@ module IsoDoc::Function
66
66
  end
67
67
 
68
68
  def clause_names(docxml, sect_num)
69
- q = "//clause[parent::sections][not(xmlns:title = 'Scope')]"\
70
- "[not(descendant::terms)]"
69
+ q = self.class::MIDDLE_CLAUSE
71
70
  docxml.xpath(ns(q)).each_with_index do |c, i|
72
71
  section_names(c, (i + sect_num), 1)
73
72
  end
data/lib/isodoc/metadata.rb CHANGED
@@ -48,8 +48,8 @@ module IsoDoc
48
48
 
49
49
  def extract_person_affiliations(authors)
50
50
  authors.inject([]) do |m, a|
51
- name = a&.at(ns("./affiliation/org/name"))&.text
52
- location = a&.at(ns("./affiliation/org/contact/address/"\
51
+ name = a&.at(ns("./affiliation/organization/name"))&.text
52
+ location = a&.at(ns("./affiliation/organization/contact/address/"\
53
53
  "formattedAddress"))&.text
54
54
  m << ((!name.nil? && !location.nil?) ? "#{name}, #{location}" :
55
55
  (name || location || ""))
data/lib/isodoc/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module IsoDoc
2
- VERSION = "0.9.20".freeze
2
+ VERSION = "0.9.21".freeze
3
3
  end
data/lib/isodoc.rb CHANGED
@@ -2,7 +2,6 @@ require_relative "isodoc/version"
2
2
 
3
3
  require "nokogiri"
4
4
  require "asciimath"
5
- require "xml/xslt"
6
5
  require "uuidtools"
7
6
  require "base64"
8
7
  require "mime/types"
data/spec/isodoc/metadata_spec.rb CHANGED
@@ -49,11 +49,11 @@ RSpec.describe IsoDoc do
49
49
  <surname>Rubble</surname>
50
50
  </name>
51
51
  <affiliation>
52
- <org><name>Slate Inc.</name>
52
+ <organization><name>Slate Inc.</name>
53
53
  <contact><address>
54
54
  <formattedAddress>Bedrock</formattedAddress>
55
55
  </address></contact>
56
- </org>
56
+ </organization>
57
57
  </affiliation>
58
58
  </person>
59
59
  </contributor>
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: isodoc
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.20
4
+ version: 0.9.21
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: asciimath