datacite-mapping 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9a277fd9f698e66af97ef9e5a6f961c552cb2ed
-  data.tar.gz: 5c0d88b7e81d3bfdbb4693e43fc9b1d088333f9e
+  metadata.gz: a8781a8ea9333f3202323eab45df470e26e913e2
+  data.tar.gz: 59e9910f4613280d441f5e9ddddecc20d52ce96e
 SHA512:
-  metadata.gz: 4a2d0acc09e211dffb9859bcf0071dd579ed6d8e3becb14dc32fa78df0009442e0da8977d6fd4d03b87ec76e883fab8cee98ae5f49d1b902412170b227e3a6d3
-  data.tar.gz: bd715e764c2f815af6ccafeb82bedd6e85c6e8eaaf3d579539c6f8faac36df9ac703c51d13af9b0c303cd46605c58951cd85d7f7f171338988c53643687f0a85
+  metadata.gz: 0425ceacf4ca420bb2285a46e70d576b36fdc9021fe8db16143a5f97e75780624b5bb7a82ac3e1cc2f9b751e776e050ce20b24538779a82f08c406f3472308f5
+  data.tar.gz: 51cd66923ab219b649f099d1b2ca72ddbd07810eda31f156cf0729fd16ca5934e428a00292aa6ec673fe33f6d7cb2d1ebe71f64fbe66554d77f10d8cdc591793

data/CHANGES.md

@@ -1,7 +1,17 @@
-## 0.1.11 (28 April 2016)
+## 0.1.13 (2 May 2016)
+
+- Update to XML::MappingExtensions 0.3.6 for improved namespace support
+- Added `namespace_prefix` accessor to `Resource` to support explicit namespace prefixing
+- Update to TypesafeEnum 0.1.7 for improved debug output
+
+## 0.1.12 (28 April 2016)
 
 - Update to XML::MappingExtensions 0.3.5
 
+## 0.1.11 (28 April 2016)
+
+- (withdrawn)
+
 ## 0.1.10 (25 April 2016)
 
 - Replace all `require_relative` with absolute `require` to avoid symlink issues

data/datacite-mapping.gemspec

@@ -24,8 +24,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'typesafe_enum', '~> 0.1', '>= 0.1.5'
-  spec.add_dependency 'xml-mapping_extensions', '~> 0.3', '>= 0.3.5'
+  spec.add_dependency 'typesafe_enum', '~> 0.1', '>= 0.1.7'
+  spec.add_dependency 'xml-mapping_extensions', '~> 0.3', '>= 0.3.6'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'equivalent-xml', '~> 0.6.0'

data/lib/datacite/mapping/module_info.rb

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

data/lib/datacite/mapping/resource.rb

@@ -1,4 +1,4 @@
-require 'xml/mapping'
+require 'xml/mapping_extensions'
 require 'datacite/mapping/identifier'
 require 'datacite/mapping/creator'
 require 'datacite/mapping/title'
@@ -17,6 +17,11 @@ module Datacite
     class Resource
       include XML::Mapping
 
+      NAMESPACE = XML::MappingExtensions::Namespace.new(
+        uri: 'http://datacite.org/schema/kernel-3',
+        schema_location: 'http://datacite.org/schema/kernel-3 http://schema.datacite.org/meta/kernel-3/metadata.xsd'
+      )
+
       # Initialies a new {Resource}
       #
       # @param identifier [Identifier] a persistent identifier that identifies a resource.
@@ -39,6 +44,7 @@ module Datacite
       # @param descriptions [Array<Description>] all additional information that does not fit in any of the other categories.
       # @param geo_locations [Array<GeoLocations>] spatial region or named place where the data was gathered or about which the data is focused.
       def initialize(identifier:, creators:, titles:, publisher:, publication_year:, subjects: [], contributors: [], dates: [], language: 'en', resource_type: nil, alternate_identifiers: [], related_identifiers: [], sizes: [], formats: [], version: nil, rights_list: [], descriptions: [], geo_locations: []) # rubocop:disable Metrics/MethodLength, Metrics/ParameterLists, Metrics/AbcSize
+        self.namespace = NAMESPACE
         self.identifier = identifier
         self.creators = creators
         self.titles = titles
@@ -59,6 +65,22 @@ module Datacite
         self.geo_locations = geo_locations
       end
 
+      # Overrides `Class.allocate`, used by `XML::Mapping` on read, to make sure
+      # the namespace gets set even when we don't call the initializer
+      def self.allocate
+        res = super
+        res.namespace = NAMESPACE
+        res
+      end
+
+      # Sets the namespace prefix to be used when writing out XML (defaults to nil)
+      # @param prefix [String, nil] The new prefix, or nil to use the default,
+      #   unprefixed namespace
+      def namespace_prefix=(prefix)
+        old_namespace = namespace
+        self.namespace = ::XML::MappingExtensions::Namespace.new(uri: old_namespace.uri, schema_location: old_namespace.schema_location, prefix: prefix)
+      end
+
       def language
         @language || 'en'
       end
@@ -92,15 +114,15 @@ module Datacite
         @publication_year = value.to_i
       end
 
-      # Overrides +::XML::Mapping.pre_save+ to write namespace information.
-      # Used for writing.
-      def pre_save(options = { mapping: :_default })
-        xml = super(options)
-        xml.add_namespace('http://datacite.org/schema/kernel-3')
-        xml.add_namespace('xsi', 'http://www.w3.org/2001/XMLSchema-instance')
-        xml.add_attribute('xsi:schemaLocation', 'http://datacite.org/schema/kernel-3 http://schema.datacite.org/meta/kernel-3/metadata.xsd')
-        xml
-      end
+      # # Overrides +::XML::Mapping.pre_save+ to write namespace information.
+      # # Used for writing.
+      # def pre_save(options = { mapping: :_default })
+      #   xml = super(options)
+      #   xml.add_namespace('http://datacite.org/schema/kernel-3')
+      #   xml.add_namespace('xsi', 'http://www.w3.org/2001/XMLSchema-instance')
+      #   xml.add_attribute('xsi:schemaLocation', 'http://datacite.org/schema/kernel-3 http://schema.datacite.org/meta/kernel-3/metadata.xsd')
+      #   xml
+      # end
 
       # @!attribute [rw] identifier
       #   @return [Identifier] a persistent identifier that identifies a resource.

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

@@ -769,6 +769,45 @@ module Datacite
           resource = Resource.parse_xml(xml_text)
           expect(resource.save_to_xml).to be_xml(xml_text)
         end
+
+        it 'allows a namespace prefix' do
+          resource = Resource.new(
+            identifier: @id,
+            creators: @creators,
+            titles: @titles,
+            publisher: @publisher,
+            publication_year: @pub_year
+          )
+          resource.namespace_prefix = 'dcs'
+          expect(resource.namespace.prefix).to eq('dcs')
+
+          expected = '<dcs:resource xmlns:dcs="http://datacite.org/schema/kernel-3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://datacite.org/schema/kernel-3 http://schema.datacite.org/meta/kernel-3/metadata.xsd">
+                        <dcs:identifier identifierType="DOI">10.14749/1407399495</dcs:identifier>
+                        <dcs:creators>
+                          <dcs:creator>
+                            <dcs:creatorName>Hedy Lamarr</dcs:creatorName>
+                            <dcs:nameIdentifier nameIdentifierScheme="ISNI" schemeURI="http://isni.org/">0000-0001-1690-159X</dcs:nameIdentifier>
+                            <dcs:affiliation>United Artists</dcs:affiliation>
+                            <dcs:affiliation>Metro-Goldwyn-Mayer</dcs:affiliation>
+                          </dcs:creator>
+                          <dcs:creator>
+                            <dcs:creatorName>Herschlag, Natalie</dcs:creatorName>
+                            <dcs:nameIdentifier nameIdentifierScheme="ISNI" schemeURI="http://isni.org/">0000-0001-0907-8419</dcs:nameIdentifier>
+                            <dcs:affiliation>Gaumont Buena Vista International</dcs:affiliation>
+                            <dcs:affiliation>20th Century Fox</dcs:affiliation>
+                          </dcs:creator>
+                        </dcs:creators>
+                        <dcs:titles>
+                          <dcs:title xml:lang="en-emodeng">An Account of a Very Odd Monstrous Calf</dcs:title>
+                          <dcs:title xml:lang="en-emodeng" titleType="Subtitle">And a Contest between Two Artists about Optick Glasses, &amp;c</dcs:title>
+                        </dcs:titles>
+                        <dcs:publisher>California Digital Library</dcs:publisher>
+                        <dcs:publicationYear>2015</dcs:publicationYear>
+                        <dcs:language>en</dcs:language>
+                      </dcs:resource>'
+
+          expect(resource.save_to_xml).to be_xml(expected)
+        end
       end
 
       describe 'convenience accessors' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datacite-mapping
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - David Moles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-28 00:00:00.000000000 Z
+date: 2016-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typesafe_enum
@@ -19,7 +19,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.1.7
 - !ruby/object:Gem::Dependency
   name: xml-mapping_extensions
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.3.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement