relaton-gb 1.9.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58f31fdd313cb672e6f580a2dcbf690a9410b76eb027fcad5204d45a13072adc
-  data.tar.gz: 12a975c602e69fa0e0de8fa34f3771daba49e22db87e5dbef38fcdfdfad12d3b
+  metadata.gz: b931b589f3f95dd9d3011cf8284eb2407020af43fd2948b8655f54a043776627
+  data.tar.gz: 40f9665b5a74ed4e8118a5bc27ae6820b5620553f4d6c2a001953c665c887cd8
 SHA512:
-  metadata.gz: e28a265459112604bb9b263022a7b21c5bd05e93293615e069c4dbd6bc35c1709545eb89330a13bcd77843e72f5c210627f3ccf0414631a6f676f292f88bd76d
-  data.tar.gz: c36c098399b490ddb43aaf1c66319a2cb060ec65f20c17e3fb26edb5230db236cb452cd0b74eedddac39a859b84761d47d40b4d435fee81d9fcb35b5cc7a6c67
+  metadata.gz: af21950b6ef87ac1be5075363fa1c1587ad07f9769b33dbaf0c7c43e0fd185fd02cf5accfadc4b86287734acc3b126fa29ee85bc3aa0186a6c803104065db71b
+  data.tar.gz: e8ec6a99f8c77ed47977fd4cebf20b7319b8e94534e61f6894db84a21c20699eca86d49ed99486d7da04a83e5cc76bc1235b67430cbca0e134f4ecca683db12e

data/.rubocop.yml

@@ -2,6 +2,8 @@
 # https://github.com/riboseinc/oss-guides
 # All project-specific additions and overrides should be specified in this file.
 
+require: rubocop-rails
+
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
 AllCops:

data/README.adoc

@@ -183,6 +183,16 @@ hit_collection.first.fetch.to_xml bibdata: true
 </bibdata>"
 ----
 
+=== Typed links
+
+Each GB document has `src` type link.
+
+[source,ruby]
+----
+hit_collection.first.fetch.link
+=> [#<RelatonBib::TypedUri:0x00007fee2c0257e8 @content=#<Addressable::URI:0x67c URI:http://openstd.samr.gov.cn/bzgk/gb/newGbInfo?hcno=083B48FA72DBD3B9BDE74507BC31736A>, @type="src">]
+----
+
 == Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/grammars/basicdoc.rng

@@ -173,9 +173,11 @@
           <data type="dateTime"/>
         </attribute>
       </optional>
-      <attribute name="from">
-        <data type="IDREF"/>
-      </attribute>
+      <optional>
+        <attribute name="from">
+          <data type="IDREF"/>
+        </attribute>
+      </optional>
       <optional>
         <attribute name="to">
           <data type="IDREF"/>
@@ -624,6 +626,9 @@
         <choice>
           <ref name="PureTextElement"/>
           <ref name="stem"/>
+          <ref name="eref"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -634,6 +639,9 @@
         <choice>
           <ref name="PureTextElement"/>
           <ref name="stem"/>
+          <ref name="eref"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -641,7 +649,12 @@
   <define name="tt">
     <element name="tt">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="eref"/>
+          <ref name="xref"/>
+          <ref name="hyperlink"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>
@@ -822,7 +835,9 @@
       <attribute name="alt"/>
     </optional>
     <ref name="CitationType"/>
-    <text/>
+    <oneOrMore>
+      <ref name="PureTextElement"/>
+    </oneOrMore>
   </define>
   <define name="hyperlink">
     <element name="link">
@@ -835,7 +850,9 @@
       <optional>
         <attribute name="alt"/>
       </optional>
-      <text/>
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="xref">
@@ -849,7 +866,9 @@
       <optional>
         <attribute name="alt"/>
       </optional>
-      <text/>
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="fn">

data/grammars/biblio.rng

@@ -401,9 +401,9 @@
       <choice>
         <!-- iso191606 TODO -->
         <group>
-          <oneOrMore>
+          <zeroOrMore>
             <ref name="street"/>
-          </oneOrMore>
+          </zeroOrMore>
           <ref name="city"/>
           <optional>
             <ref name="state"/>

data/grammars/gbstandard.rng

@@ -44,7 +44,7 @@
         <optional>
           <ref name="termdomain"/>
         </optional>
-        <ref name="definition"/>
+        <!-- <ref name="definition"/> -->
         <zeroOrMore>
           <ref name="termnote"/>
         </zeroOrMore>