curation_concerns 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3825d8bd4eec70f2cabd0c06a9f106678d1332a
-  data.tar.gz: 6f58e068e76c09b5b192cda3b9af9466cb58dd9e
+  metadata.gz: 835147e30b02f4bd8176f008f6581a72852a03f0
+  data.tar.gz: 653102b81aed097f57c153baaea3c1f85f4e3f1f
 SHA512:
-  metadata.gz: a3815d24ff5b5fbb39308fc59d4d6be90cdc6b871d7d3748d08dc92bf8bb6111f22d4ab9e288d1eb332ecb159e6966378f0d477517b9b1044468b12b8338cf4c
-  data.tar.gz: 261745338ee84efb8078374ca356004e4e4dcf11225940cf71979596449ba786d2c0fb5bbdeea407c96b19b60f03590ebe5ce55473aea90889543dd7b8277178
+  metadata.gz: 7a6827a24f8fc84168c0d53fdfadc4745b08707d29a9ef0b6abaf628ccb8e8ae6177473068e1a723bcfc4b342d49e9323e0e6a354defffe2a7ed14d094581a5a
+  data.tar.gz: 20707bc6b4305fbc5df1cdf03216f5f8b7634aa442ec141b42b67bacf77e51da16bb58efe3804ae334dba22af31a48be982e5a7e479f53e81bb856df6c1ff106

data/app/controllers/concerns/curation_concerns/single_use_links_viewer_controller_behavior.rb

@@ -74,7 +74,7 @@ module CurationConcerns
 
       def render_single_use_error(exception)
         logger.error("Rendering PAGE due to exception: #{exception.inspect} - #{exception.backtrace if exception.respond_to? :backtrace}")
-        render template: '/error/single_use_error', layout: "error", formats: [:html], status: 404
+        render 'single_use_error', layout: "error", status: 404
       end
 
       def _prefixes

data/app/services/curation_concerns/persist_directly_contained_output_file_service.rb

@@ -14,7 +14,7 @@ module CurationConcerns
       o_name = determine_original_name(file)
       m_type = determine_mime_type(file)
       uri = URI(directives.fetch(:url))
-      raise ArgumentError, "#{uri} is not an http uri" unless uri.scheme == 'http'
+      raise ArgumentError, "#{uri} is not an http(s) uri" unless uri.is_a?(URI::HTTP)
       file_set = ActiveFedora::Base.find(ActiveFedora::Base.uri_to_id(uri.to_s))
       remote_file = file_set.send("build_#{directives.fetch(:container)}".to_sym)
       remote_file.content = file

data/lib/curation_concerns/version.rb

@@ -1,3 +1,3 @@
 module CurationConcerns
-  VERSION = "1.1.1".freeze
+  VERSION = "1.1.2".freeze
 end

data/spec/controllers/curation_concerns/single_use_links_viewer_controller_spec.rb

@@ -44,7 +44,7 @@ describe CurationConcerns::SingleUseLinksViewerController do
 
         it "returns 404 if the key is not present" do
           get :download, id: download_link_hash
-          expect(response).to render_template('error/single_use_error')
+          expect(response).to render_template("curation_concerns/single_use_links_viewer/single_use_error", "layouts/error")
         end
       end
     end
@@ -61,13 +61,13 @@ describe CurationConcerns::SingleUseLinksViewerController do
         before { SingleUseLink.find_by_downloadKey!(show_link_hash).destroy }
         it "returns 404 if the key is not present" do
           get :show, id: show_link_hash
-          expect(response).to render_template('error/single_use_error')
+          expect(response).to render_template("curation_concerns/single_use_links_viewer/single_use_error", "layouts/error")
         end
       end
 
       it "returns 404 on attempt to get show path with download hash" do
         get :show, id: download_link_hash
-        expect(response).to render_template('error/single_use_error')
+        expect(response).to render_template("curation_concerns/single_use_links_viewer/single_use_error", "layouts/error")
       end
     end
   end

data/spec/views/{error → single_use_links_viewer}/single_use_error.html.erb_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe 'error/single_use_error.html.erb' do
+describe 'curation_concerns/single_use_links_viewer/single_use_error.html.erb' do
   it 'renders without errors' do
-    render file: 'error/single_use_error'
+    render
     expect(rendered).to have_text("Single Use Link Expired or Not Found")
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curation_concerns
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-07 00:00:00.000000000 Z
+date: 2016-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -950,13 +950,13 @@ files:
 - app/views/curation_concerns/operations/show.html.erb
 - app/views/curation_concerns/permissions/confirm.html.erb
 - app/views/curation_concerns/single_use_links_viewer/show.html.erb
+- app/views/curation_concerns/single_use_links_viewer/single_use_error.html.erb
 - app/views/embargoes/_embargo_history.html.erb
 - app/views/embargoes/_list_active_embargoes.html.erb
 - app/views/embargoes/_list_deactivated_embargoes.html.erb
 - app/views/embargoes/_list_expired_active_embargoes.html.erb
 - app/views/embargoes/edit.html.erb
 - app/views/embargoes/index.html.erb
-- app/views/error/single_use_error.html.erb
 - app/views/layouts/boilerplate.html.erb
 - app/views/layouts/curation_concerns.html.erb
 - app/views/layouts/curation_concerns/1_column.html.erb
@@ -1220,11 +1220,11 @@ files:
 - spec/views/curation_concerns/file_sets/show.json.jbuilder_spec.rb
 - spec/views/curation_concerns/permissions/confirm.html.erb_spec.rb
 - spec/views/curation_concerns/single_use_links_viewer/show.html.erb_spec.rb
-- spec/views/error/single_use_error.html.erb_spec.rb
 - spec/views/layouts/error.html.erb_spec.rb
 - spec/views/shared/_add_content.html.erb_spec.rb
 - spec/views/shared/_my_actions.html.erb_spec.rb
 - spec/views/single_use_links_viewer/show.html.erb_spec.rb
+- spec/views/single_use_links_viewer/single_use_error.html.erb_spec.rb
 - tasks/jasmine.rake
 - vendor/assets/images/ui-bg_glass_100_fdf5ce_1x400.png
 - vendor/assets/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
@@ -1425,8 +1425,8 @@ test_files:
 - spec/views/curation_concerns/file_sets/show.json.jbuilder_spec.rb
 - spec/views/curation_concerns/permissions/confirm.html.erb_spec.rb
 - spec/views/curation_concerns/single_use_links_viewer/show.html.erb_spec.rb
-- spec/views/error/single_use_error.html.erb_spec.rb
 - spec/views/layouts/error.html.erb_spec.rb
 - spec/views/shared/_add_content.html.erb_spec.rb
 - spec/views/shared/_my_actions.html.erb_spec.rb
 - spec/views/single_use_links_viewer/show.html.erb_spec.rb
+- spec/views/single_use_links_viewer/single_use_error.html.erb_spec.rb