relaton-calconnect 1.3.0 → 1.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 7c57b295752358948bf4b7b4e810f9ea3b4f3c41a6aa8b8be3ee32daf2cc57d5
4
- data.tar.gz: 02252f5f0f424e5ce8a5de86e61eb57110b9bb2c13bdff7048271a42bb301b53
3
+ metadata.gz: 71eab01be22eb03e579101dad181263d23036ac1c09bcd0654d1340fb3d08331
4
+ data.tar.gz: f54724b940834a13f225c51e68607e9ba03fc7b06649f419d4e9efbc14bb8126
5
5
  SHA512:
6
- metadata.gz: d11a61bff5d796282537328ae2d91f539bd514597fd424c166f82f1cd61d1075f71185d88f89b043b8986142f6699f81623a8f8db923bae3bcf6c2b58e3f9ead
7
- data.tar.gz: e6ae25e67084c5bf550dd3496ce248dd166581c2a1475e0bb922c8322b857d398beccd8b8b91324a51be247ea294fac9896c07d0f656462d6c8ed349a59ef202
6
+ metadata.gz: 378f503164f845b86d9ef58b3698ccc9a9258eb629ef3668c3ed2b7b9eb0122d3ac1536324bf37c9022bfb7574821aa1e9936414ebfb8ead915c60cb2cab4138
7
+ data.tar.gz: 49c4cdd01c66e4c4ab32ca95d8b9d77edc52cfd443689840dd81d64b019e336abcfe2d0ba7c9992631344840d81739e63b4dd5ad7fa6b4761a98bbb73fb3dda2
@@ -26,6 +26,8 @@ jobs:
26
26
  - name: Update gems
27
27
  run: |
28
28
  sudo gem install bundler --force
29
+ ruby -v | grep 2.5 && bundle config set build.debase --with-cflags="-Wno-error=implicit-function-declaration"
30
+ ruby -v | grep 2.5 && bundle config set build.ruby-debug-ide --with-cflags="-Wno-error=implicit-function-declaration"
29
31
  bundle install --jobs 4 --retry 3
30
32
  - name: Run specs
31
33
  run: |
@@ -28,9 +28,10 @@ Or install it yourself as:
28
28
  [source,ruby]
29
29
  ----
30
30
  require 'relaton_calconnect'
31
+ => true
31
32
 
32
33
  hits = RelatonCalconnect::CcBibliography.search("CC/DIR 10005:2019")
33
- => [<RelatonCalconnect::Hit:0x007f9a765185c0 @text="CC/DIR 10005:2019" @fetched="false" @fullIdentifier="" @title="">]
34
+ => <RelatonCalconnect::HitCollection:0x007f98e34a8bb0 @ref=CC/DIR 10005:2019 @fetched=false>
34
35
 
35
36
  item = hits[0].fetch
36
37
  => #<RelatonCalconnect::CcBibliographicItem:0x007f9a766b15d0
@@ -42,29 +43,29 @@ item = hits[0].fetch
42
43
  [source,ruby]
43
44
  ----
44
45
  item.to_xml
45
- => "<bibitem id=CC/DIR10005-2019 type=directive>
46
- <title format=text/plain language=en>Guidelines for the implementation of the CalConnect patent policy</title>
47
- <uri type=xml>csd/cc-10005.xml</uri>
48
- <uri type=pdf>csd/cc-10005.pdf</uri>
49
- <uri type=doc>csd/cc-10005.doc</uri>
50
- <uri type=html>csd/cc-10005.html</uri>
51
- <uri type=rxl>csd/cc-10005.rxl</uri>
52
- <docidentifier type=CC>CC/DIR 10005:2019</docidentifier>
46
+ => "<bibitem id="CC/DIR10005-2019" type="standard">
47
+ <title format="text/plain" language="en">Guidelines for the implementation of the CalConnect patent policy</title>
48
+ <uri type="xml">csd/cc-10005.xml</uri>
49
+ <uri type="pdf">csd/cc-10005.pdf</uri>
50
+ <uri type="doc">csd/cc-10005.doc</uri>
51
+ <uri type="html">csd/cc-10005.html</uri>
52
+ <uri type="rxl">csd/cc-10005.rxl</uri>
53
+ <docidentifier type="csd">CC/DIR 10005:2019</docidentifier>
53
54
  ...
54
- </bibitem>
55
+ </bibitem>"
55
56
  ----
56
57
  With argument `bibdata: true` it ouputs XML wrapped by `bibdata` element and adds flavour `ext` element.
57
58
  [source,ruby]
58
59
  ----
59
60
  item.to_xml bibdata: true
60
- => "<bibdata type=directive>
61
- <title format=text/plain language=en>Guidelines for the implementation of the CalConnect patent policy</title>
62
- <uri type=xml>csd/cc-10005.xml</uri>
63
- <uri type=pdf>csd/cc-10005.pdf</uri>
64
- <uri type=doc>csd/cc-10005.doc</uri>
65
- <uri type=html>csd/cc-10005.html</uri>
66
- <uri type=rxl>csd/cc-10005.rxl</uri>
67
- <docidentifier type=CC>CC/DIR 10005:2019</docidentifier>
61
+ => "<bibdata type="standard">
62
+ <title format="text/plain" language=en>Guidelines for the implementation of the CalConnect patent policy</title>
63
+ <uri type="xml">csd/cc-10005.xml</uri>
64
+ <uri type="pdf">csd/cc-10005.pdf</uri>
65
+ <uri type="doc">csd/cc-10005.doc</uri>
66
+ <uri type="html">csd/cc-10005.html</uri>
67
+ <uri type="rxl">csd/cc-10005.rxl</uri>
68
+ <docidentifier type="csd">CC/DIR 10005:2019</docidentifier>
68
69
  ...
69
70
  <ext>
70
71
  <doctype>directive</doctype>
@@ -79,7 +80,8 @@ item.to_xml bibdata: true
79
80
  [source,ruby]
80
81
  ----
81
82
  RelatonCalconnect::CcBibliography.get "CC/DIR 10005", "2019", {}
82
- fetching CC/DIR 10005...
83
+ [relaton-calconnect] ("CC/DIR 10005") fetching...
84
+ [relaton-calconnect] ("CC/DIR 10005") found CC/DIR 10005:2019
83
85
  => #<RelatonCalconnect::CcBibliographicItem:0x007f9a73dfa290
84
86
  ...
85
87
  ----
@@ -96,6 +96,13 @@
96
96
  </include>
97
97
  <define name="csd-standard">
98
98
  <element name="csd-standard">
99
+ <attribute name="version"/>
100
+ <attribute name="type">
101
+ <choice>
102
+ <value>semantic</value>
103
+ <value>presentation</value>
104
+ </choice>
105
+ </attribute>
99
106
  <ref name="bibdata"/>
100
107
  <zeroOrMore>
101
108
  <ref name="termdocsource"/>
@@ -43,7 +43,9 @@
43
43
  <define name="xref">
44
44
  <element name="xref">
45
45
  <attribute name="target">
46
- <data type="IDREF"/>
46
+ <data type="string">
47
+ <param name="pattern">\i\c*|\c+#\c+</param>
48
+ </data>
47
49
  </attribute>
48
50
  <optional>
49
51
  <attribute name="type">
@@ -61,6 +63,11 @@
61
63
  </choice>
62
64
  </attribute>
63
65
  </optional>
66
+ <optional>
67
+ <attribute name="droploc">
68
+ <data type="boolean"/>
69
+ </attribute>
70
+ </optional>
64
71
  <text/>
65
72
  </element>
66
73
  </define>
@@ -578,6 +585,8 @@
578
585
  <ref name="ol"/>
579
586
  <ref name="dl"/>
580
587
  <ref name="formula"/>
588
+ <ref name="quote"/>
589
+ <ref name="sourcecode"/>
581
590
  </choice>
582
591
  </oneOrMore>
583
592
  </element>
@@ -661,6 +670,16 @@
661
670
  </choice>
662
671
  </attribute>
663
672
  </optional>
673
+ <optional>
674
+ <attribute name="valign">
675
+ <choice>
676
+ <value>top</value>
677
+ <value>middle</value>
678
+ <value>bottom</value>
679
+ <value>baseline</value>
680
+ </choice>
681
+ </attribute>
682
+ </optional>
664
683
  <choice>
665
684
  <zeroOrMore>
666
685
  <choice>
@@ -697,6 +716,16 @@
697
716
  </choice>
698
717
  </attribute>
699
718
  </optional>
719
+ <optional>
720
+ <attribute name="valign">
721
+ <choice>
722
+ <value>top</value>
723
+ <value>middle</value>
724
+ <value>bottom</value>
725
+ <value>baseline</value>
726
+ </choice>
727
+ </attribute>
728
+ </optional>
700
729
  <choice>
701
730
  <zeroOrMore>
702
731
  <choice>
@@ -834,6 +863,13 @@
834
863
  </define>
835
864
  <define name="standard-document">
836
865
  <element name="standard-document">
866
+ <attribute name="version"/>
867
+ <attribute name="type">
868
+ <choice>
869
+ <value>semantic</value>
870
+ <value>presentation</value>
871
+ </choice>
872
+ </attribute>
837
873
  <ref name="bibdata"/>
838
874
  <optional>
839
875
  <ref name="boilerplate"/>
@@ -855,7 +891,7 @@
855
891
  <oneOrMore>
856
892
  <choice>
857
893
  <ref name="content"/>
858
- <ref name="preface_abstract"/>
894
+ <ref name="abstract"/>
859
895
  <ref name="foreword"/>
860
896
  <ref name="introduction"/>
861
897
  <ref name="acknowledgements"/>
@@ -922,6 +958,9 @@
922
958
  <optional>
923
959
  <attribute name="script"/>
924
960
  </optional>
961
+ <optional>
962
+ <attribute name="type"/>
963
+ </optional>
925
964
  <optional>
926
965
  <attribute name="obligation">
927
966
  <choice>
@@ -961,9 +1000,6 @@
961
1000
  </define>
962
1001
  <define name="content-subsection">
963
1002
  <element name="clause">
964
- <optional>
965
- <attribute name="type"/>
966
- </optional>
967
1003
  <ref name="Content-Section"/>
968
1004
  </element>
969
1005
  </define>
@@ -992,6 +1028,9 @@
992
1028
  </choice>
993
1029
  </attribute>
994
1030
  </optional>
1031
+ <optional>
1032
+ <attribute name="type"/>
1033
+ </optional>
995
1034
  <optional>
996
1035
  <ref name="section-title"/>
997
1036
  </optional>
@@ -1011,9 +1050,6 @@
1011
1050
  </define>
1012
1051
  <define name="clause">
1013
1052
  <element name="clause">
1014
- <optional>
1015
- <attribute name="type"/>
1016
- </optional>
1017
1053
  <ref name="Clause-Section"/>
1018
1054
  </element>
1019
1055
  </define>
@@ -1042,18 +1078,24 @@
1042
1078
  </choice>
1043
1079
  </attribute>
1044
1080
  </optional>
1081
+ <optional>
1082
+ <attribute name="type"/>
1083
+ </optional>
1045
1084
  <optional>
1046
1085
  <ref name="section-title"/>
1047
1086
  </optional>
1048
1087
  <group>
1049
- <group>
1050
- <zeroOrMore>
1051
- <ref name="BasicBlock"/>
1052
- </zeroOrMore>
1053
- <zeroOrMore>
1054
- <ref name="note"/>
1055
- </zeroOrMore>
1056
- </group>
1088
+ <choice>
1089
+ <group>
1090
+ <zeroOrMore>
1091
+ <ref name="BasicBlock"/>
1092
+ </zeroOrMore>
1093
+ <zeroOrMore>
1094
+ <ref name="note"/>
1095
+ </zeroOrMore>
1096
+ </group>
1097
+ <ref name="amend"/>
1098
+ </choice>
1057
1099
  <zeroOrMore>
1058
1100
  <choice>
1059
1101
  <ref name="clause-subsection"/>
@@ -1180,6 +1222,9 @@
1180
1222
  <optional>
1181
1223
  <attribute name="script"/>
1182
1224
  </optional>
1225
+ <optional>
1226
+ <attribute name="type"/>
1227
+ </optional>
1183
1228
  <optional>
1184
1229
  <attribute name="obligation">
1185
1230
  <choice>
@@ -1447,11 +1492,6 @@
1447
1492
  </optional>
1448
1493
  </element>
1449
1494
  </define>
1450
- <define name="preface_abstract">
1451
- <element name="abstract">
1452
- <ref name="Basic-Section"/>
1453
- </element>
1454
- </define>
1455
1495
  <define name="term-clause">
1456
1496
  <element name="clause">
1457
1497
  <optional>
@@ -1501,4 +1541,79 @@
1501
1541
  <ref name="CitationType"/>
1502
1542
  </element>
1503
1543
  </define>
1544
+ <define name="amend">
1545
+ <element name="amend">
1546
+ <optional>
1547
+ <attribute name="id">
1548
+ <data type="ID"/>
1549
+ </attribute>
1550
+ </optional>
1551
+ <attribute name="change">
1552
+ <choice>
1553
+ <value>add</value>
1554
+ <value>modify</value>
1555
+ <value>delete</value>
1556
+ </choice>
1557
+ </attribute>
1558
+ <optional>
1559
+ <attribute name="path"/>
1560
+ </optional>
1561
+ <optional>
1562
+ <attribute name="path_end"/>
1563
+ </optional>
1564
+ <optional>
1565
+ <attribute name="title"/>
1566
+ </optional>
1567
+ <optional>
1568
+ <element name="location">
1569
+ <zeroOrMore>
1570
+ <ref name="locality"/>
1571
+ </zeroOrMore>
1572
+ </element>
1573
+ </optional>
1574
+ <zeroOrMore>
1575
+ <ref name="autonumber"/>
1576
+ </zeroOrMore>
1577
+ <optional>
1578
+ <element name="description">
1579
+ <zeroOrMore>
1580
+ <ref name="BasicBlock"/>
1581
+ </zeroOrMore>
1582
+ </element>
1583
+ </optional>
1584
+ <optional>
1585
+ <element name="newcontent">
1586
+ <zeroOrMore>
1587
+ <ref name="BasicBlock"/>
1588
+ </zeroOrMore>
1589
+ </element>
1590
+ </optional>
1591
+ <optional>
1592
+ <element name="description">
1593
+ <zeroOrMore>
1594
+ <ref name="BasicBlock"/>
1595
+ </zeroOrMore>
1596
+ </element>
1597
+ </optional>
1598
+ </element>
1599
+ </define>
1600
+ <define name="autonumber">
1601
+ <element name="autonumber">
1602
+ <attribute name="type">
1603
+ <choice>
1604
+ <value>requirement</value>
1605
+ <value>recommendation</value>
1606
+ <value>permission</value>
1607
+ <value>table</value>
1608
+ <value>figure</value>
1609
+ <value>admonition</value>
1610
+ <value>formula</value>
1611
+ <value>sourcecode</value>
1612
+ <value>example</value>
1613
+ <value>note</value>
1614
+ </choice>
1615
+ </attribute>
1616
+ <text/>
1617
+ </element>
1618
+ </define>
1504
1619
  </grammar>
@@ -64,9 +64,9 @@ module RelatonCalconnect
64
64
  return { ret: item } if !year
65
65
 
66
66
  item.date.select { |d| d.type == "published" }.each do |d|
67
- return { ret: item } if year.to_i == d.on.year
67
+ return { ret: item } if year.to_i == d.on(:year)
68
68
 
69
- missed_years << d.on.year
69
+ missed_years << d.on(:year)
70
70
  end
71
71
  end
72
72
  { years: missed_years }
@@ -1,3 +1,3 @@
1
1
  module RelatonCalconnect
2
- VERSION = "1.3.0".freeze
2
+ VERSION = "1.6.0".freeze
3
3
  end
@@ -37,5 +37,5 @@ Gem::Specification.new do |spec|
37
37
  spec.add_development_dependency "webmock"
38
38
 
39
39
  spec.add_dependency "faraday"
40
- spec.add_dependency "relaton-bib", "~> 1.3.0"
40
+ spec.add_dependency "relaton-bib", "~> 1.6.0"
41
41
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: relaton-calconnect
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.0
4
+ version: 1.6.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
- autorequire:
8
+ autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2020-08-20 00:00:00.000000000 Z
11
+ date: 2020-11-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: debase
@@ -156,14 +156,14 @@ dependencies:
156
156
  requirements:
157
157
  - - "~>"
158
158
  - !ruby/object:Gem::Version
159
- version: 1.3.0
159
+ version: 1.6.0
160
160
  type: :runtime
161
161
  prerelease: false
162
162
  version_requirements: !ruby/object:Gem::Requirement
163
163
  requirements:
164
164
  - - "~>"
165
165
  - !ruby/object:Gem::Version
166
- version: 1.3.0
166
+ version: 1.6.0
167
167
  description: 'RelatonIso: retrieve CC Standards for bibliographic use using the IsoBibliographicItem
168
168
  model'
169
169
  email:
@@ -205,7 +205,7 @@ homepage: https://github.com/relaton/relaton-calconnect
205
205
  licenses:
206
206
  - BSD-2-Clause
207
207
  metadata: {}
208
- post_install_message:
208
+ post_install_message:
209
209
  rdoc_options: []
210
210
  require_paths:
211
211
  - lib
@@ -221,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
221
221
  version: '0'
222
222
  requirements: []
223
223
  rubygems_version: 3.0.6
224
- signing_key:
224
+ signing_key:
225
225
  specification_version: 4
226
226
  summary: 'RelatonIso: retrieve CC Standards for bibliographic use using the IsoBibliographicItem
227
227
  model'