stash-merritt 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46447b0a05d80b4e82864971bc91aba395e786ea
-  data.tar.gz: 0b191749296cf778f3fad1908b95a0cd13a6b93c
+  metadata.gz: 5a9f21e983f6370ae339bdcfadca7601534a8787
+  data.tar.gz: 25c675e53a7874c8b1f3f38044081239fccded2a
 SHA512:
-  metadata.gz: 5adf6893eeaa38f0ddaab555002bb521d3654d733053a1a71235a5f9b5dacf7103d03c44118d737942bb970e985eb72183b0681e6d852a09ccd08bdf0ba182fc
-  data.tar.gz: 4d38f341c4495e1394b549483582978c745d99d5b869dfdd75898163a795f9eda5890a5d4ddf697ddcbd762e1bd1ca004e5099caeb88f4a961d23a67c8aea29e
+  metadata.gz: 5a8ebb8cea13816dc6f7e8bbfdccd0ec6aec5514d4a42bb713cca6241bb8b73f1fe781b92868493415c0a6a22403269916e90429823f9ed9551d16b97e2e8d76
+  data.tar.gz: cd6adbe992b4d4a4d7b344544d977d1f769f4cba981323fa5830e8f51965da691f12c647084440ca046d629555755a89209628ea2eb6b9af925f2f80d219e174

data/CHANGES.md

@@ -0,0 +1,16 @@
+## 0.2.0 (6 April 2017)
+
+- add support for embargoes in `stash-wrapper.xml` and `mrt-embargo.txt`
+- update to reflect new DB schema with StashEngine::Author replacing
+  StashDatacite::Creator
+
+## 0.1.1 (23 February 2017)
+
+- fix issue where uploads from previous versions would be re-added to zipfiles
+  for later versions
+- fix issue where missing file uploads would not be logged / reported correctly
+  due to incorrect initialization of ArgumentError
+
+## 0.1.0 (3 February 2017)
+
+- initial release

data/lib/datacite/mapping/datacite_xml_factory.rb

@@ -27,10 +27,10 @@ module Datacite
 
         dcs_resource = Resource.new(
           identifier: Identifier.from_doi(doi_value),
-          creators: se_resource.creators.map do |c|
+          creators: se_resource.authors.map do |c|
             Creator.new(
-              name: c.creator_full_name,
-              identifier: to_dcs_identifier(c.name_identifier),
+              name: c.author_full_name,
+              identifier: dcs_identifier_from(c.author_orcid),
               affiliations: c.affiliations.map(&:smart_name)
             )
           end,
@@ -184,6 +184,15 @@ module Datacite
         Description.new(type: DescriptionType::OTHER, value: desc_text)
       end
 
+      def dcs_identifier_from(author_orcid)
+        return unless author_orcid && !author_orcid.empty?
+        NameIdentifier.new(
+          scheme: 'ORCID',
+          scheme_uri: 'http://orcid.org/',
+          value: author_orcid
+        )
+      end
+
       def to_dcs_identifier(sd_name_ident)
         return unless sd_name_ident
         sd_scheme_uri = sd_name_ident.scheme_URI

data/lib/stash/merritt/module_info.rb

@@ -4,7 +4,7 @@ module Stash
     NAME = 'stash-merritt'.freeze
 
     # The version of this gem
-    VERSION = '0.1.1'.freeze
+    VERSION = '0.2.0'.freeze
 
     # The copyright notice for this gem
     COPYRIGHT = 'Copyright (c) 2017 The Regents of the University of California'.freeze

data/lib/stash/merritt/submission_package.rb

@@ -9,6 +9,7 @@ require 'stash/merritt/submission_package/merritt_datacite_builder'
 require 'stash/merritt/submission_package/merritt_delete_builder'
 require 'stash/merritt/submission_package/merritt_oaidc_builder'
 require 'stash/merritt/submission_package/stash_wrapper_builder'
+require 'stash/merritt/submission_package/merritt_embargo_builder'
 
 module Stash
   module Merritt
@@ -67,13 +68,14 @@ module Stash
         zipfile.add(upload.upload_file_name, path)
       end
 
-      def builders
+      def builders # rubocop:disable Metrics/AbcSize
         @builders ||= [
-          StashWrapperBuilder.new(dcs_resource: dc4_resource, version_number: version_number, uploads: uploads),
+          StashWrapperBuilder.new(dcs_resource: dc4_resource, version_number: version_number, uploads: uploads, embargo_end_date: embargo_end_date),
           MerrittDataciteBuilder.new(datacite_xml_factory),
           MerrittOAIDCBuilder.new(resource_id: resource_id),
           DataONEManifestBuilder.new(uploads),
-          MerrittDeleteBuilder.new(resource_id: resource_id)
+          MerrittDeleteBuilder.new(resource_id: resource_id),
+          MerrittEmbargoBuilder.new(embargo_end_date: embargo_end_date)
         ]
       end
 
@@ -89,6 +91,10 @@ module Stash
         resource.current_file_uploads
       end
 
+      def embargo_end_date
+        @embargo_end_date ||= (embargo = resource.embargo) && embargo.end_date
+      end
+
       def new_uploads
         resource.new_file_uploads
       end

data/lib/stash/merritt/submission_package/merritt_embargo_builder.rb

@@ -0,0 +1,21 @@
+require 'stash/repo/file_builder'
+
+module Stash
+  module Merritt
+    class SubmissionPackage
+      class MerrittEmbargoBuilder < Stash::Repo::FileBuilder
+        attr_reader :embargo_end_date
+
+        def initialize(embargo_end_date:)
+          super(file_name: 'mrt-embargo.txt')
+          @embargo_end_date = embargo_end_date
+        end
+
+        def contents
+          end_date_str = (embargo_end_date && embargo_end_date.iso8601)
+          "embargoEndDate:#{end_date_str || 'none'}"
+        end
+      end
+    end
+  end
+end

data/lib/stash/merritt/submission_package/merritt_oaidc_builder.rb

@@ -55,7 +55,7 @@ module Stash
         end
 
         def add_creators(xml)
-          resource.creators.each { |c| xml.send(:'dc:creator', c.creator_full_name.delete("\r").to_s) }
+          resource.authors.each { |c| xml.send(:'dc:creator', c.author_full_name.delete("\r").to_s) }
         end
 
         def add_pub_year(xml)

data/lib/stash/merritt/submission_package/stash_wrapper_builder.rb

@@ -9,26 +9,48 @@ module Stash
         attr_reader :dcs_resource
         attr_reader :uploads
         attr_reader :version_number
+        attr_reader :embargo_end_date
 
-        def initialize(dcs_resource:, version_number:, uploads:)
+        def initialize(dcs_resource:, version_number:, uploads:, embargo_end_date:)
           super(file_name: 'stash-wrapper.xml')
           @dcs_resource = dcs_resource
           @version_number = version_number
           @uploads = uploads
+          @embargo_end_date = date_or_nil(embargo_end_date)
         end
 
-        def contents
+        def contents # rubocop:disable Metrics/AbcSize
           StashWrapper.new(
             identifier: to_sw_identifier(dcs_resource.identifier),
             version: Version.new(number: version_number, date: Date.today),
             license: to_sw_license(dcs_resource.rights_list),
             inventory: to_sw_inventory(uploads),
-            descriptive_elements: [dcs_resource.save_to_xml]
+            descriptive_elements: [dcs_resource.save_to_xml],
+            embargo: to_sw_embargo(embargo_end_date)
           ).write_xml
         end
 
         private
 
+        def date_or_nil(embargo_end_date)
+          return unless embargo_end_date
+          return embargo_end_date if embargo_end_date.is_a?(Date)
+          return embargo_end_date.utc.to_date if embargo_end_date.respond_to?(:utc)
+          raise ArgumentError, "Specified end date #{embargo_end_date} does not appear to be a date or time"
+        end
+
+        def to_sw_embargo(embargo_end_date)
+          return unless embargo_end_date
+          start_date = default_start_date(embargo_end_date)
+          Embargo.new(type: EmbargoType::DOWNLOAD, period: EmbargoType::NONE.value, start_date: start_date, end_date: embargo_end_date)
+        end
+
+        def default_start_date(embargo_end_date)
+          start_date = Date.today
+          return start_date if start_date < embargo_end_date
+          embargo_end_date
+        end
+
         def to_sw_identifier(dcs_identifier)
           return unless dcs_identifier
           raise "Invalid identifier type; expected DOI, was #{dcs_identifier.identifier_type}" unless dcs_identifier.identifier_type == 'DOI'

data/spec/db/stash/merritt/stash_wrapper_builder_spec.rb

@@ -0,0 +1,122 @@
+require 'db_spec_helper'
+
+module Stash
+  module Merritt
+    class SubmissionPackage
+      describe StashWrapperBuilder do
+        attr_reader :dc4_resource
+
+        before(:each) do
+          tmp_wrapper_xml = File.read('spec/data/archive/stash-wrapper.xml')
+          tmp_wrapper = Stash::Wrapper::StashWrapper.parse_xml(tmp_wrapper_xml)
+          dc4_xml = tmp_wrapper.stash_descriptive[0]
+          @dc4_resource = Datacite::Mapping::Resource.parse_xml(dc4_xml)
+        end
+
+        describe 'embargo' do
+          it 'defaults to NONE' do
+            builder = StashWrapperBuilder.new(
+              dcs_resource: dc4_resource,
+              version_number: 1,
+              uploads: [],
+              embargo_end_date: nil
+            )
+            wrapper_xml = builder.contents
+            wrapper = Stash::Wrapper::StashWrapper.parse_xml(wrapper_xml)
+            embargo = wrapper.embargo
+
+            none = Stash::Wrapper::Embargo.none
+            [:type, :period, :start_date, :end_date].each do |field|
+              expect(embargo.send(field)).to eq(none.send(field))
+            end
+          end
+
+          it 'accepts an end date' do
+            embargo_end_date = Date.new(1952, 2, 6)
+
+            builder = StashWrapperBuilder.new(
+              dcs_resource: dc4_resource,
+              version_number: 1,
+              uploads: [],
+              embargo_end_date: embargo_end_date
+            )
+            wrapper_xml = builder.contents
+            wrapper = Stash::Wrapper::StashWrapper.parse_xml(wrapper_xml)
+            embargo = wrapper.embargo
+
+            expect(embargo.type).to eq(Stash::Wrapper::EmbargoType::DOWNLOAD)
+            expect(embargo.end_date).to eq(embargo_end_date)
+            expect(embargo.start_date).to be <= embargo.end_date
+          end
+
+          it 'accepts a non-UTC end date' do
+            embargo_end_date = Date.new(2122, 2, 6)
+
+            builder = StashWrapperBuilder.new(
+              dcs_resource: dc4_resource,
+              version_number: 1,
+              uploads: [],
+              embargo_end_date: embargo_end_date
+            )
+            wrapper_xml = builder.contents
+            wrapper = Stash::Wrapper::StashWrapper.parse_xml(wrapper_xml)
+            embargo = wrapper.embargo
+
+            expect(embargo.type).to eq(Stash::Wrapper::EmbargoType::DOWNLOAD)
+            expect(embargo.end_date).to eq(embargo_end_date)
+            expect(embargo.start_date).to be <= embargo.end_date
+          end
+
+          it 'accepts a UTC time' do
+            embargo_end_time = Time.now.utc
+            expected_end_date = embargo_end_time.to_date
+
+            builder = StashWrapperBuilder.new(
+              dcs_resource: dc4_resource,
+              version_number: 1,
+              uploads: [],
+              embargo_end_date: embargo_end_time
+            )
+            wrapper_xml = builder.contents
+            wrapper = Stash::Wrapper::StashWrapper.parse_xml(wrapper_xml)
+            embargo = wrapper.embargo
+
+            expect(embargo.type).to eq(Stash::Wrapper::EmbargoType::DOWNLOAD)
+            expect(embargo.end_date).to eq(expected_end_date)
+            expect(embargo.start_date).to be <= embargo.end_date
+          end
+
+          it 'converts a non-UTC time to UTC date' do
+            embargo_end_time = Time.new(2020, 1, 1, 0, 0, 1, '+12:45')
+            expected_end_date = Date.new(2019, 12, 31)
+
+            builder = StashWrapperBuilder.new(
+              dcs_resource: dc4_resource,
+              version_number: 1,
+              uploads: [],
+              embargo_end_date: embargo_end_time
+            )
+            wrapper_xml = builder.contents
+            wrapper = Stash::Wrapper::StashWrapper.parse_xml(wrapper_xml)
+            embargo = wrapper.embargo
+
+            expect(embargo.type).to eq(Stash::Wrapper::EmbargoType::DOWNLOAD)
+            expect(embargo.end_date).to eq(expected_end_date)
+            expect(embargo.start_date).to be <= embargo.end_date
+          end
+
+          it 'rejects a non-date' do
+            expect do
+              StashWrapperBuilder.new(
+                dcs_resource: dc4_resource,
+                version_number: 1,
+                uploads: [],
+                embargo_end_date: Time.now.xmlschema
+              )
+            end.to raise_error(ArgumentError)
+          end
+        end
+      end
+    end
+  end
+end

data/spec/db/stash/merritt/submission_package_spec.rb

@@ -120,7 +120,7 @@ module Stash
           end
         end
 
-        it 'includes a delete list' do
+        it 'includes a delete list if needed' do
           deleted = []
           resource.file_uploads.each_with_index do |upload, index|
             next unless index.even?
@@ -136,6 +136,24 @@ module Stash
             expect(mrt_delete).to include(filename)
           end
         end
+
+        describe 'mrt-embargo.txt' do
+          it 'includes the embargo end date if present' do
+            end_date = Time.new(2020, 1, 1, 0, 0, 1, '+12:45')
+            resource.embargo = StashEngine::Embargo.new(end_date: end_date)
+            package = SubmissionPackage.new(resource: resource)
+            @zipfile_path = package.zipfile
+            mrt_embargo = zip_entry('mrt-embargo.txt')
+            expect(mrt_embargo.strip).to eq('embargoEndDate:2019-12-31T11:15:01Z')
+          end
+
+          it 'sets end date to none if no end date present' do
+            package = SubmissionPackage.new(resource: resource)
+            @zipfile_path = package.zipfile
+            mrt_embargo = zip_entry('mrt-embargo.txt')
+            expect(mrt_embargo.strip).to eq('embargoEndDate:none')
+          end
+        end
       end
 
       describe :dc3_xml do

data/spec/spec_helper.rb

@@ -43,6 +43,7 @@ ENV['RAILS_ENV'] = 'test'
 
 stash_engine_path = Gem::Specification.find_by_name('stash_engine').gem_dir
 require "#{stash_engine_path}/config/initializers/hash_to_ostruct.rb"
+require "#{stash_engine_path}/config/initializers/inflections.rb"
 
 require 'stash_engine'
 
@@ -56,6 +57,8 @@ require 'stash_engine'
   Dir.glob("#{stash_engine_path}/#{dir}/**/*.rb").sort.each(&method(:require))
 end
 
+$LOAD_PATH.unshift("#{stash_engine_path}/app/models")
+
 # ------------------------------------------------------------
 # StashDatacite
 
@@ -75,8 +78,8 @@ stash_datacite_path = Gem::Specification.find_by_name('stash_datacite').gem_dir
 ).each do |dir|
   Dir.glob("#{stash_datacite_path}/#{dir}/**/*.rb").sort.each(&method(:require))
 end
-
 StashDatacite::ResourcePatch.associate_with_resource(StashEngine::Resource)
+require "#{stash_datacite_path}/config/initializers/patches.rb"
 
 require 'util/resource_builder'
 

data/spec/util/resource_builder.rb

@@ -1,8 +1,10 @@
+require 'db_spec_helper'
+
 require 'datacite/mapping'
 require 'stash/wrapper'
 require 'time'
 
-# TODO: Get rid of this and use FactoryGirl or something
+# Borrowed from stash_migrator
 module StashDatacite
   class ResourceBuilder # rubocop:disable Metrics/ClassLength
     DESCRIPTION_TYPE = Datacite::Mapping::DescriptionType
@@ -28,7 +30,7 @@ module StashDatacite
     def self.stash_files(stash_files)
       return stash_files if stash_files.all? do |file|
         file.is_a?(Stash::Wrapper::StashFile) ||
-        file.to_s =~ /InstanceDouble\(Stash::Wrapper::StashFile\)/ # For RSpec tests
+          file.to_s =~ /InstanceDouble\(Stash::Wrapper::StashFile\)/ # For RSpec tests
       end
       raise ArgumentError, "stash_files does not appear to be an array of Stash::Wrapper::StashFile objects: #{stash_files || 'nil'}"
     end
@@ -50,7 +52,7 @@ module StashDatacite
     def populate_se_resource! # rubocop:disable Metrics/AbcSize
       set_sd_identifier(dcs_resource.identifier)
       stash_files.each { |stash_file| add_stash_file(stash_file) }
-      dcs_resource.creators.each { |dcs_creator| add_sd_creator(dcs_creator) }
+      dcs_resource.creators.each { |dcs_creator| add_se_author(dcs_creator) }
       dcs_resource.titles.each { |dcs_title| add_sd_title(dcs_title) }
       set_sd_publisher(dcs_resource.publisher)
       set_sd_pubyear(dcs_resource.publication_year)
@@ -91,16 +93,17 @@ module StashDatacite
       )
     end
 
-    def add_sd_creator(dcs_creator)
+    def add_se_author(dcs_creator)
       last_name, first_name = extract_last_first(dcs_creator.name)
-      sd_creator = Creator.create(
-        creator_first_name: first_name,
-        creator_last_name: last_name,
-        name_identifier_id: sd_name_identifier_id_for(dcs_creator.identifier),
+      se_author = StashEngine::Author.create(
+        author_first_name: first_name,
+        author_last_name: last_name,
+        author_email: email_from(dcs_creator.identifier),
+        author_orcid: orcid_from(dcs_creator.identifier),
         resource_id: se_resource_id
       )
-      sd_creator.affiliation_ids = dcs_creator.affiliations.map { |affiliation_str| sd_affiliation_id_for(affiliation_str) }
-      sd_creator
+      se_author.affiliation_ids = dcs_creator.affiliations.map { |affiliation_str| sd_affiliation_id_for(affiliation_str) }
+      se_author
     end
 
     def add_sd_title(dcs_title)
@@ -308,6 +311,22 @@ module StashDatacite
       StashDatacite::Affiliation.create(long_name: affiliation_str).id unless affiliation_str.blank?
     end
 
+    def email_from(dcs_name_identifier)
+      return unless dcs_name_identifier
+      return unless 'email' == dcs_name_identifier.scheme
+      value = dcs_name_identifier.value
+      return unless value
+      value.to_s.strip.sub('mailto:', '')
+    end
+
+    def orcid_from(dcs_name_identifier)
+      return unless dcs_name_identifier
+      return unless 'ORCID' == dcs_name_identifier.scheme
+      value = dcs_name_identifier.value
+      return unless value
+      value.to_s.strip
+    end
+
     def sd_name_identifier_id_for(dcs_name_identifier)
       return nil unless dcs_name_identifier
       scheme_uri = dcs_name_identifier.scheme_uri

data/stash-merritt.iml

@@ -7,29 +7,6 @@
     <content url="file://$MODULE_DIR$/../stash_engines/stash_engine" />
     <orderEntry type="jdk" jdkName="ruby-2.2.5-p319" jdkType="RUBY_SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library">
-      <library name="stash_datacite (v0.0.5) [path][gem]">
-        <CLASSES>
-          <root url="file://$MODULE_DIR$/../stash_engines/stash_datacite/db" />
-          <root url="file://$MODULE_DIR$/../stash_engines/stash_datacite/app" />
-          <root url="file://$MODULE_DIR$/../stash_engines/stash_datacite/bin" />
-          <root url="file://$MODULE_DIR$/../stash_engines/stash_datacite/lib" />
-          <root url="file://$MODULE_DIR$/../stash_engines/stash_datacite/tmp" />
-          <root url="file://$MODULE_DIR$/../stash_engines/stash_datacite/config" />
-          <root url="file://$MODULE_DIR$/../stash_engines/stash_datacite/coverage" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$MODULE_DIR$/../stash_engines/stash_datacite/db" />
-          <root url="file://$MODULE_DIR$/../stash_engines/stash_datacite/app" />
-          <root url="file://$MODULE_DIR$/../stash_engines/stash_datacite/bin" />
-          <root url="file://$MODULE_DIR$/../stash_engines/stash_datacite/lib" />
-          <root url="file://$MODULE_DIR$/../stash_engines/stash_datacite/tmp" />
-          <root url="file://$MODULE_DIR$/../stash_engines/stash_datacite/config" />
-          <root url="file://$MODULE_DIR$/../stash_engines/stash_datacite/coverage" />
-        </SOURCES>
-      </library>
-    </orderEntry>
     <orderEntry type="library" scope="PROVIDED" name="actionmailer (v4.2.7.1, ruby-2.2.5-p319) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="actionpack (v4.2.7.1, ruby-2.2.5-p319) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="actionview (v4.2.7.1, ruby-2.2.5-p319) [gem]" level="application" />
@@ -42,7 +19,7 @@
     <orderEntry type="library" scope="PROVIDED" name="arel (v6.0.4, ruby-2.2.5-p319) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="ast (v2.3.0, ruby-2.2.5-p319) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="builder (v3.2.3, ruby-2.2.5-p319) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.14.3, ruby-2.2.5-p319) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.14.6, ruby-2.2.5-p319) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="carrierwave (v0.10.0, ruby-2.2.5-p319) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="colorize (v0.8.1, ruby-2.2.5-p319) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="concurrent-ruby (v1.0.4, ruby-2.2.5-p319) [gem]" level="application" />
@@ -50,13 +27,13 @@
     <orderEntry type="library" scope="PROVIDED" name="database_cleaner (v1.5.3, ruby-2.2.5-p319) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="datacite-mapping (v0.2.5, ruby-2.2.5-p319) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.3, ruby-2.2.5-p319) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="diffy (v3.1.0, ruby-2.2.5-p319) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="diffy (v3.2.0, ruby-2.2.5-p319) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="docile (v1.1.5, ruby-2.2.5-p319) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="domain_name (v0.5.20161129, ruby-2.2.5-p319) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="domain_name (v0.5.20170223, ruby-2.2.5-p319) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="equivalent-xml (v0.6.0, ruby-2.2.5-p319) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="erubis (v2.7.0, ruby-2.2.5-p319) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="ezid-client (v1.5.0, ruby-2.2.5-p319) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="faraday (v0.10.1, ruby-2.2.5-p319) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="faraday (v0.11.0, ruby-2.2.5-p319) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="filesize (v0.1.1, ruby-2.2.5-p319) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="font-awesome-rails (v4.7.0.1, ruby-2.2.5-p319) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="globalid (v0.3.7, ruby-2.2.5-p319) [gem]" level="application" />
@@ -64,6 +41,7 @@
     <orderEntry type="library" scope="PROVIDED" name="hashie (v3.5.1, ruby-2.2.5-p319) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="hirb (v0.7.3, ruby-2.2.5-p319) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="http-cookie (v1.0.3, ruby-2.2.5-p319) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="httpclient (v2.8.3, ruby-2.2.5-p319) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="i18n (v0.8.0, ruby-2.2.5-p319) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="jquery-fileupload-rails (v0.4.7, ruby-2.2.5-p319) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="jquery-rails (v4.2.2, ruby-2.2.5-p319) [gem]" level="application" />
@@ -87,7 +65,7 @@
     <orderEntry type="library" scope="PROVIDED" name="mysql2 (v0.4.5, ruby-2.2.5-p319) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="netrc (v0.11.0, ruby-2.2.5-p319) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="nokogiri (v1.7.0.1, ruby-2.2.5-p319) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="oauth2 (v1.3.0, ruby-2.2.5-p319) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="oauth2 (v1.3.1, ruby-2.2.5-p319) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="omniauth (v1.2.2, ruby-2.2.5-p319) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="omniauth-google-oauth2 (v0.2.10, ruby-2.2.5-p319) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="omniauth-oauth2 (v1.3.1, ruby-2.2.5-p319) [gem]" level="application" />
@@ -113,7 +91,7 @@
     <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.5.0, ruby-2.2.5-p319) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.5.0, ruby-2.2.5-p319) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.5.0, ruby-2.2.5-p319) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rubocop (v0.47.1, ruby-2.2.5-p319) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rubocop (v0.48.1, ruby-2.2.5-p319) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="ruby-progressbar (v1.8.1, ruby-2.2.5-p319) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rubyzip (v1.2.1, ruby-2.2.5-p319) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="safe_yaml (v1.0.4, ruby-2.2.5-p319) [gem]" level="application" />
@@ -123,7 +101,7 @@
     <orderEntry type="library" scope="PROVIDED" name="simplecov-html (v0.9.0, ruby-2.2.5-p319) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="sprockets (v3.7.1, ruby-2.2.5-p319) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="sprockets-rails (v3.2.0, ruby-2.2.5-p319) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="stash-sword (v0.1.5, ruby-2.2.5-p319) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="stash-sword (v0.1.6, ruby-2.2.5-p319) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="stash-wrapper (v0.1.11.1, ruby-2.2.5-p319) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="stash_ezid_datacite (v0.1.5, ruby-2.2.5-p319) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="thor (v0.19.4, ruby-2.2.5-p319) [gem]" level="application" />
@@ -141,6 +119,7 @@
     <orderEntry type="library" scope="PROVIDED" name="xml-mapping (v0.10.0, ruby-2.2.5-p319) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="xml-mapping_extensions (v0.4.7, ruby-2.2.5-p319) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="yard (v0.9.8, ruby-2.2.5-p319) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="zeroclipboard-rails (v0.1.2, ruby-2.2.5-p319) [gem]" level="application" />
   </component>
   <component name="RModuleSettingsStorage">
     <LOAD_PATH number="2" string0="$MODULE_DIR$/lib" string1="$MODULE_DIR$/spec" />

data/stash-merritt.ipr

@@ -52,10 +52,7 @@
   <component name="InspectionProjectProfileManager">
     <profile version="1.0">
       <option name="myName" value="Project Default" />
-      <inspection_tool class="LoggerInitializedWithForeignClass" enabled="false" level="WARNING" enabled_by_default="false">
-        <option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger" />
-        <option name="loggerFactoryMethodName" value="getLogger,getLogger,getLog,getLogger" />
-      </inspection_tool>
+      <inspection_tool class="Rubocop" enabled="false" level="WARNING" enabled_by_default="false" />
       <inspection_tool class="RubyClassVariableUsageInspection" enabled="false" level="WARNING" enabled_by_default="false" />
       <inspection_tool class="RubyQuotedStringsInspection" enabled="true" level="WARNING" enabled_by_default="true" />
       <inspection_tool class="RubyResolve" enabled="true" level="WEAK WARNING" enabled_by_default="true">

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stash-merritt
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - David Moles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-23 00:00:00.000000000 Z
+date: 2017-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -245,6 +245,7 @@ files:
 - ".rubocop.yml"
 - ".ruby-version"
 - ".travis.yml"
+- CHANGES.md
 - Gemfile
 - LICENSE.md
 - README.md
@@ -260,6 +261,7 @@ files:
 - lib/stash/merritt/submission_package/data_one_manifest_builder.rb
 - lib/stash/merritt/submission_package/merritt_datacite_builder.rb
 - lib/stash/merritt/submission_package/merritt_delete_builder.rb
+- lib/stash/merritt/submission_package/merritt_embargo_builder.rb
 - lib/stash/merritt/submission_package/merritt_oaidc_builder.rb
 - lib/stash/merritt/submission_package/stash_wrapper_builder.rb
 - lib/stash/merritt/sword_helper.rb
@@ -275,6 +277,7 @@ files:
 - spec/data/dc4-with-funding-references.xml
 - spec/db/datacite/mapping/datacite_xml_factory_spec.rb
 - spec/db/stash/merritt/merritt_oaidc_builder_spec.rb
+- spec/db/stash/merritt/stash_wrapper_builder_spec.rb
 - spec/db/stash/merritt/submission_package_spec.rb
 - spec/db/stash/merritt/sword_helper_spec.rb
 - spec/db_spec_helper.rb
@@ -288,7 +291,7 @@ files:
 - stash-merritt.iml
 - stash-merritt.ipr
 - travis-local-deps.sh
-homepage: http://github.com/CDLUC3/stash-merritt
+homepage: http://github.com/stash-merritt
 licenses:
 - MIT
 metadata: {}
@@ -325,6 +328,7 @@ test_files:
 - spec/data/dc4-with-funding-references.xml
 - spec/db/datacite/mapping/datacite_xml_factory_spec.rb
 - spec/db/stash/merritt/merritt_oaidc_builder_spec.rb
+- spec/db/stash/merritt/stash_wrapper_builder_spec.rb
 - spec/db/stash/merritt/submission_package_spec.rb
 - spec/db/stash/merritt/sword_helper_spec.rb
 - spec/db_spec_helper.rb