sufia 0.0.2 → 0.0.3

data/README.md

@@ -37,6 +37,9 @@ You'll want to ensure you're not loading the blacklight.css, so remove this line
 //= require sufia
 ```
 
+### Install Fits.sh
+http://code.google.com/p/fits/downloads/list
+
 ### Start background workers
 ```
 COUNT=4 QUEUE=* rake environment resque:work

data/app/assets/javascripts/sufia.js

@@ -18,9 +18,20 @@ limitations under the License.
 //= require jquery-ui-1.9.2/jquery.ui.widget
 //= require jquery-ui-1.9.2/jquery.ui.menu
 //= require jquery-ui-1.9.2/jquery.ui.autocomplete
+
 //= require bootstrap-dropdown
 //= require bootstrap-button
+//= require bootstrap-modal
 //= require bootstrap-collapse
+//= require bootstrap-tooltip
+//= require bootstrap-popover
+
+//= require video
+//= require audio.min
+//= require jquery.validate
+//= require swfobject
+//= require jquery.zclip.min
+
 //= require batch_edit
 //= require terms_of_service
 //= require fileupload

data/app/assets/stylesheets/sufia.css

@@ -6,4 +6,5 @@
  *= require blacklight_more_facets
  *= require batch_edit
  *= require generic_files
+ *= require video-js
 */

data/app/controllers/batch_edits_controller.rb

@@ -7,7 +7,7 @@ class BatchEditsController < ApplicationController
        @generic_file = GenericFile.new
        @generic_file.depositor = current_user.login
        @groups = current_user.groups       
-       @terms = @generic_file.get_terms.reject{|k,v| (k=='generic_file__format')|| (k=='generic_file__title')|| (k == 'generic_file__part_of')|| (k == 'generic_file__date_uploaded') || (k == 'generic_file__date_modified')}
+       @terms = @generic_file.get_terms.reject{|k,v| (k=='generic_file__title')|| (k == 'generic_file__part_of')|| (k == 'generic_file__date_uploaded') || (k == 'generic_file__date_modified')}
 
        # do we want to show the original values for anything...
        @show_file = GenericFile.new

data/app/controllers/downloads_controller.rb

@@ -14,69 +14,5 @@
 
 class DownloadsController < ApplicationController
   # module mixes in normalize_identifier method
-  include Sufia::Noid
-
-  # moved check into the routine so we can handle the user with no access 
-  #before_filter :deny_access_if_not_reader, :only=>[:show]
-  prepend_before_filter :normalize_identifier, :only=>[:audit, :edit, :show, :update, :destroy] 
-  
-  def show
-    if can? :read, permissions_solr_doc_for_id(params["id"])
-      logger.info "Can read #{params['id']}"
-
-      send_content (params["id"])
-      return
-    else 
-      logger.info "Can not read #{params['id']}"
-      redirect_to "/assets/NoAccess.png"
-    end
-  end
-
-  protected
-  
-  def send_content (id)
-      @asset = ActiveFedora::Base.find(id)
-      opts = {}
-      ds = nil
-      opts[:filename] = params["filename"] || @asset.label
-      #opts[:disposition] = params["disposition"] if params.has_key?("disposition") 
-      opts[:disposition] = 'inline' 
-      if params.has_key?(:datastream_id)
-        opts[:filename] = params[:datastream_id]
-        ds = @asset.datastreams[params[:datastream_id]]
-      end
-      ds = default_content_ds(@asset) if ds.nil?
-      data = ds.content
-      opts[:type] = ds.mimeType
-      send_data data, opts
-      return
-  end
-  
-  
-  private 
-  
-  def default_content_ds(asset)
-    ActiveFedora::ContentModel.known_models_for(asset).each do |model_class|
-      return model_class.default_content_ds if model_class.respond_to?(:default_content_ds)
-    end
-    if asset.datastreams.keys.include?(DownloadsController.default_content_dsid)
-      return asset.datastreams[DownloadsController.default_content_dsid]
-    else
-      return asset.inner_object.profile.to_xml
-    end
-  end
-  
-  def self.default_content_dsid
-    "content"
-  end
-  
-  # Custom enforcement for show requests -- redirects to catalog_path if not reader.
-  def deny_access_if_not_reader
-    authenticate_user!
-    load_permissions_from_solr
-    unless can? :read, @permissions_solr_document
-      redirect_to catalog_path
-      return
-    end
-  end  
+  include Sufia::DownloadsControllerBehavior
 end

data/app/controllers/generic_files_controller.rb

@@ -14,300 +14,5 @@
 # limitations under the License.
 
 class GenericFilesController < ApplicationController
-  include Hydra::Controller::ControllerBehavior
-  include Hydra::Controller::UploadBehavior # for add_posted_blob_to_asset method
-  include Blacklight::Configurable # comply with BL 3.7
-  include Sufia::Noid # for normalize_identifier method
-
-  # This is needed as of BL 3.7
-  self.copy_blacklight_config_from(CatalogController)
-
-  # Catch permission errors
-  rescue_from Hydra::AccessDenied do |exception|
-    if (exception.action == :edit)
-      redirect_to(sufia.url_for({:action=>'show'}), :alert => exception.message)
-    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
-  before_filter :authenticate_user!, :except => [:show, :citation]
-  before_filter :has_access?, :except => [:show]
-  before_filter :enforce_access_controls
-  before_filter :find_by_id, :except => [:index, :create, :new]
-  prepend_before_filter :normalize_identifier, :except => [:index, :create, :new]
-
-  # 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
-    @terms = @generic_file.get_terms
-    @groups = current_user.groups
-  end
-
-  # routed to /files/:id
-  def index
-    @generic_files = GenericFile.find(:all, :rows => GenericFile.count)
-    render :json => @generic_files.map(&:to_jq_upload).to_json
-  end
-
-  # routed to /files/:id (DELETE)
-  def destroy
-    pid = @generic_file.noid
-    @generic_file.delete
-    Sufia.queue.push(ContentDeleteEventJob.new(pid, current_user.user_key))
-    redirect_to sufia.dashboard_index_path, :notice => render_to_string(:partial=>'generic_files/asset_deleted_flash', :locals => { :generic_file => @generic_file })
-  end
-
-  # routed to /files (POST)
-  def create
-    begin
-      retval = " "
-      # check error condition No files
-      if !params.has_key?(:files)
-         retval = render :json => [{:error => "Error! No file to save"}].to_json
-
-      # check error condition empty file
-      elsif ((params[:files][0].respond_to?(:tempfile)) && (params[:files][0].tempfile.size == 0))
-         retval = render :json => [{ :name => params[:files][0].original_filename, :error => "Error! Zero Length File!"}].to_json
-
-      elsif ((params[:files][0].respond_to?(:size)) && (params[:files][0].size == 0))
-         retval = render :json => [{ :name => params[:files][0].original_filename, :error => "Error! Zero Length File!"}].to_json
-
-      elsif (params[:terms_of_service] != '1')
-         retval = render :json => [{ :name => params[:files][0].original_filename, :error => "You must accept the terms of service!"}].to_json
-
-      # process file
-      else
-        create_and_save_generic_file
-        if @generic_file
-          Sufia.queue.push(ContentDepositEventJob.new(@generic_file.pid, current_user.user_key))
-          respond_to do |format|
-            format.html {
-              retval = render :json => [@generic_file.to_jq_upload].to_json,
-                :content_type => 'text/html',
-                :layout => false
-            }
-            format.json {
-              retval = render :json => [@generic_file.to_jq_upload].to_json
-            }
-          end
-        else
-          retval = render :json => [{:error => "Error creating generic file."}].to_json
-        end
-      end
-    rescue => error
-      logger.warn "GenericFilesController::create rescued error #{error.backtrace}"
-      retval = render :json => [{:error => "Error occurred while creating generic file."}].to_json
-    ensure
-      # remove the tempfile (only if it is a temp file)
-      params[:files][0].tempfile.delete if params[:files][0].respond_to?(:tempfile)
-    end
-
-    return retval
-  end
-
-  # routed to /files/:id/citation
-  def citation
-  end
-
-  # routed to /files/:id
-  def show
-    perms = permissions_solr_doc_for_id(@generic_file.pid)
-    @can_read =  can? :read, perms
-    @can_edit =  can? :edit, perms
-    @events = @generic_file.events(100)
-
-    respond_to do |format|
-      format.html
-      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_datastream(revision.content, :dsid => 'content')
-      version_event = true
-      Sufia.queue.push(ContentRestoredVersionEventJob.new(@generic_file.pid, current_user.user_key, params[:revision]))
-    end
-
-    if params.has_key?(:filedata)
-      return unless virus_check(params[:filedata]) == 0
-      add_posted_blob_to_asset(@generic_file, params[:filedata])
-      version_event = true
-      Sufia.queue.push(ContentNewVersionEventJob.new(@generic_file.pid, current_user.user_key))
-    end
-    @generic_file.attributes = params[:generic_file].reject { |k,v| %w{ Filedata Filename revision part_of date_modified date_uploaded format }.include? k}
-    @generic_file.set_visibility(params[:visibility])
-    @generic_file.date_modified = Time.now.ctime
-    @generic_file.save!
-    # do not trigger an update event if a version event has already been triggered
-    Sufia.queue.push(ContentUpdateEventJob.new(@generic_file.pid, current_user.user_key)) unless version_event
-    record_version_committer(@generic_file, 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 })
-
-  end
-
-  protected
-  def record_version_committer(generic_file, user)
-    version = generic_file.content.latest_version
-    # content datastream not (yet?) present
-    return if version.nil?
-    VersionCommitter.create(:obj_id => version.pid,
-                            :datastream_id => version.dsid,
-                            :version_id => version.versionID,
-                            :committer_login => user.user_key)
-  end
-
-  def find_by_id
-    @generic_file = GenericFile.find(params[:id])
-  end
-
-  def virus_check( file)
-    if defined? ClamAV
-      stat = ClamAV.instance.scanfile(file.path)
-      flash[:error] = "Virus checking did not pass for #{file.original_filename} status = #{stat}" unless stat == 0
-      logger.warn "Virus checking did not pass for #{file.inspect} status = #{stat}" unless stat == 0
-      stat
-    else
-      logger.warn "Virus checking disabled for #{file.inspect}"
-      0
-    end
-  end 
-
-  def create_and_save_generic_file
-    unless params.has_key?(:files)
-      logger.warn "!!!! No Files !!!!"
-      return
-    end
-    file = params[:files][0]
-    return nil unless virus_check(file) == 0  
-
-    @generic_file = GenericFile.new
-    @generic_file.terms_of_service = params[:terms_of_service]
-    # if we want to be able to save zero length files then we can use this to make the file 1 byte instead of zero length and fedora will take it
-    #if (file.tempfile.size == 0)
-    #   logger.warn "Encountered an empty file...  Creating a new temp file with on space."
-    #   f = Tempfile.new ("emptyfile")
-    #   f.write " "
-    #   f.rewind
-    #   file.tempfile = f
-    #end
-    add_posted_blob_to_asset(@generic_file,file)
-
-    @generic_file.apply_depositor_metadata(user_key)
-    @generic_file.date_uploaded = Time.now.ctime
-    @generic_file.date_modified = Time.now.ctime
-    @generic_file.relative_path = params[:relative_path] if params.has_key?(:relative_path)
-    @generic_file.creator = current_user.name
-
-    if params.has_key?(:batch_id)
-      batch_id = Sufia::Noid.namespaceize(params[:batch_id])
-      @generic_file.add_relationship("isPartOf", "info:fedora/#{batch_id}")
-    else
-      logger.warn "unable to find batch to attach to"
-    end
-
-    save_tries = 0
-    begin
-      @generic_file.save
-    rescue RSolr::Error::Http => error
-      logger.warn "GenericFilesController::create_and_save_generic_file Caught RSOLR error #{error.inspect}"
-      save_tries+=1
-      # fail for good if the tries is greater than 3
-      rescue_action_without_handler(error) if save_tries >=3
-      sleep 0.01
-      retry
-    end
-
-    record_version_committer(@generic_file, current_user)
-    Sufia.queue.push(UnzipJob.new(@generic_file.pid)) if file.content_type == 'application/zip'
-    return @generic_file
-  end
-  
-  
-  
-  ############################ to get rid of deprication warnings.  Need to fix #################
-  # Controller "before" filter that delegates enforcement based on the controller action
-  # Action-specific implementations are enforce_index_permissions, enforce_show_permissions, etc.
-  # @param [Hash] opts (optional, not currently used)
-  #
-  # @example
-  #   class CatalogController < ApplicationController  
-  #     before_filter :enforce_access_controls
-  #   end
-  #
-  # @deprecated HYDRA-886 Blacklight is now using Catalog#update to store pagination info, so we don't want to enforce_edit_permissions on it. Instead just call before_filter :enforce_show_permissions, :only=>:show. Move all Edit/Update/Delete methods into non-catalog backed controllers.
-  def enforce_access_controls(opts={})
-    controller_action = params[:action].to_s
-    delegate_method = "enforce_#{controller_action}_permissions"
-    if self.respond_to?(delegate_method.to_sym, true)
-      self.send(delegate_method.to_sym)
-    else
-      true
-    end
-  end
-  
- 
-  # Controller "before" filter for enforcing access controls on edit actions
-  # @param [Hash] opts (optional, not currently used)
-  def enforce_edit_permissions(opts={})
-    logger.debug("Enforcing edit permissions")
-    load_permissions_from_solr
-    if !can? :edit, params[:id]
-      session[:viewing_context] = "browse"
-      raise Hydra::AccessDenied.new("You do not have sufficient privileges to edit this document. You have been redirected to the read-only view.", :edit, params[:id])
-    else
-      session[:viewing_context] = "edit"
-    end
-  end
- 
-  ##  This method is here for you to override
-  def enforce_create_permissions(opts={})
-    logger.debug("Enforcing create permissions")
-    if !can? :create, ActiveFedora::Base.new
-      raise Hydra::AccessDenied.new "You do not have sufficient privileges to create a new document."
-    end
-  end
- 
-  ## proxies to enforce_edit_permssions.  This method is here for you to override
-  def enforce_update_permissions(opts={})
-    enforce_edit_permissions(opts)
-  end
-
-  ## proxies to enforce_edit_permssions.  This method is here for you to override
-  def enforce_destroy_permissions(opts={})
-    enforce_edit_permissions(opts)
-  end
-
-  ## proxies to enforce_edit_permssions.  This method is here for you to override
-  def enforce_new_permissions(opts={})
-    enforce_create_permissions(opts)
-  end
-
-  # Controller "before" filter for enforcing access controls on index actions
-  # Currently does nothing, instead relies on 
-  # @param [Hash] opts (optional, not currently used)
-  def enforce_index_permissions(opts={})
-    # Do nothing. Relies on enforce_search_permissions being included in the Controller's solr_search_params_logic
-    return true
-  end
-  
+  include Sufia::FilesControllerBehavior
 end

data/app/models/datastreams/generic_file_rdf_datastream.rb

@@ -17,7 +17,6 @@ class GenericFileRdfDatastream < ActiveFedora::NtriplesRDFDatastream
   map_predicates do |map|
     map.part_of(:to => "isPartOf", :in => RDF::DC)
     map.contributor(:in => RDF::DC) do |index|
-      #index.as :searchable, :facetable, :displayable
       index.as :searchable, :displayable
     end
     map.creator(:in => RDF::DC) do |index|
@@ -56,9 +55,6 @@ class GenericFileRdfDatastream < ActiveFedora::NtriplesRDFDatastream
     map.resource_type(:to => "type", :in => RDF::DC) do |index|
       index.as :searchable, :facetable, :displayable
     end
-    map.format(:in => RDF::DC) do |index|
-      index.as :searchable, :facetable, :displayable
-    end
     map.identifier(:in => RDF::DC) do |index|
       index.as :searchable, :displayable
     end

data/app/views/_ga.html.erb

@@ -15,8 +15,8 @@ limitations under the License.
 %>
 
 <%
-tracking_id = 1234 #Scholarsphere::Engine.config.ga_host_map[request.host]
-unless tracking_id.blank?
+if Sufia::Engine.config.respond_to? :google_analytics_id
+tracking_id = Sufia::Engine.config.google_analytics_id
 %>
 <script type="text/javascript">
   var _gaq = _gaq || [];