relaton-jis 1.16.8 → 1.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e113cd5725a3c5171dc809f77224245704ee4c7427acadbc999d48ca157ffe87
-  data.tar.gz: 853ac93542cff181c4884d7f7274b2a228ba0d134605b109ee156d86ff171208
+  metadata.gz: f81af6fcda0f11448a44416410a1887385d86893047a3b26c59168f0b702d10b
+  data.tar.gz: 458f566abf32ca8c7a4ec52dcdfff9199d2b5e1aea0613bd824fbeca7ab1414a
 SHA512:
-  metadata.gz: 4ec7a469729e0c12adb7d7a7373b3d8d98aa447ac3f59471df09b40725c52745b57b479ecc4afe26e4b6b042bada2169bea6fc1bd3347581f5f0af94b822fb3e
-  data.tar.gz: 562a23c32ad963f335724d91a0dabe97f4c8ee8a0a1cae77544c8ec6aa4310eaa4c27ac4c28fda9fa5306df702d9fa5c45fe90ba494b1682a70a2e322d5d7be1
+  metadata.gz: 06c67dc4e2e2fda9135fe8ac68c8011e741c7739a7ddafad9367474a1e9fd87e5537412c3a180684f4d379c12e49edf7a7bd98ae55a51c445fb5d3ab7fca546d
+  data.tar.gz: 91fbc089e677f58cad13e93d0a1351518f4caabd7b36cf1266f792fbe93e062522f8d313612597301eb0de2366de1ad0623030754be326c31449f57ce04dd442

data/README.adoc

@@ -112,7 +112,7 @@ Possible options:
 [source,ruby]
 ----
 item.to_xml
-=> "<bibitem id="JISX0208-1997" type="standard" schema-version="v1.2.5">
+=> "<bibitem id="JISX0208-1997" type="standard" schema-version="v1.2.8">
       <fetched>2023-03-18</fetched>
       <title format="text/plain" language="ja" script="Jpan">７ビット及び８ビットの２バイト情報交換用符号化漢字集合</title>
       <title format="text/plain" language="en" script="Lant">7-bit and 8-bit double byte coded KANJI sets for information interchange</title>
@@ -120,7 +120,7 @@ item.to_xml
     </bibitem>"
 
 item.to_xml bibdata: true
-=> "<bibdata type="standard" schema-version="v1.2.5">
+=> "<bibdata type="standard" schema-version="v1.2.8">
       <fetched>2023-03-18</fetched>
       <title format="text/plain" language="ja" script="Jpan">７ビット及び８ビットの２バイト情報交換用符号化漢字集合</title>
       <title format="text/plain" language="en" script="Lant">7-bit and 8-bit double byte coded KANJI sets for information interchange</title>

data/grammars/basicdoc.rng

@@ -95,8 +95,89 @@
       <ref name="pagebreak"/>
       <ref name="hr"/>
       <ref name="bookmark"/>
+      <ref name="amend"/>
     </choice>
   </define>
+  <define name="amend">
+    <element name="amend">
+      <ref name="AmendType"/>
+    </element>
+  </define>
+  <define name="AmendType">
+    <optional>
+      <attribute name="id">
+        <data type="ID"/>
+      </attribute>
+    </optional>
+    <attribute name="change">
+      <choice>
+        <value>add</value>
+        <value>modify</value>
+        <value>delete</value>
+        <value>replace</value>
+      </choice>
+    </attribute>
+    <optional>
+      <attribute name="path"/>
+    </optional>
+    <optional>
+      <attribute name="path_end"/>
+    </optional>
+    <optional>
+      <attribute name="title"/>
+    </optional>
+    <optional>
+      <element name="location">
+        <zeroOrMore>
+          <choice>
+            <ref name="locality"/>
+            <ref name="localityStack"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </optional>
+    <optional>
+      <element name="description">
+        <zeroOrMore>
+          <ref name="BasicBlock"/>
+        </zeroOrMore>
+      </element>
+    </optional>
+    <optional>
+      <element name="newcontent">
+        <optional>
+          <attribute name="id">
+            <data type="ID"/>
+          </attribute>
+        </optional>
+        <zeroOrMore>
+          <ref name="BasicBlock"/>
+        </zeroOrMore>
+      </element>
+    </optional>
+    <zeroOrMore>
+      <ref name="classification"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="contributor"/>
+    </zeroOrMore>
+  </define>
+  <define name="classification">
+    <element name="classification">
+      <ref name="classification_tag"/>
+      <ref name="classification_value"/>
+    </element>
+  </define>
+  <define name="classification_tag">
+    <element name="tag">
+      <text/>
+    </element>
+  </define>
+  <define name="classification_value">
+    <element name="value">
+      <text/>
+    </element>
+  </define>
   <define name="paragraph">
     <element name="p">
       <ref name="ParagraphType"/>
@@ -715,27 +796,36 @@
   </define>
   <define name="ruby">
     <element name="ruby">
-      <zeroOrMore>
-        <choice>
-          <ref name="PureTextElement"/>
-          <ref name="rp"/>
-          <ref name="rt"/>
-        </choice>
-      </zeroOrMore>
+      <choice>
+        <ref name="ruby_pronunciation"/>
+        <ref name="ruby_annotation"/>
+      </choice>
+      <choice>
+        <text/>
+        <ref name="ruby"/>
+      </choice>
     </element>
   </define>
-  <define name="rp">
-    <element name="rp">
-      <zeroOrMore>
-        <ref name="PureTextElement"/>
-      </zeroOrMore>
+  <define name="ruby_pronunciation">
+    <element name="pronunciation">
+      <attribute name="value"/>
+      <optional>
+        <attribute name="script"/>
+      </optional>
+      <optional>
+        <attribute name="lang"/>
+      </optional>
     </element>
   </define>
-  <define name="rt">
-    <element name="rt">
-      <zeroOrMore>
-        <ref name="PureTextElement"/>
-      </zeroOrMore>
+  <define name="ruby_annotation">
+    <element name="annotation">
+      <attribute name="value"/>
+      <optional>
+        <attribute name="script"/>
+      </optional>
+      <optional>
+        <attribute name="lang"/>
+      </optional>
     </element>
   </define>
   <define name="br">
@@ -914,44 +1004,49 @@
   -->
   <define name="image">
     <element name="image">
-      <attribute name="id">
-        <data type="ID"/>
+      <ref name="Image"/>
+    </element>
+  </define>
+  <define name="Image">
+    <attribute name="id">
+      <data type="ID"/>
+    </attribute>
+    <attribute name="src">
+      <data type="anyURI"/>
+    </attribute>
+    <attribute name="mimetype"/>
+    <optional>
+      <attribute name="filename"/>
+    </optional>
+    <optional>
+      <attribute name="width">
+        <ref name="ImageSize"/>
       </attribute>
-      <attribute name="src">
+    </optional>
+    <optional>
+      <attribute name="height">
+        <ref name="ImageSize"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="alt"/>
+    </optional>
+    <optional>
+      <attribute name="title"/>
+    </optional>
+    <optional>
+      <attribute name="longdesc">
         <data type="anyURI"/>
       </attribute>
-      <attribute name="mimetype"/>
-      <optional>
-        <attribute name="filename"/>
-      </optional>
-      <optional>
-        <attribute name="width">
-          <choice>
-            <data type="int"/>
-            <value>auto</value>
-          </choice>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="height">
-          <choice>
-            <data type="int"/>
-            <value>auto</value>
-          </choice>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="alt"/>
-      </optional>
-      <optional>
-        <attribute name="title"/>
-      </optional>
-      <optional>
-        <attribute name="longdesc">
-          <data type="anyURI"/>
-        </attribute>
-      </optional>
-    </element>
+    </optional>
+  </define>
+  <define name="ImageSize">
+    <choice>
+      <data type="string">
+        <param name="pattern">\d+([.]\d+)?(%?)</param>
+      </data>
+      <value>auto</value>
+    </choice>
   </define>
   <define name="video">
     <element name="video">

data/grammars/biblio-standoc.rng

@@ -9,11 +9,42 @@
   -->
   <include href="biblio.rng">
     <define name="BibData">
-      <ref name="BibliographicItem"/>
+      <ref name="StandardBibliographicItem"/>
       <optional>
         <ref name="ext"/>
       </optional>
     </define>
+    <define name="docrelation">
+      <element name="relation">
+        <attribute name="type">
+          <ref name="DocRelationType"/>
+        </attribute>
+        <optional>
+          <element name="description">
+            <ref name="FormattedString"/>
+          </element>
+        </optional>
+        <element name="bibitem">
+          <ref name="StandardReducedBibliographicItem"/>
+        </element>
+        <choice>
+          <zeroOrMore>
+            <ref name="locality"/>
+          </zeroOrMore>
+          <zeroOrMore>
+            <ref name="localityStack"/>
+          </zeroOrMore>
+        </choice>
+        <choice>
+          <zeroOrMore>
+            <ref name="sourceLocality"/>
+          </zeroOrMore>
+          <zeroOrMore>
+            <ref name="sourceLocalityStack"/>
+          </zeroOrMore>
+        </choice>
+      </element>
+    </define>
   </include>
   <define name="ext">
     <element name="ext">
@@ -161,4 +192,16 @@
       </optional>
     </element>
   </define>
+  <define name="StandardBibliographicItem">
+    <ref name="BibliographicItem"/>
+    <zeroOrMore>
+      <ref name="amend"/>
+    </zeroOrMore>
+  </define>
+  <define name="StandardReducedBibliographicItem">
+    <ref name="ReducedBibliographicItem"/>
+    <zeroOrMore>
+      <ref name="amend"/>
+    </zeroOrMore>
+  </define>
 </grammar>

data/grammars/biblio.rng

@@ -241,6 +241,9 @@
     </element>
   </define>
   <define name="FullNameType">
+    <optional>
+      <ref name="name_abbreviation"/>
+    </optional>
     <choice>
       <group>
         <zeroOrMore>
@@ -266,6 +269,11 @@
       <ref name="variantname"/>
     </zeroOrMore>
   </define>
+  <define name="name_abbreviation">
+    <element name="abbreviation">
+      <ref name="LocalizedString"/>
+    </element>
+  </define>
   <define name="prefix">
     <element name="prefix">
       <ref name="LocalizedString"/>
@@ -348,6 +356,9 @@
       <zeroOrMore>
         <ref name="contact"/>
       </zeroOrMore>
+      <optional>
+        <ref name="logo"/>
+      </optional>
     </element>
   </define>
   <define name="orgname">
@@ -366,6 +377,21 @@
       </choice>
     </element>
   </define>
+  <define name="logo">
+    <element name="logo">
+      <ref name="image"/>
+    </element>
+  </define>
+  <define name="depiction">
+    <element name="depiction">
+      <optional>
+        <attribute name="scope"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="image"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="NameWithVariants">
     <element name="primary">
       <ref name="LocalizedString"/>
@@ -752,6 +778,9 @@
     <optional>
       <ref name="validity"/>
     </optional>
+    <optional>
+      <ref name="depiction"/>
+    </optional>
   </define>
   <define name="ReducedBibliographicItem">
     <optional>
@@ -849,6 +878,9 @@
     <optional>
       <ref name="validity"/>
     </optional>
+    <optional>
+      <ref name="depiction"/>
+    </optional>
   </define>
   <define name="btitle">
     <element name="title">

data/lib/relaton_jis/bibliographic_item.rb

@@ -1,6 +1,5 @@
 module RelatonJis
   class BibliographicItem < RelatonIsoBib::IsoBibliographicItem
-    DOCTYPES = %w[japanese-industrial-standard technical-report technical-specification amendment].freeze
     #
     # Fetch the flavor shcema version
     #

data/lib/relaton_jis/document_type.rb

@@ -0,0 +1,16 @@
+module RelatonJis
+  class DocumentType < RelatonBib::DocumentType
+    DOCTYPES = %w[japanese-industrial-standard technical-report technical-specification amendment].freeze
+
+    def initialize(type:, abbreviation: nil)
+      check_type type
+      super
+    end
+
+    def check_type(type)
+      unless DOCTYPES.include? type
+        Util.warn "WARNING: invalid doctype: `#{type}`"
+      end
+    end
+  end
+end

data/lib/relaton_jis/hash_converter.rb

@@ -1,9 +1,16 @@
 module RelatonJis
-  class HashConverter < RelatonBib::HashConverter
+  module HashConverter
+    include RelatonBib::HashConverter
+    extend self
+
     # @param item_hash [Hash]
     # @return [Relaton3gpp::BibliographicItem]
-    def self.bib_item(item_hash)
+    def bib_item(item_hash)
       BibliographicItem.new(**item_hash)
     end
+
+    def create_doctype(**args)
+      DocumentType.new(**args)
+    end
   end
 end

data/lib/relaton_jis/scraper.rb

@@ -103,12 +103,13 @@ module RelatonJis
     end
 
     def fetch_doctype
-      case document_id
-      when /JIS\s[A-Z]\s[\w-]+:\d{4}\/AMENDMENT/ then "amendment"
-      when /JIS\s[A-Z]\s[\w-]+/ then "japanese-industrial-standard"
-      when /TR[\s\/][\w-]+/ then "technical-report"
-      when /TS[\s\/][\w-]+/ then "technical-specification"
-      end
+      type =  case document_id
+              when /JIS\s[A-Z]\s[\w-]+:\d{4}\/AMENDMENT/ then "amendment"
+              when /JIS\s[A-Z]\s[\w-]+/ then "japanese-industrial-standard"
+              when /TR[\s\/][\w-]+/ then "technical-report"
+              when /TS[\s\/][\w-]+/ then "technical-specification"
+              end
+      DocumentType.new type: type
     end
 
     def fetch_ics

data/lib/relaton_jis/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RelatonJis
-  VERSION = "1.16.8"
+  VERSION = "1.18.0"
 end

data/lib/relaton_jis.rb

@@ -5,6 +5,7 @@ require "relaton_iso_bib"
 require_relative "relaton_jis/version"
 require_relative "relaton_jis/config"
 require_relative "relaton_jis/util"
+require_relative "relaton_jis/document_type"
 require_relative "relaton_jis/bibliographic_item"
 require_relative "relaton_jis/xml_parser"
 require_relative "relaton_jis/hash_converter"

data/relaton_jis.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
 
   # Uncomment to register a new dependency of your gem
   spec.add_dependency "mechanize", "~> 2.8.0"
-  spec.add_dependency "relaton-iso-bib", "~> 1.16.0"
+  spec.add_dependency "relaton-iso-bib", "~> 1.18.0"
 
   # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-jis
 version: !ruby/object:Gem::Version
-  version: 1.16.8
+  version: 1.18.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-23 00:00:00.000000000 Z
+date: 2024-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: 1.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: 1.18.0
 description: 'RelatonJis: retrieve IETF Standards for bibliographic use using the
   BibliographicItem model'
 email:
@@ -61,6 +61,7 @@ files:
 - lib/relaton_jis/bibliographic_item.rb
 - lib/relaton_jis/bibliography.rb
 - lib/relaton_jis/config.rb
+- lib/relaton_jis/document_type.rb
 - lib/relaton_jis/hash_converter.rb
 - lib/relaton_jis/hit.rb
 - lib/relaton_jis/hit_collection.rb