relaton-iso-bib 0.9.0 → 1.1.0

data/lib/relaton_iso_bib/iso_bibliographic_item.rb

@@ -35,7 +35,7 @@ module RelatonIsoBib
     #   @return [Array<RelatonIsoBib::TypedTitleString>]
 
     # @return [String, NilClass]
-    attr_reader :doctype
+    attr_reader :doctype, :stagename
 
     # @return [RelatonIsoBib::EditorialGroup]
     attr_reader :editorialgroup
@@ -67,6 +67,7 @@ module RelatonIsoBib
     # @param validity [RelatonBib:Validity, NilClass]
     # @param docid [Array<RelatonBib::DocumentIdentifier>]
     # @param structuredidentifier [RelatonIsoBib::StructuredIdentifier]
+    # @param stagename [String, NilClass]
     #
     # @param title [Array<Hash>]
     # @option title [String] :title_intro
@@ -134,7 +135,7 @@ module RelatonIsoBib
         %i[id docnumber language script docstatus date abstract contributor
            edition version relation biblionote series medium place copyright
            link fetched docid formattedref extent accesslocation classification
-           validity].include? k
+           validity keyword].include? k
       end
       super super_args
 
@@ -158,6 +159,7 @@ module RelatonIsoBib
       @structuredidentifier = args[:structuredidentifier]
       @doctype ||= args[:doctype]
       @ics = args.fetch(:ics, []).map { |i| i.is_a?(Hash) ? Ics.new(i) : i }
+      @stagename = args[:stagename]
       @id_attribute = true
     end
     # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
@@ -243,9 +245,11 @@ module RelatonIsoBib
       end
       super builder, **opts do |b|
         if opts[:bibdata] && (doctype || respond_to?(:committee) && committee ||
-          editorialgroup || ics.any? || structuredidentifier || block_given?)
+          editorialgroup || ics.any? || structuredidentifier || stagename ||
+          block_given?)
           b.ext do
             b.doctype doctype if doctype
+            b.docsubtype docsubtype if respond_to?(:docsubtype) && docsubtype
             # GB renders gbcommittee elements istead of an editorialgroup element.
             if respond_to? :committee
               committee&.to_xml b
@@ -254,6 +258,7 @@ module RelatonIsoBib
             end
             ics.each { |i| i.to_xml b }
             structuredidentifier&.to_xml b
+            b.stagename stagename if stagename
             yield b if block_given?
           end
         end
@@ -267,6 +272,7 @@ module RelatonIsoBib
       hash["ics"] = single_element_array(ics) if ics&.any?
       hash["structuredidentifier"] = structuredidentifier.to_hash if structuredidentifier
       hash["doctype"] = doctype if doctype
+      hash["stagename"] = stagename if stagename
       hash
     end
 

data/lib/relaton_iso_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonIsoBib
-  VERSION = "0.9.0".freeze
+  VERSION = "1.1.0".freeze
 end

data/lib/relaton_iso_bib/xml_parser.rb

@@ -3,20 +3,6 @@ require "nokogiri"
 module RelatonIsoBib
   class XMLParser < RelatonBib::XMLParser
     class << self
-      # Override RelatonBib::XMLParser.form_xml method.
-      # @param xml [String]
-      # @return [RelatonIsoBib::IsoBibliographicItem]
-      def from_xml(xml)
-        doc = Nokogiri::XML(xml)
-        doc.remove_namespaces!
-        isoitem = doc.at "/bibitem|/bibdata"
-        if isoitem
-          IsoBibliographicItem.new item_data(isoitem)
-        else
-          warn "[relato-iso-bib] can't find bibitem or bibdata element in the XML"
-        end
-      end
-
       private
 
       # Override RelatonBib::XMLParser.item_data method.
@@ -31,9 +17,17 @@ module RelatonIsoBib
         data[:editorialgroup] = fetch_editorialgroup ext
         data[:ics] = fetch_ics ext
         data[:structuredidentifier] = fetch_structuredidentifier ext
+        data[:stagename] = ext.at("./stagename")&.text
         data
       end
 
+      # override RelatonBib::BibliographicItem.bib_item method
+      # @param item_hash [Hash]
+      # @return [RelatonIsoBib::IsoBibliographicItem]
+      def bib_item(item_hash)
+        IsoBibliographicItem.new item_hash
+      end
+
       # @param ext [Nokogiri::XML::Element]
       # @return [RelatonIsoBib::StructuredIdentifier]
       def fetch_structuredidentifier(ext)
@@ -77,9 +71,8 @@ module RelatonIsoBib
         sc = eg&.xpath("subcommittee")&.map { |s| iso_subgroup(s) }
         wg = eg&.xpath("workgroup")&.map { |w| iso_subgroup(w) }
         sr = eg&.at "secretariat"
-        EditorialGroup.new(
-          technical_committee: tc, subcommittee: sc, workgroup: wg, secretariat: sr&.text,
-        )
+        EditorialGroup.new(technical_committee: tc, subcommittee: sc,
+                           workgroup: wg, secretariat: sr&.text)
       end
 
       # @param com [Nokogiri::XML::Element]

data/relaton_iso_bib.gemspec

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "relaton_iso_bib/version"
 
@@ -16,8 +16,9 @@ Gem::Specification.new do |spec|
   spec.license       = "BSD-2-Clause"
 
   # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  # The `git ls-files -z` loads the files in the RubyGem that have been added
+  # into git.
+  spec.files         = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.bindir        = "exe"
@@ -35,5 +36,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov"
 
   spec.add_dependency "isoics", "~> 0.1.6"
-  spec.add_dependency "relaton-bib", "~> 0.9.0"
+  spec.add_dependency "relaton-bib", "~> 1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iso-bib
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-30 00:00:00.000000000 Z
+date: 2020-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.1.0
 description: 'RelatonIsoBib: Ruby ISOXMLDOC impementation.'
 email:
 - open.source@ribose.com