curation_concerns 1.0.0.beta8 → 1.0.0.beta9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d831ace32b6cd1aacb1efdaf22ac5a9fcf69168
-  data.tar.gz: 8fc0d5456aa13666591e2939182b0c59257cc6db
+  metadata.gz: 486a45336152e853ee3d6382246df41931f4ee82
+  data.tar.gz: d2dddd29612f023b7ffd5266d850789e075b9507
 SHA512:
-  metadata.gz: 9fdcb4b58d985603b5181365d90e944506b94971849009c4d2539af81215f02647a221d61ac21e27b0f2c84ffa57ceb233b58652e69e062b5f7135f8a7760583
-  data.tar.gz: 0b120bb5c099ed53c352b533728e088e6dced3b95b08cf2bb57770344415fb46f20b153329c9d5f9a03f4020dcb3320da41857a737c1e8e3a0953f732b11b376
+  metadata.gz: c86cd15261e654d70d97994d71fc9d56f440d351d9e75da8b85e28b2821548c0679d8b6f08ab48d6f5d0aff402b811f17ec43a3de80e753aaa496d9470a4b9da
+  data.tar.gz: fdf1787db3ee54d7167f5785babd549df3dbc8f846bab7b768edb89d9d04ea1caaa57bfb9fd21123a1caffb9d0afaa4cbc894eb4ba16a634216475c48041399f

data/RELEASING.md

@@ -1,3 +1,4 @@
+* Checkout the master branch.
 * Bump version number in `lib/curation_concerns/version.rb`
-* Commit and push your change to the master branch
-* Release the gem to rubygems.org: `rake build` then `rake release`
+* Commit your change with a message such as: `Bumped version to x.y.z`
+* Release the gem to rubygems.org: `rake release` This also pushes the code to github.

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

@@ -160,9 +160,7 @@ module CurationConcerns
       end
 
       def collection_search_builder
-        collection_search_builder_class.new(self).with(params.except(:q, :page)).tap do |builder|
-          builder.current_ability = current_ability
-        end
+        collection_search_builder_class.new(self).with(params.except(:q, :page))
       end
 
       def collection_search_builder_class
@@ -203,9 +201,7 @@ module CurationConcerns
       end
 
       def collection_member_search_builder
-        @collection_member_search_builder ||= collection_member_search_builder_class.new(self).tap do |builder|
-          builder.current_ability = current_ability
-        end
+        @collection_member_search_builder ||= collection_member_search_builder_class.new(self)
       end
 
       def process_member_changes

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

@@ -58,7 +58,6 @@ module CurationConcerns::SelectsCollections
 
   def collections_search_builder(access_level = nil)
     collections_search_builder_class.new(self).tap do |builder|
-      builder.current_ability = current_ability
       builder.discovery_perms = access_levels[access_level] if access_level
     end
   end

data/app/forms/curation_concerns/forms/collection_edit_form.rb

@@ -13,13 +13,6 @@ module CurationConcerns
 
       self.required_fields = [:title]
 
-      # Test to see if the given field is required
-      # @param [Symbol] key a field
-      # @return [Boolean] is it required or not
-      def required?(key)
-        model_class.validators_on(key).any? { |v| v.is_a? ActiveModel::Validations::PresenceValidator }
-      end
-
       # @return [Hash] All FileSets in the collection, file.to_s is the key, file.id is the value
       def select_files
         Hash[all_files]

data/app/services/curation_concerns/thumbnail_path_service.rb

@@ -12,36 +12,47 @@ module CurationConcerns
         if thumb.audio?
           audio_image
         elsif thumbnail?(thumb)
-          Rails.application.routes.url_helpers.download_path(object.thumbnail_id, file: 'thumbnail')
+          thumbnail_path(thumb)
         else
           default_image
         end
       end
 
-      def fetch_thumbnail(object)
-        return object if object.thumbnail_id == object.id
-        ::ActiveFedora::Base.find(object.thumbnail_id)
-      rescue ActiveFedora::ObjectNotFoundError
-        Rails.logger.error("Couldn't find thumbnail #{object.thumbnail_id} for #{object.id}")
-        nil
-      end
+      protected
 
-      def default_image
-        ActionController::Base.helpers.image_path 'default.png'
-      end
+        def fetch_thumbnail(object)
+          return object if object.thumbnail_id == object.id
+          ::ActiveFedora::Base.find(object.thumbnail_id)
+        rescue ActiveFedora::ObjectNotFoundError
+          Rails.logger.error("Couldn't find thumbnail #{object.thumbnail_id} for #{object.id}")
+          nil
+        end
 
-      def audio_image
-        ActionController::Base.helpers.image_path 'audio.png'
-      end
+        # @return the network path to the thumbnail
+        # @param [FileSet] thumbnail the object that is the thumbnail
+        def thumbnail_path(thumbnail)
+          Rails.application.routes.url_helpers.download_path(thumbnail.id,
+                                                             file: 'thumbnail')
+        end
 
-      # @return true if there a file on disk for this object, otherwise false
-      def thumbnail?(thumb)
-        File.exist?(thumbnail_filepath(thumb))
-      end
+        def default_image
+          ActionController::Base.helpers.image_path 'default.png'
+        end
 
-      def thumbnail_filepath(thumb)
-        CurationConcerns::DerivativePath.derivative_path_for_reference(thumb, 'thumbnail')
-      end
+        def audio_image
+          ActionController::Base.helpers.image_path 'audio.png'
+        end
+
+        # @return true if there a file on disk for this object, otherwise false
+        # @param [FileSet] thumbnail the object that is the thumbnail
+        def thumbnail?(thumb)
+          File.exist?(thumbnail_filepath(thumb))
+        end
+
+        # @param [FileSet] thumbnail the object that is the thumbnail
+        def thumbnail_filepath(thumb)
+          CurationConcerns::DerivativePath.derivative_path_for_reference(thumb, 'thumbnail')
+        end
     end
   end
 end

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

@@ -1,7 +1,7 @@
 <% if CurationConcerns.config.display_media_download_link %>
     <%= link_to main_app.download_path(file_set), target: "_new", title: "Download the full-sized image" do %>
         <figure>
-            <%= image_tag main_app.download_path(file_set, file: 'thumbnail'),
+            <%= image_tag thumbnail_url(file_set),
                           class: "img-responsive",
                           alt: "Download the full-sized image of #{file_set.to_s}" %>
             <figcaption>Download the full-sized image</figcaption>
@@ -9,7 +9,7 @@
     <% end %>
 <% else %>
     <figure>
-        <%= image_tag main_app.download_path(file_set, file: 'thumbnail'),
+        <%= image_tag thumbnail_url(file_set),
                       class: "img-responsive",
                       alt: "Thumbnail of #{file_set.to_s}" %>
     </figure>

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

@@ -1,7 +1,7 @@
 <% if CurationConcerns.config.display_media_download_link %>
     <%= link_to main_app.download_path(file_set), target: "_new", title: "Download the document" do %>
         <figure>
-            <%= image_tag main_app.download_path(file_set, file: 'thumbnail'),
+            <%= image_tag thumbnail_url(file_set),
                           class: "img-responsive",
                           alt: "Download the document #{file_set.to_s}" %>
             <figcaption>Download the document</figcaption>
@@ -9,7 +9,7 @@
     <% end %>
 <% else %>
     <figure>
-        <%= image_tag main_app.download_path(file_set, file: 'thumbnail'),
+        <%= image_tag thumbnail_url(file_set),
                       class: "img-responsive",
                       alt: "Thumbnail of #{file_set.to_s}" %>
     </figure>

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

@@ -1,7 +1,7 @@
 <% if CurationConcerns.config.display_media_download_link %>
     <%= link_to main_app.download_path(file_set), target: "_new", title: "Download the full-sized PDF" do %>
         <figure>
-            <%= image_tag main_app.download_path(file_set, file: 'thumbnail'),
+            <%= image_tag thumbnail_url(file_set),
                           class: "img-responsive",
                           alt: "Download the full-sized PDF of #{file_set.to_s}" %>
             <figcaption>Download the full-sized PDF</figcaption>
@@ -9,7 +9,7 @@
     <% end %>
 <% else %>
     <figure>
-        <%= image_tag main_app.download_path(file_set, file: 'thumbnail'),
+        <%= image_tag thumbnail_url(file_set),
                       class: "img-responsive",
                       alt: "Thumbnail of #{file_set.to_s}" %>
     </figure>

data/lib/curation_concerns/version.rb

@@ -1,3 +1,3 @@
 module CurationConcerns
-  VERSION = "1.0.0.beta8".freeze
+  VERSION = "1.0.0.beta9".freeze
 end

data/spec/forms/collection_edit_form_spec.rb

@@ -13,6 +13,11 @@ describe CurationConcerns::Forms::CollectionEditForm do
     end
   end
 
+  describe "#required?" do
+    subject { form.required?(:title) }
+    it { is_expected.to be true }
+  end
+
   describe "#human_readable_type" do
     subject { form.human_readable_type }
     it { is_expected.to eq 'Collection' }

data/spec/services/thumbnail_path_service_spec.rb

@@ -28,7 +28,7 @@ describe CurationConcerns::ThumbnailPathService do
   context "with a Work" do
     context "that has a thumbnail" do
       let(:object)         { GenericWork.new(thumbnail_id: '999') }
-      let(:representative) { build(:file_set, id: '777') }
+      let(:representative) { build(:file_set, id: '999') }
       let(:original_file)  { mock_file_factory(mime_type: 'image/jpeg') }
       before do
         allow(File).to receive(:exist?).and_return(true)

data/spec/views/curation_concerns/file_sets/show.html.erb_spec.rb

@@ -3,6 +3,8 @@ require 'spec_helper'
 describe 'curation_concerns/file_sets/show.html.erb', type: :view do
   before do
     allow(view).to receive(:parent).and_return(parent)
+    allow(view).to receive_messages(blacklight_config: CatalogController.blacklight_config,
+                                    blacklight_configuration_context: Blacklight::Configuration::Context.new(controller))
   end
 
   let(:parent) { stub_model(GenericWork) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curation_concerns
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta8
+  version: 1.0.0.beta9
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-08 00:00:00.000000000 Z
+date: 2016-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -1243,7 +1243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: A Rails Engine that allows an application to CRUD CurationConcern objects