relaton-jis 1.14.4 → 1.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c4c2984fb3fcab2b642ec7b046aa6912d6f48bcc472b8eab85ca641d53e624d
-  data.tar.gz: c65250ff70392cb0542df01b85007784e6ced5c92059d36912143e14c73cbe60
+  metadata.gz: c2ee66af10fcc5b78823a228bc7ac31263f8cd52f9e8fbbfdfb47ac500eb9c4a
+  data.tar.gz: 68ddb0faf39ad33cd96edd29f072e41787b7c9fa262c5647768f12a481f5e2a7
 SHA512:
-  metadata.gz: 26ce98826e2078f8e6567a93bc9cdb8a4c6936b91eb38a93d00e46b41bfe45a13e6b4bbd204a11baa9d3e21e1790a5276a473738aa86ec98d88c0cbd965e3f59
-  data.tar.gz: ddbdf26d69c115fc63e2cd28486cb0737b217d193e4be36925dbe2476215aed8b3abad4e08e0952064436ee6ef7408907355c0d76abc831543dbd7c6d4fb50bf
+  metadata.gz: b8c365ed292ca2405923fc74b5f9f3682bf7c95aef6cf2caa4a54e7d479203b617a530a19bf17c5ff9efb9365781f5c4b603ae7d1ec51fd467ff235eb4eed230
+  data.tar.gz: 74d12f5337f22272db21fb76264a18b8d2be376d96f116ae6235f712388e4eb074d8c6a7806a24860be3ac560ff4d983899a043cf02d3b2183a03a0b2c39ce3f

data/README.adoc

@@ -78,7 +78,7 @@ Possible options:
 [source,ruby]
 ----
 item.to_xml
-=> "<bibitem id="JISX0208-1997" type="standard" schema-version="v1.2.3">
+=> "<bibitem id="JISX0208-1997" type="standard" schema-version="v1.2.4">
       <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,7 +86,7 @@ item.to_xml
     </bibitem>"
 
 item.to_xml bibdata: true
-=> "<bibdata type="standard" schema-version="v1.2.3">
+=> "<bibdata type="standard" schema-version="v1.2.4">
       <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/biblio.rng

@@ -1283,7 +1283,7 @@
       <value>mergedInto</value>
       <value>splits</value>
       <value>splitInto</value>
-      <value>instance</value>
+      <value>instanceOf</value>
       <value>hasInstance</value>
       <value>exemplarOf</value>
       <value>hasExemplar</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?
-      warn "[relaton-jis] (\"#{ref}\") fetching..."
+      Util.warn "(#{ref}) fetching..."
       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
-        warn "[relaton-jis] (\"#{ref}\") found #{result.docidentifier[0].id}"
+        Util.warn "(#{ref}) found `#{result.docidentifier[0].id}`"
         return result
       end
       hint result, ref, year
@@ -58,12 +58,13 @@ module RelatonJis
     # @param [String, nil] year year to search
     #
     def hint(result, ref, year)
-      warn "[relaton-jis] (\"#{ref}\") not found. The identifier must be " \
-           "exactly as shown on the webdesk.jsa.or.jp website."
+      Util.warn "(#{ref}) not found. The identifier must be " \
+                "exactly as shown on the webdesk.jsa.or.jp website."
       if result.any?
-        warn "[relaton-jis] (\"#{ref}\") TIP: No match for edition " \
-             "year #{year}, but matches exist for #{result.uniq.join(', ')}."
+        Util.warn "(#{ref}) TIP: No match for edition year `#{year}`, " \
+                  "but matches exist for `#{result.uniq.join('`, `')}`."
       end
+      nil
     end
   end
 end

data/lib/relaton_jis/config.rb

@@ -0,0 +1,10 @@
+module RelatonJis
+  module Config
+    include RelatonBib::Config
+  end
+  extend Config
+
+  class Configuration < RelatonBib::Configuration
+    PROGNAME = "relaton-jis".freeze
+  end
+end

data/lib/relaton_jis/hit_collection.rb

@@ -64,7 +64,7 @@ module RelatonJis
       docid = RelatonBib::DocumentIdentifier.new id: hit.hit[:id], type: "JIS", primary: true
       fref = RelatonBib::FormattedRef.new content: hit.hit[:id]
       bibitem = BibliographicItem.new docid: [docid], formattedref: fref
-      RelatonBib::DocumentRelation.new(type: "instance", bibitem: bibitem)
+      RelatonBib::DocumentRelation.new(type: "instanceOf", bibitem: bibitem)
     end
 
     #

data/lib/relaton_jis/util.rb

@@ -0,0 +1,9 @@
+module RelatonJis
+  module Util
+    extend RelatonBib::Util
+
+    def self.logger
+      RelatonJis.configuration.logger
+    end
+  end
+end

data/lib/relaton_jis/version.rb

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

data/lib/relaton_jis.rb

@@ -3,6 +3,8 @@
 require "mechanize"
 require "relaton_iso_bib"
 require_relative "relaton_jis/version"
+require_relative "relaton_jis/config"
+require_relative "relaton_jis/util"
 require_relative "relaton_jis/bibliographic_item"
 require_relative "relaton_jis/xml_parser"
 require_relative "relaton_jis/hash_converter"
@@ -17,9 +19,9 @@ module RelatonJis
   # Returns hash of XML reammar
   # @return [String]
   def self.grammar_hash
-    gem_path = File.expand_path "..", __dir__
-    grammars_path = File.join gem_path, "grammars", "*"
-    grammars = Dir[grammars_path].sort.map { |gp| File.read gp }.join
-    Digest::MD5.hexdigest grammars
+    # gem_path = File.expand_path "..", __dir__
+    # grammars_path = File.join gem_path, "grammars", "*"
+    # grammars = Dir[grammars_path].sort.map { |gp| File.read gp }.join
+    Digest::MD5.hexdigest RelatonJis::VERSION + RelatonIsoBib::VERSION + RelatonBib::VERSION # grammars
   end
 end

data/relaton_jis.gemspec

@@ -35,8 +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-bib", "~> 1.14.9"
-  spec.add_dependency "relaton-iso-bib", "~> 1.14.0"
+  spec.add_dependency "relaton-iso-bib", "~> 1.16.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.14.4
+  version: 1.16.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-17 00:00:00.000000000 Z
+date: 2023-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -24,34 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.8.0
-- !ruby/object:Gem::Dependency
-  name: relaton-bib
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.14.9
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.14.9
 - !ruby/object:Gem::Dependency
   name: relaton-iso-bib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.16.0
 description: 'RelatonJis: retrieve IETF Standards for bibliographic use using the
   BibliographicItem model'
 email:
@@ -74,11 +60,13 @@ files:
 - lib/relaton_jis.rb
 - lib/relaton_jis/bibliographic_item.rb
 - lib/relaton_jis/bibliography.rb
+- lib/relaton_jis/config.rb
 - lib/relaton_jis/hash_converter.rb
 - lib/relaton_jis/hit.rb
 - lib/relaton_jis/hit_collection.rb
 - lib/relaton_jis/processor.rb
 - lib/relaton_jis/scraper.rb
+- lib/relaton_jis/util.rb
 - lib/relaton_jis/version.rb
 - lib/relaton_jis/xml_parser.rb
 - relaton_jis.gemspec