sufia 6.0.0.rc2 → 6.0.0.rc3

data/app/controllers/concerns/sufia/homepage_controller.rb

@@ -13,8 +13,9 @@ module Sufia::HomepageController
   end
 
   def index
-    @featured_researcher = ContentBlock.find_or_create_by(name: 'featured_researcher')
-    @marketing_text = ContentBlock.find_or_create_by(name: 'marketing_text')
+    @featured_researcher = ContentBlock.featured_researcher
+    @featured_researcher ||= ContentBlock.create(name: ContentBlock::RESEARCHER)
+    @marketing_text = ContentBlock.find_or_create_by(name: ContentBlock::MARKETING)
     @featured_work_list = FeaturedWorkList.new
     recent
   end

data/app/controllers/content_blocks_controller.rb

@@ -1,8 +1,24 @@
 class ContentBlocksController < ApplicationController
   load_and_authorize_resource
 
+  def create
+    @content_block.save
+    redirect_to :back
+  end
+
   def update
-    @content_block.update(params.require(:content_block).permit(:value))
+    @content_block.update(update_params)
     redirect_to :back
   end
+
+protected
+
+  def create_params
+    params.require(:content_block).permit([:name, :value, :external_key])
+  end
+
+  def update_params
+    params.require(:content_block).permit([:value, :external_key])
+  end
+
 end

data/app/controllers/downloads_controller.rb

@@ -1,4 +1,3 @@
 class DownloadsController < ApplicationController
-  # module mixes in normalize_identifier method
   include Sufia::DownloadsControllerBehavior
 end

data/app/controllers/my/shares_controller.rb

@@ -3,6 +3,7 @@ module My
 
     self.solr_search_params_logic += [
       :show_only_shared_files,
+      :show_only_generic_files
     ]
 
     def show_only_shared_files(solr_parameters, user_parameters)

data/app/controllers/single_use_links_controller.rb

@@ -1,5 +1,4 @@
 class SingleUseLinksController < ApplicationController
-  prepend_before_filter :normalize_identifier
   before_filter :authenticate_user!
   before_filter :authorize_user!
 

data/app/controllers/single_use_links_viewer_controller.rb

@@ -1,11 +1,9 @@
 require 'sufia/single_use_error'
 
 class SingleUseLinksViewerController < ApplicationController
-
   include Sufia::DownloadsControllerBehavior
 
-  skip_filter :normalize_identifier
-  skip_before_filter :load_datastream, except: :download
+  skip_before_filter :load_file, except: :download
 
   class Ability
     include CanCan::Ability
@@ -18,10 +16,8 @@ class SingleUseLinksViewerController < ApplicationController
       @single_use_link = single_use_link
 
       can :read, ActiveFedora::Base do |obj|
-        single_use_link.valid? and
-          single_use_link.itemId == obj.id and single_use_link.destroy!
+        single_use_link.valid? && single_use_link.itemId == obj.id && single_use_link.destroy!
       end if single_use_link
-
     end
   end
 
@@ -30,7 +26,6 @@ class SingleUseLinksViewerController < ApplicationController
   rescue_from ActiveRecord::RecordNotFound, with: :render_single_use_error
 
   def download
-    # send the data content
     raise not_found_exception unless single_use_link.path == sufia.download_path(id: @asset)
     send_content
   end
@@ -57,7 +52,7 @@ class SingleUseLinksViewerController < ApplicationController
   end
 
   def single_use_link
-    @single_use_link ||= SingleUseLink.find_by_downloadKey! params[:id]
+    @single_use_link ||= SingleUseLink.find_by_downloadKey!(params[:id])
   end
 
   def not_found_exception

data/app/forms/sufia/forms/generic_file_edit_form.rb

@@ -2,15 +2,8 @@ module Sufia
   module Forms
     class GenericFileEditForm < GenericFilePresenter
       include HydraEditor::Form
+      include HydraEditor::Form::Permissions
       self.required_fields = [:title, :creator, :tag, :rights]
-
-      # This is required so that fields_for will draw a nested form.
-      # See ActionView::Helpers#nested_attributes_association?
-      #   https://github.com/rails/rails/blob/a04c0619617118433db6e01b67d5d082eaaa0189/actionview/lib/action_view/helpers/form_helper.rb#L1890
-      def permissions_attributes= attributes
-        model.permissions_attributes= attributes
-      end
-
     end
   end
 end

data/app/helpers/content_block_helper.rb

@@ -1,22 +1,42 @@
 module ContentBlockHelper
 
-  def editable_content_block(content_block)
+  def editable_content_block(content_block, show_new=false)
     return raw(content_block.value) unless can? :update, content_block
     capture do
-      concat content_tag(:div, id: dom_id(content_block, 'preview')) { 
+      concat content_tag(:div, id: dom_id(content_block, 'preview'), class: 'content_block_preview') {
         concat raw(content_block.value) 
-        concat button_tag "Edit", class: "btn btn-primary", data: {
-          behavior: 'reveal-editor', target: '#' + dom_id(content_block, 'edit')
-        }
+        concat edit_button(content_block)
+        concat new_button(content_block) if show_new
       } 
-      concat form_for([sufia, content_block] ) { |f|
-        concat f.text_area :value, id: "text_area_#{content_block.name}", class: "tinymce", rows: 20, cols: 120
-        concat f.submit 'Save', class: "btn btn-primary"
-      }
-
+      concat edit_form(content_block)
+      concat new_form(content_block.name) if show_new
     end
   end
 
+  def edit_button(content_block)
+    button_tag "Edit", class: 'btn btn-primary', data: { behavior: 'reveal-editor', target: '#' + dom_id(content_block, 'edit') }
+  end
+
+  def new_button(content_block)
+    button_tag "New", class: 'btn btn-primary', data: { behavior: 'reveal-editor', target: '#' + 'new_content_block' }
+  end
+
+  def edit_form(content_block, editing_field_id=nil)
+    editing_field_id ||= "text_area_#{content_block.name}"
+    form_for([sufia, content_block], html: { class: 'tinymce-form' }) { |f|
+      concat hidden_field_tag 'content_block[name]', content_block.name
+      concat f.text_area :value, id: editing_field_id, class: "tinymce", rows: 20, cols: 120
+      concat f.label :external_key, content_block.external_key_name
+      concat f.text_field :external_key
+      concat content_tag(:div) { f.submit 'Save', class: "btn btn-primary" }
+    }
+  end
+
+  def new_form(name)
+    content_block = ContentBlock.new(name: name)
+    edit_form(content_block, "new_#{name}_text_area")
+  end
+
   def tiny_mce_stuff
     capture do
       concat tinymce_assets

data/app/helpers/generic_file_helper.rb

@@ -11,19 +11,19 @@ module GenericFileHelper
 
   def render_download_icon title = nil
     if title.nil?
-      link_to download_image_tag, sufia.download_path(@generic_file.id), { target: "_blank", title: "Download the document", id: "file_download", data: { label: @generic_file.id } }
+      link_to download_image_tag, sufia.download_path(@generic_file), { target: "_blank", title: "Download the document", id: "file_download", data: { label: @generic_file.id } }
     else
       link_to (download_image_tag(title) + title), sufia.download_path(@generic_file), { target: "_blank", title: title, id: "file_download", data: { label: @generic_file.id } }
     end
   end
 
   def render_download_link text = nil
-    link_to (text || "Download"), sufia.download_path(@generic_file.noid), { id: "file_download", target: "_new", data: { label: @generic_file.id } }
+    link_to (text || "Download"), sufia.download_path(@generic_file), { id: "file_download", target: "_new", data: { label: @generic_file.id } }
   end
 
   def render_collection_list gf
     unless gf.collections.empty?
-      ("Is part of: " + gf.collections.map { |c| link_to(c.title, collections.collection_path(c.id)) }.join(", ")).html_safe
+      ("Is part of: " + gf.collections.map { |c| link_to(c.title, collections.collection_path(c)) }.join(", ")).html_safe
     end
   end
 
@@ -33,7 +33,7 @@ module GenericFileHelper
     if title.nil?
       image_tag "default.png", { alt: "No preview available", class: "img-responsive" }
     else
-      image_tag sufia.download_path(@generic_file, datastream_id: 'thumbnail'), { class: "img-responsive", alt: "#{title} of #{@generic_file.title.first}" }
+      image_tag sufia.download_path(@generic_file, file: 'thumbnail'), { class: "img-responsive", alt: "#{title} of #{@generic_file.title.first}" }
     end
   end
 

data/app/helpers/sufia/dashboard_helper_behavior.rb

@@ -41,11 +41,11 @@ module Sufia
     end
 
     def number_of_files user=current_user
-      ::GenericFile.where(Solrizer.solr_name('depositor', :stored_searchable) => user.user_key).count
+      ::GenericFile.where(Solrizer.solr_name('depositor', :symbol) => user.user_key).count
     end
 
     def number_of_collections user=current_user
-      ::Collection.where(Solrizer.solr_name('depositor', :stored_searchable) => user.user_key).count
+      ::Collection.where(Solrizer.solr_name('depositor', :symbol) => user.user_key).count
     end
 
     def notifications_for_dashboard

data/app/helpers/sufia/sufia_helper_behavior.rb

@@ -38,7 +38,7 @@ module Sufia
       # file
       else
         path = if document.image? || document.pdf? || document.video? || document.office_document?
-          sufia.download_path document.noid, datastream_id: 'thumbnail'
+          sufia.download_path document, file: 'thumbnail'
         elsif document.audio?
           "audio.png"
         else
@@ -76,7 +76,7 @@ module Sufia
     end
 
     def number_of_deposits(user)
-      ActiveFedora::Base.where(Solrizer.solr_name('depositor', :stored_searchable) => user.user_key).count
+      ActiveFedora::Base.where(Solrizer.solr_name('depositor', :symbol) => user.user_key).count
     end
 
     def link_to_facet(field, field_string)
@@ -154,8 +154,8 @@ module Sufia
     end
 
     def render_visibility_link document
-      link_to render_visibility_label(document), sufia.edit_generic_file_path(document.noid, {anchor: "permissions_display"}),
-        id: "permission_"+document.noid, class: "visibility-link"
+      link_to render_visibility_label(document), sufia.edit_generic_file_path(document, {anchor: "permissions_display"}),
+        id: "permission_"+document.id, class: "visibility-link"
     end
 
     def render_visibility_label document

data/app/helpers/trophy_helper.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 module TrophyHelper
- def display_trophy_link(user, noid, args={}, &block)
-   trophy = user.trophies.where(generic_file_id: noid).first
+ def display_trophy_link(user, id, args={}, &block)
+   trophy = user.trophies.where(generic_file_id: id).first
    trophyclass = trophy ? "trophy-on" : "trophy-off"
 
    args[:add_text] ||= "Highlight File on Profile"
@@ -12,7 +12,7 @@ module TrophyHelper
    args[:data]['add-text'] = args[:add_text]
    args[:data]['remove-text'] = args[:remove_text]
 
-   args[:data][:url] = sufia.trophy_profile_path(user, file_id: noid)
+   args[:data][:url] = sufia.trophy_profile_path(user, file_id: id)
    link_to '#', class: args[:class], data: args[:data] do
      yield(text)
    end

data/app/jobs/content_delete_event_job.rb

@@ -1,8 +1,7 @@
 class ContentDeleteEventJob < EventJob
 
   def run
-    noid = Sufia::Noid.noidify(generic_file_id)
-    action = "User #{link_to_profile depositor_id} has deleted file '#{noid}'"
+    action = "User #{link_to_profile depositor_id} has deleted file '#{generic_file_id}'"
     timestamp = Time.now.to_i
     depositor = User.find_by_user_key(depositor_id)
     # Create the event

data/app/jobs/content_deposit_event_job.rb

@@ -1,7 +1,7 @@
 class ContentDepositEventJob < EventJob
   def run
     gf = GenericFile.find(generic_file_id)
-    action = "User #{link_to_profile depositor_id} has deposited #{link_to gf.title.first, Sufia::Engine.routes.url_helpers.generic_file_path(gf.noid)}"
+    action = "User #{link_to_profile depositor_id} has deposited #{link_to gf.title.first, Sufia::Engine.routes.url_helpers.generic_file_path(gf)}"
     timestamp = Time.now.to_i
     depositor = User.find_by_user_key(depositor_id)
     # Create the event

data/app/jobs/content_depositor_change_event_job.rb

@@ -23,7 +23,7 @@ class ContentDepositorChangeEventJob < EventJob
     file.apply_depositor_metadata(login)
     file.save!
 
-    action = "User #{link_to_profile file.proxy_depositor} has transferred #{link_to file.title.first, Sufia::Engine.routes.url_helpers.generic_file_path(file.noid)} to user #{link_to_profile login}"
+    action = "User #{link_to_profile file.proxy_depositor} has transferred #{link_to file.title.first, Sufia::Engine.routes.url_helpers.generic_file_path(file)} to user #{link_to_profile login}"
     timestamp = Time.now.to_i
     depositor = ::User.find_by_user_key(file.depositor)
     proxy_depositor = ::User.find_by_user_key(file.proxy_depositor)

data/app/jobs/content_new_version_event_job.rb

@@ -1,7 +1,7 @@
 class ContentNewVersionEventJob < EventJob
   def run
     gf = GenericFile.find(generic_file_id)
-    action = "User #{link_to_profile depositor_id} has added a new version of #{link_to gf.title.first, Sufia::Engine.routes.url_helpers.generic_file_path(gf.noid)}"
+    action = "User #{link_to_profile depositor_id} has added a new version of #{link_to gf.title.first, Sufia::Engine.routes.url_helpers.generic_file_path(gf)}"
     timestamp = Time.now.to_i
     depositor = User.find_by_user_key(depositor_id)
     # Create the event

data/app/jobs/content_restored_version_event_job.rb

@@ -9,7 +9,7 @@ class ContentRestoredVersionEventJob < EventJob
 
   def run
     gf = GenericFile.find(generic_file_id)
-    action = "User #{link_to_profile depositor_id} has restored a version '#{revision_id}' of #{link_to gf.title.first, Sufia::Engine.routes.url_helpers.generic_file_path(gf.noid)}"
+    action = "User #{link_to_profile depositor_id} has restored a version '#{revision_id}' of #{link_to gf.title.first, Sufia::Engine.routes.url_helpers.generic_file_path(gf)}"
     timestamp = Time.now.to_i
     depositor = User.find_by_user_key(depositor_id)
     # Create the event

data/app/jobs/content_update_event_job.rb

@@ -1,7 +1,7 @@
 class ContentUpdateEventJob < EventJob
   def run
     gf = GenericFile.find(generic_file_id)
-    action = "User #{link_to_profile depositor_id} has updated #{link_to gf.title.first, Sufia::Engine.routes.url_helpers.generic_file_path(gf.noid)}"
+    action = "User #{link_to_profile depositor_id} has updated #{link_to gf.title.first, Sufia::Engine.routes.url_helpers.generic_file_path(gf)}"
     timestamp = Time.now.to_i
     depositor = User.find_by_user_key(depositor_id)
     # Create the event

data/app/models/concerns/sufia/solr_document_behavior.rb

@@ -4,12 +4,16 @@ module Sufia
     extend ActiveSupport::Concern
     include Sufia::GenericFile::MimeTypes
     include Sufia::Permissions::Readable
-    
+
     # Add a schema.org itemtype
     def itemtype
       Sufia.config.resource_types_to_schema[resource_type.first] || 'http://schema.org/CreativeWork'
     end
 
+    def to_param
+      self[:id]
+    end
+
     def title_or_label
       title || label
     end
@@ -20,10 +24,6 @@ module Sufia
       get(Solrizer.solr_name('has_model', :symbol)).split(':').last.downcase
     end
 
-    def to_param
-      noid
-    end
-
     ##
     # Offer the source (ActiveFedora-based) model to Rails for some of the
     # Rails methods (e.g. link_to).
@@ -40,10 +40,6 @@ module Sufia
       self[Solrizer.solr_name('active_fedora_model', Solrizer::Descriptor.new(:string, :stored, :indexed))]
     end
 
-    def noid
-      self[Solrizer.solr_name('noid', Sufia::IndexingService.noid_indexer)]
-    end
-
     def date_uploaded
       field = self[Solrizer.solr_name("date_uploaded", :stored_sortable, type: :date)]
       return unless field.present?

data/app/models/content_block.rb

@@ -1,2 +1,22 @@
 class ContentBlock < ActiveRecord::Base
+
+  MARKETING  = 'marketing_text'
+  RESEARCHER = 'featured_researcher'
+
+  def self.recent_researchers
+    where(name: RESEARCHER).order('created_at DESC')
+  end
+
+  def self.featured_researcher
+    recent_researchers.first
+  end
+
+  def self.external_keys
+    { RESEARCHER => 'User' }
+  end
+
+  def external_key_name
+    self.class.external_keys.fetch(name) { 'External Key' }
+  end
+
 end

data/app/models/featured_work_list.rb

@@ -21,6 +21,10 @@ class FeaturedWorkList
     end
   end
 
+  def empty?
+    featured_works.empty?
+  end
+
   private
     def add_solr_document_to_works
       solr_docs.each do |doc|

data/app/presenters/sufia/collection_presenter.rb

@@ -5,8 +5,9 @@ module Sufia
 
     self.model_class = ::Collection
     # Terms is the list of fields displayed by app/views/collections/_show_descriptions.html.erb
-    self.terms = [:resource_type, :creator, :contributor, :tag, :rights, :publisher, :date_created,
-                  :subject, :language, :identifier, :based_near, :related_url]
+    self.terms = [:title, :total_items, :size, :resource_type, :description, :creator, :contributor,
+                  :tag, :rights, :publisher, :date_created, :subject, :language, :identifier,
+                  :based_near, :related_url]
 
     # Depositor and permissions are not displayed in app/views/collections/_show_descriptions.html.erb
     # so don't include them in `terms'.
@@ -16,6 +17,17 @@ module Sufia
       terms.select { |t| self[t].present? }
     end
 
+    def [](key)
+      case key
+        when :size
+          size
+        when :total_items
+          total_items
+        else
+          super
+      end
+    end
+
     def size
       number_to_human_size(model.bytes)
     end

data/app/presenters/sufia/generic_file_presenter.rb

@@ -10,5 +10,21 @@ module Sufia
     # so don't include them in `terms'.
     delegate :depositor, :permissions, to: :model
 
+    def tweeter
+      user = ::User.find_by_user_key(model.depositor)
+      if user.try(:twitter_handle).present?
+        "@#{user.twitter_handle}"
+      else
+        I18n.translate('sufia.product_twitter_handle')
+      end
+    end
+
+    # Add a schema.org itemtype
+    def itemtype
+      # Look up the first non-empty resource type value in a hash from the config
+      Sufia.config.resource_types_to_schema[resource_type.to_a.reject { |type| type.empty? }.first] || 'http://schema.org/CreativeWork'
+    rescue
+      'http://schema.org/CreativeWork'
+    end
   end
 end