relaton-jis 1.18.0 → 1.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f81af6fcda0f11448a44416410a1887385d86893047a3b26c59168f0b702d10b
-  data.tar.gz: 458f566abf32ca8c7a4ec52dcdfff9199d2b5e1aea0613bd824fbeca7ab1414a
+  metadata.gz: 53da4fedaab9f861ce6b3d306c232e00e40af65cb3d4d1e7f8977a26441c3594
+  data.tar.gz: 60019731d68c3b3bf520fbc99f2e7d4bc09e616fc03d470b58044867bb94820f
 SHA512:
-  metadata.gz: 06c67dc4e2e2fda9135fe8ac68c8011e741c7739a7ddafad9367474a1e9fd87e5537412c3a180684f4d379c12e49edf7a7bd98ae55a51c445fb5d3ab7fca546d
-  data.tar.gz: 91fbc089e677f58cad13e93d0a1351518f4caabd7b36cf1266f792fbe93e062522f8d313612597301eb0de2366de1ad0623030754be326c31449f57ce04dd442
+  metadata.gz: 4b8bcf1d6a2ca662b03bcf6ba2e92583932056dc387f82fcbca7acdaba9403f07164e71c7f294b9c1a06cade4fa1c3447e5caa0dbc8b1f7040a8f4ef610356ae
+  data.tar.gz: 2ce6c3f8eb2f284b66743d2b55d4a57eba9cceb2d26fba33a2a5b568a8786058b27f505ea275740e9d09f601042824cfd365d184f41f0b94d5b5b4c1ff89e8e5

data/README.adoc

@@ -22,24 +22,13 @@ If bundler is not being used to manage dependencies, install the gem by executin
 
 == Usage
 
-=== 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.
+=== Search for standards using keywords
 
 [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>
 
@@ -112,7 +101,7 @@ Possible options:
 [source,ruby]
 ----
 item.to_xml
-=> "<bibitem id="JISX0208-1997" type="standard" schema-version="v1.2.8">
+=> "<bibitem id="JISX0208-1997" type="standard" schema-version="v1.2.9">
       <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 +109,7 @@ item.to_xml
     </bibitem>"
 
 item.to_xml bibdata: true
-=> "<bibdata type="standard" schema-version="v1.2.8">
+=> "<bibdata type="standard" schema-version="v1.2.9">
       <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>
@@ -160,6 +149,10 @@ item.link
   @type="pdf">]
 ----
 
+=== Logging
+
+RelatonJis uses the relaton-logger gem for logging. By default, it logs to STDOUT. To change the log levels and add other loggers, read the https://github.com/relaton/relaton-logger#usage[relaton-logger] documentation.
+
 == 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

@@ -244,6 +244,9 @@
         <data type="ID"/>
       </attribute>
       <attribute name="reviewer"/>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="date">
           <data type="dateTime"/>

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 from webdesk.jsa.or.jp ..."
+      Util.info "Fetching from webdesk.jsa.or.jp ...", key: ref
       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.info "Found: `#{result.docidentifier[0].id}`", key: ref
         return result
       end
       hint result, ref, year
@@ -58,10 +58,10 @@ module RelatonJis
     # @param [String, nil] year year to search
     #
     def hint(result, ref, year)
-      Util.warn "(#{ref}) Not found."
+      Util.info "Not found.", key: ref
       if result.any?
-        Util.warn "(#{ref}) TIP: No match for edition year `#{year}`, " \
-                  "but matches exist for `#{result.uniq.join('`, `')}`."
+        Util.info "TIP: No match for edition year `#{year}`, but " \
+                  "matches exist for `#{result.uniq.join('`, `')}`.", key: ref
       end
       nil
     end

data/lib/relaton_jis/document_type.rb

@@ -9,7 +9,7 @@ module RelatonJis
 
     def check_type(type)
       unless DOCTYPES.include? type
-        Util.warn "WARNING: invalid doctype: `#{type}`"
+        Util.warn "invalid doctype: `#{type}`"
       end
     end
   end

data/lib/relaton_jis/util.rb

@@ -1,9 +1,6 @@
 module RelatonJis
   module Util
     extend RelatonBib::Util
-
-    def self.logger
-      RelatonJis.configuration.logger
-    end
+    PROGNAME = "relaton-jis".freeze
   end
 end

data/lib/relaton_jis/version.rb

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

data/lib/relaton_jis/xml_parser.rb

@@ -1,9 +1,17 @@
 module RelatonJis
   class XMLParser < RelatonBib::XMLParser
-    # @param item_hash [Hash]
-    # @return [RelatonSgpp::BibliographicItem]
-    def self.bib_item(item_hash)
-      BibliographicItem.new(**item_hash)
+    class << self
+      private
+
+      # @param item_hash [Hash]
+      # @return [RelatonSgpp::BibliographicItem]
+      def bib_item(item_hash)
+        BibliographicItem.new(**item_hash)
+      end
+
+      def create_doctype(type)
+        DocumentType.new type: type.text, abbreviation: type[:abbreviation]
+      end
     end
   end
 end

data/lib/relaton_jis.rb

@@ -3,7 +3,6 @@
 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/document_type"
 require_relative "relaton_jis/bibliographic_item"

data/relaton_jis.gemspec

@@ -34,8 +34,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # Uncomment to register a new dependency of your gem
-  spec.add_dependency "mechanize", "~> 2.8.0"
-  spec.add_dependency "relaton-iso-bib", "~> 1.18.0"
+  spec.add_dependency "mechanize", "~> 2.10"
+  spec.add_dependency "relaton-iso-bib", "~> 1.19.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.18.0
+  version: 1.19.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-08 00:00:00.000000000 Z
+date: 2024-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '2.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '2.10'
 - !ruby/object:Gem::Dependency
   name: relaton-iso-bib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: 1.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: 1.19.0
 description: 'RelatonJis: retrieve IETF Standards for bibliographic use using the
   BibliographicItem model'
 email:
@@ -60,7 +60,6 @@ files:
 - lib/relaton_jis.rb
 - 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
@@ -92,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.3.27
 signing_key: 
 specification_version: 4
 summary: 'RelatonJis: retrieve IETF Standards for bibliographic use using the BibliographicItem

data/lib/relaton_jis/config.rb

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