relaton-jis 1.16.1 → 1.16.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2ee66af10fcc5b78823a228bc7ac31263f8cd52f9e8fbbfdfb47ac500eb9c4a
-  data.tar.gz: 68ddb0faf39ad33cd96edd29f072e41787b7c9fa262c5647768f12a481f5e2a7
+  metadata.gz: 1b3a731d5e0f676963ec89f4899c2d1bb8284373d42926fa99b62d6175ffde3d
+  data.tar.gz: fd4571456406d7175da4c2b4e613a9c1ddac3cda715a54914bfd0d4b39d1bba9
 SHA512:
-  metadata.gz: b8c365ed292ca2405923fc74b5f9f3682bf7c95aef6cf2caa4a54e7d479203b617a530a19bf17c5ff9efb9365781f5c4b603ae7d1ec51fd467ff235eb4eed230
-  data.tar.gz: 74d12f5337f22272db21fb76264a18b8d2be376d96f116ae6235f712388e4eb074d8c6a7806a24860be3ac560ff4d983899a043cf02d3b2183a03a0b2c39ce3f
+  metadata.gz: 6f304a961b00a79400f0b372122e24e136dd165b5d364c91d5a7221f1eabad76b4289c358b8da1a061f3d0dab7be5ddb27cf21d4e2a39d849cb83f369c4f38ad
+  data.tar.gz: 79d9d7aac0fcb3b7e5686ac1c9c5cc367d958f60becca732fb3c0c945a9286698664004ce9b8f7e97fd1d6bce4717aa59f262c0e1abfb2ff450d69875579f911

data/README.adoc

@@ -22,13 +22,24 @@ If bundler is not being used to manage dependencies, install the gem by executin
 
 == Usage
 
-=== Search for standards using keywords
+=== Configuration
+
+Configuration is optional. The available option is `logger` which is a `Logger` instance. By default, the logger is `Logger.new($stderr)` with `Logger::WARN` level. To change the logger level, use `RelatonJis.configure` block.
 
 [source,ruby]
 ----
 require 'relaton_jis'
 => true
 
+RelatonJis.configure do |config|
+  config.logger.level = Logger::DEBUG
+end
+----
+
+=== Search for standards using keywords
+
+[source,ruby]
+----
 hit_collection = RelatonJis::Bibliography.search("JIS X 0208")
 => <RelatonJis::HitCollection:0x00000000018858 @ref=JIS X 0208 @fetched=false>
 
@@ -54,14 +65,14 @@ item.docidentifier
 [source,ruby]
 ----
 item = RelatonJis::Bibliography.get "JIS X 0208:1997"
-[relaton-jis] ("JIS X 0208:1997") fetching...
-[relaton-jis] ("JIS X 0208:1997") found JIS X 0208:1997
+[relaton-jis] (JIS X 0208:1997) Fetching from webdesk.jsa.or.jp ...
+[relaton-jis] (JIS X 0208:1997) Found: `JIS X 0208:1997`
 => #<RelatonJis::BibliographicItem:0x00007fe4478ecc08
 ...
 
 item = RelatonJis::Bibliography.get "JIS X 0208", "1997"
-[relaton-jis] ("JIS X 0208") fetching...
-[relaton-jis] ("JIS X 0208") found JIS X 0208:1997
+[relaton-jis] (JIS X 0208) Fetching  from webdesk.jsa.or.jp ...
+[relaton-jis] (JIS X 0208) Found: `JIS X 0208:1997`
 => #<RelatonJis::BibliographicItem:0x00007fe436b49d90
 ...
 
@@ -78,7 +89,7 @@ Possible options:
 [source,ruby]
 ----
 item.to_xml
-=> "<bibitem id="JISX0208-1997" type="standard" schema-version="v1.2.4">
+=> "<bibitem id="JISX0208-1997" type="standard" schema-version="v1.2.5">
       <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>
@@ -86,12 +97,12 @@ item.to_xml
     </bibitem>"
 
 item.to_xml bibdata: true
-=> "<bibdata type="standard" schema-version="v1.2.4">
+=> "<bibdata type="standard" schema-version="v1.2.5">
       <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>
       ...
-      <ext schema-version="">
+      <ext schema-version="v0.0.1">
         <doctype>standard</doctype>
         <editorialgroup>
           <technical-committee>一般財団法人　日本規格協会</technical-committee>

data/grammars/basicdoc.rng

@@ -346,6 +346,8 @@
           <ref name="keyword"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </oneOrMore>
     </element>
@@ -623,6 +625,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -636,6 +640,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -648,6 +654,8 @@
           <ref name="eref"/>
           <ref name="xref"/>
           <ref name="hyperlink"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
         </choice>
       </zeroOrMore>
     </element>
@@ -655,7 +663,11 @@
   <define name="keyword">
     <element name="keyword">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>
@@ -676,7 +688,11 @@
   <define name="strike">
     <element name="strike">
       <zeroOrMore>
-        <ref name="PureTextElement"/>
+        <choice>
+          <ref name="PureTextElement"/>
+          <ref name="index"/>
+          <ref name="index-xref"/>
+        </choice>
       </zeroOrMore>
     </element>
   </define>

data/grammars/biblio.rng

@@ -942,6 +942,7 @@
       <value>obsoleted</value>
       <value>confirmed</value>
       <value>updated</value>
+      <value>corrected</value>
       <value>issued</value>
       <value>transmitted</value>
       <value>copied</value>

data/lib/relaton_jis/bibliography.rb

@@ -36,7 +36,7 @@ module RelatonJis
     def get(ref, year = nil, opts = {}) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       code = ref.sub(/\s\((all parts|規格群)\)/, "")
       opts[:all_parts] ||= !$1.nil?
-      Util.warn "(#{ref}) fetching..."
+      Util.warn "(#{ref}) Fetching from webdesk.jsa.or.jp ..."
       hits = search(code, year)
       unless hits
         hint [], ref, year
@@ -44,7 +44,7 @@ module RelatonJis
       end
       result = opts[:all_parts] ? hits.find_all_parts : hits.find
       if result.is_a? RelatonJis::BibliographicItem
-        Util.warn "(#{ref}) found `#{result.docidentifier[0].id}`"
+        Util.warn "(#{ref}) Found: `#{result.docidentifier[0].id}`"
         return result
       end
       hint result, ref, year
@@ -58,8 +58,7 @@ module RelatonJis
     # @param [String, nil] year year to search
     #
     def hint(result, ref, year)
-      Util.warn "(#{ref}) not found. The identifier must be " \
-                "exactly as shown on the webdesk.jsa.or.jp website."
+      Util.warn "(#{ref}) Not found."
       if result.any?
         Util.warn "(#{ref}) TIP: No match for edition year `#{year}`, " \
                   "but matches exist for `#{result.uniq.join('`, `')}`."

data/lib/relaton_jis/hit_collection.rb

@@ -38,6 +38,8 @@ module RelatonJis
 
     def find_all_years # rubocop:disable Metrics/AbcSize
       hits = @array.select { |hit| hit.eq? ref_parts }
+      return [] if hits.empty?
+
       item = hits.max_by { |i| i.id_parts[:year].to_i }.fetch
       item_id = item.docidentifier.first.id
       parent = item.to_most_recent_reference

data/lib/relaton_jis/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-jis
 version: !ruby/object:Gem::Version
-  version: 1.16.1
+  version: 1.16.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-21 00:00:00.000000000 Z
+date: 2023-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize