datacite-mapping 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39a51d2bc6f023b2308eb35b6664c7596864b77e
-  data.tar.gz: 819bff7d2a7231ab63751730ccc97cf7e153f737
+  metadata.gz: 6a91f9e92cf4a42a6c6aca44d3c36e40f8510718
+  data.tar.gz: 7de721bdcf72f3777175043bd9cf8f31d7f2c141
 SHA512:
-  metadata.gz: ecc82770a27ba2628df4b052461a2685d23b560a1714707ecfd9542d3cab0029c9240e04af6bb4687d307f3532d1cf6919d7917a00d2a39b45c06eae80640575
-  data.tar.gz: 99c279353fc59098686af86a10b436e5066eae0f266787e2deae19699bfa47a085d0e42364a5eaf081b590a60cf8c56f5d8220892c8e774e47ff87ae83730218
+  metadata.gz: 476908576e8337442ce8e0404cd45af2e2ede7326b38316a17edae256a16b10e3ec71490490e2fd6cf6a18b31d39185b71373c7881bdf5bb330958c757202a2c
+  data.tar.gz: a5c4abf35c4d71aef347dd975256dc2ac231c5c2fcf7709511c13f5d9da367927bcadcf5a2a31d34f54d242e28b0c9bf0b05d3cc19e46702ae7ef082de5da38d

data/CHANGES.md

@@ -1,3 +1,10 @@
+## 0.1.7 (Next)
+
+## 0.1.6 (24 March 2016)
+
+- Make validation method aliasing more robust against double-require problems, hopefully preventing
+  `SystemStackError (stack level too deep)` on misconfigured systems
+
 ## 0.1.5 (27 Jan 2016)
 
 - Make gemspec smart enough to handle SSH checkouts

data/lib/datacite/mapping.rb

@@ -1,5 +1,16 @@
 require 'logger'
 
+module XML
+  module Mapping
+    module ClassMethods
+      def maybe_alias(new_name, old_name)
+        return alias_method new_name, old_name unless method_defined?(new_name)
+        self
+      end
+    end
+  end
+end
+
 # Module for working with the [DataCite metadata schema](https://schema.datacite.org/meta/kernel-3/index.html)
 module Datacite
   # Maps DataCite XML to Ruby objects
@@ -36,3 +47,4 @@ module Datacite
     end
   end
 end
+

data/lib/datacite/mapping/alternate_identifier.rb

@@ -13,9 +13,9 @@ module Datacite
       text_node :type, '@alternateIdentifierType'
       text_node :value, 'text()'
 
-      alias_method :_type=, :type=
+      maybe_alias :_type=, :type=
       private :_type=
-      alias_method :_value=, :value=
+      maybe_alias :_value=, :value=
       private :_value=
 
       # Initializes a new {AlternateIdentifier}

data/lib/datacite/mapping/contributor.rb

@@ -94,8 +94,8 @@ module Datacite
       #   @return [ContributorType] the contributor type. Cannot be nil.
       typesafe_enum_node :type, '@contributorType', class: ContributorType
 
-      alias_method :_name=, :name=
-      alias_method :_type=, :type=
+      maybe_alias :_name=, :name=
+      maybe_alias :_type=, :type=
       private :_name=
       private :_type=
 

data/lib/datacite/mapping/creator.rb

@@ -19,10 +19,10 @@ module Datacite
       #   @return [Array<String>, nil] The creator's affiliations. Defaults to an empty list.
       array_node :affiliations, 'affiliation', class: String, default_value: []
 
-      alias_method :_name=, :name=
+      maybe_alias :_name=, :name=
       private :_name=
 
-      alias_method :_affiliations=, :affiliations=
+      maybe_alias :_affiliations=, :affiliations=
       private :_affiliations=
 
       # Initializes a new {Creator}.

data/lib/datacite/mapping/date.rb

@@ -57,13 +57,13 @@ module Datacite
       # @!attribute [rw] type
       #  @return [DateType] the type of date. Cannot be nil.
       typesafe_enum_node :type, '@dateType', class: DateType
-      alias_method :_type=, :type=
+      maybe_alias :_type=, :type=
       private :_type=
 
       # @!method value
       #   @return [String] The value as a string. May be any [W3C DateTime format](http://www.w3.org/TR/NOTE-datetime).
       text_node :value, 'text()'
-      alias_method :_value=, :value=
+      maybe_alias :_value=, :value=
       private :_value=
 
       attr_reader :year

data/lib/datacite/mapping/description.rb

@@ -90,10 +90,10 @@ module Datacite
       #     handling of `<br/>` tags.
       break_preserving_value_node :value, 'node()'
 
-      alias_method :_language, :language
+      maybe_alias :_language, :language
       private :_language
 
-      alias_method :_language=, :language=
+      maybe_alias :_language=, :language=
       private :_language=
 
       # Initializes a new {Description}

data/lib/datacite/mapping/geo_location.rb

@@ -37,7 +37,7 @@ module Datacite
         self.place = place
       end
 
-      alias_method :_place=, :place=
+      maybe_alias :_place=, :place=
       private :_place=
 
       def place=(value)

data/lib/datacite/mapping/identifier.rb

@@ -22,10 +22,10 @@ module Datacite
         self.value = value
       end
 
-      alias_method :_value=, :value=
+      maybe_alias :_value=, :value=
       private :_value=
 
-      alias_method :_identifier_type=, :identifier_type=
+      maybe_alias :_identifier_type=, :identifier_type=
       private :_identifier_type=
 
       def value=(v)

data/lib/datacite/mapping/module_info.rb

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

data/lib/datacite/mapping/name_identifier.rb

@@ -18,10 +18,10 @@ module Datacite
       #   @return [String] the identifier value. Cannot be nil.
       text_node :value, 'text()'
 
-      alias_method :_scheme=, :scheme=
+      maybe_alias :_scheme=, :scheme=
       private :_scheme=
 
-      alias_method :_value=, :value=
+      maybe_alias :_value=, :value=
       private :_value=
 
       # Initializes a new {NameIdentifier}

data/lib/datacite/mapping/related_identifier.rb

@@ -167,11 +167,11 @@ module Datacite
       #   @return [String, nil] the type of the metadata scheme. Used only with `HasMetadata`/`IsMetadataFor`. Optional.
       text_node :scheme_type, '@schemeType', default_value: nil
 
-      alias_method :_relation_type=, :relation_type=
+      maybe_alias :_relation_type=, :relation_type=
       private :_relation_type=
-      alias_method :_value=, :value=
+      maybe_alias :_value=, :value=
       private :_value=
-      alias_method :_identifier_type=, :identifier_type=
+      maybe_alias :_identifier_type=, :identifier_type=
       private :_identifier_type=
 
       # Initializes a new {RelatedIdentifier}.

data/lib/datacite/mapping/resource.rb

@@ -132,10 +132,10 @@ module Datacite
         self.geo_locations = geo_locations
       end
 
-      alias_method :_language, :language
+      maybe_alias :_language, :language
       private :_language
 
-      alias_method :_language=, :language=
+      maybe_alias :_language=, :language=
       private :_language=
 
       def language
@@ -146,7 +146,7 @@ module Datacite
         self._language = value.strip if value
       end
 
-      alias_method :_identifier=, :identifier=
+      maybe_alias :_identifier=, :identifier=
       private :_identifier=
 
       def identifier=(value)
@@ -154,7 +154,7 @@ module Datacite
         self._identifier = value
       end
 
-      alias_method :_creators=, :creators=
+      maybe_alias :_creators=, :creators=
       private :_creators=
 
       def creators=(value)
@@ -162,7 +162,7 @@ module Datacite
         self._creators = value
       end
 
-      alias_method :_titles=, :titles=
+      maybe_alias :_titles=, :titles=
       private :_titles=
 
       def titles=(value)
@@ -170,7 +170,7 @@ module Datacite
         self._titles = value
       end
 
-      alias_method :_publisher=, :publisher=
+      maybe_alias :_publisher=, :publisher=
       private :_publisher=
 
       def publisher=(value)
@@ -178,7 +178,7 @@ module Datacite
         self._publisher = value.strip
       end
 
-      alias_method :_publication_year=, :publication_year=
+      maybe_alias :_publication_year=, :publication_year=
       private :_publication_year=
 
       def publication_year=(value)

data/lib/datacite/mapping/resource_type.rb

@@ -63,7 +63,7 @@ module Datacite
       #    @return [String] additional free text description of the resource type. Optional.
       text_node :value, 'text()', default_value: nil
 
-      alias_method :_resource_type_general=, :resource_type_general=
+      maybe_alias :_resource_type_general=, :resource_type_general=
       private :_resource_type_general=
 
       # Initializes a new {ResourceType}

data/lib/datacite/mapping/rights.rb

@@ -24,7 +24,7 @@ module Datacite
         self.value = value
       end
 
-      alias_method :_value=, :value=
+      maybe_alias :_value=, :value=
       private :_value=
 
       def value=(v)

data/lib/datacite/mapping/subject.rb

@@ -24,10 +24,10 @@ module Datacite
       #   @return [String] the subject itself.
       text_node :value, 'text()'
 
-      alias_method :_language, :language
+      maybe_alias :_language, :language
       private :_language
 
-      alias_method :_language=, :language=
+      maybe_alias :_language=, :language=
       private :_language=
 
       # Initializes a new {Subject}

data/lib/datacite/mapping/title.rb

@@ -33,10 +33,10 @@ module Datacite
       #   @return [String] the title itself.
       text_node :value, 'text()'
 
-      alias_method :_language, :language
+      maybe_alias :_language, :language
       private :_language
 
-      alias_method :_language=, :language=
+      maybe_alias :_language=, :language=
       private :_language=
 
       # Initializes a new {Title}.
@@ -58,7 +58,7 @@ module Datacite
         self._language = value.strip if value
       end
 
-      alias_method :_value=, :value=
+      maybe_alias :_value=, :value=
 
       def value=(v)
         fail ArgumentError, 'Value cannot be empty or nil' unless v && !v.empty?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datacite-mapping
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - David Moles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-27 00:00:00.000000000 Z
+date: 2016-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typesafe_enum