relaton-itu 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 169f68ca9de0a9e01f2130919807393d53507a2fd92f98a7043337ee9c037a18
-  data.tar.gz: a5fc6f91b1d6c6af3b25919c77f2a3f1cc57bbc527983207d5163088ba01ea6c
+  metadata.gz: '0296cc075043482de147d46ed60967df09931278eda654caae1f92bcd4a30930'
+  data.tar.gz: 47645aff343e6f2d87e4022833ca3d2928be3a7d01ceb6c4456d19bcd7d98b82
 SHA512:
-  metadata.gz: 3243b1b99b363cb8bb773320ad5c70f0e48de661b4db92c1e3a96991de163ff40dd6179f974ebd80507ad2b37aca4ad0e20ca549c880787752128517a4dd34a9
-  data.tar.gz: d40ffddd2ef5a4ec569f92ae6253148b85ae434b38fa31ec2eb27681bf3e948096137b0acf86535fade15e4ccc79e538668a6371dbb575416a8a842739cdcf97
+  metadata.gz: 17c721e761b2cb4e8a42f8b328bec1ce90935a6ee289810e9153088980719d7e2ce84aeb79dd331f148bbe91168c7cc1a2df7e0a990264daba0bdbc1921eda53
+  data.tar.gz: '0648252af5e10601c126fa2494966f0291fafbffb16dcc0f8f8782a3fdc7e8a6f3e6e4dfcd839c0444516fce76a2233732f93522f59f450234b7e361eaaaf74a'

data/lib/relaton_itu/editorial_group.rb

@@ -16,8 +16,9 @@ module RelatonItu
     # @param subgroup [Hash, RelatonItu::ItuGroup, NilClass]
     # @param workgroup [Hash, RelatonItu::ItuGroup, NilClass]
     def initialize(bureau:, group:, subgroup: nil, workgroup: nil)
-      raise ArgumentError, "invalid bureau: #{bureau}" unless BUREAUS.include? bureau
-
+      unless BUREAUS.include? bureau
+        warn "[relaton-itu] WARNING: invalid bureau: #{bureau}"
+      end
       @bureau = bureau
       @group = group.is_a?(Hash) ? ItuGroup.new(group) : group
       @subgroup = subgroup.is_a?(Hash) ? ItuGroup.new(subgroup) : subgroup
@@ -28,7 +29,7 @@ module RelatonItu
     def to_xml(builder)
       builder.editorialgroup do
         builder.bureau bureau
-        builder.group { |b| group.to_xml b }
+        builder.group { |b| group.to_xml b } if group
         builder.subgroup { |b| group.to_xml b } if subgroup
         builder.workgroup { |b| group.to_xml b } if workgroup
       end
@@ -36,7 +37,8 @@ module RelatonItu
 
     # @return [Hash]
     def to_hash
-      hash = { "bureau" => bureau, "group" => group.to_hash }
+      hash = { "bureau" => bureau }
+      hash["group"] = group.to_hash if group
       hash["subgroup"] = subgroup.to_hash if subgroup
       hash["workgroup"] = workgroup.to_hash if workgroup
       hash

data/lib/relaton_itu/hash_converter.rb

@@ -9,6 +9,15 @@ module RelatonItu
 
         ret[:editorialgroup] = EditorialGroup.new eg
       end
+
+      # @param ret [Hash]
+      def structuredidentifier_hash_to_bib(ret)
+        return unless ret[:structuredidentifier]
+
+        ret[:structuredidentifier] = StructuredIdentifier.new(
+          ret[:structuredidentifier],
+        )
+      end
     end
   end
 end

data/lib/relaton_itu/itu_bibliographic_item.rb

@@ -7,12 +7,12 @@ module RelatonItu
       joint-itu-iso-iec
     ].freeze
 
+    # @params structuredidentifier [RelatonItu::StructuredIdentifier]
     def initialize(**args)
       @doctype = args.delete :doctype
       if doctype && !TYPES.include?(doctype)
-        raise ArgumentError, "invalid doctype: #{doctype}"
+        warn "[relaton-itu] WARNING: invalid doctype: #{doctype}"
       end
-
       super
     end
   end

data/lib/relaton_itu/itu_bibliography.rb

@@ -3,6 +3,7 @@
 require "relaton_iso_bib"
 require "relaton_itu/itu_bibliographic_item"
 require "relaton_itu/editorial_group"
+require "relaton_itu/structured_identifier"
 require "relaton_itu/itu_group"
 require "relaton_itu/scrapper"
 require "relaton_itu/hit_collection"

data/lib/relaton_itu/structured_identifier.rb

@@ -0,0 +1,37 @@
+module RelatonItu
+  class StructuredIdentifier
+    # @return [String]
+    attr_reader :bureau, :docnumber
+
+    # @return [String, NilClass]
+    attr_reader :annexid
+
+    # @param bureau [String] T, D, or R
+    # @param docnumber [String]
+    # @param annexid [String, NilClass]
+    def initialize(bureau:, docnumber:, annexid: nil)
+      unless EditorialGroup::BUREAUS.include? bureau
+        warn "[relaton-itu] WARNING: invalid bureau: #{bureau}"
+      end
+      @bureau = bureau
+      @docnumber = docnumber
+      @annexid = annexid
+    end
+
+    # @param builder [Nokogiri::XML::Builder]
+    def to_xml(builder)
+      builder.structuredidentifier do |b|
+        b.bureau bureau
+        b.docnumber docnumber
+        b.annexid annexid if annexid
+      end
+    end
+
+    # @return [Hash]
+    def to_hash
+      hash = { bureau: bureau, docnumber: docnumber }
+      hash[:annexid] = annexid if annexid
+      hash
+    end
+  end
+end

data/lib/relaton_itu/version.rb

@@ -1,3 +1,3 @@
 module RelatonItu
-  VERSION = "1.0.1".freeze
+  VERSION = "1.0.2".freeze
 end

data/lib/relaton_itu/xml_parser.rb

@@ -3,21 +3,14 @@ require "nokogiri"
 module RelatonItu
   class XMLParser < RelatonIsoBib::XMLParser
     class << self
-      # Override RelatonIsoBib::XMLParser.form_xml method.
-      # @param xml [String]
+      private
+
+      # @param item_hash [Hash]
       # @return [RelatonItu::ItuBibliographicItem]
-      def from_xml(xml)
-        doc = Nokogiri::XML(xml)
-        ituitem = doc.at "/bibitem|/bibdata"
-        if ituitem
-          ItuBibliographicItem.new item_data(ituitem)
-        elsif
-          warn "[relaton-itu] can't find bibitem or bibdata element in the XML"
-        end
+      def bib_item(item_hash)
+        ItuBibliographicItem.new item_hash
       end
 
-      private
-
       # @param ext [Nokogiri::XML::Element]
       # @return [RelatonItu::EditorialGroup]
       def fetch_editorialgroup(ext)
@@ -54,6 +47,18 @@ module RelatonItu
           start: period.at("start").text, finish: period.at("end")&.text,
         )
       end
+
+      # @param ext [Nokogiri::XML::Element]
+      # @return [RelatonItu::StructuredIdentifier]
+      def fetch_structuredidentifier(ext)
+        sid = ext.at "./structuredidentifier"
+        return unless sid
+
+        br = sid.at("bureau").text
+        dn = sid.at("docnumber").text
+        an = sid.at("annexid")&.text
+        StructuredIdentifier.new(bureau: br, docnumber: dn, annexid: an)
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-itu
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-04 00:00:00.000000000 Z
+date: 2020-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase
@@ -200,6 +200,7 @@ files:
 - lib/relaton_itu/itu_group.rb
 - lib/relaton_itu/processor.rb
 - lib/relaton_itu/scrapper.rb
+- lib/relaton_itu/structured_identifier.rb
 - lib/relaton_itu/version.rb
 - lib/relaton_itu/xml_parser.rb
 - relaton-itu.gemspec