stash-wrapper 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 764ebbb6a0634bb11b50fdf67e5814ba64b2104a
-  data.tar.gz: 4ad02c0f86c1ffe0d0dd5f3493ab184776d7ff36
+  metadata.gz: 3ae3ee08a179c12c58921b916cd4643494a7c6c1
+  data.tar.gz: 1ef85936f7f0b4f460ad92828764bf444d548e0e
 SHA512:
-  metadata.gz: d6b71cc941ce51c4dbe1eb2db16e68ad91f13317cf9b4a3bff7011315afd13e2efdf90633777671f76b959f672f60ecb63b4208edb627049a90f5f3d8ad19e2c
-  data.tar.gz: e174031853d8d1ce5ff2cdaba5a2dfe16931a5b9a038aca74845faff5319a79759ee75dd6d23af43dcb432facd06db5aa24aa90624ebf04e2a8d42ed733302b7
+  metadata.gz: 856c79ec10de00d0e8184d6c83040ef7e166986e94981a3b93f88117250f3bf0c9c22363a5c6514c76cc6b19f5058707e7e7dbd159e9681050fa28e17eae754a
+  data.tar.gz: b9839d55c2cba560b6c65c652dadadc4d1582d43396582a75bf5b1fda39249c4e4a14e56ee1f19e4d0d056b9f12f2a4136b777b986df44c3d6200219f4b9893c

data/.gitignore

@@ -27,7 +27,7 @@ db/*.sqlite3
 
 /log/
 
-# IntellJ
+# IntelliJ
 
 *.iml
 *.ipr

data/CHANGES.md

@@ -1,3 +1,17 @@
+# 0.1.10 (next)
+
+- Added convenience constant `License::CC_ZERO` for the
+  [CC0](https://creativecommons.org/publicdomain/zero/1.0/legalcode) public domain declaration
+- Allow `License` to take a string as a `uri` parameter, so long as that string is a valid URI
+- Validate parameters for:
+  - `StashWrapper`
+  - `StashAdministrative` (fixes issue #2)
+  - `Embargo`
+  - `Identifier`
+  - `Inventory`
+  - `Size`
+  - `Version`
+
 # 0.1.9 (18 May 2016)
 
 - Update to XML::MappingExtensions 0.4.1

data/lib/stash/wrapper/embargo.rb

@@ -18,11 +18,15 @@ module Stash
       # @param period [String] The embargo period
       # @param start_date [Date] The embargo start date
       # @param end_date [Date] The embargo end date
-      def initialize(type:, period:, start_date:, end_date:)
+      def initialize(type:, period:, start_date:, end_date:) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        fail ArgumentError, "Specified type does not appear to be an EmbargoType: #{type || 'nil'}" unless type && type.is_a?(EmbargoType)
+        fail ArgumentError, "Specified embargo period does not appear to be a non-empty string: #{period.inspect}" if period.to_s.strip.empty?
+        fail ArgumentError, "Specified start date does not appear to be a date: #{start_date || 'nil'}" unless start_date && start_date.respond_to?(:iso8601)
+        fail ArgumentError, "Specified end date does not appear to be a date: #{end_date || 'nil'}" unless end_date && end_date.respond_to?(:iso8601)
+
         self.type = type
-        self.period = period
-        self.start_date = start_date
-        self.end_date = end_date
+        self.period = period.to_s
+        self.start_date, self.end_date = valid_range(start_date, end_date)
       end
 
       # Creates a new `Embargo` instance of type {EmbargoType::NONE} with the current date as start and end.
@@ -31,7 +35,16 @@ module Stash
         today = Date.today
         new(type: EmbargoType::NONE, period: EmbargoType::NONE.value, start_date: today, end_date: today)
       end
-    end
 
+      private
+
+      def valid_range(start_date, end_date)
+        if start_date > end_date
+          fail RangeError, "start_date #{start_date} must be <= end_date #{end_date}"
+        else
+          [start_date.to_date, end_date.to_date]
+        end
+      end
+    end
   end
 end

data/lib/stash/wrapper/identifier.rb

@@ -12,6 +12,8 @@ module Stash
 
       # Creates a new {Identifier}
       def initialize(type:, value:)
+        fail ArgumentError, "Identifier type does not appear to be an IdentifierType: #{type || 'nil'}" unless type && type.is_a?(IdentifierType)
+        fail ArgumentError, "Identifier value does not appear to be a non-empty string: #{value.inspect}" if value.to_s.strip.empty?
         self.type = type
         self.value = value
       end

data/lib/stash/wrapper/inventory.rb

@@ -14,9 +14,19 @@ module Stash
       # creates a new {Inventory} object
       # @param files [List<StashFile>] The inventory of files
       def initialize(files:)
-        self.files = files
+        self.files = valid_file_array(files)
         self.num_files = files.size
       end
+
+      private
+
+      def valid_file_array(files)
+        fail ArgumentError, "specified file list does not appear to be an array of StashFiles: #{files.inspect}" unless files.is_a?(Array)
+        files.each_with_index do |f, i|
+          fail ArgumentError, "files[#{i}] does not appear to be a StashFile: #{f.inspect}" unless f.is_a?(StashFile)
+        end
+        files
+      end
     end
   end
 end

data/lib/stash/wrapper/license.rb

@@ -12,10 +12,13 @@ module Stash
 
       # Creates a new {License} object
       # @param name [String] The license name
-      # @param uri [URI] The license URI
+      # @param uri [URI, String] The license URI
+      # @raise [URI::InvalidURIError] if `uri` is a string that is not a valid URI
       def initialize(name:, uri:)
+        fail ArgumentError, "License name does not appear to be a non-empty string: #{name.inspect}" if name.to_s.strip.empty?
+        fail ArgumentError, 'No uri provided' unless uri
         self.name = name
-        self.uri = uri
+        self.uri = ::XML::MappingExtensions.to_uri(uri)
       end
     end
 
@@ -25,6 +28,13 @@ module Stash
         name: 'Creative Commons Attribution 4.0 International (CC-BY)',
         uri: URI('https://creativecommons.org/licenses/by/4.0/legalcode')
       )
+
+      # Convenience instance for the [CC0](https://creativecommons.org/publicdomain/zero/1.0/legalcode)
+      # public domain declaration
+      CC_ZERO = License.new(
+        name: 'CC0 1.0 Universal (CC0 1.0) Public Domain Dedication',
+        uri: URI('https://creativecommons.org/publicdomain/zero/1.0/legalcode')
+      )
     end
   end
 end

data/lib/stash/wrapper/module_info.rb

@@ -5,7 +5,7 @@ module Stash
     NAME = 'stash-wrapper'
 
     # The version of this gem
-    VERSION = '0.1.9'
+    VERSION = '0.1.10'
 
     # The copyright notice for this gem
     COPYRIGHT = 'Copyright (c) 2016 The Regents of the University of California'

data/lib/stash/wrapper/size.rb

@@ -14,6 +14,7 @@ module Stash
       # Creates a new {Size}
       # @param bytes [Integer] the size in bytes
       def initialize(bytes:)
+        fail ArgumentError, "specified file size does not appear to be an integer byte count: #{bytes || 'nil'}" unless bytes.respond_to?(:to_i) && bytes.to_i == bytes
         self.size = bytes
         self.unit = SizeUnit::BYTE
       end

data/lib/stash/wrapper/stash_administrative.rb

@@ -22,7 +22,12 @@ module Stash
       #   is supplied, it will default to an embargo of type {EmbargoType::NONE}
       #   with the current date as start and end.
       # @param inventory [Inventory, nil] the (optional) file inventory
-      def initialize(version:, license:, embargo: nil, inventory: nil)
+      def initialize(version:, license:, embargo: nil, inventory: nil) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        fail ArgumentError, "version does not appear to be a Version object: #{version || 'nil'}" unless version.is_a?(Version)
+        fail ArgumentError, "license does not appear to be a License object: #{license || 'nil'}" unless license.is_a?(License)
+        fail ArgumentError, "embargo does not appear to be an Embargo object: #{embargo || 'nil'}" if embargo unless embargo.is_a?(Embargo)
+        fail ArgumentError, "inventory does not appear to be an Inventory object: #{inventory || 'nil'}" if inventory unless inventory.is_a?(Inventory)
+
         self.version = version
         self.license = license
         self.embargo = embargo || Embargo.none

data/lib/stash/wrapper/stash_wrapper.rb

@@ -36,6 +36,8 @@ module Stash
       # @param descriptive_elements [Array<REXML::Element>] the encapsulated
       #   XML metadata
       def initialize(identifier:, version:, license:, embargo: nil, inventory: nil, descriptive_elements:) # rubocop:disable Metrics/ParameterLists
+        fail ArgumentError, "identifier does not appear to be an Identifier object: #{identifier || 'nil'}" unless identifier.is_a?(Identifier)
+
         self.identifier = identifier
         self.stash_administrative = StashAdministrative.new(
           version: version,

data/lib/stash/wrapper/version.rb

@@ -15,6 +15,8 @@ module Stash
       # @param date [Date] the date the new version was created
       # @param note [String, nil] the (optional) version note
       def initialize(number:, date:, note: nil)
+        fail ArgumentError, "specified version number does not appear to be an integer: #{number || 'nil'}" unless number.respond_to?(:to_i) && number.to_i == number
+        fail ArgumentError, "date does not appear to be a Date object: #{date || 'nil'}" unless date.respond_to?(:iso8601)
         self.version_number = number
         self.date = date
         self.note = note

data/spec/data/wrapper/wrapper-2.xml

@@ -16,8 +16,8 @@
         <st:embargo>
             <st:type>download</st:type>
             <st:period>1 year</st:period>
-            <st:start>2014-08-18Z</st:start>
-            <st:end>2013-08-18Z</st:end>
+            <st:start>2013-08-18Z</st:start>
+            <st:end>2014-08-18Z</st:end>
         </st:embargo>
         <st:inventory num_files="10">
             <st:file>

data/spec/unit/stash/wrapper/embargo_spec.rb

@@ -3,6 +3,83 @@ require 'spec_helper'
 module Stash
   module Wrapper
     describe Embargo do
+      describe '#initialize' do
+
+        attr_reader :params
+
+        before(:each) do
+          @params = {
+            type: EmbargoType::DOWNLOAD,
+            period: 'a year and a day',
+            start_date: Date.new(2015, 1, 1),
+            end_date: Date.new(2016, 1, 1)
+          }
+        end
+
+        it 'sets values from parameters' do
+          type = params[:type]
+          period = params[:period]
+          start_date = params[:start_date]
+          end_date = params[:end_date]
+          embargo = Embargo.new(params)
+          expect(embargo.type).to eq(type)
+          expect(embargo.period).to eq(period)
+          expect(embargo.start_date).to eq(start_date)
+          expect(embargo.end_date).to eq(end_date)
+        end
+
+        it 'rejects a nil type' do
+          params[:type] = nil
+          expect { Embargo.new(params) }.to raise_error(ArgumentError)
+        end
+
+        it 'rejects a string type' do
+          params[:type] = 'download'
+          expect { Embargo.new(params) }.to raise_error(ArgumentError)
+        end
+
+        it 'rejects a nil period' do
+          params[:period] = nil
+          expect { Embargo.new(params) }.to raise_error(ArgumentError)
+        end
+
+        it 'rejects an empty period' do
+          params[:period] = ''
+          expect { Embargo.new(params) }.to raise_error(ArgumentError)
+        end
+
+        it 'rejects a blank period' do
+          params[:period] = ' '
+          expect { Embargo.new(params) }.to raise_error(ArgumentError)
+        end
+
+        it 'rejects a nil start date' do
+          params[:start_date] = nil
+          expect { Embargo.new(params) }.to raise_error(ArgumentError)
+        end
+
+        it 'rejects a string start date' do
+          params[:start_date] = '2015-01-01'
+          expect { Embargo.new(params) }.to raise_error(ArgumentError)
+        end
+
+        it 'rejects a nil end date' do
+          params[:end_date] = nil
+          expect { Embargo.new(params) }.to raise_error(ArgumentError)
+        end
+
+        it 'rejects a string end date' do
+          params[:end_date] = '2016-01-01'
+          expect { Embargo.new(params) }.to raise_error(ArgumentError)
+        end
+
+        it 'rejects an invalid date range' do
+          params[:start_date] = Date.new(2016, 1, 1)
+          params[:end_date] = Date.new(2015, 12, 31)
+          expect { Embargo.new(params) }.to raise_error(RangeError)
+        end
+      end
+
       describe 'none' do
         it "returns a no-embargo #{Embargo}" do
           embargo = Embargo.none

data/spec/unit/stash/wrapper/identifier_spec.rb

@@ -0,0 +1,63 @@
+require 'spec_helper'
+
+module Stash
+  module Wrapper
+    describe Identifier do
+      describe '#initialize' do
+        attr_accessor :params
+
+        before(:each) do
+          @params = {
+            type: IdentifierType::DOI,
+            value: '10.14749/1407399498'
+          }
+        end
+
+        it 'sets fields from parameters' do
+          type = params[:type]
+          value = params[:value]
+          id = Identifier.new(params)
+          expect(id.type).to eq(type)
+          expect(id.value).to eq(value)
+        end
+
+        it 'requires a type' do
+          params.delete(:type)
+          expect { Identifier.new(params) }.to raise_error(ArgumentError)
+        end
+
+        it 'rejects a nil type' do
+          params[:type] = nil
+          expect { Identifier.new(params) }.to raise_error(ArgumentError)
+        end
+
+        it 'rejects a string type' do
+          params[:type] = 'ARK'
+          expect { Identifier.new(params) }.to raise_error(ArgumentError)
+        end
+
+        it 'requires a value' do
+          params.delete(:value)
+          expect { Identifier.new(params) }.to raise_error(ArgumentError)
+        end
+
+        it 'rejects a nil value' do
+          params[:value] = nil
+          expect { Identifier.new(params) }.to raise_error(ArgumentError)
+        end
+
+        it 'rejects an empty value' do
+          params[:value] = ''
+          expect { Identifier.new(params) }.to raise_error(ArgumentError)
+        end
+
+        it 'rejects a blank value' do
+          params[:value] = ' '
+          expect { Identifier.new(params) }.to raise_error(ArgumentError)
+        end
+
+      end
+    end
+
+  end
+end

data/spec/unit/stash/wrapper/inventory_spec.rb

@@ -0,0 +1,75 @@
+require 'spec_helper'
+
+module Stash
+  module Wrapper
+    describe Inventory do
+      describe '#initialize' do
+        attr_reader :params
+        before(:each) do
+          @params = {
+            files: [
+              StashFile.new(pathname: 'HSRC_MasterSampleII.dat', size_bytes: 12_345, mime_type: 'text/plain'),
+              StashFile.new(pathname: 'HSRC_MasterSampleII.csv', size_bytes: 67_890, mime_type: 'text/csv'),
+              StashFile.new(pathname: 'HSRC_MasterSampleII.sas7bdat', size_bytes: 123_456, mime_type: 'application/x-sas-data')
+            ]
+          }
+        end
+
+        it 'sets the file list' do
+          files = params[:files]
+          inv = Inventory.new(params)
+          expect(inv.files).to eq(files)
+        end
+
+        it 'sets the file count' do
+          files = params[:files]
+          inv = Inventory.new(params)
+          expect(inv.num_files).to eq(files.size)
+        end
+
+        it 'accepts an empty list' do
+          params[:files] = []
+          inv = Inventory.new(params)
+          expect(inv.files).to eq([])
+          expect(inv.num_files).to eq(0)
+        end
+
+        it 'rejects single files' do
+          params[:files] = params[:files][0]
+          expect { Inventory.new(params) }.to raise_error(ArgumentError)
+        end
+
+        it 'rejects strings' do
+          params[:files] = 'HSRC_MasterSampleII.dat'
+          expect { Inventory.new(params) }.to raise_error(ArgumentError)
+        end
+
+        it 'rejects File objects' do
+          File.new('spec/data/wrapper/wrapper-2-payload.xml') do |f|
+            params[:files] = f
+            expect { Inventory.new(params) }.to raise_error(ArgumentError)
+          end
+        end
+
+        it 'rejects arrays of strings' do
+          params[:files] = params[:files].map(&:pathname)
+          expect { Inventory.new(params) }.to raise_error(ArgumentError)
+        end
+
+        it 'rejects arrays of File objects' do
+          files = [
+            File.new('spec/data/wrapper/wrapper-1.xml'),
+            File.new('spec/data/wrapper/wrapper-1.xml')
+          ]
+          begin
+            params[:files] = files
+            expect { Inventory.new(params) }.to raise_error(ArgumentError)
+          ensure
+            files.each(&:close)
+          end
+        end
+
+      end
+    end
+  end
+end

data/spec/unit/stash/wrapper/license_spec.rb

@@ -0,0 +1,70 @@
+require 'spec_helper'
+
+module Stash
+  module Wrapper
+    describe License do
+      describe '#initialize' do
+
+        attr_reader :params
+
+        before(:each) do
+          @params = {
+            name: 'Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)',
+            uri: URI('http://creativecommons.org/licenses/by-sa/4.0/legalcode')
+          }
+        end
+
+        it 'sets attributes from parameters' do
+          name = params[:name]
+          uri = params[:uri]
+          lic = License.new(params)
+          expect(lic.name).to eq(name)
+          expect(lic.uri).to eq(uri)
+        end
+
+        it 'requires a name' do
+          params.delete(:name)
+          expect { License.new(params) }.to raise_error(ArgumentError)
+        end
+
+        it 'rejects a nil name' do
+          params[:name] = nil
+          expect { License.new(params) }.to raise_error(ArgumentError)
+        end
+
+        it 'rejects an empty name' do
+          params[:name] = ''
+          expect { License.new(params) }.to raise_error(ArgumentError)
+        end
+
+        it 'rejects a blank name' do
+          params[:name] = ' '
+          expect { License.new(params) }.to raise_error(ArgumentError)
+        end
+
+        it 'requires a uri' do
+          params.delete(:uri)
+          expect { License.new(params) }.to raise_error(ArgumentError)
+        end
+
+        it 'accepts a string URI' do
+          url = 'http://example.org/'
+          params[:uri] = url
+          lic = License.new(params)
+          expect(lic.uri).to eq(URI(url))
+        end
+
+        it 'rejects a nil uri' do
+          params[:uri] = nil
+          expect { License.new(params) }.to raise_error(ArgumentError)
+        end
+
+        it 'rejects an invalid uri' do
+          params[:uri] = 'I am not a URI'
+          expect { License.new(params) }.to raise_error(URI::InvalidURIError)
+        end
+
+      end
+    end
+  end
+end

data/spec/unit/stash/wrapper/size_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+module Stash
+  module Wrapper
+    describe Size do
+      describe '#initialize' do
+        attr_accessor :params
+
+        before(:each) do
+          @params = { bytes: 12_345 }
+        end
+
+        it 'sets fields from parameters' do
+          size = Size.new(params)
+          expect(size.size).to eq(12_345)
+          expect(size.unit).to eq(SizeUnit::BYTE)
+        end
+
+        it 'rejects a nil byte count' do
+          params.delete(:bytes)
+          expect { Size.new(params) }.to raise_error(ArgumentError)
+        end
+
+        it 'rejects a non-integer byte count' do
+          params[:bytes] = 1.1
+          expect { Size.new(params) }.to raise_error(ArgumentError)
+        end
+
+        it 'rejects a non-numeric byte count' do
+          params[:bytes] = '1'
+          expect { Size.new(params) }.to raise_error(ArgumentError)
+        end
+      end
+    end
+  end
+end

data/spec/unit/stash/wrapper/stash_administrative_spec.rb

@@ -3,16 +3,23 @@ require 'spec_helper'
 module Stash
   module Wrapper
     describe StashAdministrative do
+
+      attr_reader :params
+
+      before(:each) do
+        @params = {
+          version: Version.new(number: 1, date: Date.new(2013, 8, 18), note: 'Sample wrapped Datacite document'),
+          license: License::CC_BY,
+          inventory: Inventory.new(
+            files: [
+              StashFile.new(pathname: 'HSRC_MasterSampleII.dat', size_bytes: 12_345, mime_type: 'text/plain')
+            ])
+        }
+      end
+
       describe '#initialize' do
         it 'defaults to no embargo' do
-          admin = StashAdministrative.new(
-            version: Version.new(number: 1, date: Date.new(2013, 8, 18), note: 'Sample wrapped Datacite document'),
-            license: License::CC_BY,
-            inventory: Inventory.new(
-              files: [
-                StashFile.new(pathname: 'HSRC_MasterSampleII.dat', size_bytes: 12_345, mime_type: 'text/plain')
-              ])
-          )
+          admin = StashAdministrative.new(params)
           embargo = admin.embargo
           expect(embargo).to be_an(Embargo)
           expect(embargo.type).to eq(EmbargoType::NONE)
@@ -21,6 +28,29 @@ module Stash
           expect(embargo.start_date).to eq(today)
           expect(embargo.end_date).to eq(today)
         end
+
+        it 'requires a version' do
+          params.delete(:version)
+          expect { StashAdministrative.new(params) }.to raise_error(ArgumentError)
+        end
+
+        it 'requires a valid version' do
+          params[:version] = 1
+          expect { StashAdministrative.new(params) }.to raise_error(ArgumentError)
+
+          params[:version] = '1'
+          expect { StashAdministrative.new(params) }.to raise_error(ArgumentError)
+        end
+
+        it 'requires a license' do
+          params.delete(:license)
+          expect { StashAdministrative.new(params) }.to raise_error(ArgumentError)
+        end
+
+        it 'requires a valid license' do
+          params[:license] = 'CC-BY'
+          expect { StashAdministrative.new(params) }.to raise_error(ArgumentError)
+        end
       end
     end
   end

data/spec/unit/stash/wrapper/stash_file_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+module Stash
+  module Wrapper
+    describe StashFile do
+      describe '#initialize' do
+        attr_reader :params
+        before(:each) do
+          @params = {
+            pathname: 'foo.txt',
+            size_bytes: 12_345,
+            mime_type: 'text/plain'
+          }
+        end
+
+        it 'sets attributes from parameters'
+
+        it 'requires a pathname'
+        it 'rejects a nil pathname'
+        it 'rejects an empty pathname'
+        it 'rejects a blank pathname'
+
+        it 'requires size_bytes'
+        it 'rejects a nil size_bytes'
+        it 'rejects a non-integer size_bytes'
+        it 'rejects a non-numeric size_bytes'
+
+        it 'accepts a standard MIME type'
+        it 'accepts a non-standard MIME type'
+        it 'fails if mime_type isn\'t a MIME type'
+        it 'parses a nil mime-type as nil'
+      end
+    end
+  end
+end

data/spec/unit/stash/wrapper/stash_wrapper_spec.rb

@@ -109,6 +109,57 @@ module Stash
         end
       end
 
+      describe '#initialize' do
+
+        attr_reader :params
+
+        before(:each) do
+          @params = {
+            identifier: Identifier.new(type: IdentifierType::DOI, value: '10.14749/1407399498'),
+            version: Version.new(number: 1, date: Date.new(2013, 8, 18), note: 'Sample wrapped Datacite document'),
+            license: License::CC_BY,
+            inventory: Inventory.new(
+              files: [
+                StashFile.new(pathname: 'HSRC_MasterSampleII.dat', size_bytes: 12_345, mime_type: 'text/plain')
+              ]),
+            descriptive_elements: []
+          }
+        end
+
+        it 'requires an identifier' do
+          params.delete(:identifier)
+          expect { StashWrapper.new(params) }.to raise_error(ArgumentError)
+        end
+
+        it 'requires a valid identifier' do
+          params[:identifier] = 'doi:10.14749/1407399498'
+          expect { StashWrapper.new(params) }.to raise_error(ArgumentError)
+        end
+
+        it 'requires a version' do
+          params.delete(:version)
+          expect { StashWrapper.new(params) }.to raise_error(ArgumentError)
+        end
+
+        it 'requires a valid version' do
+          params[:version] = 1
+          expect { StashWrapper.new(params) }.to raise_error(ArgumentError)
+
+          params[:version] = '1'
+          expect { StashWrapper.new(params) }.to raise_error(ArgumentError)
+        end
+
+        it 'requires a license' do
+          params.delete(:license)
+          expect { StashWrapper.new(params) }.to raise_error(ArgumentError)
+        end
+
+        it 'requires a valid license' do
+          params[:license] = 'CC-BY'
+          expect { StashWrapper.new(params) }.to raise_error(ArgumentError)
+        end
+      end
+
       describe 'convenience accessors' do
         it 'evades the law of Demeter' do
           data = File.read('spec/data/wrapper/wrapper-1.xml')
@@ -193,7 +244,7 @@ module Stash
               identifier: Identifier.new(type: IdentifierType::DOI, value: '10.14749/1407399498'),
               version: Version.new(number: 1, date: Date.new(2013, 8, 18), note: 'Sample wrapped Datacite document'),
               license: License::CC_BY,
-              embargo: Embargo.new(type: EmbargoType::DOWNLOAD, period: '1 year', start_date: Date.new(2014, 8, 18), end_date: Date.new(2013, 8, 18)),
+              embargo: Embargo.new(type: EmbargoType::DOWNLOAD, period: '1 year', start_date: Date.new(2013, 8, 18), end_date: Date.new(2014, 8, 18)),
               inventory: Inventory.new(
                 files: [
                   StashFile.new(pathname: 'HSRC_MasterSampleII.dat', size_bytes: 12_345, mime_type: 'text/plain')
@@ -252,7 +303,7 @@ module Stash
             identifier: Identifier.new(type: IdentifierType::DOI, value: '10.14749/1407399498'),
             version: Version.new(number: 1, date: Date.new(2013, 8, 18), note: 'Sample wrapped Datacite document'),
             license: License::CC_BY,
-            embargo: Embargo.new(type: EmbargoType::DOWNLOAD, period: '1 year', start_date: Date.new(2014, 8, 18), end_date: Date.new(2013, 8, 18)),
+            embargo: Embargo.new(type: EmbargoType::DOWNLOAD, period: '1 year', start_date: Date.new(2013, 8, 18), end_date: Date.new(2014, 8, 18)),
             inventory: Inventory.new(
               files: [
                 StashFile.new(pathname: 'HSRC_MasterSampleII.dat', size_bytes: 12_345, mime_type: 'text/plain'),

data/spec/unit/stash/wrapper/version_spec.rb

@@ -0,0 +1,68 @@
+require 'spec_helper'
+
+module Stash
+  module Wrapper
+    describe Version do
+      describe '#initialize' do
+        attr_reader :params
+
+        before(:each) do
+          @params = {
+            number: 1,
+            date: Date.today,
+            note: 'I am a note'
+          }
+        end
+
+        it 'sets fields from arguments' do
+          number = params[:number]
+          date = params[:date]
+          note = params[:note]
+          version = Version.new(params)
+          expect(version.version_number).to eq(number)
+          expect(version.date).to eq(date)
+          expect(version.note).to eq(note)
+        end
+
+        it 'accepts a nil note' do
+          params.delete(:note)
+          version = Version.new(params)
+          expect(version.note).to be_nil
+
+          params[:note] = nil
+          version = Version.new(params)
+          expect(version.note).to be_nil
+        end
+
+        it 'accepts a DateTime as the date' do
+          date = DateTime.new(2001, 2, 3, 4, 5, 6)
+          params[:date] = date
+          version = Version.new(params)
+          expect(version.date).to eq(date)
+          xml = version.write_xml
+          expect(xml).to include('<date>2001-02-03Z</date>')
+        end
+
+        it 'rejects a nil number' do
+          params.delete(:number)
+          expect { Version.new(params) }.to raise_error(ArgumentError)
+        end
+
+        it 'rejects a non-integer number' do
+          params[:number] = 1.1
+          expect { Version.new(params) }.to raise_error(ArgumentError)
+        end
+
+        it 'rejects a non-numeric number' do
+          params[:number] = '1'
+          expect { Version.new(params) }.to raise_error(ArgumentError)
+        end
+
+        it 'rejects a non-date or -datetime' do
+          params[:date] = '2016-06-01'
+          expect { Version.new(params) }.to raise_error(ArgumentError)
+        end
+      end
+    end
+  end
+end

data/stash-wrapper.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
 
   origin = `git config --get remote.origin.url`.chomp
-  origin_uri = origin.start_with?('http') ? URI(origin) : URI(origin.sub('git@github.com:', 'https://github.com/'))
+  origin_uri = origin.start_with?('http') ? URI(origin) : URI(origin.gsub(%r{git@([^:]+)(.com|.org)[^\/]+}, 'http://\1\2'))
   spec.homepage = URI::HTTP.build(host: origin_uri.host, path: origin_uri.path.chomp('.git')).to_s
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -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.4', '>= 0.4.1'
+  spec.add_dependency 'xml-mapping_extensions', '~> 0.4', '>= 0.4.2'
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'equivalent-xml', '~> 0.6.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stash-wrapper
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - David Moles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-18 00:00:00.000000000 Z
+date: 2016-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typesafe_enum
@@ -39,7 +39,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -206,10 +206,16 @@ files:
 - spec/rspec_custom_matchers.rb
 - spec/spec_helper.rb
 - spec/unit/stash/wrapper/embargo_spec.rb
+- spec/unit/stash/wrapper/identifier_spec.rb
+- spec/unit/stash/wrapper/inventory_spec.rb
+- spec/unit/stash/wrapper/license_spec.rb
+- spec/unit/stash/wrapper/size_spec.rb
 - spec/unit/stash/wrapper/stash_administrative_spec.rb
+- spec/unit/stash/wrapper/stash_file_spec.rb
 - spec/unit/stash/wrapper/stash_wrapper_spec.rb
+- spec/unit/stash/wrapper/version_spec.rb
 - stash-wrapper.gemspec
-homepage: http://github.com/CDLUC3/stash-wrapper
+homepage: http://github.com/stash-wrapper
 licenses:
 - MIT
 metadata: {}
@@ -244,6 +250,12 @@ test_files:
 - spec/rspec_custom_matchers.rb
 - spec/spec_helper.rb
 - spec/unit/stash/wrapper/embargo_spec.rb
+- spec/unit/stash/wrapper/identifier_spec.rb
+- spec/unit/stash/wrapper/inventory_spec.rb
+- spec/unit/stash/wrapper/license_spec.rb
+- spec/unit/stash/wrapper/size_spec.rb
 - spec/unit/stash/wrapper/stash_administrative_spec.rb
+- spec/unit/stash/wrapper/stash_file_spec.rb
 - spec/unit/stash/wrapper/stash_wrapper_spec.rb
+- spec/unit/stash/wrapper/version_spec.rb
 has_rdoc: