datacite-mapping 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 930b87f0c713df87fdfb98ccec007a1b5bd12782
-  data.tar.gz: f8972ae87744fb2ecef07f3dcd150ecfdea875ac
+  metadata.gz: 0e3a18fb33b9c652f32beb77e758b5e317cfc0b1
+  data.tar.gz: 967f6e66468d35a1d1938d3a19d4d530dd0bb22e
 SHA512:
-  metadata.gz: 48e367daa0194fdf95bec71d25809047c12fde35d112f31b84868a4598ac464585a2611f31a26350f6df280bc44ab1fc13b491a671ea51110aa6d867a7a78239
-  data.tar.gz: 787da05d0a22de31f66b6f1865bddee0a70656c817e129df5902cf5893c36d953b06b7a40267b1c82f3b74020cc49e6d47b431362b2b1936ff4214e42057f7f5
+  metadata.gz: 048fac57a650168fdd92e1f4c7ba293088a97b87decb7b72aadb5b8a928ec000cc37a6a40c396b7df01327ba75607f949f78fb5e7abd63475c8efe8c2fec8dba
+  data.tar.gz: 87e5b52c29f34b3972cf6f208ccb1da757f441ea699ba4665232b4da96a53a1af1b9dd553f85a5c764e4f2754725107bdb97e4be794157fdd865e165cdfdf821

data/.yardopts

@@ -1,2 +1,3 @@
---markup markdown
+--markup-provider=redcarpet
+--markup=markdown
 --default-return ''

data/CHANGES.md

@@ -1,10 +1,17 @@
+## 0.1.4 (6 Jan 2016)
+
+- Fix issue where missing `xml:lang` attribute in `<resource>` would produce a `no value, and no default value`
+  error instead of defaulting to `'en'` as documented
+- Ensure that YARD formats README correctly when converting from GitHub-flavored Markdown to HTML
+- Update to [XML::MappingExtensions](https://github.com/dmolesUC3/xml-mapping_extensions) 0.3.3
+
 ## 0.1.3 (18 Dec 2015)
 
-- Update to [TypesafeEnum](https://github.com/dmolesUC3/typesafe_enum) 0.1.4.
+- Update to [TypesafeEnum](https://github.com/dmolesUC3/typesafe_enum) 0.1.4
 
 ## 0.1.2 (17 Dec 2015)
 
-- Update to [TypesafeEnum](https://github.com/dmolesUC3/typesafe_enum) 0.1.3.
+- Update to [TypesafeEnum](https://github.com/dmolesUC3/typesafe_enum) 0.1.3
 
 ## 0.1.1 (14 Dec 2015)
 

data/LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 The Regents of the University of California
+Copyright (c) 2016 The Regents of the University of California
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/datacite-mapping.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'typesafe_enum', '~> 0.1', '>= 0.1.4'
-  spec.add_dependency 'xml-mapping_extensions', '~> 0.3', '>= 0.3.2'
+  spec.add_dependency 'xml-mapping_extensions', '~> 0.3', '>= 0.3.3'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'equivalent-xml', '~> 0.6.0'
@@ -33,5 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov', '~> 0.9.2'
   spec.add_development_dependency 'simplecov-console', '~> 0.2.0'
   spec.add_development_dependency 'rubocop', '~> 0.32.1'
+  spec.add_development_dependency 'redcarpet', '~> 3.3'
+  spec.add_development_dependency 'github-markup', '~> 1.4'
   spec.add_development_dependency 'yard', '~> 0.8'
 end

data/lib/datacite/mapping/creator.rb

@@ -16,7 +16,7 @@ module Datacite
       object_node :identifier, 'nameIdentifier', class: NameIdentifier, default_value: nil
 
       # @!attribute [rw] affiliations
-      #   @return [Array<Affiliation>, nil] The creator's affiliations. Defaults to an empty list.
+      #   @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=
@@ -28,7 +28,7 @@ module Datacite
       # 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.
-      # @param affiliations [Array<Affiliation>, nil] The creator's affiliations. Defaults to an empty list.
+      # @param affiliations [Array<String>, nil] The creator's affiliations. Defaults to an empty list.
       def initialize(name:, identifier: nil, affiliations: [])
         self.name = name
         self.identifier = identifier

data/lib/datacite/mapping/module_info.rb

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

data/lib/datacite/mapping/resource.rb

@@ -52,7 +52,7 @@ module Datacite
       # @!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'
+      text_node :language, 'language', default_value: nil
 
       # @!attribute [rw] resource_type
       #   @return [ResourceType, nil] the type of the resource. Optional.

data/lib/datacite/mapping.rb

@@ -1,3 +1,5 @@
+require 'logger'
+
 # 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

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

@@ -464,6 +464,55 @@ module Datacite
         end
       end
 
+      describe '#parse_xml' do
+        before(:each) do
+          identifier = Identifier.new(value: '10.5072/example-full').save_to_xml
+
+          creators = REXML::Element.new('creators')
+          creators.add_element(Creator.new(
+            name: 'Miller, Elizabeth',
+            identifier: NameIdentifier.new(scheme: 'ORCID', scheme_uri: URI('http://orcid.org'), value: '0000-0001-5000-0007'),
+            affiliations: ['DataCite']
+          ).save_to_xml)
+
+          titles = REXML::Element.new('titles')
+          titles.add_element(Title.new(
+            language: 'en-us',
+            value: 'Full DataCite XML Example'
+          ).save_to_xml)
+          titles.add_element(Title.new(
+            language: 'en-us',
+            type: TitleType::SUBTITLE,
+            value: 'Demonstration of DataCite Properties.'
+          ).save_to_xml)
+
+          publisher = REXML::Element.new('publisher')
+          publisher.text = 'DataCite'
+
+          publication_year = REXML::Element.new('publicationYear')
+          publication_year.text = '2014'
+
+          resource = REXML::Element.new('resource')
+          resource.add_namespace('http://datacite.org/schema/kernel-3')
+          resource.add_namespace('xsi', 'http://www.w3.org/2001/XMLSchema-instance')
+          resource.add_attribute('xsi:schemaLocation', 'http://datacite.org/schema/kernel-3 http://schema.datacite.org/meta/kernel-3/metadata.xsd')
+          resource.add_element(identifier)
+          resource.add_element(creators)
+          resource.add_element(titles)
+          resource.add_element(publisher)
+          resource.add_element(publication_year)
+
+          @required_xml = resource
+        end
+
+        it 'parses a resource with only required attributes' do
+          resource = Resource.parse_xml(@required_xml)
+          expect(resource.language).to eq('en')
+        end
+
+        it 'correctly differentiates required and optional attributes'
+      end
+
       describe '#save_to_xml' do
         it 'sets the namespace to http://datacite.org/schema/kernel-3'
         it "doesn't clobber the namespace on the various xml:lang attributes"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datacite-mapping
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - David Moles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2016-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typesafe_enum
@@ -39,7 +39,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
   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.2
+        version: 0.3.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -148,6 +148,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.32.1
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+- !ruby/object:Gem::Dependency
+  name: github-markup
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement