hyrax 1.0.0.rc2 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99e1fa3e513ad51bdf68404a23597596504fe7bf
-  data.tar.gz: 79efe8dbd4eca246b5b6252f19390dbd86a9dba7
+  metadata.gz: a3425401f62c2b4c3509f2254c84fef91e55d34c
+  data.tar.gz: c959faf3cc3c45eb8ccc024d48567ec5e41d41af
 SHA512:
-  metadata.gz: 363166554478d540eb6afc4c2b5179fc81ce18307c7c88874d11c0f0b9510845bc5e322ab6824dc9c5023b2360d311fbc4437c0d3a1daa559dc32b7119605e1a
-  data.tar.gz: 05c71ebf86f994a796c24833b4d231e31cb2ba1d4d5d91be5e1eeb596c1226e3575fbf31389677f22f5d94be1e210ae941c7a330734c94333bbf5255ad3a2bb5
+  metadata.gz: 79d50f4747368ff6908659683221905c45f041ccad389580824119ddcdd346c4a9015aa5685dded91e83ba6101defb82608fe52bfc133ef1be81f905fe458f58
+  data.tar.gz: 5fd59a562ca1c3420d8f662a116fe0bdb6975eb6884b0c228b86039ff7e699cfbbd63b0ace358a7fa6855ed67bcae6a1b5d5aa693c6a72734e411244713d8de3

data/README.md

@@ -117,7 +117,7 @@ Starting up Redis will depend on your operating system, and may in fact already
 
 ## Rails
 
-We recommend the latest Rails 5.0 release.
+Hyrax requires Rails 5. We recommend the latest Rails 5.0 release.
 
 ```
 # If you don't already have Rails at your disposal...

data/app/actors/hyrax/actors/file_set_actor.rb

@@ -35,7 +35,7 @@ module Hyrax
         file_set.label ||= file.respond_to?(:original_filename) ? file.original_filename : ::File.basename(file)
         file_set.title = [file_set.label] if file_set.title.blank?
         return false unless file_set.save # Need to save the file_set in order to get an id
-        file_actor_class.new(file_set, relation, user).ingest_file(file, asynchronous)
+        build_file_actor(relation).ingest_file(file, asynchronous)
         true
       end
 
@@ -58,8 +58,7 @@ module Hyrax
       # @param [String] revision_id the revision to revert to
       # @param [String] relation ('original_file')
       def revert_content(revision_id, relation = 'original_file')
-        file_actor = file_actor_class.new(file_set, relation, user)
-        return false unless file_actor.revert_to(revision_id)
+        return false unless build_file_actor(relation).revert_to(revision_id)
         Hyrax.config.callback.run(:after_revert_content, file_set, user, revision_id)
         true
       end
@@ -67,7 +66,7 @@ module Hyrax
       # @param [File, ActionDigest::HTTP::UploadedFile, Tempfile] file the file uploaded by the user.
       # @param [String] relation ('original_file')
       def update_content(file, relation = 'original_file')
-        file_actor_class.new(file_set, relation, user).ingest_file(file)
+        build_file_actor(relation).ingest_file(file, true)
         Hyrax.config.callback.run(:after_update_content, file_set, user)
         true
       end
@@ -103,14 +102,15 @@ module Hyrax
           @ability ||= ::Ability.new(user)
         end
 
+        def build_file_actor(relation)
+          file_actor_class.new(file_set, relation, user)
+        end
+
         # Takes an optional block and executes the block if the save was successful.
         # @return [Boolean] false if the save was unsuccessful
         def save
           on_retry = ->(exception, _, _, _) { ActiveFedora::Base.logger.warn "Hyrax::Actors::FileSetActor#save Caught RSOLR error #{exception.inspect}" }
-          Retriable.retriable on: RSolr::Error::Http,
-                              on_retry: on_retry,
-                              tries: 4,
-                              base_interval: 0.01 do
+          Retriable.retriable on: RSolr::Error::Http, on_retry: on_retry, tries: 4, base_interval: 0.01 do
             return false unless file_set.save
           end
           yield if block_given?

data/app/views/hyrax/base/_form_permission_under_embargo.html.erb

@@ -0,0 +1,16 @@
+<fieldset class="set-access-controls">
+  <legend>
+    Visibility
+    <small>Who should be able to view or download this content?</small>
+  </legend>
+
+  <section class="help-block">
+    <p>
+      <strong>This work is under embargo.</strong>  You can change the settings of the embargo here, or you can visit the <%= link_to 'Embargo Management Page', main_app.edit_embargo_path(f.object) %> to deactivate it.
+    </p>
+  </section>
+
+    <input type="hidden" name="<%= f.object_name %>[visibility]" value="<%= Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_EMBARGO %>" />
+    <%= render "form_permission_embargo", f: f %>
+
+</fieldset>

data/app/views/hyrax/base/_form_permission_under_lease.html.erb

@@ -0,0 +1,18 @@
+<fieldset class="set-access-controls">
+  <legend>
+    Visibility
+    <small>Who should be able to view or download this content?</small>
+  </legend>
+
+  <section class="help-block">
+    <p>
+      <strong>This work is under lease.</strong>  You can change the settings of the lease here, or you can visit the <%= link_to 'Lease Management Page', main_app.edit_lease_path(f.object) %> to deactivate it.
+    </p>
+  </section>
+
+  <div class="form-group">
+    <input type="hidden" name="<%= f.object_name %>[visibility]" value="<%= Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_LEASE %>" />
+    <%= render "form_permission_lease", f: f %>
+  </div>
+
+</fieldset>

data/app/views/hyrax/file_sets/media_display/_default.html.erb

@@ -1,6 +1,10 @@
 <div class="no-preview">
   <%= t('hyrax.works.show.no_preview') %>
   <% if Hyrax.config.display_media_download_link? %>
-    <p/><%= link_to t('hyrax.file_set.show.download'), hyrax.download_path(file_set), target: "_new" %>
+    <p/><%= link_to t('hyrax.file_set.show.download'),
+      hyrax.download_path(file_set),
+      id: "file_download",
+      data: { label: file_set.id },
+      target: "_new" %>
   <% end %>
 </div>

data/app/views/hyrax/file_sets/media_display/_image.html.erb

@@ -8,6 +8,8 @@
       <%= link_to hyrax.download_path(file_set),
                   data: { turbolinks: false },
                   target: :_blank,
+                  id: "file_download",
+                  data: { label: file_set.id },
                   class: "btn btn-default" do %>
           <%= t('hyrax.file_set.show.downloadable_content.image_link') %>
       <% end %>

data/app/views/hyrax/file_sets/media_display/_office_document.html.erb

@@ -8,6 +8,8 @@
       <%= link_to hyrax.download_path(file_set),
                   data: { turbolinks: false },
                   target: :_blank,
+                  id: "file_download",
+                  data: { label: file_set.id },
                   class: "btn btn-default" do %>
           <%= t('hyrax.file_set.show.downloadable_content.office_link') %>
       <% end %>

data/app/views/hyrax/file_sets/media_display/_pdf.html.erb

@@ -8,6 +8,8 @@
       <%= link_to hyrax.download_path(file_set),
                   data: { turbolinks: false },
                   target: :_blank,
+                  id: "file_download",
+                  data: { label: file_set.id },
                   class: "btn btn-default" do %>
           <%= t('hyrax.file_set.show.downloadable_content.pdf_link') %>
       <% end %>

data/lib/hyrax/version.rb

@@ -1,3 +1,3 @@
 module Hyrax
-  VERSION = '1.0.0.rc2'.freeze
+  VERSION = '1.0.1'.freeze
 end

data/spec/actors/hyrax/actors/file_set_actor_spec.rb

@@ -139,6 +139,29 @@ describe Hyrax::Actors::FileSetActor do
     end
   end
 
+  describe "#update_content" do
+    let(:relation) { 'original_file' }
+    let(:file_actor) { Hyrax::Actors::FileActor.new(file_set, relation, user) }
+    before do
+      allow(actor).to receive(:build_file_actor).with(relation).and_return(file_actor)
+    end
+    it 'calls ingest_file' do
+      expect(file_actor).to receive(:ingest_file).with(local_file, true)
+      actor.update_content(local_file)
+    end
+    it 'runs callbacks' do
+      # Do not bother ingesting the file -- test only that the callback is run
+      allow(file_actor).to receive(:ingest_file).with(local_file, true)
+      expect(Hyrax.config.callback).to receive(:run).with(:after_update_content, file_set, user)
+      actor.update_content(local_file)
+    end
+    it "returns true" do
+      # Do not bother ingesting the file -- test only the return value
+      allow(file_actor).to receive(:ingest_file).with(local_file, true)
+      expect(actor.update_content(local_file)).to be true
+    end
+  end
+
   describe "#destroy" do
     it "destroys the object" do
       actor.destroy

data/spec/controllers/hyrax/file_sets_controller_spec.rb

@@ -201,7 +201,7 @@ describe Hyrax::FileSetsController do
         it "spawns a content new version event job" do
           expect(ContentNewVersionEventJob).to receive(:perform_later).with(file_set, user)
 
-          expect(actor).to receive(:ingest_file).with(expected_file_type)
+          expect(actor).to receive(:ingest_file).with(expected_file_type, true)
           file = fixture_file_upload('/world.png', 'image/png')
           post :update, params: { id: file_set, filedata: file, file_set: { keyword: [''], permissions_attributes: [{ type: 'person', name: 'archivist1', access: 'edit' }] } }
           post :update, params: { id: file_set, file_set: { files: [file], keyword: [''], permissions_attributes: [{ type: 'person', name: 'archivist1', access: 'edit' }] } }

data/spec/views/hyrax/file_sets/media_display/_default.html.erb_spec.rb

@@ -15,6 +15,11 @@ describe 'hyrax/file_sets/mdeia_display/_default.html.erb', type: :view do
     expect(rendered).to have_css('a', text: 'Download the file')
   end
 
+  it "includes google analytics data in the download link" do
+    expect(rendered).to have_css('a#file_download')
+    expect(rendered).to have_selector("a[data-label=\"#{file_set.id}\"]")
+  end
+
   context "no download links" do
     let(:link) { false }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyrax
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc2
+  version: 1.0.1
 platform: ruby
 authors:
 - Justin Coyne
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-12 00:00:00.000000000 Z
+date: 2017-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -1590,6 +1590,8 @@ files:
 - app/views/hyrax/base/_form_permission.html.erb
 - app/views/hyrax/base/_form_permission_embargo.html.erb
 - app/views/hyrax/base/_form_permission_lease.html.erb
+- app/views/hyrax/base/_form_permission_under_embargo.html.erb
+- app/views/hyrax/base/_form_permission_under_lease.html.erb
 - app/views/hyrax/base/_form_progress.html.erb
 - app/views/hyrax/base/_form_relationships.html.erb
 - app/views/hyrax/base/_form_representative.html.erb
@@ -2552,12 +2554,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Hyrax is a front-end based on the robust Hydra framework, providing a user