fix Place#to_hash function

relaton · Sep 20, 2020 · 2965ccd · 2965ccd
1 parent 7cd71fc
commit 2965ccd
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/lib/relaton_bib.rb b/lib/relaton_bib.rb
@@ -34,7 +34,7 @@ def parse_date(date) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/Met
 
   # @param array [Array]
   # @return [Array<String>, String]
-  def single_element_array(array) # rubocop:disable Metrics/CyclomaticComplexity
+  def single_element_array(array) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
     if array.size > 1
       array.map { |e| e.is_a?(String) ? e : e.to_hash }
     else

diff --git a/lib/relaton_bib/bibliographic_date.rb b/lib/relaton_bib/bibliographic_date.rb
@@ -6,7 +6,8 @@ module RelatonBib
   # Bibliographic date.
   class BibliographicDate
     TYPES = %w[published accessed created implemented obsoleted confirmed
-               updated issued transmitted copied unchanged circulated adapted].freeze
+               updated issued transmitted copied unchanged circulated adapted
+               vote-started vote-ended].freeze
 
     # @return [String]
     attr_reader :type

diff --git a/lib/relaton_bib/place.rb b/lib/relaton_bib/place.rb
@@ -25,7 +25,7 @@ def to_xml(builder)
     # @return [Hash]
     def to_hash
       if uri || region
-        hash = { name: name }
+        hash = { "name" => name }
         hash["uri"] = uri if uri
         hash["region"] = region if region
         hash

diff --git a/lib/relaton_bib/version.rb b/lib/relaton_bib/version.rb
@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.4.0".freeze
+  VERSION = "1.4.1".freeze
 end
diff --git a/lib/relaton_bib/xml_parser.rb b/lib/relaton_bib/xml_parser.rb
@@ -202,7 +202,9 @@ def stage(elm)
                                   abbreviation: elm[:abbreviation])
       end
 
-      def fetch_dates(item) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
+      # @param node [Nokogiri::XML::Elemen]
+      # @return [Array<RelatonBib::BibliographicDate>]
+      def fetch_dates(item) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
         item.xpath("./date").reduce([]) do |a, d|
           type = d[:type].to_s.empty? ? "published" : d[:type]
           if (on = d.at("on"))
@@ -229,7 +231,7 @@ def get_org(org) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
                          identifier: identifier)
       end
 
-      def get_person(person) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity
+      def get_person(person) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
         affiliations = person.xpath("./affiliation").map do |a|
           org = a.at "./organization"
           desc = a.xpath("./description").map do |e|

diff --git a/spec/examples/hash.yml b/spec/examples/hash.yml
@@ -245,7 +245,7 @@ medium:
   scale: medium scale
 place:
 - bib place
-- :name: Geneva
+- name: Geneva
   uri: geneva.place
   region: Switzelznd
 extent: