relaton-jis 1.16.0 → 1.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6227e97046cb6fa42f7a00f120713279fd0dc673b1cbee2ecbf550e595fb46dd
-  data.tar.gz: f952fc50ae5a6fdc7b839af1956457d9c4c6c1041e61557b2f7493a8b6b0c96f
+  metadata.gz: 0f553d8895e1407f6efa8f149be93c2923b89a6a8e8c1a104098b9b8c3a56055
+  data.tar.gz: ec304140ac64f7173e592661d0f183d1b1285d09164fc4b472d53154758f045b
 SHA512:
-  metadata.gz: 227152cc685526b2375b53de5201a3a819b33deec0391870513f9f7eca493030809ba92a8137323c795724800821b530d651e1f1ccf48bfb1bae19b1c2d39832
-  data.tar.gz: e67f10b5df5c9305b98b4627e4f9801751c7bd13a1545997f08d7d1d0f6717939c42c957a84535e05fc364e2ba08fb364432c7e2e1cf4e04b5bf96897c19f2b5
+  metadata.gz: df6a1896c95ab8245adc1647b530c7fa821bf1f7c9da679805005f28acf396b8c6acc33ed63ad80fe1dfc85635fce7bf287da13d7a9c7ad32fc7cbd52f0bd7c2
+  data.tar.gz: 78dfe40b2cdcb55c4ae4215a4bd3ad95f6181cd16284956963d00501c4527d5945b7f806e6206a637d93e6ae029ca3e5df893713020328407e95547b8a9499f4

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
 ...
 

data/lib/relaton_jis/bibliography.rb

@@ -14,13 +14,15 @@ module RelatonJis
     #
     def search(code, year = nil)
       agent = Mechanize.new
-      resp = agent.post "#{SOURCE}0010/searchByKeyword", search_type: "JIS", keyword: code
+      resp = agent.post "#{SOURCE}0010/searchByKeyword", search_type: "JIS",
+                                                         keyword: code
       disp = JSON.parse resp.body
       # raise RelatonBib::RequestError, "No results found for #{code}" if disp["disp_screen"].nil?
       return if disp["disp_screen"].nil?
 
       result = agent.get "#{SOURCE}#{disp['disp_screen']}/index"
-      HitCollection.new code, year, result: result.xpath("//div[@class='blockGenaral']")
+      HitCollection.new code, year,
+                        result: result.xpath("//div[@class='blockGenaral']")
     end
 
     #
@@ -36,7 +38,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 from webdesk.jsa.or.jp ..."
       hits = search(code, year)
       unless hits
         hint [], ref, year
@@ -44,7 +46,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 +60,12 @@ 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."
       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/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.16.0"
+  VERSION = "1.16.2"
 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-jis
 version: !ruby/object:Gem::Version
-  version: 1.16.0
+  version: 1.16.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-03 00:00:00.000000000 Z
+date: 2023-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -60,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