datacite-mapping 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a91f9e92cf4a42a6c6aca44d3c36e40f8510718
-  data.tar.gz: 7de721bdcf72f3777175043bd9cf8f31d7f2c141
+  metadata.gz: c79053989c440d5710c31da54a67e010273171e4
+  data.tar.gz: 20c42a0f8f6a37acd2993b30c7b56902e51af652
 SHA512:
-  metadata.gz: 476908576e8337442ce8e0404cd45af2e2ede7326b38316a17edae256a16b10e3ec71490490e2fd6cf6a18b31d39185b71373c7881bdf5bb330958c757202a2c
-  data.tar.gz: a5c4abf35c4d71aef347dd975256dc2ac231c5c2fcf7709511c13f5d9da367927bcadcf5a2a31d34f54d242e28b0c9bf0b05d3cc19e46702ae7ef082de5da38d
+  metadata.gz: 3bc96db87aaf5b26b8ea9059633b0d50ec811678ef4a95be3940775e68955363418c2f062fc265d1ff7bc28ea9f93205186087d47a3347a0de0d0e2cebc8cb08
+  data.tar.gz: 2ee12cf0fc5d0d5b1cf93e3ec461992870a389d368830944c45bb3ee6911cabb3444305d41a48260a3c9e903297c7b8ec8ff216ee4f68703d179d077c5d6454c

data/CHANGES.md

@@ -1,4 +1,9 @@
-## 0.1.7 (Next)
+## 0.1.8 (Next)
+
+## 0.1.7 (28 March 2016)
+
+- Stop having XML::Mapping generate accessors for fields that need validation (& stop using aliasing
+  to layer validation on top of generated accessors)
 
 ## 0.1.6 (24 March 2016)
 

data/lib/datacite/mapping.rb

@@ -1,16 +1,5 @@
 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
@@ -47,4 +36,3 @@ module Datacite
     end
   end
 end
-

data/lib/datacite/mapping/alternate_identifier.rb

@@ -8,16 +8,6 @@ module Datacite
     class AlternateIdentifier
       include XML::Mapping
 
-      root_element_name 'alternateIdentifier'
-
-      text_node :type, '@alternateIdentifierType'
-      text_node :value, 'text()'
-
-      maybe_alias :_type=, :type=
-      private :_type=
-      maybe_alias :_value=, :value=
-      private :_value=
-
       # Initializes a new {AlternateIdentifier}
       # @param type [String] the identifier type
       # @param value [String] the identifier value
@@ -30,16 +20,19 @@ module Datacite
       # @param val [String] the identifier type
       def type=(val)
         fail ArgumentError, 'No identifier type provided' unless val
-        self._type = val
+        @type = val
       end
 
       # Sets the value. Cannot be nil.
       # @param val [String] the value
       def value=(val)
         fail ArgumentError, 'No identifier value provided' unless val
-        self._value = val
+        @value = val
       end
 
+      root_element_name 'alternateIdentifier'
+      text_node :type, '@alternateIdentifierType'
+      text_node :value, 'text()'
     end
   end
 end

data/lib/datacite/mapping/contributor.rb

@@ -78,27 +78,6 @@ module Datacite
     class Contributor
       include XML::Mapping
 
-      # @!attribute [rw] name
-      #   @return [String] the personal name of the contributor, in the format `Family, Given`. Cannot be empty or nil
-      text_node :name, 'contributorName'
-
-      # @!attribute [rw] identifier
-      #   @return [NameIdentifier, nil] an identifier for the contributor. Optional.
-      object_node :identifier, 'nameIdentifier', class: NameIdentifier, default_value: nil
-
-      # @!attribute [rw] affiliations
-      #   @return [Array<String>] the contributor's affiliations. Defaults to an empty list.
-      array_node :affiliations, 'affiliation', class: String, default_value: []
-
-      # @!attribute [rw] type
-      #   @return [ContributorType] the contributor type. Cannot be nil.
-      typesafe_enum_node :type, '@contributorType', class: ContributorType
-
-      maybe_alias :_name=, :name=
-      maybe_alias :_type=, :type=
-      private :_name=
-      private :_type=
-
       # Initializes a new {Contributor}.
       # @param name [String] the personal name of the contributor, in the format `Family, Given`. Cannot be empty or nil
       # @param identifier [NameIdentifier, nil] an identifier for the contributor. Optional.
@@ -113,13 +92,29 @@ module Datacite
 
       def name=(value)
         fail ArgumentError, 'Name cannot be empty or nil' unless value && !value.empty?
-        self._name = value
+        @name = value
       end
 
       def type=(value)
         fail ArgumentError, 'Type cannot be nil' unless value
-        self._type = value
+        @type = value
       end
+
+      # @!attribute [rw] name
+      #   @return [String] the personal name of the contributor, in the format `Family, Given`. Cannot be empty or nil
+      text_node :name, 'contributorName'
+
+      # @!attribute [rw] identifier
+      #   @return [NameIdentifier, nil] an identifier for the contributor. Optional.
+      object_node :identifier, 'nameIdentifier', class: NameIdentifier, default_value: nil
+
+      # @!attribute [rw] affiliations
+      #   @return [Array<String>] the contributor's affiliations. Defaults to an empty list.
+      array_node :affiliations, 'affiliation', class: String, default_value: []
+
+      # @!attribute [rw] type
+      #   @return [ContributorType] the contributor type. Cannot be nil.
+      typesafe_enum_node :type, '@contributorType', class: ContributorType
     end
   end
 end

data/lib/datacite/mapping/creator.rb

@@ -7,24 +7,6 @@ module Datacite
     class Creator
       include XML::Mapping
 
-      # @!attribute [rw] name
-      #   @return [String] The personal name of the creator, in the format `Family, Given`. Cannot be empty or nil.
-      text_node :name, 'creatorName'
-
-      # @!attribute [rw] identifier
-      #   @return [NameIdentifier, nil] An identifier for the creator. Optional.
-      object_node :identifier, 'nameIdentifier', class: NameIdentifier, default_value: nil
-
-      # @!attribute [rw] affiliations
-      #   @return [Array<String>, nil] The creator's affiliations. Defaults to an empty list.
-      array_node :affiliations, 'affiliation', class: String, default_value: []
-
-      maybe_alias :_name=, :name=
-      private :_name=
-
-      maybe_alias :_affiliations=, :affiliations=
-      private :_affiliations=
-
       # Initializes a new {Creator}.
       # @param name [String] The personal name of the creator, in the format `Family, Given`. Cannot be empty or nil.
       # @param identifier [NameIdentifier, nil] An identifier for the creator. Optional.
@@ -37,12 +19,25 @@ module Datacite
 
       def name=(value)
         fail ArgumentError, 'Name cannot be empty or nil' unless value && !value.empty?
-        self._name = value
+        @name = value
       end
 
       def affiliations=(value)
-        self._affiliations = value || []
+        @affiliations = value || []
       end
+
+      # @!attribute [rw] name
+      #   @return [String] The personal name of the creator, in the format `Family, Given`. Cannot be empty or nil.
+      text_node :name, 'creatorName'
+
+      # @!attribute [rw] identifier
+      #   @return [NameIdentifier, nil] An identifier for the creator. Optional.
+      object_node :identifier, 'nameIdentifier', class: NameIdentifier, default_value: nil
+
+      # @!attribute [rw] affiliations
+      #   @return [Array<String>, nil] The creator's affiliations. Defaults to an empty list.
+      array_node :affiliations, 'affiliation', class: String, default_value: []
+
     end
   end
 end

data/lib/datacite/mapping/date.rb

@@ -54,18 +54,6 @@ module Datacite
     class Date
       include XML::Mapping
 
-      # @!attribute [rw] type
-      #  @return [DateType] the type of date. Cannot be nil.
-      typesafe_enum_node :type, '@dateType', class: DateType
-      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()'
-      maybe_alias :_value=, :value=
-      private :_value=
-
       attr_reader :year
       attr_reader :month
       attr_reader :day
@@ -86,7 +74,7 @@ module Datacite
 
       def type=(val)
         fail ArgumentError, 'Date type cannot be nil' unless val
-        self._type = val
+        @type = val
       end
 
       # Sets the value.
@@ -107,7 +95,7 @@ module Datacite
           @nsec = @date_time.to_time.nsec if @date_time
         end
         fail ArgumentError, "Unable to parse date value '#{val}'" unless @year
-        self._value = new_value
+        @value = new_value
       end
 
       private
@@ -148,6 +136,13 @@ module Datacite
         nil
       end
 
+      # @!attribute [rw] type
+      #  @return [DateType] the type of date. Cannot be nil.
+      typesafe_enum_node :type, '@dateType', class: DateType
+
+      # @!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()'
     end
   end
 end

data/lib/datacite/mapping/description.rb

@@ -76,26 +76,6 @@ module Datacite
     class Description
       include XML::Mapping
 
-      # @!attribute [rw] language
-      #   @return [String] an IETF BCP 47, ISO 639-1 language code identifying the language.
-      #     It's unclear from the spec whether language is required; to play it safe, if it's missing, we default to 'en'.
-      text_node :language, '@xml:lang', default_value: nil
-
-      # @!attribute [rw] type
-      #   @return [DescriptionType] the description type.
-      typesafe_enum_node :type, '@descriptionType', class: DescriptionType
-
-      # @!attribute [rw] value
-      #   @return [String] the description itself. See {Description} for notes on special
-      #     handling of `<br/>` tags.
-      break_preserving_value_node :value, 'node()'
-
-      maybe_alias :_language, :language
-      private :_language
-
-      maybe_alias :_language=, :language=
-      private :_language=
-
       # Initializes a new {Description}
       # @param language [String] an IETF BCP 47, ISO 639-1 language code identifying the language.
       #   It's unclear from the spec whether language is required; to play it safe, if it's missing, we default to 'en'.
@@ -109,13 +89,27 @@ module Datacite
       end
 
       def language
-        _language || 'en'
+        @language || 'en'
       end
 
       def language=(value)
-        self._language = value.strip if value
+        @language = value.strip if value
       end
 
+      # @!attribute [rw] language
+      #   @return [String] an IETF BCP 47, ISO 639-1 language code identifying the language.
+      #     It's unclear from the spec whether language is required; to play it safe, if it's missing, we default to 'en'.
+      text_node :language, '@xml:lang', default_value: nil
+
+      # @!attribute [rw] type
+      #   @return [DescriptionType] the description type.
+      typesafe_enum_node :type, '@descriptionType', class: DescriptionType
+
+      # @!attribute [rw] value
+      #   @return [String] the description itself. See {Description} for notes on special
+      #     handling of `<br/>` tags.
+      break_preserving_value_node :value, 'node()'
+
     end
   end
 end

data/lib/datacite/mapping/geo_location.rb

@@ -13,6 +13,20 @@ module Datacite
     class GeoLocation
       include XML::Mapping
 
+      # Initializes a new {GeoLocation}
+      # @param point [GeoLocationPoint, nil] the latitude and longitude at which the data was gathered or about which the data is focused.
+      # @param box [GeoLocationBox, nil] the latitude-longitude quadrangle containing the area where the data was gathered or about which the data is focused.
+      # @param place [String, nil] the spatial region or named place where the data was gathered or about which the data is focused.
+      def initialize(point: nil, box: nil, place: nil)
+        self.point = point
+        self.box = box
+        self.place = place
+      end
+
+      def place=(value)
+        @place = value.respond_to?(:strip) ? value.strip : value
+      end
+
       root_element_name 'geoLocation'
 
       # @!attribute [rw] point
@@ -27,23 +41,6 @@ module Datacite
       #   @return [String, nil] the spatial region or named place where the data was gathered or about which the data is focused.
       text_node :place, 'geoLocationPlace', default_value: nil
 
-      # Initializes a new {GeoLocation}
-      # @param point [GeoLocationPoint, nil] the latitude and longitude at which the data was gathered or about which the data is focused.
-      # @param box [GeoLocationBox, nil] the latitude-longitude quadrangle containing the area where the data was gathered or about which the data is focused.
-      # @param place [String, nil] the spatial region or named place where the data was gathered or about which the data is focused.
-      def initialize(point: nil, box: nil, place: nil)
-        self.point = point
-        self.box = box
-        self.place = place
-      end
-
-      maybe_alias :_place=, :place=
-      private :_place=
-
-      def place=(value)
-        self._place = value.respond_to?(:strip) ? value.strip : value
-      end
-
     end
   end
 end

data/lib/datacite/mapping/identifier.rb

@@ -11,9 +11,6 @@ module Datacite
     class Identifier
       include XML::Mapping
 
-      text_node :identifier_type, '@identifierType'
-      text_node :value, 'text()'
-
       # Initializes a new {Identifier}
       # @param value [String]
       #   the identifier value. Must be a valid DOI value (`10.`_registrant code_`/`_suffix_)
@@ -22,15 +19,9 @@ module Datacite
         self.value = value
       end
 
-      maybe_alias :_value=, :value=
-      private :_value=
-
-      maybe_alias :_identifier_type=, :identifier_type=
-      private :_identifier_type=
-
       def value=(v)
         fail ArgumentError, "Identifier value '#{v}' is not a valid DOI" unless v.match(%r{10\..+/.+})
-        self._value = v
+        @value = v
       end
 
       # Sets the identifier type. Should only be called by the XML mapping engine.
@@ -38,8 +29,11 @@ module Datacite
       #   the identifier type (always 'DOI')
       def identifier_type=(v)
         fail ArgumentError, "Identifier type '#{v}' must be 'DOI'" unless 'DOI' == v
-        self._identifier_type = v
+        @identifier_type = v
       end
+
+      text_node :identifier_type, '@identifierType'
+      text_node :value, 'text()'
     end
   end
 end

data/lib/datacite/mapping/module_info.rb

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

data/lib/datacite/mapping/name_identifier.rb

@@ -6,24 +6,6 @@ module Datacite
     class NameIdentifier
       include XML::Mapping
 
-      root_element_name 'nameIdentifier'
-
-      # @!attribute [rw] scheme
-      #   @return [String] the name identifier scheme. Cannot be nil.
-      text_node :scheme, '@nameIdentifierScheme'
-      # @!attribute [rw] scheme_uri
-      #   @return [URI, nil] the URI of the identifier scheme. Optional.
-      uri_node :scheme_uri, '@schemeURI', default_value: nil
-      # @!attribute [rw] value
-      #   @return [String] the identifier value. Cannot be nil.
-      text_node :value, 'text()'
-
-      maybe_alias :_scheme=, :scheme=
-      private :_scheme=
-
-      maybe_alias :_value=, :value=
-      private :_value=
-
       # Initializes a new {NameIdentifier}
       # @param scheme [Scheme] the name identifier scheme. Cannot be nil.
       # @param scheme_uri [URI, nil] the URI of the identifier scheme. Optional.
@@ -36,13 +18,26 @@ module Datacite
 
       def scheme=(v)
         fail ArgumentError, 'Scheme cannot be empty or nil' unless v && !v.empty?
-        self._scheme = v
+        @scheme = v
       end
 
       def value=(v)
         fail ArgumentError, 'Value cannot be empty or nil' unless v && !v.empty?
-        self._value = v
+        @value = v
       end
+
+      root_element_name 'nameIdentifier'
+
+      # @!attribute [rw] scheme
+      #   @return [String] the name identifier scheme. Cannot be nil.
+      text_node :scheme, '@nameIdentifierScheme'
+      # @!attribute [rw] scheme_uri
+      #   @return [URI, nil] the URI of the identifier scheme. Optional.
+      uri_node :scheme_uri, '@schemeURI', default_value: nil
+      # @!attribute [rw] value
+      #   @return [String] the identifier value. Cannot be nil.
+      text_node :value, 'text()'
+
     end
   end
 end

data/lib/datacite/mapping/related_identifier.rb

@@ -141,39 +141,6 @@ module Datacite
     class RelatedIdentifier
       include XML::Mapping
 
-      root_element_name 'relatedIdentifier'
-
-      # @!attribute [rw] relation_type
-      #   @return [RelationType] the relationship of the {Resource} to the related resource. Cannot be nil.
-      typesafe_enum_node :relation_type, '@relationType', class: RelationType
-
-      # @!attribute [rw] value
-      #   @return [String] the identifier value. Cannot be nil.
-      text_node :value, 'text()'
-
-      # @!attribute [rw] identifier_type
-      #   @return [RelatedIdentifierType] the type of the related identifier. Cannot be nil.
-      typesafe_enum_node :identifier_type, '@relatedIdentifierType', class: RelatedIdentifierType
-
-      # @!attribute [rw] related_metadata_scheme
-      #   @return [String, nil] the name of the metadata scheme. Used only with `HasMetadata`/`IsMetadataFor`. Optional.
-      text_node :related_metadata_scheme, '@relatedMetadataScheme', default_value: nil
-
-      # @!attribute [rw] scheme_uri
-      #   @return [URI, nil] the URI of the metadata scheme. Used only with `HasMetadata`/`IsMetadataFor`. Optional.
-      uri_node :scheme_uri, '@schemeURI', default_value: nil
-
-      # @!attribute [rw] scheme_type
-      #   @return [String, nil] the type of the metadata scheme. Used only with `HasMetadata`/`IsMetadataFor`. Optional.
-      text_node :scheme_type, '@schemeType', default_value: nil
-
-      maybe_alias :_relation_type=, :relation_type=
-      private :_relation_type=
-      maybe_alias :_value=, :value=
-      private :_value=
-      maybe_alias :_identifier_type=, :identifier_type=
-      private :_identifier_type=
-
       # Initializes a new {RelatedIdentifier}.
       # @param relation_type [RelationType] the relationship of the {Resource} to the related resource. Cannot be nil.
       # @param value [String] the identifier value. Cannot be nil.
@@ -192,18 +159,45 @@ module Datacite
 
       def value=(value)
         fail ArgumentError, 'Value cannot be empty or nil' unless value && !value.empty?
-        self._value = value
+        @value = value
       end
 
       def identifier_type=(value)
         fail ArgumentError, 'Identifier type cannot be empty or nil' unless value
-        self._identifier_type = value
+        @identifier_type = value
       end
 
       def relation_type=(value)
         fail ArgumentError, 'Relation type cannot be nil' unless value
-        self._relation_type = value
+        @relation_type = value
       end
+
+      root_element_name 'relatedIdentifier'
+
+      # @!attribute [rw] relation_type
+      #   @return [RelationType] the relationship of the {Resource} to the related resource. Cannot be nil.
+      typesafe_enum_node :relation_type, '@relationType', class: RelationType
+
+      # @!attribute [rw] value
+      #   @return [String] the identifier value. Cannot be nil.
+      text_node :value, 'text()'
+
+      # @!attribute [rw] identifier_type
+      #   @return [RelatedIdentifierType] the type of the related identifier. Cannot be nil.
+      typesafe_enum_node :identifier_type, '@relatedIdentifierType', class: RelatedIdentifierType
+
+      # @!attribute [rw] related_metadata_scheme
+      #   @return [String, nil] the name of the metadata scheme. Used only with `HasMetadata`/`IsMetadataFor`. Optional.
+      text_node :related_metadata_scheme, '@relatedMetadataScheme', default_value: nil
+
+      # @!attribute [rw] scheme_uri
+      #   @return [URI, nil] the URI of the metadata scheme. Used only with `HasMetadata`/`IsMetadataFor`. Optional.
+      uri_node :scheme_uri, '@schemeURI', default_value: nil
+
+      # @!attribute [rw] scheme_type
+      #   @return [String, nil] the type of the metadata scheme. Used only with `HasMetadata`/`IsMetadataFor`. Optional.
+      text_node :scheme_type, '@schemeType', default_value: nil
+
     end
   end
 end

data/lib/datacite/mapping/resource.rb

@@ -17,79 +17,6 @@ module Datacite
     class Resource
       include XML::Mapping
 
-      # @!attribute [rw] identifier
-      #   @return [Identifier] a persistent identifier that identifies a resource.
-      object_node :identifier, 'identifier', class: Identifier
-
-      # @!attribute [rw] creators
-      #   @return [Array<Creator>] the main researchers involved working on the data, or the authors of the publication in priority order.
-      array_node :creators, 'creators', 'creator', class: Creator
-
-      # @!attribute [rw] titles
-      #   @return [Array<Title>] the names or titles by which a resource is known.
-      array_node :titles, 'titles', 'title', class: Title
-
-      # @!attribute [rw] publisher
-      #   @return [String] the name of the entity that holds, archives, publishes prints, distributes, releases, issues, or produces the resource.
-      text_node :publisher, 'publisher'
-
-      # @!attribute [rw] publication_year
-      #   @return [Integer] year when the resource is made publicly available.
-      numeric_node :publication_year, 'publicationYear'
-
-      # @!attribute [rw] subjects
-      #   @return [Array<Subject>] subjects, keywords, classification codes, or key phrases describing the resource.
-      array_node :subjects, 'subjects', 'subject', class: Subject, default_value: []
-
-      # @!attribute [rw] contributors
-      #   @return [Array<Contributor>] institutions or persons responsible for collecting, creating, or otherwise contributing to the developement of the dataset.
-      array_node :contributors, 'contributors', 'contributor', class: Contributor, default_value: []
-
-      # @!attribute [rw] dates
-      #   @return [Array<Date>] different dates relevant to the work.
-      array_node :dates, 'dates', 'date', class: Date, default_value: []
-
-      # @!attribute [rw] language
-      #   @return [String] Primary language of the resource: an IETF BCP 47, ISO 639-1 language code.
-      #   It's unclear from the spec whether language is required; to play it safe, if it's missing, we default to 'en'.
-      text_node :language, 'language', default_value: nil
-
-      # @!attribute [rw] resource_type
-      #   @return [ResourceType, nil] the type of the resource. Optional.
-      object_node :resource_type, 'resourceType', class: ResourceType, default_value: nil
-
-      # @!attribute [rw] alternate_identifiers
-      #   @return [Array<AlternateIdentifier>] an identifier or identifiers other than the primary {Identifier} applied to the resource being registered.
-      array_node :alternate_identifiers, 'alternateIdentifiers', 'alternateIdentifier', class: AlternateIdentifier, default_value: []
-
-      # @!attribute [rw] related_identifiers
-      #   @return [Array<RelatedIdentifier>] identifiers of related resources.
-      array_node :related_identifiers, 'relatedIdentifiers', 'relatedIdentifier', class: RelatedIdentifier, default_value: []
-
-      # @!attribute [rw] sizes
-      #   @return [Array<String>] unstructured size information about the resource.
-      array_node :sizes, 'sizes', 'size', class: String, default_value: []
-
-      # @!attribute [rw] formats
-      #   @return [Array<String>] technical format of the resource, e.g. file extension or MIME type.
-      array_node :formats, 'formats', 'format', class: String, default_value: []
-
-      # @!attribute [rw] version
-      #   @return [String] version number of the resource. Optional.
-      text_node :version, 'version', default_value: nil
-
-      # @!attribute [rw] rights_list
-      #   @return [Array<Rights>] rights information for this resource.
-      array_node :rights_list, 'rightsList', 'rights', class: Rights, default_value: []
-
-      # @!attribute [rw] descriptions
-      #   @return [Array<Description>] all additional information that does not fit in any of the other categories.
-      array_node :descriptions, 'descriptions', 'description', class: Description, default_value: []
-
-      # @!attribute [rw] geo_locations
-      #   @return [Array<GeoLocations>] spatial region or named place where the data was gathered or about which the data is focused.
-      array_node :geo_locations, 'geoLocations', 'geoLocation', class: GeoLocation, default_value: []
-
       # Initialies a new {Resource}
       #
       # @param identifier [Identifier] a persistent identifier that identifies a resource.
@@ -132,58 +59,37 @@ module Datacite
         self.geo_locations = geo_locations
       end
 
-      maybe_alias :_language, :language
-      private :_language
-
-      maybe_alias :_language=, :language=
-      private :_language=
-
       def language
-        _language || 'en'
+        @language || 'en'
       end
 
       def language=(value)
-        self._language = value.strip if value
+        @language = value.strip if value
       end
 
-      maybe_alias :_identifier=, :identifier=
-      private :_identifier=
-
       def identifier=(value)
         fail ArgumentError, 'Resource must have an identifier' unless value
-        self._identifier = value
+        @identifier = value
       end
 
-      maybe_alias :_creators=, :creators=
-      private :_creators=
-
       def creators=(value)
         fail ArgumentError, 'Resource must have at least one creator' unless value && value.size > 0
-        self._creators = value
+        @creators = value
       end
 
-      maybe_alias :_titles=, :titles=
-      private :_titles=
-
       def titles=(value)
         fail ArgumentError, 'Resource must have at least one title' unless value && value.size > 0
-        self._titles = value
+        @titles = value
       end
 
-      maybe_alias :_publisher=, :publisher=
-      private :_publisher=
-
       def publisher=(value)
         fail ArgumentError, 'Resource must have at least one publisher' unless value && value.size > 0
-        self._publisher = value.strip
+        @publisher = value.strip
       end
 
-      maybe_alias :_publication_year=, :publication_year=
-      private :_publication_year=
-
       def publication_year=(value)
         fail ArgumentError, 'Resource must have a four-digit publication year' unless value && value.to_i.between?(1000, 9999)
-        self._publication_year = value.to_i
+        @publication_year = value.to_i
       end
 
       # Overrides +::XML::Mapping.pre_save+ to write namespace information.
@@ -196,6 +102,79 @@ module Datacite
         xml
       end
 
+      # @!attribute [rw] identifier
+      #   @return [Identifier] a persistent identifier that identifies a resource.
+      object_node :identifier, 'identifier', class: Identifier
+
+      # @!attribute [rw] creators
+      #   @return [Array<Creator>] the main researchers involved working on the data, or the authors of the publication in priority order.
+      array_node :creators, 'creators', 'creator', class: Creator
+
+      # @!attribute [rw] titles
+      #   @return [Array<Title>] the names or titles by which a resource is known.
+      array_node :titles, 'titles', 'title', class: Title
+
+      # @!attribute [rw] publisher
+      #   @return [String] the name of the entity that holds, archives, publishes prints, distributes, releases, issues, or produces the resource.
+      text_node :publisher, 'publisher'
+
+      # @!attribute [rw] publication_year
+      #   @return [Integer] year when the resource is made publicly available.
+      numeric_node :publication_year, 'publicationYear'
+
+      # @!attribute [rw] subjects
+      #   @return [Array<Subject>] subjects, keywords, classification codes, or key phrases describing the resource.
+      array_node :subjects, 'subjects', 'subject', class: Subject, default_value: []
+
+      # @!attribute [rw] contributors
+      #   @return [Array<Contributor>] institutions or persons responsible for collecting, creating, or otherwise contributing to the developement of the dataset.
+      array_node :contributors, 'contributors', 'contributor', class: Contributor, default_value: []
+
+      # @!attribute [rw] dates
+      #   @return [Array<Date>] different dates relevant to the work.
+      array_node :dates, 'dates', 'date', class: Date, default_value: []
+
+      # @!attribute [rw] language
+      #   @return [String] Primary language of the resource: an IETF BCP 47, ISO 639-1 language code.
+      #   It's unclear from the spec whether language is required; to play it safe, if it's missing, we default to 'en'.
+      text_node :language, 'language', default_value: nil
+
+      # @!attribute [rw] resource_type
+      #   @return [ResourceType, nil] the type of the resource. Optional.
+      object_node :resource_type, 'resourceType', class: ResourceType, default_value: nil
+
+      # @!attribute [rw] alternate_identifiers
+      #   @return [Array<AlternateIdentifier>] an identifier or identifiers other than the primary {Identifier} applied to the resource being registered.
+      array_node :alternate_identifiers, 'alternateIdentifiers', 'alternateIdentifier', class: AlternateIdentifier, default_value: []
+
+      # @!attribute [rw] related_identifiers
+      #   @return [Array<RelatedIdentifier>] identifiers of related resources.
+      array_node :related_identifiers, 'relatedIdentifiers', 'relatedIdentifier', class: RelatedIdentifier, default_value: []
+
+      # @!attribute [rw] sizes
+      #   @return [Array<String>] unstructured size information about the resource.
+      array_node :sizes, 'sizes', 'size', class: String, default_value: []
+
+      # @!attribute [rw] formats
+      #   @return [Array<String>] technical format of the resource, e.g. file extension or MIME type.
+      array_node :formats, 'formats', 'format', class: String, default_value: []
+
+      # @!attribute [rw] version
+      #   @return [String] version number of the resource. Optional.
+      text_node :version, 'version', default_value: nil
+
+      # @!attribute [rw] rights_list
+      #   @return [Array<Rights>] rights information for this resource.
+      array_node :rights_list, 'rightsList', 'rights', class: Rights, default_value: []
+
+      # @!attribute [rw] descriptions
+      #   @return [Array<Description>] all additional information that does not fit in any of the other categories.
+      array_node :descriptions, 'descriptions', 'description', class: Description, default_value: []
+
+      # @!attribute [rw] geo_locations
+      #   @return [Array<GeoLocations>] spatial region or named place where the data was gathered or about which the data is focused.
+      array_node :geo_locations, 'geoLocations', 'geoLocation', class: GeoLocation, default_value: []
+
     end
   end
 end

data/lib/datacite/mapping/resource_type.rb

@@ -53,19 +53,6 @@ module Datacite
     class ResourceType
       include XML::Mapping
 
-      root_element_name 'resourceType'
-
-      # @!attribute [rw] resource_type_general
-      #    @return [ResourceTypeGeneral] the general resource type
-      typesafe_enum_node :resource_type_general, '@resourceTypeGeneral', class: ResourceTypeGeneral
-
-      # @!attribute [rw] value
-      #    @return [String] additional free text description of the resource type. Optional.
-      text_node :value, 'text()', default_value: nil
-
-      maybe_alias :_resource_type_general=, :resource_type_general=
-      private :_resource_type_general=
-
       # Initializes a new {ResourceType}
       # @param resource_type_general [ResourceTypeGeneral] the general resource type
       # @param value [String] additional free text description of the resource type.
@@ -76,8 +63,18 @@ module Datacite
 
       def resource_type_general=(val)
         fail ArgumentError, 'General resource type cannot be nil' unless val
-        self._resource_type_general = val
+        @resource_type_general = val
       end
+
+      root_element_name 'resourceType'
+
+      # @!attribute [rw] resource_type_general
+      #    @return [ResourceTypeGeneral] the general resource type
+      typesafe_enum_node :resource_type_general, '@resourceTypeGeneral', class: ResourceTypeGeneral
+
+      # @!attribute [rw] value
+      #    @return [String] additional free text description of the resource type. Optional.
+      text_node :value, 'text()', default_value: nil
     end
   end
 end

data/lib/datacite/mapping/rights.rb

@@ -7,14 +7,6 @@ module Datacite
     class Rights
       include XML::Mapping
 
-      # @!attribute [rw] uri
-      #   @return [URI, nil] a URI for the license. Optional.
-      uri_node :uri, '@rightsURI', default_value: nil
-
-      # @!attribute [rw] value
-      #   @return [String] the rights statement. Cannot be empty or nil.
-      text_node :value, 'text()'
-
       # Initializes a new {Rights} object
       #
       # @param uri [URI, nil] a URI for the license. Optional.
@@ -24,13 +16,18 @@ module Datacite
         self.value = value
       end
 
-      maybe_alias :_value=, :value=
-      private :_value=
-
       def value=(v)
         fail ArgumentError, 'Value cannot be empty or nil' unless v && !v.empty?
-        self._value = v.strip
+        @value = v.strip
       end
+
+      # @!attribute [rw] uri
+      #   @return [URI, nil] a URI for the license. Optional.
+      uri_node :uri, '@rightsURI', default_value: nil
+
+      # @!attribute [rw] value
+      #   @return [String] the rights statement. Cannot be empty or nil.
+      text_node :value, 'text()'
     end
   end
 end

data/lib/datacite/mapping/subject.rb

@@ -7,29 +7,6 @@ module Datacite
     class Subject
       include XML::Mapping
 
-      # @!attribute [rw] scheme
-      #   @return [String, nil] the subject scheme or classification code or authority if one is used. Optional.
-      text_node :scheme, '@subjectScheme', default_value: nil
-
-      # @!attribute [rw] scheme_uri
-      #   @return [URI, nil] the URI of the subject scheme or classification code or authority if one is used. Optional.
-      uri_node :scheme_uri, '@schemeURI', default_value: nil
-
-      # @!attribute [rw] language
-      #   @return [String] an IETF BCP 47, ISO 639-1 language code identifying the language.
-      #     It's unclear from the spec whether language is required; to play it safe, if it's missing, we default to 'en'.
-      text_node :language, '@xml:lang', default_value: nil
-
-      # @!attribute [rw] value
-      #   @return [String] the subject itself.
-      text_node :value, 'text()'
-
-      maybe_alias :_language, :language
-      private :_language
-
-      maybe_alias :_language=, :language=
-      private :_language=
-
       # Initializes a new {Subject}
       # @param scheme [String, nil] the subject scheme or classification code or authority if one is used. Optional.
       # @param scheme_uri [URI, nil] the URI of the subject scheme or classification code or authority if one is used. Optional.
@@ -44,12 +21,30 @@ module Datacite
       end
 
       def language
-        _language || 'en'
+        @language || 'en'
       end
 
       def language=(value)
-        self._language = value.strip if value
+        @language = value.strip if value
       end
+
+      # @!attribute [rw] scheme
+      #   @return [String, nil] the subject scheme or classification code or authority if one is used. Optional.
+      text_node :scheme, '@subjectScheme', default_value: nil
+
+      # @!attribute [rw] scheme_uri
+      #   @return [URI, nil] the URI of the subject scheme or classification code or authority if one is used. Optional.
+      uri_node :scheme_uri, '@schemeURI', default_value: nil
+
+      # @!attribute [rw] language
+      #   @return [String] an IETF BCP 47, ISO 639-1 language code identifying the language.
+      #     It's unclear from the spec whether language is required; to play it safe, if it's missing, we default to 'en'.
+      text_node :language, '@xml:lang', default_value: nil
+
+      # @!attribute [rw] value
+      #   @return [String] the subject itself.
+      text_node :value, 'text()'
+
     end
   end
 end

data/lib/datacite/mapping/title.rb

@@ -20,25 +20,6 @@ module Datacite
     class Title
       include XML::Mapping
 
-      # @!attribute [rw] language
-      #   @return [String] an IETF BCP 47, ISO 639-1 language code identifying the language.
-      #     It's unclear from the spec whether language is required; to play it safe, if it's missing, we default to 'en'.
-      text_node :language, '@xml:lang', default_value: nil
-
-      # @!attribute [rw] type
-      #   @return [TitleType, nil] the title type. Optional.
-      typesafe_enum_node :type, '@titleType', class: TitleType, default_value: nil
-
-      # @!attribute [rw] value
-      #   @return [String] the title itself.
-      text_node :value, 'text()'
-
-      maybe_alias :_language, :language
-      private :_language
-
-      maybe_alias :_language=, :language=
-      private :_language=
-
       # Initializes a new {Title}.
       # @param language [String] an IETF BCP 47, ISO 639-1 language code identifying the language.
       #   It's unclear from the spec whether language is required; to play it safe, if it's missing, we default to 'en'.
@@ -51,19 +32,31 @@ module Datacite
       end
 
       def language
-        _language || 'en'
+        @language || 'en'
       end
 
       def language=(value)
-        self._language = value.strip if value
+        @language = value.strip if value
       end
 
-      maybe_alias :_value=, :value=
-
       def value=(v)
         fail ArgumentError, 'Value cannot be empty or nil' unless v && !v.empty?
-        self._value = v.strip
+        @value = v.strip
       end
+
+      # @!attribute [rw] language
+      #   @return [String] an IETF BCP 47, ISO 639-1 language code identifying the language.
+      #     It's unclear from the spec whether language is required; to play it safe, if it's missing, we default to 'en'.
+      text_node :language, '@xml:lang', default_value: nil
+
+      # @!attribute [rw] type
+      #   @return [TitleType, nil] the title type. Optional.
+      typesafe_enum_node :type, '@titleType', class: TitleType, default_value: nil
+
+      # @!attribute [rw] value
+      #   @return [String] the title itself.
+      text_node :value, 'text()'
+
     end
   end
 end

metadata

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