relaton-iso-bib 1.0.1 → 1.4.0

data/lib/relaton_iso_bib/structured_identifier.rb

@@ -26,7 +26,6 @@ module RelatonIsoBib
       @project_number = args[:project_number]
       @part = args[:part]
       @subpart = args[:subpart]
-      # @prefix = args[:prefix]
       @type = args[:type]
     end
 
@@ -34,18 +33,19 @@ module RelatonIsoBib
     def remove_part
       @part_number = nil
       @subpart_number = nil
-      case @type
-      when "Chinese Standard" then @project_number = @project_number.sub(/\.\d+/, "")
-      else
-        @project_number = @project_number.sub(/-\d+/, "")
-      end
+      @project_number = case @type
+                        when "Chinese Standard"
+                          @project_number.sub(/\.\d+/, "")
+                        else
+                          @project_number = @project_number.sub(/-\d+/, "")
+                        end
     end
 
     def remove_date
-      case @type
-      when "Chinese Standard" then @project_number = @project_number.sub(/-[12]\d\d\d/, "")
+      if @type == "Chinese Standard"
+        @project_number.sub!(/-[12]\d\d\d/, "")
       else
-        @project_number = @project_number.sub(/:[12]\d\d\d/, "")
+        @project_number.sub!(/:[12]\d\d\d/, "")
       end
     end
 
@@ -63,7 +63,9 @@ module RelatonIsoBib
         pn = builder.send "project-number", project_number
         pn[:part] = part if part
         pn[:subpart] = subpart if subpart
-        builder.send "tc-document-number", tc_document_number if tc_document_number
+        if tc_document_number
+          builder.send "tc-document-number", tc_document_number
+        end
       end
       xml[:type] = type if type
     end
@@ -78,5 +80,27 @@ module RelatonIsoBib
       hash["type"] = type if type
       hash
     end
+
+    # @param prefix [String]
+    # @return [String]
+    def to_asciibib(prefix = "") # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
+      pref = prefix.empty? ? prefix : prefix + "."
+      pref += "structured_identifier"
+      out = ""
+      if tc_document_number
+        out += "#{pref}.tc_document_number:: #{tc_document_number}\n"
+      end
+      if project_number
+        out += "#{pref}.project_number:: #{project_number}\n"
+      end
+      out += "#{pref}.part:: #{part}\n" if part
+      out += "#{pref}.subpart:: #{subpart}\n" if subpart
+      out += "#{pref}.type:: #{type}\n" if type
+      out
+    end
+
+    def presence?
+      true
+    end
   end
 end

data/lib/relaton_iso_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonIsoBib
-  VERSION = "1.0.1".freeze
+  VERSION = "1.4.0".freeze
 end

data/lib/relaton_iso_bib/xml_parser.rb

@@ -15,7 +15,6 @@ module RelatonIsoBib
 
         data[:doctype] = ext.at("./doctype")&.text
         data[:editorialgroup] = fetch_editorialgroup ext
-        data[:ics] = fetch_ics ext
         data[:structuredidentifier] = fetch_structuredidentifier ext
         data[:stagename] = ext.at("./stagename")&.text
         data
@@ -31,7 +30,7 @@ module RelatonIsoBib
       # @param ext [Nokogiri::XML::Element]
       # @return [RelatonIsoBib::StructuredIdentifier]
       def fetch_structuredidentifier(ext)
-        sid = ext.at "./structuredidentifier"
+        sid = ext&.at "./structuredidentifier"
         return unless sid
 
         pn = sid.at "project-number"
@@ -44,27 +43,21 @@ module RelatonIsoBib
 
       # Override RelatonBib::XMLParser.ttitle method.
       # @param title [Nokogiri::XML::Element]
-      # @return [RelatonIsoBib::TypedTitleString]
+      # @return [RelatonBib::TypedTitleString]
       def ttitle(title)
         return unless title
 
-        TypedTitleString.new(
+        RelatonBib::TypedTitleString.new(
           type: title[:type], content: title.text, language: title[:language],
           script: title[:script], format: title[:format]
         )
       end
 
-      # @param item [Nokogiri::XML::Element]
-      # @return [Array<RelatonIsoBib::Ics>]
-      def fetch_ics(ext)
-        ext.xpath("./ics/code").map { |ics| Ics.new ics.text }
-      end
-
       # @TODO Organization doesn't recreated
       # @param ext [Nokogiri::XML::Element]
       # @return [RelatonIsoBib::EditorialGroup]
-      def fetch_editorialgroup(ext)
-        eg = ext.at("./editorialgroup")
+      def fetch_editorialgroup(ext) # rubocop:disable Metrics/CyclomaticComplexity
+        eg = ext&.at("./editorialgroup")
         return unless eg
 
         tc = eg&.xpath("technical-committee")&.map { |t| iso_subgroup(t) }

data/relaton_iso_bib.gemspec

@@ -16,7 +16,8 @@ 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.
+  # 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
@@ -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", ">= 1.0.3"
+  spec.add_dependency "relaton-bib", "~> 1.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iso-bib
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-05-19 00:00:00.000000000 Z
+date: 2020-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase
@@ -140,16 +140,16 @@ dependencies:
   name: relaton-bib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.4.0
 description: 'RelatonIsoBib: Ruby ISOXMLDOC impementation.'
 email:
 - open.source@ribose.com
@@ -181,7 +181,6 @@ files:
 - lib/relaton_iso_bib/iso_bibliographic_item.rb
 - lib/relaton_iso_bib/iso_document_relation.rb
 - lib/relaton_iso_bib/structured_identifier.rb
-- lib/relaton_iso_bib/typed_title_string.rb
 - lib/relaton_iso_bib/version.rb
 - lib/relaton_iso_bib/xml_parser.rb
 - relaton_iso_bib.gemspec
@@ -189,7 +188,7 @@ homepage: https://github.com/relaton/relaton-iso-bib
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -205,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: 'RelatonIsoBib: Ruby ISOXMLDOC impementation.'
 test_files: []

data/lib/relaton_iso_bib/typed_title_string.rb

@@ -1,32 +0,0 @@
-module RelatonIsoBib
-  class TypedTitleString < RelatonBib::TypedTitleString
-    # TITLE_TYPES = %w[title-main title-intro title-part main].freeze
-
-    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-
-    # @param type [String]
-    # @param title [RelatonBib::FormattedString, Hash]
-    # @param content [String]
-    # @param language [String]
-    # @param script [String]
-    def initialize(**args)
-      # if args[:type] && !TITLE_TYPES.include?(args[:type])
-      #   raise ArgumentError, %{The type #{args[:type]} is invalid.}
-      # end
-
-      unless args[:title] || args[:content]
-        raise ArgumentError, %{Keyword "title" or "content" should be passed.}
-      end
-
-      @type = args[:type]
-
-      if args[:title]
-        @title = args[:title]
-      else
-        fsargs = args.select { |k, _v| %i[content language script format].include? k }
-        @title = RelatonBib::FormattedString.new(fsargs)
-      end
-    end
-    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
-  end
-end