datacite-mapping 0.2.4 → 0.4.1

data/spec/unit/datacite/mapping/geo_location_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Datacite
@@ -45,11 +47,11 @@ module Datacite
         end
         it 'accepts a polygon' do
           polygon = GeoLocationPolygon.new(points: [
-            GeoLocationPoint.new(47.61, -122.33),
-            GeoLocationPoint.new(-33.45, -122.33),
-            GeoLocationPoint.new(47.61, -70.67),
-            GeoLocationPoint.new(47.61, -122.33)
-          ])
+                                             GeoLocationPoint.new(47.61, -122.33),
+                                             GeoLocationPoint.new(-33.45, -122.33),
+                                             GeoLocationPoint.new(47.61, -70.67),
+                                             GeoLocationPoint.new(47.61, -122.33)
+                                           ])
           loc = GeoLocation.new(polygon: polygon)
           expect(loc.polygon).to eq(polygon)
         end
@@ -106,11 +108,11 @@ module Datacite
       describe '#polygon=' do
         it 'sets the polygon' do
           polygon = GeoLocationPolygon.new(points: [
-            GeoLocationPoint.new(47.61, -122.33),
-            GeoLocationPoint.new(-33.45, -122.33),
-            GeoLocationPoint.new(47.61, -70.67),
-            GeoLocationPoint.new(47.61, -122.33)
-          ])
+                                             GeoLocationPoint.new(47.61, -122.33),
+                                             GeoLocationPoint.new(-33.45, -122.33),
+                                             GeoLocationPoint.new(47.61, -70.67),
+                                             GeoLocationPoint.new(47.61, -122.33)
+                                           ])
           loc = GeoLocation.new
           loc.polygon = polygon
           expect(loc.polygon).to eq(polygon)
@@ -168,11 +170,11 @@ module Datacite
           expect(loc.place).to eq('Atlantic Ocean')
           actual_polygon = loc.polygon
           expected_polygon = GeoLocationPolygon.new(points: [
-            GeoLocationPoint.new(31.233, -67.302),
-            GeoLocationPoint.new(-68.211, -71.032),
-            GeoLocationPoint.new(42.893, 41.09),
-            GeoLocationPoint.new(31.233, -67.302)
-          ])
+                                                      GeoLocationPoint.new(31.233, -67.302),
+                                                      GeoLocationPoint.new(-68.211, -71.032),
+                                                      GeoLocationPoint.new(42.893, 41.09),
+                                                      GeoLocationPoint.new(31.233, -67.302)
+                                                    ])
           expect(actual_polygon).to eq(expected_polygon)
         end
 
@@ -196,12 +198,12 @@ module Datacite
             point: GeoLocationPoint.new(31.233, -67.302),
             box: GeoLocationBox.new(41.09, -71.032, 42.893, -68.211),
             place: 'Atlantic Ocean',
-            polygon: (GeoLocationPolygon.new(points: [
-              GeoLocationPoint.new(-67.302, 31.233),
-              GeoLocationPoint.new(-71.032, -68.211),
-              GeoLocationPoint.new(41.09, 42.893),
-              GeoLocationPoint.new(-67.302, 31.233)
-            ]))
+            polygon: GeoLocationPolygon.new(points: [
+                                              GeoLocationPoint.new(-67.302, 31.233),
+                                              GeoLocationPoint.new(-71.032, -68.211),
+                                              GeoLocationPoint.new(41.09, 42.893),
+                                              GeoLocationPoint.new(-67.302, 31.233)
+                                            ])
           )
         end
 
@@ -257,7 +259,7 @@ module Datacite
 
           it 'writes DC3 in XSD-defined order: point, box, place' do
             actual_xml = loc.save_to_xml(mapping: :datacite_3)
-            expected_order = %w(geoLocationPoint geoLocationBox geoLocationPlace)
+            expected_order = %w[geoLocationPoint geoLocationBox geoLocationPlace]
             actual_order = actual_xml.children.map(&:name)
             expect(actual_order).to eq(expected_order)
           end

data/spec/unit/datacite/mapping/identifier_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Datacite
@@ -21,13 +23,13 @@ module Datacite
         end
 
         it 'disallows bad DOIs' do
-          bad_dois = %w(
+          bad_dois = %w[
             20.14749/1407399495
             11.14749/1407399495
             10./1407399495
             10.14749\1407399495
             10.14749/
-          )
+          ]
           bad_dois.each do |doi|
             expect { Identifier.new(value: doi) }.to raise_error(ArgumentError)
           end
@@ -71,13 +73,13 @@ module Datacite
         end
 
         it 'raises ArgumentError if it is passed a bad DOI' do
-          bad_dois = %w(
+          bad_dois = %w[
             20.14749/1407399495
             11.14749/1407399495
             10./1407399495
             10.14749\1407399495
             10.14749/
-          )
+          ]
           bad_dois.each do |doi|
             expect { Identifier.from_doi(doi) }.to raise_error do |e|
               expect(e).to be_an(ArgumentError)
@@ -95,13 +97,13 @@ module Datacite
         end
         it 'disallows bad DOIs' do
           id = Identifier.allocate
-          bad_dois = %w(
+          bad_dois = %w[
             20.14749/1407399495
             11.14749/1407399495
             10./1407399495
             10.14749\1407399495
             10.14749/
-          )
+          ]
           bad_dois.each do |doi|
             expect { id.value = doi }.to raise_error(ArgumentError)
             expect(id.value).to be_nil

data/spec/unit/datacite/mapping/name_identifier_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Datacite

data/spec/unit/datacite/mapping/related_identifier_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Datacite

data/spec/unit/datacite/mapping/resource_spec.rb

@@ -1,5 +1,7 @@
-# coding: utf-8
+# frozen_string_literal: true
+
 require 'spec_helper'
+require 'tmpdir'
 
 module Datacite
   module Mapping
@@ -119,9 +121,9 @@ module Datacite
                 resource = Resource.new(args)
                 expect(resource.creator_affiliations)
                   .to eq([
-                    ['United Artists', 'Metro-Goldwyn-Mayer'],
-                    ['Gaumont Buena Vista International', '20th Century Fox']
-                  ])
+                           ['United Artists', 'Metro-Goldwyn-Mayer'],
+                           ['Gaumont Buena Vista International', '20th Century Fox']
+                         ])
               end
             end
           end
@@ -171,32 +173,31 @@ module Datacite
             expect { Resource.new(args) }.to raise_error(ArgumentError)
           end
           it 'requires a non-blank publisher' do
-            args[:publisher] = "\n  \n"
-            expect { Resource.new(args) }.to raise_error(ArgumentError)
+            expect { Publisher.new(value: '   ') }.to raise_error(ArgumentError)
           end
           it 'can be initialized' do
             resource = Resource.new(args)
-            expect(resource.publisher).to eq(publisher)
+            expect(resource.publisher.value).to eq(publisher)
           end
           it 'can be set' do
             new_publisher = 'University of California'
             resource = Resource.new(args)
             resource.publisher = new_publisher
-            expect(resource.publisher).to eq(new_publisher)
+            expect(resource.publisher.value).to eq(new_publisher)
           end
           it 'strips on initialization' do
-            args[:publisher] = '
+            args[:publisher] = Publisher.new(value: '
             University of California
-          '
+             ')
             resource = Resource.new(args)
-            expect(resource.publisher).to eq('University of California')
+            expect(resource.publisher.value).to eq('University of California')
           end
           it 'strips on set' do
             resource = Resource.new(args)
-            resource.publisher = '
+            resource.publisher = Publisher.new(value: '
             University of California
-          '
-            expect(resource.publisher).to eq('University of California')
+              ')
+            expect(resource.publisher.value).to eq('University of California')
           end
         end
 
@@ -228,7 +229,7 @@ module Datacite
           it 'converts strings to integers' do
             new_pub_year = 1963
             resource = Resource.new(args)
-            resource.publication_year = "#{new_pub_year}"
+            resource.publication_year = new_pub_year.to_s
             expect(resource.publication_year).to eq(new_pub_year)
           end
         end
@@ -426,7 +427,8 @@ module Datacite
                   scheme_uri: URI('http://iatistandard.org/201/codelists/OrganisationIdentifier/'),
                   value: 'GR-9¾'
                 ),
-                type: ContributorType::FUNDER)
+                type: ContributorType::FUNDER
+              )
               @resource.contributors << @funder
             end
 
@@ -465,7 +467,7 @@ module Datacite
           describe 'dates:' do
             it 'can be initialized' do
               dates = [
-                Date.new(value: DateTime.new(1914, 8, 4, 11, 01, 6.0123, '+1'), type: DateType::AVAILABLE),
+                Date.new(value: DateTime.new(1914, 8, 4, 11, 0o1, 6.0123, '+1'), type: DateType::AVAILABLE),
                 Date.new(value: '1914-08-04T11:01:06.0123+01:00', type: DateType::AVAILABLE)
               ]
               args[:dates] = dates
@@ -483,7 +485,7 @@ module Datacite
             it 'can be set' do
               resource = Resource.new(args)
               dates = [
-                Date.new(value: DateTime.new(1914, 8, 4, 11, 01, 6.0123, '+1'), type: DateType::AVAILABLE),
+                Date.new(value: DateTime.new(1914, 8, 4, 11, 0o1, 6.0123, '+1'), type: DateType::AVAILABLE),
                 Date.new(value: '1914-08-04T11:01:06.0123+01:00', type: DateType::AVAILABLE)
               ]
               resource.dates = dates
@@ -625,7 +627,7 @@ module Datacite
 
           describe 'sizes:' do
             it 'can be initialized' do
-              sizes = %w(48K 128K)
+              sizes = %w[48K 128K]
               args[:sizes] = sizes
               resource = Resource.new(args)
               expect(resource.sizes).to eq(sizes)
@@ -639,7 +641,7 @@ module Datacite
 
           describe '#sizes=' do
             it 'can be set' do
-              sizes = %w(48K 128K)
+              sizes = %w[48K 128K]
               resource = Resource.new(args)
               resource.sizes = sizes
               expect(resource.sizes).to eq(sizes)
@@ -660,7 +662,7 @@ module Datacite
 
           describe 'formats:' do
             it 'can be initialized' do
-              formats = %w(D64 DSK)
+              formats = %w[D64 DSK]
               args[:formats] = formats
               resource = Resource.new(args)
               expect(resource.formats).to eq(formats)
@@ -674,7 +676,7 @@ module Datacite
 
           describe '#formats=' do
             it 'can be set' do
-              formats = %w(D64 DSK)
+              formats = %w[D64 DSK]
               resource = Resource.new(args)
               resource.formats = formats
               expect(resource.formats).to eq(formats)
@@ -918,7 +920,7 @@ module Datacite
         end
 
         def parse_file(xml_text, basename)
-          return Resource.parse_xml(xml_text)
+          Resource.parse_xml(xml_text)
         rescue Exception => e # rubocop:disable Lint/RescueException
           warn "Error parsing #{basename}: #{e}"
           File.open("tmp/#{basename}-xml_text.xml", 'w') { |t| t.write(xml_text) }
@@ -929,7 +931,7 @@ module Datacite
         def write_xml(resource, basename, options)
           # Workaround for Dash 1 datacite.xml with missing DOI
           resource.identifier = Identifier.from_doi('10.5555/12345678') unless resource.identifier
-          return resource.write_xml(options)
+          resource.write_xml(options)
         rescue Exception => e # rubocop:disable Lint/RescueException
           warn "Error writing #{basename}: #{e}"
           raise
@@ -940,7 +942,7 @@ module Datacite
           r1 = r0.gsub(%r{&lt;br\s+/&gt;}, '<br/>') # entity-de-escape <br/> tags
           # r2 = r1.gsub(%r{<(?!br)[^>]+/>}, '') # remove empty tags
           r2 = r1
-          r3 = r2.gsub(/<resource (xmlns:xsi="[^"]+")\s+(xsi:schemaLocation="[^"]+")>/, "<resource \\2 \\1 xmlns=\"http://datacite.org/schema/kernel-3\">") # fix missing namespace
+          r3 = r2.gsub(/<resource (xmlns:xsi="[^"]+")\s+(xsi:schemaLocation="[^"]+")>/, '<resource \\2 \\1 xmlns="http://datacite.org/schema/kernel-3">') # fix missing namespace
           r4 = r3.gsub(%r{(<identifier[^>]+>)\s*([^ ]+)\s*(</identifier>)}, '\\1\\2\\3') # trim identifiers
           r5 = r4.gsub(%r{<([^>]+tude)>([0-9.-]+?)(0?)0+</\1>}, '<\\1>\\2\\3</\\1>') # strip trailing coordinate zeroes
           r6 = r5.gsub(%r{<(geoLocation[^>]+)>[^<]+</\1>}) { |loc| loc.gsub(/([0-9\-]+\.[0-9]+?)0+([^0-9])/, '\\1\\2') } # strip trailing coordinate zeroes
@@ -984,11 +986,10 @@ module Datacite
           actual_xml = write_xml(resource, basename, options)
           expected_xml.gsub!(/(<resource[^>]+>)\s+(<creators>)/, "\\1\n  <identifier identifierType=\"DOI\">10.5555/12345678</identifier>\n  \\2") if fix_dash1
           begin
-            # actual_xml = actual_xml.gsub('&apos;', "'")
             expect(actual_xml).to be_xml(expected_xml)
           rescue Exception # rubocop:disable Lint/RescueException
-            File.open("tmp/#{basename}-expected.xml", 'w') { |t| t.write(expected_xml) }
-            File.open("tmp/#{basename}-actual.xml", 'w') { |t| t.write(actual_xml) }
+            File.open("/tmp/#{basename}-expected.xml", 'w') { |t| t.write(expected_xml) }
+            File.open("/tmp/#{basename}-actual.xml", 'w') { |t| t.write(actual_xml) }
             raise
           end
         end
@@ -1017,7 +1018,7 @@ module Datacite
             matches = warnings_including(substring)
             found_count = matches.size
             msg = "expected #{count} warnings including '#{substring}', found #{found_count}"
-            msg << ": #{matches}" if include_matches
+            msg += ": #{matches}" if include_matches
             expect(found_count).to eq(count), msg
           end
 
@@ -1025,7 +1026,7 @@ module Datacite
             matches = REXML::XPath.match(rexml, xpath)
             found_count = matches.size
             msg = "expected #{count} matches for XPath '#{xpath}', found #{found_count}"
-            msg << ": #{matches}" if include_matches
+            msg += ": #{matches}" if include_matches
             expect(found_count).to eq(count), msg
           end
 
@@ -1033,7 +1034,7 @@ module Datacite
             @warnings = []
             allow(ReadOnlyNodes).to receive(:warn) do |w|
               warnings << w
-              Kernel.warn(w) # for debugging
+              # Kernel.warn(w) # for debugging
             end
 
             xml = File.read('spec/data/datacite-4-synthetic.xml')
@@ -1051,7 +1052,7 @@ module Datacite
           end
 
           it 'warns about givenNames and familyNames' do
-            name_tags = %w(givenName familyName)
+            name_tags = %w[givenName familyName]
             name_tags.each do |tag|
               expect_matches("//#{tag}", 0, true)
               expect_warning(tag, 1)
@@ -1151,7 +1152,7 @@ module Datacite
 
       describe '#save_to_file' do
         it 'saves to a file' do
-          xml_text =  File.read('spec/data/datacite4/datacite-example-full-v4.0.xml')
+          xml_text = File.read('spec/data/datacite4/datacite-example-full-v4.xml')
           resource = Resource.parse_xml(xml_text)
           Dir.mktmpdir('resource_spec') do |dir|
             path = "#{dir}/resource.xml"

data/spec/unit/datacite/mapping/rights_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Datacite
@@ -12,9 +14,6 @@ module Datacite
           rights = Rights.new(value: 'CC0 1.0 Universal', uri: URI('http://creativecommons.org/publicdomain/zero/1.0/'))
           expect(rights.uri).to eq(URI('http://creativecommons.org/publicdomain/zero/1.0/'))
         end
-        it 'requires a value' do
-          expect { Rights.new(uri: URI('http://creativecommons.org/publicdomain/zero/1.0/')) }.to raise_error(ArgumentError)
-        end
       end
 
       describe '#value=' do
@@ -23,16 +22,6 @@ module Datacite
           rights.value = 'CC0 1.0 Universal'
           expect(rights.value).to eq('CC0 1.0 Universal')
         end
-        it 'requires a value' do
-          rights = Rights.new(value: 'CC0 1.0 Universal')
-          expect { rights.value = nil }.to raise_error(ArgumentError)
-          expect(rights.value).to eq('CC0 1.0 Universal')
-        end
-        it 'requires a non-empty value' do
-          rights = Rights.new(value: 'CC0 1.0 Universal')
-          expect { rights.value = '' }.to raise_error(ArgumentError)
-          expect(rights.value).to eq('CC0 1.0 Universal')
-        end
       end
 
       describe '#uri=' do
@@ -80,7 +69,7 @@ module Datacite
           expected_xml = '<rights rightsURI="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International (CC BY 4.0)</rights>'
           expect(rights.save_to_xml).to be_xml(expected_xml)
 
-          [:CC_ZERO, :CC_BY].each do |c|
+          %i[CC_ZERO CC_BY].each do |c|
             r = Rights.const_get(c)
             puts "#{c.to_s.downcase.gsub('_zero', '0')}:"
             puts "  uri: #{r.uri}"

data/spec/unit/datacite/mapping/subject_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Datacite

data/spec/unit/datacite/mapping/title_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Datacite