relaton-bib 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bedb89ee8f076ed4e8425c31c97f6649944de4e3402e4cfb6747688ad63a9889
-  data.tar.gz: aa1391e5af6e07da77b848dfa0fc71be21b95ecd77972952ed922bcdf7ce59db
+  metadata.gz: 57c6be55831892ce4762c2a9e8f4526cc6e7efadb3f99b0a1cf0cea7219ed001
+  data.tar.gz: ae71060872bb8fb1630a66fda9a7af01c9dbc5497efbe16669193fbca4c426a8
 SHA512:
-  metadata.gz: 27d51cee453b3449681b498fffb6067f2366e9ceeb1525bf13c80ff13c12f39dbfb2158da0cbee60111d4623d7054fb5a8e22ad89edc18ee582f04fe5c3ae35a
-  data.tar.gz: 56ee00e29060d7f7eaccdbb8ac16b3c0d9186916583b28f5e01eaaadf6a42bc54b5ac3e8695e1f4d17eac5e202b6be53b6e0ed7ea6bfea0b277e01a73fc8c1e4
+  metadata.gz: b3074c5b9dc2ee9e963b766e7428f1c56aa2cd961e11618e4eea8e0c0f5d20e35bd9d16a1ede8f821f2840bb0de4cf1e053666c486dfe6f6927d07999ad5c9b6
+  data.tar.gz: 9b5f8e1c773a95438942b6a69e13ce0f82e4fb194c364d141580d38726adc2329a00fc8b5b2ac96197591ae8993a1886148313b75676ca2b32865b1d7b17fbbc

data/lib/relaton_bib/bibtex_parser.rb

@@ -147,17 +147,16 @@ module RelatonBib
       # @param bibtex [BibTeX::Entry]
       # @return [Array<RelatonBib::BiblioNote>]
       def fetch_note(bibtex)
-        note = []
-        note << BiblioNote.new(type: "annote", content: bibtex.annote.to_s) if bibtex["annote"]
-
-        if bibtex["howpublished"]
-          note << BiblioNote.new(type: "howpublished", content: bibtex.howpublished.to_s)
+        bibtex.select do |k, _v|
+          %i[annote howpublished comment note content].include? k
+        end.reduce([]) do |mem, note|
+          type = case note[0]
+                 when :note then nil
+                 when :content then "tableOfContents"
+                 else note[0].to_s
+                 end
+          mem << BiblioNote.new(type: type, content: note[1].to_s)
         end
-
-        note << BiblioNote.new(type: "comment", content: bibtex.comment.to_s) if bibtex["comment"]
-        note << BiblioNote.new(content: bibtex.note.to_s) if bibtex["note"]
-        note << BiblioNote.new(type: "tableOfContents", content: bibtex["content"]) if bibtex["content"]
-        note
       end
 
       # @param bibtex [BibTeX::Entry]
@@ -172,16 +171,19 @@ module RelatonBib
       # @param bibtex [BibTeX::Entry]
       # @return [Array<RelatonBib::BibItemLocality>]
       def fetch_extent(bibtex)
-        extent = []
-        extent << BibItemLocality.new("chapter", bibtex.chapter.to_s) if bibtex["chapter"]
-
-        if bibtex["pages"]
-          from, to = bibtex.pages.to_s.split "-"
-          extent << BibItemLocality.new("page", from, to)
+        bibtex.select do |k, _v|
+          %i[chapter pages volume].include? k
+        end.reduce([]) do |mem, loc|
+          if loc[0] == :pages
+            type = "page"
+            from, to = loc[1].to_s.split "-"
+          else
+            type = loc[0].to_s
+            from = loc[1].to_s
+            to = nil
+          end
+          mem << BibItemLocality.new(type, from, to)
         end
-
-        extent << BibItemLocality.new("volume", bibtex.volume.to_s) if bibtex["volume"]
-        extent
       end
 
       # @param bibtex [BibTeX::Entry]
@@ -192,7 +194,7 @@ module RelatonBib
           series << Series.new(
             type: "journal",
             title: TypedTitleString.new(content: bibtex.journal.to_s),
-            number: bibtex["number"]&.to_s
+            number: bibtex["number"]&.to_s,
           )
         end
 

data/lib/relaton_bib/document_relation.rb

@@ -31,16 +31,20 @@ module RelatonBib
     # @return [Array<RelatonBib::Locality, RelatonBib::LocalityStack>]
     attr_reader :locality
 
-    # @return [Array<RelatonBib::SourceLocality, RelatonBib::SourceLocalityStack>]
+    # @return [Array<RelatonBib::SourceLocality,
+    #   RelatonBib::SourceLocalityStack>]
     attr_reader :source_locality
 
     # @param type [String]
     # @parma description [RelatonBib::FormattedString, NilClass]
-    # @param bibitem [RelatonBib::BibliographicItem, RelatonIso::IsoBibliographicItem]
+    # @param bibitem [RelatonBib::BibliographicItem,
+    #   RelatonIso::IsoBibliographicItem]
     # @param locality [Array<RelatonBib::Locality, RelatonBib::LocalityStack>]
-    # @param source_locality [Array<RelatonBib::SourceLocality, RelatonBib::SourceLocalityStack>]
-    def initialize(type:, description: nil, bibitem:, locality: [], source_locality: [])
-      type             = "obsoletes" if type == "Now withdrawn"
+    # @param source_locality [Array<RelatonBib::SourceLocality,
+    #   RelatonBib::SourceLocalityStack>]
+    def initialize(type:, description: nil, bibitem:, locality: [],
+                   source_locality: [])
+      type = "obsoletes" if type == "Now withdrawn"
       unless TYPES.include? type
         warn "[relaton-bib] WARNING: invalid relation type: #{type}"
       end
@@ -51,6 +55,8 @@ module RelatonBib
       @bibitem         = bibitem
     end
 
+    # rubocop:disable Metrics/AbcSize
+
     # @param builder [Nokogiri::XML::Builder]
     def to_xml(builder, **opts)
       opts.delete :bibdata
@@ -62,6 +68,7 @@ module RelatonBib
         source_locality.each { |l| l.to_xml builder }
       end
     end
+    # rubocop:enable Metrics/AbcSize
 
     # @return [Hash]
     def to_hash

data/lib/relaton_bib/formatted_string.rb

@@ -12,7 +12,7 @@ module RelatonBib
     # @return [String]
     attr_reader :format
 
-    # @param content [String]
+    # @param content [String, Array<RelatonBib::LocalizedString>]
     # @param language [String, NilClass] language code Iso639
     # @param script [String, NilClass] script code Iso15924
     # @param format [String] the content type
@@ -36,8 +36,8 @@ module RelatonBib
       hash = super
       return hash unless format
 
-      hash = { "content" => hash } if hash.is_a? String
-      hash["format"] = format if format
+      hash = { "content" => hash } unless hash.is_a? Hash
+      hash["format"] = format
       hash
     end
   end

data/lib/relaton_bib/hash_converter.rb

@@ -168,7 +168,8 @@ module RelatonBib
       def stage(stg)
         return unless stg
 
-        DocumentStatus::Stage.new(**stg)
+        args = stg.is_a?(String) ? { value: stg } : stg
+        DocumentStatus::Stage.new(**args)
       end
 
       def contributors_hash_to_bib(ret)
@@ -329,7 +330,7 @@ module RelatonBib
         ret[:series] = array(ret[:series])&.map do |s|
           s[:formattedref] && s[:formattedref] = formattedref(s[:formattedref])
           if s[:title]
-            s[:title] = { content: s[:title] } unless s.is_a?(Hash)
+            s[:title] = { content: s[:title] } unless s[:title].is_a?(Hash)
             s[:title] = typed_title_strig(s[:title])
           end
           s[:abbreviation] && s[:abbreviation] = localizedstring(s[:abbreviation])

data/lib/relaton_bib/localized_string.rb

@@ -11,21 +11,35 @@ module RelatonBib
     # @return [Array<String>] script Iso15924 code
     attr_reader :script
 
-    # @return [String]
+    # @return [String, Array<RelatonBib::LocalizedString>]
     attr_accessor :content
 
-    # @param content [String]
+    # @param content [String, Array<RelatonBib::LocalizedString>]
     # @param language [String] language code Iso639
     # @param script [String] script code Iso15924
     def initialize(content, language = nil, script = nil)
+      unless content.is_a?(String) || content.is_a?(Array) &&
+          (inv = content.reject { |c| c.is_a?(LocalizedString) || c.is_a?(Hash) }).
+              none? && content.any?
+        klass = content.is_a?(Array) ? inv.first.class : content.class
+        raise ArgumentError, "invalid LocalizedString content type: #{klass}"
+      end
       @language = language.is_a?(String) ? [language] : language
       @script = script.is_a?(String) ? [script] : script
-      @content = content
+      @content = if content.is_a?(Array)
+                   content.map do |c|
+                     if c.is_a?(Hash)
+                       LocalizedString.new c[:content], c[:language], c[:script]
+                     else c
+                     end
+                   end
+                 else content
+                 end
     end
 
     # @return [String]
     def to_s
-      content
+      content.is_a?(String) ? content : content.first.to_s
     end
 
     # @return [TrueClass, FalseClass]
@@ -37,19 +51,26 @@ module RelatonBib
     def to_xml(builder)
       return unless content
 
-      builder.parent["language"] = language.join(",") if language&.any?
-      builder.parent["script"]   = script.join(",") if script&.any?
-      builder.text content.encode(xml: :text)
+      if content.is_a?(Array)
+        content.each { |c| builder.variant { c.to_xml builder } }
+      else
+        builder.parent["language"] = language.join(",") if language&.any?
+        builder.parent["script"]   = script.join(",") if script&.any?
+        builder.text content.encode(xml: :text)
+      end
     end
 
     # @return [Hash]
     def to_hash
-      return content unless language || script
+      if content.is_a? String
+        return content unless language || script
 
-      hash = { "content" => content }
-      hash["language"] = single_element_array(language) if language&.any?
-      hash["script"] = single_element_array(script) if script&.any?
-      hash
+        hash = { "content" => content }
+        hash["language"] = single_element_array(language) if language&.any?
+        hash["script"] = single_element_array(script) if script&.any?
+        hash
+      else content.map &:to_hash
+      end
     end
   end
 end

data/lib/relaton_bib/typed_title_string.rb

@@ -30,7 +30,7 @@ module RelatonBib
         @title = args[:title]
       else
         fsargs = args.select do |k, _v|
-          %i[content language script format].include? k 
+          %i[content language script format].include? k
         end
         @title = FormattedString.new(fsargs)
       end

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.0.3".freeze
+  VERSION = "1.0.4".freeze
 end

data/lib/relaton_bib/xml_parser.rb

@@ -159,8 +159,12 @@ module RelatonBib
       def ttitle(title)
         return unless title
 
+        variants = title.xpath("variant").map do |v|
+          LocalizedString.new v.text, v[:language], v[:script]
+        end
+        content = variants.any? ? variants : title.text
         TypedTitleString.new(
-          type: title[:type], content: title.text, language: title[:language],
+          type: title[:type], content: content, language: title[:language],
           script: title[:script], format: title[:format]
         )
       end

data/relaton-bib.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "relaton_bib/version"
 
@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
 
   # 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
+  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"
@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
+  spec.add_development_dependency "byebug"
   spec.add_development_dependency "debase"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "rake", "~> 10.0"
@@ -30,7 +31,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "ruby-debug-ide"
   spec.add_development_dependency "ruby-jing"
   spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "byebug"
 
   spec.add_dependency "addressable"
   spec.add_dependency "bibtex-ruby"

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-19 00:00:00.000000000 Z
+date: 2020-05-26 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: debase
   requirement: !ruby/object:Gem::Requirement
@@ -108,20 +122,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement