stash-merritt 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf3299ac7ab5dfacd5f34d68f94f58985126cc1a
-  data.tar.gz: 199ad43c3ff3149474c5fa96096afa9b7aac6715
+  metadata.gz: f0929e76df292579509bd760cc6906f3886b1474
+  data.tar.gz: ddbafc67e4487606a13aee6116f0dad9e68371e8
 SHA512:
-  metadata.gz: d3810a1472c76152187acaa66e9b2c294c324deb3ccd3a40361b772d10492cfc22a54bb7ae0be10565220b6f8b4d568e947325f757e824df5613d6f86bcc70bd
-  data.tar.gz: ee05c454262f4ce76e86ef138a8243374fb03a52587f97f4e1cab2e863d858e26ea655c3bbdacccca63836406a8fb63f40dbcc4a1b56fde65fbd5291b7da5510
+  metadata.gz: 23e692e54ed88c08abdd8ec2b67c942913e4b37e10186a4b208714c06fe5becb56f32594944e5e49469052c0bd7e48361abeba2704df0f3eca5f25070fc9f6ee
+  data.tar.gz: 8ef7aaa13b2fdd46602150e35feb45379ee1616a87b03f9d892bcf0521c26742efb0556037197028095039f71b488403b25a4282e3d52eea12610e498156a73a

data/lib/stash/merritt/ezid_helper.rb

@@ -4,26 +4,18 @@ module Stash
   module Merritt
     class EzidHelper
       attr_reader :resource
-      attr_reader :url_helpers
 
-      def initialize(resource:, url_helpers:)
+      def initialize(resource:)
         @resource = resource
-        @url_helpers = url_helpers
       end
 
       # @return [String] the identifier (DOI, ARK, or URN)
-      def ensure_identifier
-        identifier_str = resource.identifier_str
-        return identifier_str if identifier_str
-
-        new_identifier_str = ezid_client.mint_id
-        resource.ensure_identifier(new_identifier_str)
-        new_identifier_str
+      def mint_id
+        ezid_client.mint_id
       end
 
-      def update_metadata(dc3_xml:)
+      def update_metadata(dc3_xml:, landing_page_url:)
         identifier_str = resource.identifier_str
-        landing_page_url = url_helpers.show_path(identifier_str)
         ezid_client.update_metadata(identifier_str, dc3_xml, landing_page_url)
       end
 

data/lib/stash/merritt/module_info.rb

@@ -4,7 +4,7 @@ module Stash
     NAME = 'stash-merritt'.freeze
 
     # The version of this gem
-    VERSION = '0.0.1'.freeze
+    VERSION = '0.1.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_job.rb

@@ -45,13 +45,25 @@ module Stash
         @resource ||= StashEngine::Resource.find(resource_id)
       end
 
+      def tenant
+        @tenant ||= resource.tenant
+      end
+
+      def landing_page_url
+        @landing_page_url ||= begin
+          path_to_landing = url_helpers.show_path(resource.identifier_str)
+          tenant.landing_url(path_to_landing)
+        end
+      end
+
       def ezid_helper
-        @ezid_helper ||= EzidHelper.new(resource: resource, url_helpers: url_helpers)
+        @ezid_helper ||= EzidHelper.new(resource: resource)
       end
 
       def ensure_identifier
-        log.info("#{Time.now.xmlschema} #{self.class}: ensuring identifier for resource #{resource_id} (#{resource.identifier_str})")
-        ezid_helper.ensure_identifier
+        return if resource.identifier
+        log.info("#{Time.now.xmlschema} #{self.class}: minting new identifier for resource #{resource_id}")
+        resource.ensure_identifier(ezid_helper.mint_id)
       end
 
       def create_package
@@ -67,8 +79,8 @@ module Stash
       end
 
       def update_metadata(dc3_xml)
-        log.info("#{Time.now.xmlschema} #{self.class}: updating identifier metadata for resource #{resource_id} (#{resource.identifier_str})")
-        ezid_helper.update_metadata(dc3_xml: dc3_xml)
+        log.info("#{Time.now.xmlschema} #{self.class}: updating identifier landing page (#{landing_page_url}) and metadata for resource #{resource_id} (#{resource.identifier_str})")
+        ezid_helper.update_metadata(dc3_xml: dc3_xml, landing_page_url: landing_page_url)
       end
 
       def cleanup(package)

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

@@ -33,7 +33,7 @@ module Stash
                                                                  id_scheme: 'doi')
         allow(tenant).to receive(:tenant_id).and_return('dataone')
         allow(tenant).to receive(:short_name).and_return('DataONE')
-        allow(tenant).to receive(:landing_url) { |path| "https://stash-dev.example.edu/#{path}" }
+        allow(tenant).to receive(:landing_url) { |path_to_landing| URI::HTTPS.build(host: 'stash.example.edu', path: path_to_landing).to_s }
         allow(tenant).to receive(:sword_params).and_return(collection_uri: 'http://sword.example.edu/stash-dev')
         allow(StashEngine::Tenant).to receive(:find).with('dataone').and_return(tenant)
 
@@ -51,7 +51,7 @@ module Stash
         ).build
 
         @url_helpers = double(Module) # yes, apparently URL helpers are an anonymous module
-        allow(url_helpers).to(receive(:show_path)) { |identifier| identifier }
+        allow(url_helpers).to(receive(:show_path)) { |identifier| "/stash/#{identifier}" }
 
         # TODO: move this to ResourceBuilder
         stash_wrapper.inventory.files.each do |stash_file|

data/spec/unit/stash/merritt/ezid_helper_spec.rb

@@ -19,8 +19,10 @@ module Stash
 
         @identifier_str = 'doi:10.15146/R38675309'
         @url_helpers = double(Module)
-        @landing_page_url = "http://stash.example.edu/stash/#{identifier_str}"
-        allow(url_helpers).to receive(:show_path).with(identifier_str).and_return(landing_page_url)
+
+        path_to_landing = "/stash/#{identifier_str}"
+        @landing_page_url = URI::HTTPS.build(host: 'stash.example.edu', path: path_to_landing).to_s
+        allow(url_helpers).to receive(:show_path).with(identifier_str).and_return(path_to_landing)
 
         @tenant = double(StashEngine::Tenant)
         id_params = {
@@ -32,19 +34,14 @@ module Stash
         }
         allow(tenant).to receive(:identifier_service).and_return(OpenStruct.new(id_params))
         allow(tenant).to receive(:tenant_id).and_return('dataone')
+        allow(tenant).to receive(:landing_url).with(path_to_landing).and_return(landing_page_url)
         allow(resource).to receive(:tenant).and_return(tenant)
 
-        @helper = EzidHelper.new(resource: resource, url_helpers: url_helpers)
+        @helper = EzidHelper.new(resource: resource)
       end
 
-      describe :ensure_identifier do
-        it 'returns an existing identifier without bothering EZID' do
-          expect(resource).to receive(:identifier_str).and_return(identifier_str)
-          expect(::Ezid::Client).not_to receive(:new)
-          expect(helper.ensure_identifier).to eq(identifier_str)
-        end
-
-        it 'mints and assigns a new identifier if none is present' do
+      describe :mint_id do
+        it 'mints a new identifier' do
           identifier = instance_double(::Ezid::MintIdentifierResponse)
           allow(identifier).to receive(:id).and_return(identifier_str)
 
@@ -53,12 +50,11 @@ module Stash
             .with(user: 'stash', password: '3cc9d3fbd9788148c6a32a1415fa673a')
             .and_return(ezid_client)
 
-          expect(resource).to receive(:identifier_str).and_return(nil)
           expect(ezid_client).to receive(:mint_identifier)
             .with('doi:10.15146/R3', status: 'reserved', profile: 'datacite')
             .and_return(identifier)
-          expect(resource).to receive(:ensure_identifier).with(identifier_str)
-          expect(helper.ensure_identifier).to eq(identifier_str)
+
+          expect(helper.mint_id).to eq(identifier_str)
         end
       end
 
@@ -80,7 +76,7 @@ module Stash
           )
 
           expect(resource).to receive(:identifier_str).and_return(identifier_str)
-          helper.update_metadata(dc3_xml: dc3_xml)
+          helper.update_metadata(dc3_xml: dc3_xml, landing_page_url: landing_page_url)
         end
       end
     end

data/spec/unit/stash/merritt/submission_job_spec.rb

@@ -4,6 +4,7 @@ module Stash
   module Merritt
     describe SubmissionJob do
       attr_reader :logger
+      attr_reader :landing_page_url
       attr_reader :tenant
       attr_reader :resource_id
       attr_reader :resource
@@ -23,6 +24,8 @@ module Stash
         @rails_logger = Rails.logger
         Rails.logger = logger
 
+        @landing_page_url = URI::HTTPS.build(host: 'stash.example.edu', path: '/stash/doi:10.123/456').to_s
+
         @tenant = double(StashEngine::Tenant)
         sword_params = {
           collection_uri: 'http://example.edu/sword/example',
@@ -31,6 +34,7 @@ module Stash
         }.freeze
         allow(tenant).to receive(:sword_params).and_return(sword_params)
         allow(tenant).to receive(:id).and_return('example_u')
+        allow(tenant).to receive(:landing_url) { |path_to_landing| URI::HTTPS.build(host: 'stash.example.edu', path: path_to_landing).to_s }
 
         @resource_id = 37
         @resource = double(StashEngine::Resource)
@@ -40,12 +44,14 @@ module Stash
         allow(resource).to receive(:tenant).and_return(tenant)
         allow(resource).to receive(:tenant_id).and_return('example_u')
 
+        identifier = double(StashEngine::Identifier)
+        allow(resource).to receive(:identifier).and_return(identifier)
+
         @url_helpers = double(Module) # yes, apparently URL helpers are an anonymous module
-        allow(url_helpers).to(receive(:show_path)) { |identifier| identifier }
+        allow(url_helpers).to(receive(:show_path)) { |identifier_str| "/stash/#{identifier_str}" }
 
         @ezid_helper = instance_double(EzidHelper)
-        allow(EzidHelper).to receive(:new).with(resource: resource, url_helpers: url_helpers).and_return(ezid_helper)
-        allow(ezid_helper).to receive(:ensure_identifier)
+        allow(EzidHelper).to receive(:new).with(resource: resource).and_return(ezid_helper)
         allow(ezid_helper).to receive(:update_metadata)
 
         @package = instance_double(SubmissionPackage)
@@ -65,8 +71,10 @@ module Stash
       end
 
       describe :submit! do
-        it 'ensures an identifier' do
-          expect(ezid_helper).to receive(:ensure_identifier)
+        it 'mints an ID if needed' do
+          expect(resource).to receive(:identifier).and_return(nil)
+          expect(ezid_helper).to receive(:mint_id).and_return('doi:10.123/456')
+          expect(resource).to receive(:ensure_identifier).with('doi:10.123/456')
           job.submit!
         end
 
@@ -78,7 +86,7 @@ module Stash
         it 'updates the metadata' do
           dc3_xml = '<resource/>'
           expect(package).to receive(:dc3_xml).and_return(dc3_xml)
-          expect(ezid_helper).to receive(:update_metadata).with(dc3_xml: dc3_xml)
+          expect(ezid_helper).to receive(:update_metadata).with(dc3_xml: dc3_xml, landing_page_url: landing_page_url)
           job.submit!
         end
 
@@ -102,7 +110,8 @@ module Stash
           end
 
           it 'fails on an ID minting error' do
-            expect(ezid_helper).to receive(:ensure_identifier).and_raise(Ezid::NotAllowedError)
+            expect(resource).to receive(:identifier).and_return(nil)
+            expect(ezid_helper).to receive(:mint_id).and_raise(Ezid::NotAllowedError)
             expect(job.submit!.error).to be_a(Ezid::NotAllowedError)
           end
 

data/stash-merritt.iml

@@ -41,6 +41,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.13.7, 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" />

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stash-merritt
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - David Moles