relaton-plateau 1.19.2 → 1.19.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e95b332f0144bd7af6816a2854082c34ba658ca7f0cc593e05a046be13ed44c
-  data.tar.gz: 2a69c3e8a2c0cde1603f4eadcb3f078b14a4b01970c28bf43edcdffb47ca034b
+  metadata.gz: 9440584ea13e611d6139c74cd9ba79bbde532c76e2ba43d2fbc47c4fbe00388c
+  data.tar.gz: cdb45b8fbb9a1d27d7c3580788056a3f9fa38b727d69444b1789ada6bd203e8b
 SHA512:
-  metadata.gz: 38f9bbd18d7ee0d63a9c0bdf25882af04004f863576a1999bf0f09d13effef3508c2acbe50cfbc9d3bafdcfd45fb91d688e5f328081427913969c21c1570ce05
-  data.tar.gz: 8e9bc8e67859ec617f302d1b080646be8e4157729619f71ee3e2fe3005984249ba36674fe48df663f444f0d06f3eb90ff0d7755107b11c8f966a0c8e149e6b3c
+  metadata.gz: 6ea8f22a10154239a499e018756b3cfb8d84a7647860881f3b81c7ba4732d374d6a6db5f464d916fd6ceda68aaed023e7b5914399cbdbc8c07d3992906ce9914
+  data.tar.gz: b380d9c2cdd1e311fd5e66948aedcf95e1645aa8c14abdb3d4140289cf48b3523325aa401fc34a85d8a22b1d41670f78e1b0a9083af91d1415ec43d67c9695a7

data/README.adoc

@@ -33,13 +33,36 @@ Or install it yourself as:
 
 === Fetching
 
+==== Fetching Technical Reports
+
 [source,ruby]
 ----
 require "relaton/plateau"
+Relaton::Plateau::Bibliography.get("PLATEAU Technical Report #00")
+[relaton-plateau] INFO: (PLATEAU Technical Report #00) Fetching ...
+[relaton-plateau] INFO: (PLATEAU Technical Report #00) Found `PLATEAU Technical Report #00`
+ => #<Relaton::Plateau::BibItem:0x00000001238cfc98
+...
+----
+
+==== Fetching Handbooks unversioned
+
+[source,ruby]
+----
+Relaton::Plateau::Bibliography.get("PLATEAU Handbook #00")
+[relaton-plateau] INFO: (PLATEAU Handbook #00) Fetching ...
+[relaton-plateau] INFO: (PLATEAU Handbook #00) Found `PLATEAU Handbook #00`
+ => #<Relaton::Plateau::BibItem:0x00000001238c7598
+...
+----
 
-bib = Relaton::Plateau::Bibliography.get("PLATEAU Handbook #00 第1.0版")
-[relaton-plateau] INFO: (PLATEAU Handbook #00 第1.0版) Fetching ...
-[relaton-plateau] INFO: (PLATEAU Handbook #00 第1.0版) Found `PLATEAU Handbook #00 第1.0版`
+==== Fetching Handbooks versioned
+
+[source,ruby]
+----
+bib = Relaton::Plateau::Bibliography.get("PLATEAU Handbook #00 1.0")
+[relaton-plateau] INFO: (PLATEAU Handbook #00 1.0) Fetching ...
+[relaton-plateau] INFO: (PLATEAU Handbook #00 1.0) Found `PLATEAU Handbook #00 1.0`
 => #<Relaton::Plateau::BibItem:0x0000000104afbcc0
 ...
 ----
@@ -52,15 +75,15 @@ bib = Relaton::Plateau::Bibliography.get("PLATEAU Handbook #00 第1.0版")
 ----
 # Render bibitem
 puts bib.to_xml
-<bibitem id="PLATEAUHandbook#00第1.0版" type="standard" schema-version="v1.2.9">
+<bibitem id="PLATEAUHandbook#001.0" type="standard" schema-version="v1.2.9">
   <title type="main" format="text/plain" language="ja" script="Jpan">3D都市モデルの導入ガイダンス</title>
   <title type="main" format="text/plain" language="en" script="Latn">Guidance on the Installation for 3D City Model</title>
   <uri type="pdf">https://www.mlit.go.jp/plateau/file/libraries/doc/plateau_doc_0000_ver01.pdf</uri>
-  <docidentifier type="PLATEAU" primary="true">PLATEAU Handbook #00 第1.0版</docidentifier>
+  <docidentifier type="PLATEAU" primary="true">PLATEAU Handbook #00 1.0</docidentifier>
   <date type="published">
     <on>2021-03-26</on>
   </date>
-  <edition number="1.0">第1.0版</edition>
+  <edition number="1.0">1.0</edition>
   <abstract format="text/plain" language="ja" script="Jpan">地方自治体担当者や民間事業者等に向けた 3D都市モデル導入のためのガイダンス</abstract>
 </bibitem>
 
@@ -70,18 +93,18 @@ puts bib.to_xml(bibdata: true)
   <title type="main" format="text/plain" language="ja" script="Jpan">3D都市モデルの導入ガイダンス</title>
   <title type="main" format="text/plain" language="en" script="Latn">Guidance on the Installation for 3D City Model</title>
   <uri type="pdf">https://www.mlit.go.jp/plateau/file/libraries/doc/plateau_doc_0000_ver01.pdf</uri>
-  <docidentifier type="PLATEAU" primary="true">PLATEAU Handbook #00 第1.0版</docidentifier>
+  <docidentifier type="PLATEAU" primary="true">PLATEAU Handbook #00 1.</docidentifier>
   <date type="published">
     <on>2021-03-26</on>
   </date>
-  <edition number="1.0">第1.0版</edition>
+  <edition number="1.0">1.0</edition>
   <abstract format="text/plain" language="ja" script="Jpan">地方自治体担当者や民間事業者等に向けた 3D都市モデル導入のためのガイダンス</abstract>
   <ext>
     <doctype>handbook</doctype>
     <structuredidentifier type="Handbook">
       <agency>PLATEAU</agency>
       <docnumber>00</docnumber>
-      <edition>第1.0版</edition>
+      <edition>1.0</edition>
     </structuredidentifier>
     <cover>
       <image src="https://www.mlit.go.jp//plateau/uploads/2022/06/1@2x.jpg" mimetype="image/jpeg"/>
@@ -97,7 +120,7 @@ puts bib.to_xml(bibdata: true)
 puts bib.to_hash.to_yaml
 ---
 schema-version: v1.2.9
-id: PLATEAUHandbook#00第1.0版
+id: PLATEAUHandbook#001.0
 title:
 - content: 3D都市モデルの導入ガイダンス
   language:
@@ -118,14 +141,14 @@ link:
   type: pdf
 type: standard
 docid:
-- id: 'PLATEAU Handbook #00 第1.0版'
+- id: 'PLATEAU Handbook #00 1.0'
   type: PLATEAU
   primary: true
 date:
 - type: published
   value: '2021-03-26'
 edition:
-  content: 第1.0版
+  content: 1.0
   number: '1.0'
 revdate: '2021-03-26'
 abstract:
@@ -142,7 +165,7 @@ structuredidentifier:
   type: Handbook
   agency:
   - PLATEAU
-  edition: 第1.0版
+  edition: 1.0
 ext:
   cover:
     image:
@@ -156,7 +179,7 @@ ext:
 [source,ruby]
 ----
 puts bib.to_bibxml
-<reference anchor="PLATEAU.Handbook.#00.第1.0版">
+<reference anchor="PLATEAU.Handbook.#00.1.0">
   <front>
     <title>3D都市モデルの導入ガイダンス</title>
     <date year="2021" month="March" day="26"/>
@@ -172,7 +195,7 @@ puts bib.to_bibxml
 puts bib.to_asciibib
 [%bibitem]
 == {blank}
-id:: PLATEAUHandbook#00第1.0版
+id:: PLATEAUHandbook#001.0
 title::
 title.type:: main
 title.content:: 3D都市モデルの導入ガイダンス
@@ -188,8 +211,8 @@ title.format:: text/plain
 type:: standard
 docid.type:: PLATEAU
 docid.primary:: true
-docid.id:: PLATEAU Handbook #00 第1.0版
-edition.content:: 第1.0版
+docid.id:: PLATEAU Handbook #00 1.0
+edition.content:: 1.0
 edition.number:: 1.0
 date.type:: published
 date.on:: 2021-03-26
@@ -203,7 +226,7 @@ doctype.type:: handbook
 structured_identifier.docnumber:: 00
 structured_identifier.agency:: PLATEAU
 structured_identifier.type:: Handbook
-structured_identifier.edition:: 第1.0版
+structured_identifier.edition:: 1.0
 cover.image.src:: https://www.mlit.go.jp//plateau/uploads/2022/06/1@2x.jpg
 cover.image.mimetype:: image/jpeg
 filesize:: 18381880

data/lib/relaton/plateau/bibitem.rb

@@ -4,14 +4,14 @@ require_relative "stagename"
 module Relaton
   module Plateau
     class BibItem < RelatonBib::BibliographicItem
-      # @return [Relaton::Plateau::Cover]
+      # @return [Relaton::Plateau::Cover, nil]
       attr_reader :cover
 
-      # @return [Relaton::Plateau::Stagename]
+      # @return [Relaton::Plateau::Stagename, nil]
       attr_reader :stagename
 
-      # @return [Integer]
-      attr_reader :filesize
+      # @return [Integer, nil]
+      attr_accessor :filesize
 
       def initialize(**args)
         @cover = args.delete(:cover)
@@ -44,8 +44,8 @@ module Relaton
               ics.each { |i| b.ics i }
               structuredidentifier&.to_xml b
               stagename&.to_xml b
-              cover.to_xml b
-              b.filesize filesize
+              cover&.to_xml b
+              b.filesize filesize if filesize
             end
             ext["schema-version"] = ext_schema if !opts[:embedded] && respond_to?(:ext_schema) && ext_schema
           end
@@ -72,6 +72,20 @@ module Relaton
         output
       end
 
+      def to_all_editions(hits)
+        me = deep_clone
+        me.docidentifier.each(&:remove_edition)
+        me.id.sub!(/#{Regexp.escape(me.edition.content)}$/, "")
+        me.instance_variable_set :@edition, nil
+        me.date = []
+        me.instance_variable_set :@link, []
+        me.filesize = nil
+        hits.each do |h|
+          me.relation << RelatonBib::DocumentRelation.new(type: "hasEdition", bibitem: h.bibitem)
+        end
+        me
+      end
+
       private
 
       def has_ext_data?

data/lib/relaton/plateau/bibliography.rb

@@ -24,20 +24,15 @@ module Relaton
       end
 
       def search(code)
-        rows = index.search { |r| r[:id] ==  code }
+        all_editions = code.match?(/Handbook #\d+$/)
+        rows = index.search do |r|
+          id = all_editions ? r[:id].sub(/ \d+\.\d+$/, "") : r[:id]
+          id ==  code
+        end
         return unless rows.any?
 
-        row = rows.sort_by { |r| r[:id] }.last
-        fetch_doc code, **row
-      end
-
-      def fetch_doc(code, id:, file:)
-        resp = Net::HTTP.get_response URI("#{GHURL}#{file}")
-        return unless resp.is_a? Net::HTTPSuccess
-
-        hash = YAML.load(resp.body)
-        args = HashConverter.hash_to_bib hash
-        BibItem.new(**args)
+        hits = rows.map { |r| Hit.new(**r) }
+        all_editions ? hits[0].bibitem.to_all_editions(hits) : hits[0].bibitem
       end
     end
   end

data/lib/relaton/plateau/docidentifier.rb

@@ -0,0 +1,9 @@
+module Relaton
+  module Plateau
+    class Docidentifier < RelatonBib::DocumentIdentifier
+      def remove_edition
+        @id.sub!(/ \d+\.\d+$/, "")
+      end
+    end
+  end
+end

data/lib/relaton/plateau/handbook_parser.rb

@@ -15,11 +15,11 @@ module Relaton
       private
 
       def edition
-        @edition ||= @version["title"].split.first
+        @edition ||= @version["title"].split.first.match(/[\d.]+/).to_s
       end
 
-      def parse_docid
-        super << create_docid("PLATEAU Handbook ##{@entry["slug"]} #{edition}")
+      def parse_docnumber
+        "Handbook ##{@entry["slug"]} #{edition}"
       end
 
       def parse_title

data/lib/relaton/plateau/hash_converter.rb

@@ -42,6 +42,10 @@ module Relaton
         BibItem.new(**item_hash)
       end
 
+      def create_docid(**args)
+        Docidentifier.new(**args)
+      end
+
       def create_doctype(**args)
         DocumentType.new(**args)
       end

data/lib/relaton/plateau/hit.rb

@@ -0,0 +1,27 @@
+module Relaton
+  module Plateau
+    class Hit
+      def initialize(**args)
+        @id = args[:id]
+        @file = args[:file]
+      end
+
+      def bibitem
+        return @bibitem if defined? @bibitem
+        @bibitem = fetch_doc
+      end
+
+      private
+
+      def fetch_doc
+        resp = Net::HTTP.get_response URI("#{Bibliography::GHURL}#{@file}")
+        return unless resp.is_a? Net::HTTPSuccess
+
+        hash = YAML.load(resp.body)
+        args = HashConverter.hash_to_bib hash
+        args[:fetched] = Date.today.to_s
+        BibItem.new(**args)
+      end
+    end
+  end
+end

data/lib/relaton/plateau/parser.rb

@@ -1,7 +1,8 @@
 module Relaton
   module Plateau
+    # Base class for Plateau parsers
     class Parser
-      ATTRIS = %i[docid title abstract cover edition type doctype subdoctype
+      ATTRIS = %i[docid docnumber title abstract cover edition type doctype subdoctype
                   date link contributor filesize keyword structuredidentifier].freeze
 
       def initialize(item)
@@ -17,10 +18,14 @@ module Relaton
 
       private
 
-      def parse_docid; [] end
+      def parse_docid
+        [create_docid("PLATEAU #{parse_docnumber}")]
+      end
+
+      def parse_docnumber; end
 
       def create_docid(id)
-        RelatonBib::DocumentIdentifier.new(type: "PLATEAU", id: id, primary: true)
+        Docidentifier.new(type: "PLATEAU", id: id, primary: true)
       end
 
       def create_formatted_string(content, lang = "ja", script = "Jpan")
@@ -55,7 +60,7 @@ module Relaton
 
       def parse_contributor
         name = [
-          { content: "国土交通省都市局", language: "ja", script: "Jpan" },
+          { content: "国土交通省", language: "ja", script: "Jpan" },
           {
             content: "Japanese Ministry of Land, Infrastructure, Transport and Tourism",
             language: "en",

data/lib/relaton/plateau/technical_report_parser.rb

@@ -8,8 +8,8 @@ module Relaton
 
       private
 
-      def parse_docid
-        super << create_docid("PLATEAU Technical Report ##{@entry["slug"]}")
+      def parse_docnumber
+        "Technical Report ##{@entry["slug"]}"
       end
 
       def parse_abstract

data/lib/relaton/plateau/version.rb

@@ -2,6 +2,6 @@
 
 module Relaton
   module Plateau
-    VERSION = "1.19.2"
+    VERSION = "1.19.4"
   end
 end

data/lib/relaton/plateau/xml_parser.rb

@@ -54,6 +54,10 @@ module Relaton
           BibItem.new(**item_hash)
         end
 
+        def create_docid(**args)
+          Docidentifier.new(**args)
+        end
+
         def create_doctype(type)
           DocumentType.new type: type.text, abbreviation: type[:abbreviation]
         end

data/lib/relaton/plateau.rb

@@ -4,8 +4,10 @@ require "relaton/index"
 require "relaton_bib"
 require_relative "plateau/version"
 require_relative "plateau/util"
+require_relative "plateau/docidentifier"
 require_relative "plateau/document_type"
 require_relative "plateau/bibitem"
+require_relative "plateau/hit"
 require_relative "plateau/bibliography"
 require_relative "plateau/xml_parser"
 require_relative "plateau/hash_converter"

data/{relaton-plateau.gemspec → relaton_plateau.gemspec}

@@ -27,5 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "base64"
   spec.add_dependency "relaton-index", "~> 0.2.12"
   spec.add_dependency "relaton-logger", "~> 0.2.0"
-  spec.add_dependency "relaton-bib", "~> 1.19.3"
+  spec.add_dependency "relaton-bib", "~> 1.19.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-plateau
 version: !ruby/object:Gem::Version
-  version: 1.19.2
+  version: 1.19.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-31 00:00:00.000000000 Z
+date: 2024-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.19.3
+        version: 1.19.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.19.3
+        version: 1.19.4
 description: Retrieve Project PLATEAU bibliographic items.
 email:
 - open.source@ribose.com
@@ -93,10 +93,12 @@ files:
 - lib/relaton/plateau/bibitem.rb
 - lib/relaton/plateau/bibliography.rb
 - lib/relaton/plateau/cover.rb
+- lib/relaton/plateau/docidentifier.rb
 - lib/relaton/plateau/document_type.rb
 - lib/relaton/plateau/fetcher.rb
 - lib/relaton/plateau/handbook_parser.rb
 - lib/relaton/plateau/hash_converter.rb
+- lib/relaton/plateau/hit.rb
 - lib/relaton/plateau/parser.rb
 - lib/relaton/plateau/processor.rb
 - lib/relaton/plateau/stagename.rb
@@ -104,7 +106,7 @@ files:
 - lib/relaton/plateau/util.rb
 - lib/relaton/plateau/version.rb
 - lib/relaton/plateau/xml_parser.rb
-- relaton-plateau.gemspec
+- relaton_plateau.gemspec
 - sig/relaton/plateau.rbs
 homepage: https://github.com/relaton/relaton-plateau
 licenses: