relaton-jis 1.18.1 → 1.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 384ce3921d788a33ca6cf5eb01274172735874b1fe2f4d1e407bc2e8cec44487
-  data.tar.gz: b5875b375b58b93f553c1dc1bec23e01676fe47f9f8b716cead9f120d92b73c0
+  metadata.gz: c223759d15403f399f92edd2272b156b0e3c7f6c7dc274babb6b24cf02f99326
+  data.tar.gz: 387192eb0a06f3f0cca389decf2e0aa9d13193aed0f52d0e8949c7089ce77b99
 SHA512:
-  metadata.gz: e4a3dcede68fc4394eae1ca1a24f01a9d9daa5ac249bfac4c1e696451bd8dcc2fa77f5df0eac667320cdbe82da2a079aff4d3df824eb38ffcf1b6a727bfc6097
-  data.tar.gz: cb0dfb2614ec3234ca68cb1d0afe290c181088e56173d3db8578bd2d3e22852cbd77d1a80b495874c897ca74a9d1ee9615d85569074e906c0c4a60e3958a0136
+  metadata.gz: a1ceb478a730fba7ce00809420161cc996b1ade2e3d590fab98c75668ee1450df0be2daebf1f5e3cedd8fe099121bd5e2ed01d73b56b5b755afee12e2a009302
+  data.tar.gz: 1c7fe1151443babf282595293d6c41f5945fe75d56481f06edd60a5c00f61b15f9ff65a428de6827494f08df3a64f5eb620a6fdb2f1832f826d4de346dee28f7

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/scraper.rb

@@ -120,13 +120,25 @@ module RelatonJis
     end
 
     def fetch_contributor
-      @doc.xpath("./table/tr[th[.='原案作成団体']]/td").map do |node|
-        name = RelatonBib::LocalizedString.new node.text.strip, "ja", "Jpan"
-        org = RelatonBib::Organization.new name: name
-        RelatonBib::ContributionInfo.new entity: org, role: [type: "author"]
+      @doc.xpath("./table/tr[th[.='原案作成団体']]/td").reduce([]) do |a, node|
+        a << create_contrib(node, "author")
+        a << create_contrib(node, "publisher")
       end
     end
 
+    def create_contrib(node, role)
+      org = RelatonBib::Organization.new name: create_orgname(node)
+      RelatonBib::ContributionInfo.new entity: org, role: [type: role]
+    end
+
+    def create_orgname(node)
+      name = [RelatonBib::LocalizedString.new(node.text.strip, "ja", "Jpan")]
+      if node.text.include?("日本規格協会")
+        name << RelatonBib::LocalizedString.new("Japanese Industrial Standards", "en", "Latn")
+      end
+      name
+    end
+
     def fetch_editorialgroup
       node = @doc.at("./table/tr[th[.='原案作成団体']]/td")
       return unless node

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.1"
+  VERSION = "1.19.1"
 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

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
 
   # Uncomment to register a new dependency of your gem
   spec.add_dependency "mechanize", "~> 2.10"
-  spec.add_dependency "relaton-iso-bib", "~> 1.18.0"
+  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.1
+  version: 1.19.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-19 00:00:00.000000000 Z
+date: 2024-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -30,14 +30,14 @@ dependencies:
     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

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