sufia 4.0.0.beta2 → 4.0.0.beta3

data/app/helpers/sufia_helper.rb

@@ -1,93 +0,0 @@
-module SufiaHelper
-
-  # link_back_to_dashboard(:label=>'Back to Search')
-  # Create a link back to the dashboard screen, keeping the user's facet, query and paging choices intact by using session.
-  def link_back_to_dashboard(opts={:label=>'Back to Search'})
-    query_params = session[:search] ? session[:search].dup : {}
-    query_params.delete :counter
-    query_params.delete :total
-    link_url = dashboard_index_path + "?" + query_params.to_query
-    link_to opts[:label], link_url
-  end
-
-  def link_to_dashboard_query(query)
-    p = params.dup
-    p.delete :page
-    p.delete :action
-    p[:q]=query
-    link_url = dashboard_index_path(p)
-    link_to(query, link_url)
-  end
-
-  def display_user_name(recent_document)
-    return "no display name" unless recent_document.depositor
-    return User.find_by_user_key(recent_document.depositor).name rescue recent_document.depositor
-  end
-
-  def number_of_deposits(user)
-    ActiveFedora::Base.where(Solrizer.solr_name('depositor', :stored_searchable) => user.user_key).count
-  end
-
-  def link_to_facet(field, field_string)
-    link_to(field, add_facet_params(field_string, field).merge!({"controller" => "catalog", :action=> "index"}))
-  end
-
-  # @param values [Array] The values to display
-  # @param solr_field [String] The name of the solr field to link to without its suffix (:facetable) 
-  # @param empty_message [String] ('No value entered') The message to display if no values are passed in.
-  # @param separator [String] (', ') The value to join with. 
-  def link_to_facet_list(values, solr_field, empty_message="No value entered", separator=", ")
-    return empty_message if values.blank?
-    facet_field = Solrizer.solr_name(solr_field, :facetable)
-    safe_join(values.map{ |item| link_to_facet(item, facet_field) }, separator)
-  end
-
-
-  def link_to_field(fieldname, fieldvalue, displayvalue = nil)
-    p = {:search_field=>'advanced', fieldname=>'"'+fieldvalue+'"'}
-    link_url = catalog_index_path(p)
-    display = displayvalue.blank? ? fieldvalue: displayvalue
-    link_to(display, link_url)
-  end
-
-  def iconify_auto_link(text, showLink = true)
-    auto_link(text) do |value|
-      link = "<i class='icon-external-link'></i>&nbsp;#{value}<br />" if showLink
-      link = "<i class='icon-external-link'></i>&nbsp;<br />" unless showLink
-      link
-    end
-  end
-
-  def link_to_profile(login)
-    user = User.find_by_user_key(login)
-    return login if user.nil?
-
-    text = if user.respond_to? :name
-      user.name
-    else
-      login
-    end
-
-    link_to text, Sufia::Engine.routes.url_helpers.profile_path(user)
-  end
-
-  def linkify_chat_id(chat_id)
-    if chat_id.end_with? '@chat.psu.edu'
-      "<a href=\"xmpp:#{chat_id}\">#{chat_id}</a>"
-    else
-      chat_id
-    end
-  end
-
-  # Create a link back to the index screen, keeping the user's facet, query and paging choices intact by using session.
-  # We should be able to do away with this method in Blacklight 5
-  # @example
-  #   link_back_to_catalog(:label=>'Back to Search')
-  def link_back_to_catalog(opts={:label=>nil})
-    scope = opts.delete(:route_set) || self
-    query_params = current_search_session.try(:query_params) || {}
-    link_url = scope.url_for(query_params)
-    opts[:label] ||= t('blacklight.back_to_search')
-    link_to opts[:label], link_url
-  end
-end

data/app/views/catalog/_bookmark_form.html.erb

@@ -1,8 +0,0 @@
-<%= form_tag '/bookmarks', :name => "bookmarks" do %>
-  <% documents.each_with_index do |document, index| %>
-    <%= hidden_field_tag "bookmarks[#{index}][document_id]", document.get(:id)%>
-    <%= hidden_field_tag "bookmarks[#{index}][title]", h(document[document_show_link_field])%>
-  <% end %>
-  <%= link_to_function "Add to Bookmarks", "document.bookmarks.submit()" %>
-  <%= submit_tag 'Add to Bookmarks', :class => 'hide' %>
-<% end %>

data/app/views/catalog/_home_header.html.erb

@@ -1,15 +0,0 @@
-<div class="home_call_action col-xs-12 col-sm-4 pull-right">
-  <div class="home_share_work">
-    <%= link_to "<i class=\"icon-file\"></i> #{t('sufia.share_button')}".html_safe, sufia.new_generic_file_path, :class => "btn btn-primary btn-lg btn-block", :id => "contribute_link" %>
-    <p class="text-center"><a href="/terms/">Terms of Use</a></p>
-  </div><!-- /.home_share_work -->
-</div><!-- /.col-xs-3 -->
-<div class="col-xs-12 col-sm-8">
-  <div class="col-sm-offset-2 col-sm-9 col-md-offset-1  home_marketing_text">
-      <h2>Share. Manage. Preserve.</h2>
-      <p>Raise the profile of your research and boost its impact with Sufia!</p>
-  </div>
-</div>
-
-
-

data/app/views/catalog/_recents.html.erb

@@ -1,17 +0,0 @@
-<% msg = 'Login to see your recently added documents' if msg.blank? and current_user.blank? %>
-<% msg = 'You have no documents to display. Contribute some of your documents!' if msg.blank? %>
-<div>
-  <% if recent_documents.blank? %>
-    <% msg = 'Login to see your recently added documents' if msg.blank? and current_user.blank? %>
-    <% msg = 'You have no documents to display. Contribute some of your documents!' if msg.blank? %>
-    <h3><%= msg %></h3>
-  <% else %>
-
-      <div id="recent_docs">
-        <table class="table table-bordered table-striped"> 
-          <%= render :partial => "recent_document", :collection => recent_documents, :locals=>{:display_thumbs=> display_thumbs, :display_access=> display_access} %>
-        </table>
-      </div>
-   <% end %>
-
-</div>

data/app/views/dashboard/_index_partials/_thumbnail_display.html.erb

@@ -1,9 +0,0 @@
-<% width = 36 if width.blank? %>
-<% if document.image? || document.pdf? || document.video? %>
-  <% path = sufia.download_path(document.noid, {datastream_id: 'thumbnail'}) %>
-<% elsif document.audio? %>
-  <% path = "audio.png" %>
-<% else %>
-  <% path = "default.png" %>
-<% end %>
-<%= link_to image_tag(path, {width: width}), sufia.generic_file_path(document) %>

data/app/views/layouts/_homepage_sidebar2.html.erb

@@ -1,14 +0,0 @@
-<h2 class="heading1">Contribute</h2>
-<%= link_to "<i class=\"icon-file\"></i> #{t('sufia.share_button')}".html_safe, sufia.new_generic_file_path, :class => "btn btn-primary btn-large", :id => "contribute_link" %>
-<div class="row center"> <a href="/terms/">Terms of Use</a></div><br />
-<%- if blacklight_config.respond_to?(:tag_cloud_field_name) && blacklight_config.tag_cloud_field_name %>
-  <div class="row">
-    <h2 class="heading1 pull-left">Explore</h2>
-    <%= render partial:'catalog/tagcloud', locals:{tag_cloud_field_name:blacklight_config.tag_cloud_field_name}%>
-  </div>
-<%- end %>
-<div class="row">&nbsp;</div>
-<div class="row">
-  <h2 class="heading1">My Latest</h2>
-  <%= render :partial=>'/catalog/recents', :locals => {:recent_documents=>@recent_user_documents, :display_thumbs=>false, :display_access=>true} %>
-</row>

data/lib/sufia/files_controller_behavior.rb

@@ -1,253 +0,0 @@
-module Sufia
-  module FilesController
-    autoload :LocalIngestBehavior, 'sufia/files_controller/local_ingest_behavior'
-    autoload :UploadCompleteBehavior, 'sufia/files_controller/upload_complete_behavior'
-  end
-  module FilesControllerBehavior
-    extend ActiveSupport::Concern
-    extend Sufia::FilesController::UploadCompleteBehavior
-
-    included do
-      include Hydra::Controller::ControllerBehavior
-      include Blacklight::Configurable
-      include Sufia::Noid # for normalize_identifier method
-      include Sufia::FilesController::LocalIngestBehavior
-      extend Sufia::FilesController::UploadCompleteBehavior
-
-      layout "sufia-one-column"
-
-      self.copy_blacklight_config_from(CatalogController)
-
-      # Catch permission errors
-      rescue_from Hydra::AccessDenied, CanCan::AccessDenied do |exception|
-        if exception.action == :edit
-          redirect_to(sufia.url_for({:action=>'show'}), :alert => "You do not have sufficient privileges to edit this document")
-        elsif current_user and current_user.persisted?
-          redirect_to root_url, :alert => exception.message
-        else
-          session["user_return_to"] = request.url
-          redirect_to new_user_session_url, :alert => exception.message
-        end
-      end
-
-      # actions: audit, index, create, new, edit, show, update,
-      #          destroy, permissions, citation, stats
-      before_filter :authenticate_user!, :except => [:show, :citation]
-      before_filter :has_access?, :except => [:show]
-      prepend_before_filter :normalize_identifier, :except => [:index, :create, :new]
-      load_resource :only=>[:audit]
-      load_and_authorize_resource :except=>[:index, :audit]
-    end
-
-    # routed to /files/new
-    def new
-      @generic_file = ::GenericFile.new
-      @batch_noid = Sufia::Noid.noidify(Sufia::IdService.mint)
-    end
-
-    # routed to /files/:id/edit
-    def edit
-      @generic_file.initialize_fields
-      @groups = current_user.groups
-    end
-
-    # routed to /files/:id/stats
-    def stats
-      path = sufia.generic_file_path(Sufia::Noid.noidify(params[:id]))
-      # Pull back results from GA, filter them for path, and hashify
-      @created = DateTime.parse(::GenericFile.find(params[:id]).create_date)
-      results_list = Sufia::UsageStatistics.profile.pageview(
-        start_date: @created,
-        end_date: DateTime.now,
-        sort: 'date').for_path(path)
-      @stats_json = Sufia::UsageStatistics.as_flot_json(results_list)
-      @pageviews = Sufia::UsageStatistics.total_pageviews(results_list)
-    end
-
-    # routed to /files/:id (DELETE)
-    def destroy
-      pid = @generic_file.noid
-      @generic_file.destroy
-      Sufia.queue.push(ContentDeleteEventJob.new(pid, current_user.user_key))
-      redirect_to self.class.destroy_complete_path(params), :notice => render_to_string(:partial=>'generic_files/asset_deleted_flash', :locals => { :generic_file => @generic_file })
-    end
-
-    # routed to /files (POST)
-    def create
-      if params[:local_file].present?
-        perform_local_ingest
-      elsif params[:selected_files].present?
-        create_from_browse_everything(params)
-      else
-        create_from_upload(params)
-      end
-    end
-    
-    def create_from_browse_everything(params)
-      params[:selected_files].each_pair do |index, file_info| 
-        next if file_info.blank? || file_info["url"].blank?
-        create_file_from_url(file_info["url"])
-      end
-      redirect_to self.class.upload_complete_path( params[:batch_id])
-    end
-    
-    # Generic utility for creating GenericFile from a URL
-    # Used in to import files using URLs from a file picker like browse_everything 
-    def create_file_from_url(url, batch_id=nil)
-      @generic_file = ::GenericFile.new
-      @generic_file.import_url = url
-      @generic_file.label = File.basename(url)
-      create_metadata(@generic_file)
-      Sufia.queue.push(ImportUrlJob.new(@generic_file.pid))
-      return @generic_file
-    end
-
-    def create_from_upload(params)
-      # check error condition No files
-      return json_error("Error! No file to save") if !params.has_key?(:files)
-
-      file = params[:files].detect {|f| f.respond_to?(:original_filename) }
-      if !file
-        json_error "Error! No file for upload", 'unknown file', :status => :unprocessable_entity
-      elsif (empty_file?(file))
-        json_error "Error! Zero Length File!", file.original_filename
-      elsif (!terms_accepted?)
-        json_error "You must accept the terms of service!", file.original_filename
-      else
-        process_file(file)
-      end
-    rescue => error
-      logger.error "GenericFilesController::create rescued #{error.class}\n\t#{error.to_s}\n #{error.backtrace.join("\n")}\n\n"
-      json_error "Error occurred while creating generic file."
-    ensure
-      # remove the tempfile (only if it is a temp file)
-      file.tempfile.delete if file.respond_to?(:tempfile)
-    end
-
-    # routed to /files/:id/citation
-    def citation
-    end
-
-    # routed to /files/:id
-    def show
-      respond_to do |format|
-        format.html {
-          @events = @generic_file.events(100)
-        }
-        format.endnote { render :text => @generic_file.export_as_endnote }
-      end
-    end
-
-    # routed to /files/:id/audit (POST)
-    def audit
-      render :json=>@generic_file.audit
-    end
-
-    # routed to /files/:id (PUT)
-    def update
-      version_event = false
-
-      if params.has_key?(:revision) and params[:revision] !=  @generic_file.content.latest_version.versionID
-        revision = @generic_file.content.get_version(params[:revision])
-        @generic_file.add_file(revision.content, datastream_id, revision.label)
-        version_event = true
-        Sufia.queue.push(ContentRestoredVersionEventJob.new(@generic_file.pid, current_user.user_key, params[:revision]))
-      end
-
-      if params.has_key?(:filedata)
-        file = params[:filedata]
-        @generic_file.add_file(file, datastream_id, file.original_filename)
-        version_event = true
-      end
-
-      # only update metadata if there is a generic_file object which is not the case for version updates
-      update_metadata if params[:generic_file]
-
-      #always save the file so the new version or metadata gets recorded
-      if @generic_file.save
-        # do not trigger an update event if a version event has already been triggered
-        if version_event
-          Sufia.queue.push(ContentNewVersionEventJob.new(@generic_file.pid, current_user.user_key)) if params.has_key?(:filedata)
-        else
-          Sufia.queue.push(ContentUpdateEventJob.new(@generic_file.pid, current_user.user_key))
-        end
-        @generic_file.record_version_committer(current_user)
-        redirect_to sufia.edit_generic_file_path(:tab => params[:redirect_tab]), :notice => render_to_string(:partial=>'generic_files/asset_updated_flash', :locals => { :generic_file => @generic_file })
-      else
-        render action: 'edit'
-      end
-    rescue => error
-      flash[:error] = error.message
-      logger.error "GenericFilesController::update rescued #{error.class}\n\t#{error.message}\n #{error.backtrace.join("\n")}\n\n"
-      render action: 'edit'
-    end
-
-    protected
-
-    def json_error(error, name=nil, additional_arguments={})
-      args = {:error => error}
-      args[:name] = name if name
-      render additional_arguments.merge({:json => [args]})
-    end
-
-    def empty_file?(file)
-      (file.respond_to?(:tempfile) && file.tempfile.size == 0) || (file.respond_to?(:size) && file.size == 0)
-    end
-
-    def process_file(file)
-      @generic_file = ::GenericFile.new
-      update_metadata_from_upload_screen
-      create_metadata(@generic_file)
-      Sufia::GenericFile::Actions.create_content(@generic_file, file, file.original_filename, datastream_id, current_user)
-      respond_to do |format|
-        format.html {
-          render :json => [@generic_file.to_jq_upload],
-          :content_type => 'text/html',
-          :layout => false
-        }
-        format.json {
-          render :json => [@generic_file.to_jq_upload]
-        }
-      end
-    rescue ActiveFedora::RecordInvalid => af
-      flash[:error] = af.message
-      json_error "Error creating generic file: #{af.message}"
-    end
-
-    # override this method if you want to change how the terms are accepted on upload.
-    def terms_accepted?
-      params[:terms_of_service] == '1'
-    end
-
-    # override this method if you need to initialize more complex RDF assertions (b-nodes)
-    # @deprecated use @generic_file.initialize_fields instead
-    def initialize_fields(file)
-      file.initialize_fields
-    end
-
-    ActiveSupport::Deprecation.deprecate_methods(FilesControllerBehavior, :initialize_fields)
-
-    # The name of the datastream where we store the file data
-    def datastream_id
-      'content'
-    end
-
-    # this is provided so that implementing application can override this behavior and map params to different attributes
-    def update_metadata_from_upload_screen
-      # Relative path is set by the jquery uploader when uploading a directory
-      @generic_file.relative_path = params[:relative_path] if params[:relative_path]
-    end
-
-    # this is provided so that implementing application can override this behavior and map params to different attributes
-    def update_metadata
-      @generic_file.attributes = @generic_file.sanitize_attributes(params[:generic_file])
-      @generic_file.visibility = params[:visibility]
-      @generic_file.date_modified = DateTime.now
-    end
-
-    def create_metadata(file)
-      Sufia::GenericFile::Actions.create_metadata(file, current_user, params[:batch_id])
-    end
-
-  end
-end

data/spec/helpers/generic_file_helper_spec.rb

@@ -1,28 +0,0 @@
-require 'spec_helper'
-
-describe GenericFileHelper do
-  it "draws add button" do
-    helper.add_field(:test).should == 
-      "<button class=\"adder btn\" id=\"additional_test_submit\" name=\"additional_test\">+<span class=\"sr-only\">add another test</span></button>"
-  end
-
-  it "draws subtract button" do
-    helper.subtract_field(:test).should == 
-      "<button class=\"remover btn\" id=\"additional_test_submit\" name=\"additional_test\">-<span class=\"sr-only\">add another test</span></button>"
-  end
-
-  it "draws help_icon" do
-    str = String.new(helper.help_icon(:tag))
-    doc = Nokogiri::HTML(str)
-    a = doc.xpath('//a').first
-    
-    a.attr('data-content').should == "Words or phrases you select to describe what the file is about. These are used to search for content. <em>This is a required field</em>."
-    a.attr('data-original-title').should == "Keyword"
-    a.attr('id').should == "generic_file_tag_help"
-    i = a.children.first
-    i.attr('class').should == 'glyphicon glyphicon-question-sign icon-large'
-  end
-
-end
-
-

data/spec/lib/sufia/usage_statistics_spec.rb

@@ -1,75 +0,0 @@
-require 'spec_helper'
-
-describe Sufia::UsageStatistics do
-  before do
-    token = OAuth2::AccessToken.new(nil, nil)
-    allow(subject).to receive(:token).and_return(token)
-  end
-
-  it 'responds to :config' do
-    expect(subject).to respond_to(:config)
-  end
-
-  it 'reads its config from a yaml file' do
-    expect(subject.config.keys.sort).to eql ['app_name', 'app_version', 'client_email', 'privkey_path', 'privkey_secret']
-  end
-
-  it 'responds to :user' do
-    expect(subject).to respond_to(:user)
-  end
-
-  it 'instantiates a user' do
-    expect(subject.user).to be_a(Legato::User)
-  end
-
-  it 'responds to :profile' do
-    expect(subject).to respond_to(:profile)
-  end
-
-  describe 'querying' do
-    before do
-      profile = Legato::Management::Profile.new({"id" => 12345, "name" => "Profile 1", "accountId" => "12345", "webPropertyId" => "UA-12345-2", "timezone" => "America/Chicago"}, subject.user)
-      allow(subject).to receive(:profile).and_return(profile)
-    end
-
-    let(:query) { Sufia::UsageStatistics.profile.pageview }
-
-    it 'returns a query object' do
-      expect(query).to be_a(Legato::Query)
-    end
-
-    describe 'results' do
-      before(:all) do
-        @system_timezone = ENV['TZ']
-        ENV['TZ'] = 'UTC'
-      end
-
-      after(:all) do
-        ENV['TZ'] = @system_timezone
-      end
-
-      # Mock and stub Google Analytics results
-      before do
-        @mock_query = double('query')
-        allow(@mock_query).to receive(:collection).and_return([
-            OpenStruct.new(date: '2014-01-01', pageviews: 4),
-            OpenStruct.new(date: '2014-01-02', pageviews: 8),
-            OpenStruct.new(date: '2014-01-03', pageviews: 6),
-            OpenStruct.new(date: '2014-01-04', pageviews: 10),
-            OpenStruct.new(date: '2014-01-05', pageviews: 2)])
-        allow(@mock_query).to receive(:map).and_return(@mock_query.collection.map(&:marshal_dump))
-        allow(Sufia::UsageStatistics.profile).to receive(:pageview).and_return(@mock_query)
-      end
-
-      let(:results) { @mock_query }
-
-      it 'converts results to json' do
-        expect(subject.as_flot_json(results)).to eql('[[1388534400000,4],[1388620800000,8],[1388707200000,6],[1388793600000,10],[1388880000000,2]]')
-      end
-
-      it 'calculates total page views' do
-        expect(subject.total_pageviews(results)).to eql(30)
-      end
-    end
-  end
-end