relaton-calconnect 1.2.0 → 1.6.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36e8a627c7853cba4a74d1a71ed6c86950c4dd073d039f61c0c435684bb0ac03
-  data.tar.gz: ae11b505a0fc2313872279fe5e9b21bbb6d7d08d3c06d55ab6c810e8b88aa709
+  metadata.gz: b0c90ca70cf2912b796013a1a4e4ff9a225f6f0c9ec9b8e4a1d4029fc1d7ddd4
+  data.tar.gz: 8e7b241bad69422ff22d0bbcc962a607003b62889110af0cd7304643c422f0c9
 SHA512:
-  metadata.gz: c62b1fdfecd28e08175f784f09e9b49dc6b90e2957a96af40c890e053fb3855b601a0bba4a266181c95f9e56a0e008c6cda26543faa5f177c1cf5527ea66c1de
-  data.tar.gz: 21b431cf86af2ba08538b027d0a08a2071fe610dedad54ff35ec483d6b9207a6679884a42caeee183b5dafa7b031b7701784598b4034a304d7ad2ade28ac5d69
+  metadata.gz: 3e9c55e1d3dc5d4f0394e5a560bed195f0764a56ba470abcec1891d65ab001ac22018167943b79c28c006183aa9beab0a8c48092f1e172704b9bc6d11d93d84b
+  data.tar.gz: 377828036488e47cdac777dcacccf95a081ec2f0af2adeec8c25cffc98a7c16459e18091fb7fc591c1b5a6e88db5363350c1a904290d2320dce85dd23a1e9853

data/.github/workflows/macos.yml

@@ -26,6 +26,8 @@ jobs:
       - name: Update gems
         run: |
           sudo gem install bundler --force
+          ruby -v | grep 2.5 && bundle config set build.debase --with-cflags="-Wno-error=implicit-function-declaration"
+          ruby -v | grep 2.5 && bundle config set build.ruby-debug-ide --with-cflags="-Wno-error=implicit-function-declaration"
           bundle install --jobs 4 --retry 3
       - name: Run specs
         run: |

data/.github/workflows/ubuntu.yml

@@ -29,4 +29,5 @@ jobs:
           bundle install --jobs 4 --retry 3
       - name: Run specs
         run: |
+          unset JAVA_TOOL_OPTIONS
           bundle exec rake

data/.rubocop.yml

@@ -5,6 +5,6 @@
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.4
 Rails:
-  Enabled: true
+  Enabled: false

data/README.adoc

@@ -28,9 +28,10 @@ Or install it yourself as:
 [source,ruby]
 ----
 require 'relaton_calconnect'
+=> true
 
 hits = RelatonCalconnect::CcBibliography.search("CC/DIR 10005:2019")
-=> [<RelatonCalconnect::Hit:0x007f9a765185c0 @text="CC/DIR 10005:2019" @fetched="false" @fullIdentifier="" @title="">]
+=> <RelatonCalconnect::HitCollection:0x007f98e34a8bb0 @ref=CC/DIR 10005:2019 @fetched=false>
 
 item = hits[0].fetch
 => #<RelatonCalconnect::CcBibliographicItem:0x007f9a766b15d0
@@ -42,29 +43,29 @@ item = hits[0].fetch
 [source,ruby]
 ----
 item.to_xml
-=> "<bibitem id=CC/DIR10005-2019 type=directive>
-      <title format=text/plain language=en>Guidelines for the implementation of the CalConnect patent policy</title>
-      <uri type=xml>csd/cc-10005.xml</uri>
-      <uri type=pdf>csd/cc-10005.pdf</uri>
-      <uri type=doc>csd/cc-10005.doc</uri>
-      <uri type=html>csd/cc-10005.html</uri>
-      <uri type=rxl>csd/cc-10005.rxl</uri>
-      <docidentifier type=CC>CC/DIR 10005:2019</docidentifier>
+=> "<bibitem id="CC/DIR10005-2019" type="standard">
+      <title format="text/plain" language="en">Guidelines for the implementation of the CalConnect patent policy</title>
+      <uri type="xml">csd/cc-10005.xml</uri>
+      <uri type="pdf">csd/cc-10005.pdf</uri>
+      <uri type="doc">csd/cc-10005.doc</uri>
+      <uri type="html">csd/cc-10005.html</uri>
+      <uri type="rxl">csd/cc-10005.rxl</uri>
+      <docidentifier type="csd">CC/DIR 10005:2019</docidentifier>
       ...
-    </bibitem>
+    </bibitem>"
 ----
 With argument `bibdata: true` it ouputs XML wrapped by `bibdata` element and adds flavour `ext` element.
 [source,ruby]
 ----
 item.to_xml bibdata: true
-=> "<bibdata type=directive>
-      <title format=text/plain language=en>Guidelines for the implementation of the CalConnect patent policy</title>
-      <uri type=xml>csd/cc-10005.xml</uri>
-      <uri type=pdf>csd/cc-10005.pdf</uri>
-      <uri type=doc>csd/cc-10005.doc</uri>
-      <uri type=html>csd/cc-10005.html</uri>
-      <uri type=rxl>csd/cc-10005.rxl</uri>
-      <docidentifier type=CC>CC/DIR 10005:2019</docidentifier>
+=> "<bibdata type="standard">
+      <title format="text/plain" language=en>Guidelines for the implementation of the CalConnect patent policy</title>
+      <uri type="xml">csd/cc-10005.xml</uri>
+      <uri type="pdf">csd/cc-10005.pdf</uri>
+      <uri type="doc">csd/cc-10005.doc</uri>
+      <uri type="html">csd/cc-10005.html</uri>
+      <uri type="rxl">csd/cc-10005.rxl</uri>
+      <docidentifier type="csd">CC/DIR 10005:2019</docidentifier>
       ...
       <ext>
         <doctype>directive</doctype>
@@ -79,7 +80,8 @@ item.to_xml bibdata: true
 [source,ruby]
 ----
 RelatonCalconnect::CcBibliography.get "CC/DIR 10005", "2019", {}
-fetching CC/DIR 10005...
+[relaton-calconnect] ("CC/DIR 10005") fetching...
+[relaton-calconnect] ("CC/DIR 10005") found CC/DIR 10005:2019
 => #<RelatonCalconnect::CcBibliographicItem:0x007f9a73dfa290
 ...
 ----

data/grammars/csd.rng

@@ -96,6 +96,13 @@
   </include>
   <define name="csd-standard">
     <element name="csd-standard">
+      <attribute name="version"/>
+      <attribute name="type">
+        <choice>
+          <value>semantic</value>
+          <value>presentation</value>
+        </choice>
+      </attribute>
       <ref name="bibdata"/>
       <zeroOrMore>
         <ref name="termdocsource"/>

data/grammars/isodoc.rng

@@ -43,7 +43,9 @@
     <define name="xref">
       <element name="xref">
         <attribute name="target">
-          <data type="IDREF"/>
+          <data type="string">
+            <param name="pattern">\i\c*|\c+#\c+</param>
+          </data>
         </attribute>
         <optional>
           <attribute name="type">
@@ -61,6 +63,11 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="droploc">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <text/>
       </element>
     </define>
@@ -578,6 +585,8 @@
             <ref name="ol"/>
             <ref name="dl"/>
             <ref name="formula"/>
+            <ref name="quote"/>
+            <ref name="sourcecode"/>
           </choice>
         </oneOrMore>
       </element>
@@ -661,6 +670,16 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="valign">
+            <choice>
+              <value>top</value>
+              <value>middle</value>
+              <value>bottom</value>
+              <value>baseline</value>
+            </choice>
+          </attribute>
+        </optional>
         <choice>
           <zeroOrMore>
             <choice>
@@ -697,6 +716,16 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="valign">
+            <choice>
+              <value>top</value>
+              <value>middle</value>
+              <value>bottom</value>
+              <value>baseline</value>
+            </choice>
+          </attribute>
+        </optional>
         <choice>
           <zeroOrMore>
             <choice>
@@ -834,6 +863,13 @@
   </define>
   <define name="standard-document">
     <element name="standard-document">
+      <attribute name="version"/>
+      <attribute name="type">
+        <choice>
+          <value>semantic</value>
+          <value>presentation</value>
+        </choice>
+      </attribute>
       <ref name="bibdata"/>
       <optional>
         <ref name="boilerplate"/>
@@ -855,7 +891,7 @@
       <oneOrMore>
         <choice>
           <ref name="content"/>
-          <ref name="preface_abstract"/>
+          <ref name="abstract"/>
           <ref name="foreword"/>
           <ref name="introduction"/>
           <ref name="acknowledgements"/>
@@ -922,6 +958,9 @@
       <optional>
         <attribute name="script"/>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -961,9 +1000,6 @@
   </define>
   <define name="content-subsection">
     <element name="clause">
-      <optional>
-        <attribute name="type"/>
-      </optional>
       <ref name="Content-Section"/>
     </element>
   </define>
@@ -992,6 +1028,9 @@
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -1011,9 +1050,6 @@
   </define>
   <define name="clause">
     <element name="clause">
-      <optional>
-        <attribute name="type"/>
-      </optional>
       <ref name="Clause-Section"/>
     </element>
   </define>
@@ -1042,18 +1078,24 @@
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
     <group>
-      <group>
-        <zeroOrMore>
-          <ref name="BasicBlock"/>
-        </zeroOrMore>
-        <zeroOrMore>
-          <ref name="note"/>
-        </zeroOrMore>
-      </group>
+      <choice>
+        <group>
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
+          <zeroOrMore>
+            <ref name="note"/>
+          </zeroOrMore>
+        </group>
+        <ref name="amend"/>
+      </choice>
       <zeroOrMore>
         <choice>
           <ref name="clause-subsection"/>
@@ -1180,6 +1222,9 @@
       <optional>
         <attribute name="script"/>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -1447,11 +1492,6 @@
       </optional>
     </element>
   </define>
-  <define name="preface_abstract">
-    <element name="abstract">
-      <ref name="Basic-Section"/>
-    </element>
-  </define>
   <define name="term-clause">
     <element name="clause">
       <optional>
@@ -1501,4 +1541,79 @@
       <ref name="CitationType"/>
     </element>
   </define>
+  <define name="amend">
+    <element name="amend">
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
+      <attribute name="change">
+        <choice>
+          <value>add</value>
+          <value>modify</value>
+          <value>delete</value>
+        </choice>
+      </attribute>
+      <optional>
+        <attribute name="path"/>
+      </optional>
+      <optional>
+        <attribute name="path_end"/>
+      </optional>
+      <optional>
+        <attribute name="title"/>
+      </optional>
+      <optional>
+        <element name="location">
+          <zeroOrMore>
+            <ref name="locality"/>
+          </zeroOrMore>
+        </element>
+      </optional>
+      <zeroOrMore>
+        <ref name="autonumber"/>
+      </zeroOrMore>
+      <optional>
+        <element name="description">
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
+        </element>
+      </optional>
+      <optional>
+        <element name="newcontent">
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
+        </element>
+      </optional>
+      <optional>
+        <element name="description">
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
+        </element>
+      </optional>
+    </element>
+  </define>
+  <define name="autonumber">
+    <element name="autonumber">
+      <attribute name="type">
+        <choice>
+          <value>requirement</value>
+          <value>recommendation</value>
+          <value>permission</value>
+          <value>table</value>
+          <value>figure</value>
+          <value>admonition</value>
+          <value>formula</value>
+          <value>sourcecode</value>
+          <value>example</value>
+          <value>note</value>
+        </choice>
+      </attribute>
+      <text/>
+    </element>
+  </define>
 </grammar>

data/lib/relaton_calconnect/cc_bibliography.rb

@@ -64,9 +64,9 @@ module RelatonCalconnect
           return { ret: item } if !year
 
           item.date.select { |d| d.type == "published" }.each do |d|
-            return { ret: item } if year.to_i == d.on.year
+            return { ret: item } if year.to_i == d.on(:year)
 
-            missed_years << d.on.year
+            missed_years << d.on(:year)
           end
         end
         { years: missed_years }

data/lib/relaton_calconnect/version.rb

@@ -1,3 +1,3 @@
 module RelatonCalconnect
-  VERSION = "1.2.0".freeze
+  VERSION = "1.6.pre1".freeze
 end

data/relaton_calconnect.gemspec

@@ -37,5 +37,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "webmock"
 
   spec.add_dependency "faraday"
-  spec.add_dependency "relaton-bib", "~> 1.2.0"
+  spec.add_dependency "relaton-bib", "~> 1.6.pre"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-calconnect
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.6.pre1
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-26 00:00:00.000000000 Z
+date: 2020-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.6.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.6.pre
 description: 'RelatonIso: retrieve CC Standards for bibliographic use using the IsoBibliographicItem
   model'
 email:
@@ -205,7 +205,7 @@ homepage: https://github.com/relaton/relaton-calconnect
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -216,12 +216,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: 'RelatonIso: retrieve CC Standards for bibliographic use using the IsoBibliographicItem
   model'