datacite-mapping 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8781a8ea9333f3202323eab45df470e26e913e2
-  data.tar.gz: 59e9910f4613280d441f5e9ddddecc20d52ce96e
+  metadata.gz: aff43fbc3d2ced53be18c3c3f8351af84d25a102
+  data.tar.gz: 3d8b932af5c5b8429e9f9bde9b95867adae9a4d1
 SHA512:
-  metadata.gz: 0425ceacf4ca420bb2285a46e70d576b36fdc9021fe8db16143a5f97e75780624b5bb7a82ac3e1cc2f9b751e776e050ce20b24538779a82f08c406f3472308f5
-  data.tar.gz: 51cd66923ab219b649f099d1b2ca72ddbd07810eda31f156cf0729fd16ca5934e428a00292aa6ec673fe33f6d7cb2d1ebe71f64fbe66554d77f10d8cdc591793
+  metadata.gz: 76eb23b7af667ab5d53d8546785f1d2ec7381bcf9e78d998c1c4e20a18db6954c9a835372e93d612f188703458bb3585b192f6e27efe1c443493b7b3b7b70ce3
+  data.tar.gz: c475108f5497cf866b835f3ed0d8f9b72ed18ed837ad817dbb9a77b647a45b87c2b39f5a78158d82ff90827f23deec0876c28322fa8134d710906245bc0cd6be

data/datacite-mapping.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'typesafe_enum', '~> 0.1', '>= 0.1.7'
-  spec.add_dependency 'xml-mapping_extensions', '~> 0.3', '>= 0.3.6'
+  spec.add_dependency 'xml-mapping_extensions', '~> 0.4'
 
   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.13'
+    VERSION = '0.1.14'
 
     # The copyright notice for this gem
     COPYRIGHT = 'Copyright (c) 2016 The Regents of the University of California'

data/lib/datacite/mapping/resource.rb

@@ -15,9 +15,9 @@ module Datacite
     # of a resource for citation and retrieval purposes, along with recommended use instructions.
     # The resource that is being identified can be of any kind, but it is typically a dataset.
     class Resource
-      include XML::Mapping
+      include XML::MappingExtensions::Namespaced
 
-      NAMESPACE = XML::MappingExtensions::Namespace.new(
+      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'
       )
@@ -44,7 +44,6 @@ 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
@@ -65,20 +64,12 @@ 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)
+      def self.namespace_prefix=(prefix)
         old_namespace = namespace
-        self.namespace = ::XML::MappingExtensions::Namespace.new(uri: old_namespace.uri, schema_location: old_namespace.schema_location, prefix: prefix)
+        self.namespace ::XML::MappingExtensions::Namespace.new(uri: old_namespace.uri, schema_location: old_namespace.schema_location, prefix: prefix)
       end
 
       def language

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

@@ -778,8 +778,8 @@ module Datacite
             publisher: @publisher,
             publication_year: @pub_year
           )
-          resource.namespace_prefix = 'dcs'
-          expect(resource.namespace.prefix).to eq('dcs')
+          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>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datacite-mapping
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - David Moles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-03 00:00:00.000000000 Z
+date: 2016-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typesafe_enum
@@ -36,20 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement