datacite-mapping 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94b1cd9d6fa3c9f73d4e01b8932735ed5531de96
-  data.tar.gz: 1f641d5ea6c21711480d806a4fc6e07b07df2697
+  metadata.gz: e8d570ed19b36949ccbd477c42b99eb16decca70
+  data.tar.gz: 3f9608fb7b9520b69bfc5a4f802d36d3cfeba96b
 SHA512:
-  metadata.gz: 8958bbce65cce405ec02251e111902de276955f4f822a60409ef62c0532cc3315869db205f2491b95d8701579a623da711513c1938f637ab9c59ea84646668e9
-  data.tar.gz: 91bfefea1df89cf6067fa6f9a680c885ee49f76ff700849e88ada850016f42626fe3eec484da19efd1e1520ea16480dbea41afcbf5c75ec447d9b36237a8bbfe
+  metadata.gz: 1a4d62507b31e9a3c3086ae9a4f2721c7e8539d0e08d49ccff037e85eaca7a2b740d3055791ba81f8df5589e01ca0ab04d90beec3881c979039a58f874a06a4a
+  data.tar.gz: 56f0d8270aca2b12cca28998fca293490d8cb30ff89f4af1274fbb571bb81bd1a99d50f978cf42b6e1532ec4e573ebdecaf8e5b067978d5bc5dfb1b6b839cfeb

data/CHANGES.md

@@ -1,3 +1,10 @@
+## 0.2.4 (8 November 2016)
+
+- Fix issue where writing a resource in Datacite 3 would cause the Datacite 3 namespace
+  to stick around, even when later writing Datacite 4.
+- Remove well-intentioned but ill-advised feature that would auto-sort `<geoLocationBox/>`
+  coordinates into north/south and east/west.
+
 ## 0.2.3 (5 October 2016)
 
 - Allow empty `<identifier/>` tags on read, but not write

data/lib/datacite/mapping/geo_location_box.rb

@@ -117,8 +117,10 @@ module Datacite
       end
 
       def init_from_array(coordinates)
-        self.south_latitude, self.north_latitude = [coordinates[0], coordinates[2]].sort
-        self.west_longitude, self.east_longitude = [coordinates[1], coordinates[3]].sort
+        self.south_latitude = coordinates[0]
+        self.north_latitude = coordinates[2]
+        self.west_longitude = coordinates[1]
+        self.east_longitude = coordinates[3]
       end
     end
 

data/lib/datacite/mapping/module_info.rb

@@ -4,7 +4,7 @@ module Datacite
     NAME = 'datacite-mapping'.freeze
 
     # The version of this gem
-    VERSION = '0.2.3'.freeze
+    VERSION = '0.2.4'.freeze
 
     # The copyright notice for this gem
     COPYRIGHT = 'Copyright (c) 2016 The Regents of the University of California'.freeze

data/lib/datacite/mapping/resource.rb

@@ -28,12 +28,15 @@ module Datacite
 
       # Overrides Namespaced::InstanceMethods.fill_into_xml to check mapping
       def fill_into_xml(xml, options = { mapping: :_default })
-        if options[:mapping] == :datacite_3
-          unless namespace.uri == DATACITE_3_NAMESPACE.uri
-            @namespace = DATACITE_3_NAMESPACE.with_prefix(namespace.prefix)
-          end
+        current_namespace = namespace
+        return super if options[:mapping] != :datacite_3 || current_namespace.uri == DATACITE_3_NAMESPACE.uri
+
+        begin
+          @namespace = DATACITE_3_NAMESPACE.with_prefix(current_namespace.prefix)
+          super
+        ensure
+          @namespace = current_namespace
         end
-        super
       end
 
       # Initialies a new {Resource}

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

@@ -12,20 +12,12 @@ module Datacite
           expect(box.east_longitude).to eq(-70.67)
         end
 
-        it 'accepts a quad with flipped east/west coordinates' do
-          box = GeoLocationBox.new(-33.45, -70.67, 47.61, -122.33)
-          expect(box.south_latitude).to eq(-33.45)
-          expect(box.west_longitude).to eq(-122.33)
-          expect(box.north_latitude).to eq(47.61)
-          expect(box.east_longitude).to eq(-70.67)
-        end
-
-        it 'accepts a quad with flipped north/south coordinates' do
-          box = GeoLocationBox.new(47.61, -122.33, -33.45, -70.67)
-          expect(box.south_latitude).to eq(-33.45)
-          expect(box.west_longitude).to eq(-122.33)
-          expect(box.north_latitude).to eq(47.61)
-          expect(box.east_longitude).to eq(-70.67)
+        it 'accepts a quad crossing 180°' do
+          box = GeoLocationBox.new(-41.289, 174.777, 21.3, -157.817)
+          expect(box.south_latitude).to eq(-41.289)
+          expect(box.west_longitude).to eq(174.777)
+          expect(box.north_latitude).to eq(21.3)
+          expect(box.east_longitude).to eq(-157.817)
         end
 
         it 'accepts :south_latitude, :west_longitude, :north_latitude, :east_longitude' do

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

@@ -1045,6 +1045,11 @@ module Datacite
             expect(rexml.namespace).to eq(DATACITE_3_NAMESPACE.uri)
           end
 
+          it 'still writes DC4 by default after writing DC3' do
+            dc4xml = resource.save_to_xml
+            expect(dc4xml.namespace).to eq(DATACITE_4_NAMESPACE.uri)
+          end
+
           it 'warns about givenNames and familyNames' do
             name_tags = %w(givenName familyName)
             name_tags.each do |tag|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datacite-mapping
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - David Moles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-05 00:00:00.000000000 Z
+date: 2016-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typesafe_enum
@@ -656,4 +656,3 @@ test_files:
 - spec/unit/datacite/mapping/rights_spec.rb
 - spec/unit/datacite/mapping/subject_spec.rb
 - spec/unit/datacite/mapping/title_spec.rb
-has_rdoc: