curation_concerns 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91dd51748b5be3e045374bdf92ab07b0378f67f9
-  data.tar.gz: 92e499a69aa59d9bfce9f6b9adb654301fa86bde
+  metadata.gz: c3825d8bd4eec70f2cabd0c06a9f106678d1332a
+  data.tar.gz: 6f58e068e76c09b5b192cda3b9af9466cb58dd9e
 SHA512:
-  metadata.gz: d99de5a52ae7f2dc56f2499243f858e5d5c29a2a540a2c2972235441f20e7b91286806c846d89ac9bd0f9da49f912d52e6fbc9a8c2e129e04542bab801f55737
-  data.tar.gz: 239ff60e74ce548ef485a4eb7de1c83803c931b9d254d8cbe50d3404a1fea434a0e5394e8c736252982f0946e89b721c3eb20d2682516d1489617260151b5b09
+  metadata.gz: a3815d24ff5b5fbb39308fc59d4d6be90cdc6b871d7d3748d08dc92bf8bb6111f22d4ab9e288d1eb332ecb159e6966378f0d477517b9b1044468b12b8338cf4c
+  data.tar.gz: 261745338ee84efb8078374ca356004e4e4dcf11225940cf71979596449ba786d2c0fb5bbdeea407c96b19b60f03590ebe5ce55473aea90889543dd7b8277178

data/app/helpers/curation_concerns/main_app_helpers.rb

@@ -10,5 +10,4 @@ module CurationConcerns::MainAppHelpers
   include CurationConcerns::CollectionsHelper
   include CurationConcerns::PermissionsHelper
   include CurationConcerns::RightsHelper
-  include CurationConcerns::BlacklightOverridesHelper
 end

data/app/services/curation_concerns/file_set_audit_service.rb

@@ -1,8 +1,15 @@
 module CurationConcerns
   class FileSetAuditService
-    attr_reader :file_set
+    attr_reader :file_set, :id
+
+    # @param file_set [ActiveFedora::Base, String] file_set
     def initialize(file_set)
-      @file_set = file_set
+      if file_set.is_a?(String)
+        @id = file_set
+      else
+        @id = file_set.id
+        @file_set = file_set
+      end
     end
 
     NO_RUNS = 999
@@ -18,7 +25,7 @@ module CurationConcerns
     # Do not try to access the versions if we do not have access to them.
     # Use this when a file_set is loaded from solr instead of fedora
     def logged_audit_status
-      audit_results = ChecksumAuditLog.logs_for(file_set.id, "original_file")
+      audit_results = ChecksumAuditLog.logs_for(id, "original_file")
                                       .collect { |result| result["pass"] }
 
       if audit_results.length > 0
@@ -101,5 +108,10 @@ module CurationConcerns
       def days_since_last_audit(latest_audit)
         (DateTime.now - latest_audit.updated_at.to_date).to_i
       end
+
+      # Loads the FileSet from Fedora if needed
+      def file_set
+        @file_set ||= FileSet.find(id)
+      end
   end
 end

data/app/views/collections/_index_default.html.erb

@@ -1,2 +1,9 @@
-<%= render 'catalog/index_default', document: document, document_counter: document_counter %>
-
+<% doc_presenter = index_presenter(document) %>
+<dl class="document-metadata dl-horizontal dl-invert">
+  <% index_fields(document).each do |field_name, field| -%>
+    <% if should_render_index_field? document, field %>
+	    <dt class="blacklight-<%= field_name.parameterize %>"><%= render_index_field_label document, field: field_name %></dt>
+	    <dd class="blacklight-<%= field_name.parameterize %>"><%= doc_presenter.field_value  field_name %></dd>
+    <% end -%>
+  <% end -%>
+</dl>

data/lib/curation_concerns/version.rb

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

data/spec/services/file_set_audit_service_spec.rb

@@ -1,15 +1,16 @@
 require 'spec_helper'
 
 describe CurationConcerns::FileSetAuditService do
-  let(:f)       { create(:file_set, content: File.open(fixture_file_path('world.png'))) }
-  let(:service) { described_class.new(f) }
+  let(:f)                 { create(:file_set, content: File.open(fixture_file_path('world.png'))) }
+  let(:service_by_object) { described_class.new(f) }
+  let(:service_by_id)     { described_class.new(f.id) }
 
   describe '#audit' do
     context 'when a file has two versions' do
       before do
         CurationConcerns::VersioningService.create(f.original_file) # create a second version -- the factory creates the first version when it attaches +content+
       end
-      subject { service.audit[f.original_file.id] }
+      subject { service_by_object.audit[f.original_file.id] }
       specify 'returns two log results' do
         expect(subject.length).to eq(2)
       end
@@ -17,14 +18,14 @@ describe CurationConcerns::FileSetAuditService do
   end
 
   describe '#audit_file' do
-    subject { service.send(:audit_file, f.original_file) }
+    subject { service_by_object.send(:audit_file, f.original_file) }
     specify 'returns a single result' do
       expect(subject.length).to eq(1)
     end
   end
 
   describe '#audit_file_version' do
-    subject { service.send(:audit_file_version, f.original_file.id, f.original_file.uri) }
+    subject { service_by_object.send(:audit_file_version, f.original_file.id, f.original_file.uri) }
     specify 'returns a single ChecksumAuditLog for the given file' do
       expect(subject).to be_kind_of ChecksumAuditLog
       expect(subject.file_set_id).to eq(f.id)
@@ -33,7 +34,7 @@ describe CurationConcerns::FileSetAuditService do
   end
 
   describe '#audit_stat' do
-    subject { service.send(:audit_stat, f.original_file) }
+    subject { service_by_object.send(:audit_stat, f.original_file) }
     context 'when no audits have been run' do
       it 'reports that audits have not been run' do
         expect(subject).to eq 'Audits have not yet been run on this file.'
@@ -57,42 +58,56 @@ describe CurationConcerns::FileSetAuditService do
       CurationConcerns::VersioningService.create(f.original_file)
       ChecksumAuditLog.create!(pass: 1, file_set_id: f.id, version: f.original_file.versions.first.uri, file_id: 'original_file')
     end
-    subject { service.human_readable_audit_status }
+    subject { service_by_object.human_readable_audit_status }
     it { is_expected.to eq 'Some audits have not been run, but the ones run were passing.' }
   end
 
   describe '#logged_audit_status' do
-    subject { service.logged_audit_status }
+    context "with an object" do
+      subject { service_by_object.logged_audit_status }
 
-    it "doesn't trigger audits" do
-      expect(service).not_to receive(:audit_file)
-      expect(subject).to eq "Audits have not yet been run on this file."
-    end
+      it "doesn't trigger audits" do
+        expect(service_by_object).not_to receive(:audit_file)
+        expect(subject).to eq "Audits have not yet been run on this file."
+      end
 
-    context "when no audit is passing" do
-      before do
-        ChecksumAuditLog.create!(pass: 1, file_set_id: f.id, version: f.original_file.versions.first.label, file_id: 'original_file')
+      context "when no audit is passing" do
+        before do
+          ChecksumAuditLog.create!(pass: 1, file_set_id: f.id, version: f.original_file.versions.first.label, file_id: 'original_file')
+        end
+
+        it "reports the audit result" do
+          expect(subject).to eq 'passing'
+        end
       end
 
-      it "reports the audit result" do
-        expect(subject).to eq 'passing'
+      context "when one audit is passing" do
+        before do
+          ChecksumAuditLog.create!(pass: 0, file_set_id: f.id, version: f.original_file.versions.first.label, file_id: 'original_file')
+          ChecksumAuditLog.create!(pass: 1, file_set_id: f.id, version: f.original_file.versions.first.label, file_id: 'original_file')
+        end
+
+        it "reports the audit result" do
+          expect(subject).to eq 'failing'
+        end
       end
     end
 
-    context "when one audit is passing" do
+    context "with an id" do
+      subject { service_by_id.logged_audit_status }
+
       before do
-        ChecksumAuditLog.create!(pass: 0, file_set_id: f.id, version: f.original_file.versions.first.label, file_id: 'original_file')
         ChecksumAuditLog.create!(pass: 1, file_set_id: f.id, version: f.original_file.versions.first.label, file_id: 'original_file')
       end
 
       it "reports the audit result" do
-        expect(subject).to eq 'failing'
+        expect(subject).to eq 'passing'
       end
     end
   end
 
   describe '#stat_to_string' do
-    subject { service.send(:stat_to_string, val) }
+    subject { service_by_object.send(:stat_to_string, val) }
     context 'when audit_stat is 0' do
       let(:val) { 0 }
       it { is_expected.to eq 'failing' }

data/spec/services/rights_service_spec.rb

@@ -4,7 +4,7 @@ describe RightsService do
   before do
     # Configure QA to use fixtures
     qa_fixtures = { local_path: File.expand_path('../../fixtures/authorities', __FILE__) }
-    stub_const("Qa::Authorities::LocalSubauthority::AUTHORITIES_CONFIG", qa_fixtures)
+    allow(Qa::Authorities::Local).to receive(:config).and_return(qa_fixtures)
   end
 
   describe "#select_active_options" do

data/spec/views/curation_concerns/base/_form_rights_spec.rb

@@ -13,7 +13,7 @@ describe 'curation_concerns/base/_form_rights.html.erb' do
 
   before do
     qa_fixtures = { local_path: File.expand_path('../../../../fixtures/authorities', __FILE__) }
-    stub_const("Qa::Authorities::LocalSubauthority::AUTHORITIES_CONFIG", qa_fixtures)
+    allow(Qa::Authorities::Local).to receive(:config).and_return(qa_fixtures)
   end
 
   context "when active and inactive rights are associated with a work" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curation_concerns
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-05 00:00:00.000000000 Z
+date: 2016-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -717,7 +717,6 @@ files:
 - app/helpers/batch_select_helper.rb
 - app/helpers/collections_helper.rb
 - app/helpers/curation_concerns/ability_helper.rb
-- app/helpers/curation_concerns/blacklight_overrides_helper.rb
 - app/helpers/curation_concerns/catalog_helper.rb
 - app/helpers/curation_concerns/collections_helper.rb
 - app/helpers/curation_concerns/collections_helper_behavior.rb

data/app/helpers/curation_concerns/blacklight_overrides_helper.rb

@@ -1,11 +0,0 @@
-module CurationConcerns::BlacklightOverridesHelper
-  # Overrides Blacklight::BlacklightHelperBehavior
-  def presenter(document)
-    case action_name
-    when 'edit', 'update'
-      show_presenter(document)
-    else
-      super(document)
-    end
-  end
-end