relaton-bib 1.12.1 → 1.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0b1ea12faaf38ba10b73a5febe3ac1740c9746319b7a20038c263373ea3dd25
-  data.tar.gz: ef008d6e8283479a0daec628bd7cb22219ff77ff4a53813b64478d916e0f4de1
+  metadata.gz: af4361f2c87e045e86e3ca8dd81e4e729f88598476daf14be487d8d5972bb9c8
+  data.tar.gz: 962832013669c49bd25b813d003f454a552d7427b45774a1e936c2146f31c391
 SHA512:
-  metadata.gz: a279a45bb36054842755b1ca417865a61caaa913bdff2847672649688ff2c08d051cccb5ad13b7fd650a893c442dddd533e9d45cc7847964f6938f63ecabaa80
-  data.tar.gz: 4a6782ace9e988681e61422acc62bd14117e1188041bddda5d5e6c213b1eb2f1c4f7c7d1d646e7502a33260ef1e58b4fd12ba50e3e3f3a7ccb8cd1d8fcda3d86
+  metadata.gz: cee39b14e0fe58a1db12205f3294144103c46fe8e82cf48a81c95195952d9130d999e5f8bb809ce2a500100d05fa3692d2bbf19a341598c37304f86a4f2d077c
+  data.tar.gz: afd5a003dc908a9bc895269ff4e3d0ca46762c16f7c3ec7d4007f86b35d150f3251994e9ee3dffd63095fe6fba75607be5ef461903064c408cbbb91230a02895

data/lib/relaton_bib/bibxml_parser.rb

@@ -251,7 +251,10 @@ module RelatonBib
       #   "front/author[not(@surname)][not(@fullname)]/organization",
       # ).map do |org|
       org = contrib.at("./organization")
-      name = ORGNAMES[org.text] || org.text
+      orgname = org.text.strip
+      return if orgname.empty?
+
+      name = ORGNAMES[orgname] || orgname
       { entity: new_org(name, org[:abbrev]), role: [contributor_role(contrib)] }
       # end
     end

data/lib/relaton_bib/contribution_info.rb

@@ -59,8 +59,8 @@ module RelatonBib
     # @param count [Integer] number of contributors
     # 2return [String]
     def to_asciibib(prefix = "", count = 1)
-      pref = prefix.empty? ? prefix : prefix + "."
-      out = count > 1 ? "#{prefix}::\n" : ""
+      pref = prefix.empty? ? prefix : "#{prefix}."
+      out = count > 1 ? "#{prefix}.role::\n" : ""
       description.each do |d|
         out += d.to_asciibib "#{pref}role.description", description.size
       end

data/lib/relaton_bib/contributor.rb

@@ -46,12 +46,12 @@ module RelatonBib
 
     # @return [Hash]
     def to_hash # rubocop:disable Metrics/AbcSize
-      hash = {}
-      hash["street"] = street if street&.any?
-      hash["city"] = city
-      hash["state"] = state if state
-      hash["country"] = country
-      hash["postcode"] = postcode if postcode
+      hash = { "address" => {} }
+      hash["address"]["street"] = street if street&.any?
+      hash["address"]["city"] = city
+      hash["address"]["state"] = state if state
+      hash["address"]["country"] = country
+      hash["address"]["postcode"] = postcode if postcode
       hash
     end
 
@@ -92,7 +92,7 @@ module RelatonBib
 
     # @return [Hash]
     def to_hash
-      { "type" => type, "value" => value }
+      { type => value }
     end
 
     # @param prefix [String]
@@ -101,8 +101,8 @@ module RelatonBib
     def to_asciibib(prefix = "", count = 1)
       pref = prefix.empty? ? prefix : "#{prefix}."
       out = count > 1 ? "#{pref}contact::\n" : ""
-      out += "#{pref}contact.type:: #{type}\n"
-      out += "#{pref}contact.value:: #{value}\n"
+      # out += "#{pref}contact.type:: #{type}\n"
+      out += "#{pref}contact.#{type}:: #{value}\n"
       out
     end
   end

data/lib/relaton_bib/document_relation_collection.rb

@@ -6,7 +6,7 @@ module RelatonBib
     extend Forwardable
 
     def_delegators :@array, :<<, :[], :first, :last, :empty?, :any?, :size,
-                   :each, :detect, :map, :reduce, :length
+                   :each, :detect, :map, :reduce, :length, :unshift
 
     # @param relation [Array<RelatonBib::DocumentRelation, Hash>]
     # @option relation [String] :type
@@ -32,7 +32,7 @@ module RelatonBib
     # @param prefix [String]
     # @return [String]
     def to_asciibib(prefix = "")
-      pref = prefix.empty? ? "relation" : prefix + ".relation"
+      pref = prefix.empty? ? "relation" : "#{prefix}.relation"
       out = ""
       @array.each do |r|
         out += size > 1 ? "#{pref}::\n" : ""

data/lib/relaton_bib/document_status.rb

@@ -56,8 +56,8 @@ module RelatonBib
     def stage_new(stg)
       case stg
       when Stage then stg
-      when Hash then Stage.new(**stg)
-      when String then Stage.new(value: stg)
+      when Hash then self.class::Stage.new(**stg)
+      when String then self.class::Stage.new(value: stg)
       end
     end
 

data/lib/relaton_bib/hash_converter.rb

@@ -279,13 +279,19 @@ module RelatonBib
         return [] unless entity[:contact]
 
         RelatonBib.array(entity[:contact]).map do |a|
-          if a[:city] || a[:country]
+          if a[:city] || a[:country] # it's for old version compatibility, should be removed in the future
             RelatonBib::Address.new(
               street: Array(a[:street]), city: a[:city], postcode: a[:postcode],
               country: a[:country], state: a[:state]
             )
-          else
+          elsif a[:address]
+            a[:address][:street] = RelatonBib.array(a[:address][:street])
+            RelatonBib::Address.new(**a[:address])
+          elsif a[:type] # it's for old version compatibility, should be removed in the future
             RelatonBib::Contact.new(type: a[:type], value: a[:value])
+          else
+            type, value = a.flatten
+            RelatonBib::Contact.new(type: type.to_s, value: value)
           end
         end
       end

data/lib/relaton_bib/series.rb

@@ -37,7 +37,7 @@ module RelatonBib
     # @param run [String, nil]
     def initialize(**args)
       unless args[:title].is_a?(RelatonBib::TypedTitleString)
-        raise ArgumentError, "argument `title` should present"
+        raise ArgumentError, "argument `title` should present in series"
       end
 
       # if args[:type] && !TYPES.include?(args[:type])

data/lib/relaton_bib/technical_committee.rb

@@ -12,9 +12,7 @@ module RelatonBib
 
     # @param builder [Nokogiri::XML::Builder]
     def to_xml(builder)
-      builder.send "technical-committee" do |b|
-        workgroup.to_xml b
-      end
+      builder.send(:"technical-committee") { |b| workgroup.to_xml b }
     end
 
     # @return [Hash]
@@ -26,7 +24,7 @@ module RelatonBib
     # @param count [Integer] number of technical committees
     # @return [String]
     def to_asciibib(prefix = "", count = 1)
-      pref = prefix.empty? ? prefix : prefix + "."
+      pref = prefix.empty? ? prefix : "#{prefix}."
       pref += "technical_committee"
       out = count > 1 ? "#{pref}::\n" : ""
       out += workgroup.to_asciibib pref

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.12.1".freeze
+  VERSION = "1.12.4".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 1.12.1
+  version: 1.12.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-28 00:00:00.000000000 Z
+date: 2022-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug