sufia 0.0.5 → 0.0.6

data/config/routes.rb

@@ -8,7 +8,7 @@ Sufia::Engine.routes.draw do
 
   # Route path-less requests to the index view of catalog
   root :to => "catalog#index"
-
+  
   # "Recently added files" route for catalog index view
   match "catalog/recent" => "catalog#recent", :as => :catalog_recent
 
@@ -26,11 +26,6 @@ Sufia::Engine.routes.draw do
   # Downloads controller route
   resources :downloads, :only => "show"
 
-  # Login/logout route to destroy session
-  # can just be in the PSU scholarsphere
-  match 'logout' => 'sessions#destroy', :as => :destroy_user_session
-  match 'login' => 'sessions#new', :as => :new_user_session
-
   # Messages
   match 'notifications' => 'mailbox#index', :as => :mailbox
   match 'notifications/delete_all' => 'mailbox#delete_all', :as => :mailbox_delete_all
@@ -41,6 +36,10 @@ Sufia::Engine.routes.draw do
   match 'users/:uid' => 'users#show', :as => :profile
   match 'users/:uid/edit' => 'users#edit', :as => :edit_profile
   match 'users/:uid/update' => 'users#update', :as => :update_profile, :via => :put
+  match "users/:uid/trophy" => "users#toggle_trophy", :as => :update_trophy_user, :via => :post
+
+
+
   match 'users/:uid/follow' => 'users#follow', :as => :follow_user
   match 'users/:uid/unfollow' => 'users#unfollow', :as => :unfollow_user
 
@@ -82,6 +81,9 @@ Sufia::Engine.routes.draw do
 
   # Static page routes (workaround)
   match ':action' => 'static#:action', :constraints => { :action => /about|help|terms|zotero|mendeley|agreement|subject_libraries|versions/ }, :as => :static
+
+  # Catch-all (for routing errors)
+  match '*error' => 'errors#routing'
   
 end
 

data/features/support/cleanup.rb

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 at_exit do
-  Batch.find(:all, :rows=>Batch.count).map(&:delete)
-  GenericFile.find(:all, :rows=>GenericFile.count).map(&:delete)
+  Batch.destroy_all
+  GenericFile.destroy_all
   User.destroy_all
 end

data/lib/generators/sufia/sufia_generator.rb

@@ -35,7 +35,7 @@ This generator makes the following changes to your application:
     # Can't get this any more DRY, because we need this order.
     %w{acts_as_follower_migration.rb	add_social_to_users.rb		create_single_use_links.rb	add_ldap_attrs_to_user.rb
 add_avatars_to_users.rb		create_checksum_audit_logs.rb	create_version_committers.rb
-add_groups_to_users.rb		create_local_authorities.rb}.each do |f|
+add_groups_to_users.rb		create_local_authorities.rb	create_trophies.rb}.each do |f|
       better_migration_template f
     end
   end

data/lib/generators/sufia/templates/config/sufia.rb

@@ -1,7 +1,3 @@
-
-require 'sufia/http_header_auth'
-
-# TODO move this method to HttpAuth initializer
 # Returns an array containing the vhost 'CoSign service' value and URL
 Sufia.config do |config|
   config.id_namespace = "sufia"
@@ -13,21 +9,6 @@ Sufia.config do |config|
 
   config.max_days_between_audits = 7
 
-  # TODO move these to an HttpAuth initializer
-    # Map hostnames onto vhosts
-  config.hosts_vhosts_map = {
-    'fedora1test' => 'https://scholarsphere-integration.dlt.psu.edu:8443/',
-    'fedora2test' => 'https://scholarsphere-test.dlt.psu.edu/',
-    'ss1stage' => 'https://scholarsphere-staging.dlt.psu.edu/',
-    'ss2stage' => 'https://scholarsphere-staging.dlt.psu.edu/',
-    'ss1prod' => 'https://scholarsphere.psu.edu/',
-    'ss2prod' => 'https://scholarsphere.psu.edu/'
-  }
-
-  # TODO move these to an HttpAuth initializer
-  config.logout_url = "https://webaccess.psu.edu/cgi-bin/logout?#{Sufia::HttpHeaderAuth.get_vhost_by_host(config)[1]}"
-  config.login_url = "https://webaccess.psu.edu?cosign-#{Sufia::HttpHeaderAuth.get_vhost_by_host(config)[0]}&#{Sufia::HttpHeaderAuth.get_vhost_by_host(config)[1]}"
-
       config.cc_licenses = {
       'Attribution 3.0 United States' => 'http://creativecommons.org/licenses/by/3.0/us/',
       'Attribution-ShareAlike 3.0 United States' => 'http://creativecommons.org/licenses/by-sa/3.0/us/',
@@ -65,24 +46,6 @@ Sufia.config do |config|
       "Other" => "Other",
     }
 
-    # reflect a field name change (should one happen) in the generic file datastream
-    config.metadata_help = {
-      "generic_file_resource_type" => "Pre-defined categories to describe the type of file content being uploaded, such as \"article\" or \"dataset.\"  More than one type may be selected.",
-      "generic_file_title" => "A name for the file to aid in identifying it. Defaults to the file name, though a more descriptive title is encouraged. <em>This is a required field</em>.",
-      "generic_file_tag" => "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>.",
-      "generic_file_subject" => "Headings or index terms describing what the file is about; these <em>do</em> need to conform to an existing vocabulary. Currently ScholarSphere supports Library of Congress Subject Headings.",
-      "generic_file_creator" => "The person or group responsible for the file being uploaded. Usually this is the author of the content. Personal names should be entered with the last name first, e.g. \"Smith, John.\" <em>This is a required field</em>.",
-      "generic_file_related_url" => "A link to a website or other specific content (audio, video, PDF document) related to the file. An example is the URL of a research project from which the file was derived.",
-      "generic_file_based_near" => "A place name related to the file, such as its site of publication, or the city, state, or country the file's contents are about. Calls upon the GeoNames web service (<a href=\"http://www.geonames.org\">http://www.geonames.org</a>).",
-      "generic_file_contributor" => "A person or group you want to recognize for playing a role in the creation of the file, but not the primary role. If there is a specific role you would like noted, include it in parentheses, e.g. \"Jones, Mary (advisor).\"",
-      "generic_file_date_created" => "The date on which the file was generated. Dates are accepted in the form YYYY-MM-DD, e.g. 1776-07-04.",
-      "generic_file_description" => "Free-text notes about the file itself. Examples include abstracts of a paper, citation information for a journal article, or a tag indicating a larger collection to which the file belongs.",
-      "generic_file_identifier" => "A unique handle describing the file. An example would be a DOI for a journal article, or an ISBN or OCLC number for a book.",
-      "generic_file_language" => " The language of the file content.",
-      "generic_file_publisher" => "The person or group making the file available. Generally this is Penn State or the Penn State University Libraries.",
-      "generic_file_rights" => "Licensing and distribution information governing access to the file. Select from the provided drop-down list. <em>This is a required field</em>."
-    }
-
     config.permission_levels = {
       "Choose Access"=>"none",
       "View/Download" => "read",

data/lib/generators/sufia/templates/migrations/create_trophies.rb

@@ -0,0 +1,10 @@
+class CreateTrophies < ActiveRecord::Migration
+  def change
+    create_table :trophies do |t|
+      t.integer :user_id
+      t.string :generic_file_id
+
+      t.timestamps
+    end
+  end
+end

data/lib/sufia/downloads_controller_behavior.rb

@@ -26,10 +26,9 @@ module Sufia
     
     def show
       if can? :read, params["id"]
-        logger.info "Can read #{params['id']}"
-
-        send_content (params["id"])
-        return
+        asset = ActiveFedora::Base.find(params[:id], :cast=>true)
+        # we can now examine @asset and determine if we should send_content, or some other action.
+        send_content (asset)
       else 
         logger.info "Can not read #{params['id']}"
         redirect_to "/assets/NoAccess.png"
@@ -38,17 +37,16 @@ module Sufia
 
     protected
     
-    def send_content (id)
-        @asset = ActiveFedora::Base.find(id, :cast=>true)
+    def send_content (asset)
         opts = {}
         ds = nil
-        opts[:filename] = params["filename"] || @asset.label
+        opts[:filename] = params["filename"] || asset.label
         opts[:disposition] = 'inline' 
         if params.has_key?(:datastream_id)
           opts[:filename] = params[:datastream_id]
-          ds = @asset.datastreams[params[:datastream_id]]
+          ds = asset.datastreams[params[:datastream_id]]
         end
-        ds = default_content_ds(@asset) if ds.nil?
+        ds = default_content_ds(asset) if ds.nil?
         raise ActionController::RoutingError.new('Not Found') if ds.nil?
         data = ds.content
         opts[:type] = ds.mimeType

data/lib/sufia/files_controller_behavior.rb

@@ -55,7 +55,7 @@ module Sufia
 
     # routed to /files/:id/edit
     def edit
-      @terms = @generic_file.get_terms
+      @terms = @generic_file.terms_for_editing
       @groups = current_user.groups
     end
 
@@ -199,8 +199,8 @@ module Sufia
       add_posted_blob_to_asset(@generic_file,file, file_name)
 
       @generic_file.apply_depositor_metadata(user_key)
-      @generic_file.date_uploaded = Time.now.ctime
-      @generic_file.date_modified = Time.now.ctime
+      @generic_file.date_uploaded = Date.today
+      @generic_file.date_modified = Date.today
       @generic_file.relative_path = relative_path if relative_path
       @generic_file.creator = current_user.name
 
@@ -217,7 +217,7 @@ module Sufia
         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
+        raise error if save_tries >=3
         sleep 0.01
         retry
       end

data/lib/sufia/generic_file.rb

@@ -37,6 +37,12 @@ module Sufia
       around_save :characterize_if_changed, :retry_warming
     end
 
+    def delete
+       self.cleanup_trophies
+       super
+    end
+
+
     def pdf?
       ["application/pdf"].include? self.mime_type
     end
@@ -85,6 +91,11 @@ module Sufia
         end
     end
 
+    def cleanup_trophies
+      Trophy.destroy_all(generic_file_id: self.noid)
+    end
+
+
     def related_files
       relateds = begin
                    self.batch.generic_files
@@ -104,9 +115,6 @@ module Sufia
       solr_doc["noid_s"] = noid
       solr_doc["file_format_t"] = file_format
       solr_doc["file_format_facet"] = solr_doc["file_format_t"]
-      # remap dates as a valid xml date not to_s
-      solr_doc['generic_file__date_uploaded_dt'] = Time.parse(date_uploaded).utc.to_s.sub(' ','T').sub(' UTC','Z') rescue Time.new(date_uploaded).utc.to_s.sub(' ','T').sub(' UTC','Z') unless date_uploaded.blank?
-      solr_doc['generic_file__date_modified_dt'] = Time.parse(date_modified).utc.to_s.sub(' ','T').sub(' UTC','Z') rescue Time.new(date_modified).utc.to_s.sub(' ','T').sub(' UTC','Z') unless date_modified.blank?
       return solr_doc
     end
 
@@ -140,15 +148,13 @@ module Sufia
       }
     end
 
-    def get_terms
-      terms = []
-      self.descMetadata.class.config[:predicate_mapping].each do |uri, mappings|
-        new_terms = mappings.keys.map(&:to_s).select do |term|
-          term.start_with? "generic_file__" and !['type', 'behaviors'].include? term.split('__').last
-        end
-        terms.concat(new_terms)
-      end
-      terms
+    def terms_for_editing
+      terms_for_display -
+       [:part_of, :date_modified, :date_uploaded, :format, :resource_type]
+    end
+
+    def terms_for_display
+      self.descMetadata.class.config.keys
     end
 
     def get_values
@@ -156,11 +162,10 @@ module Sufia
       values = {}
       terms.each do |t|
           next if t.empty?
-          key = t.to_s.split("generic_file__").last
-          next if ['part_of', 'date_modified', 'date_uploaded'].include?(key)
-          values[key] = self.send(key) if self.respond_to?(key)
+          next if ['part_of', 'date_modified', 'date_uploaded'].include?(t)
+          values[t] = self.send(key) if self.respond_to?(key)
       end        
-      return values          
+      values          
     end
 
     # Is this file in the middle of being processed by a batch?
@@ -170,16 +175,5 @@ module Sufia
        return (!self.batch.status.empty?) && (self.batch.status.count == 1) && (self.batch.status[0] == "processing")
     end
 
-    module ClassMethods
-      # TODO this could probably be better handled by i18n
-      @@FIELD_LABEL_MAP = {"based_near"=>"Location", 'description'=>"Abstract or Summary", 'tag'=>"Keyword", 'date_created'=>"Date Created", 'related_url'=>"Related URL"}
-
-      def get_label(key)
-         label = @@FIELD_LABEL_MAP[key]
-         label = key.gsub('_',' ').titleize if label.blank?
-         return label
-      end
-    end
-
   end
 end

data/lib/sufia/jobs/batch_update_job.rb

@@ -70,7 +70,7 @@ class BatchUpdateJob
       save_tries += 1
       logger.warn "BatchUpdateJob caught RSOLR error on #{gf.pid}: #{error.inspect}"
       # fail for good if the tries is greater than 3
-      rescue_action_without_handler(error) if save_tries >=3
+      raise error if save_tries >=3
       sleep 0.01
       retry
     end #

data/lib/sufia/user.rb

@@ -63,7 +63,24 @@ module Sufia::User
 
   # Redefine this for more intuitive keys in Redis
   def to_param
-    user_key
+    # hack because rails doesn't like periods in urls.
+    user_key.gsub(/\./, '-dot-')
+  end
+
+  # method needed for trophies
+  def trophies
+     trophies = Trophy.where(user_id:self.id)
+    return trophies
+  end
+  
+  #method to get the trophy ids without the namespace included
+  def trophy_ids
+    trophies=[]
+    trophies.each do |t|
+      @trophies << GenericFile.find("#{Sufia::Engine.config.id_namespace}:#{t.generic_file_id}")
+ 
+    end
+    return trophies
   end
 
   # method needed for messaging
@@ -108,6 +125,11 @@ module Sufia::User
     def batchuser_key
       'batchuser@example.com'
     end
+
+    def from_url_component(component)
+      User.find_by_user_key(component.gsub(/-dot-/, '.'))
+    end
+
   end
 
 end

data/lib/sufia/version.rb

@@ -1,3 +1,3 @@
 module Sufia
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/tasks/fixtures.rake

@@ -21,7 +21,7 @@
 # The files should be named id_[fixture id] which should relates to the id within the foxml sufia:[fixture id] where 
 # [fixture id] is some alpha numeric id ('test1')
 #
-# There are 2 sets of data needed to attach to a ScholarSphere fixture, 1 the data file, and 2 the metadata.
+# There are 2 sets of data needed to attach to a sufia fixture, 1 the data file, and 2 the metadata.
 # It is important that the meta-data contains the appropriate id, or solor will not index it!
 #
 # Usage: rake sufia:fixtures:create [DIR=<fixture dir>] [FIXTURE_ID=<fixture id>] [FIXTURE_TITLE=<fixture title>] [FIXTURE_USER=<fixture user>]
@@ -38,7 +38,7 @@
 #                      DEFAULT: archivist1
 #           
 #          
-#               Creates new fixture files including the erb, descMeta, and text for loading into ScholarSphere.  
+#               Creates new fixture files including the erb, descMeta, and text for loading into sufia.  
 #               The Files are named based on the sufia: id_<fixture id>.foxml.erb, id_<fixture id>.descMeta.txt, and id_<fixture id>.txt
 #               The foxml.erb file references the descMeta.txt and .txt file.  You can edit the erb to point to other data and/or edit the 
 #               .descMeta.txt  and/or .txt file to contain the data you wish.  
@@ -228,7 +228,6 @@ namespace :sufia do
       User.create(email: 'archivist1@example.com')#, display_name: 'Captain Archivist')
       # Then, set this user as the depositor of test4 to appease this damn failing cuke
       gf = GenericFile.find('sufia:test4')
-      gf.terms_of_service = '1'
       gf.apply_depositor_metadata('archivist1@example.com')
       gf.save
     end

data/spec/controllers/generic_files_controller_spec.rb

@@ -161,6 +161,13 @@ describe GenericFilesController do
       end
     end
 
+    it "should error out of create and save after on continuos rsolr error" do
+      GenericFile.any_instance.stub(:save).and_raise(RSolr::Error::Http.new({},{}))  
+          
+      file = fixture_file_upload('/world.png','image/png')
+      xhr :post, :create, :files=>[file], :Filename=>"The world", :batch_id => "sample:batch_id", :permission=>{"group"=>{"public"=>"read"} }, :terms_of_service=>"1"
+      response.body.should include("Error occurred while creating generic file.")
+    end
 
   end
 

data/spec/controllers/single_use_link_controller_spec.rb

@@ -2,8 +2,6 @@ require 'spec_helper'
 
 describe SingleUseLinkController do
   before(:all) do
-    User.any_instance.stub(:groups).and_return([])
-
     @user = FactoryGirl.find_or_create(:user)
     @file = GenericFile.new
     @file.set_title_and_label('world.png')

data/spec/controllers/users_controller_spec.rb

@@ -51,14 +51,14 @@ describe UsersController do
     it "redirects to show profile when user attempts to edit another profile" do
       get :edit, uid: @another_user.user_key
       response.should redirect_to(@routes.url_helpers.profile_path(URI.escape(@another_user.user_key,'@.')))
-      flash[:alert].should include("You cannot edit archivist1@example.com's profile")
+      flash[:alert].should include("Permission denied: cannot access this page.")
     end
   end
   describe "#update" do
     it "should not allow other users to update" do
       post :update, uid: @another_user.user_key, user: { avatar: nil }
       response.should redirect_to(@routes.url_helpers.profile_path(URI.escape(@another_user.user_key,'@.')))
-      flash[:alert].should include("You cannot edit archivist1@example.com's profile")
+      flash[:alert].should include("Permission denied: cannot access this page.")
     end
     it "should set an avatar and redirect to profile" do
       @user.avatar.file?.should be_false
@@ -173,4 +173,30 @@ describe UsersController do
       flash[:alert].should include("You cannot follow or unfollow yourself")
     end
   end
+  describe "#toggle_trophy" do
+     before do
+       @file = GenericFile.new()
+       @file.apply_depositor_metadata(@user.user_key)
+       @file.save
+       @file_id = @file.pid.split(":").last
+     end
+     after do
+       @file.delete
+     end
+     it "should trophy a file" do
+      post :toggle_trophy, {uid: @user.user_key, file_id: @file_id}
+      JSON.parse(response.body)['user_id'].should == @user.id
+      JSON.parse(response.body)['generic_file_id'].should == @file_id
+    end
+     it "should not trophy a file for a different user" do
+      post :toggle_trophy, {uid: @another_user.user_key, file_id: @file_id}
+      response.should_not be_success
+    end
+     it "should not trophy a file with no edit privs" do
+      sign_out @user
+      sign_in @another_user
+      post :toggle_trophy, {uid: @another_user.user_key, file_id: @file_id}
+      response.should_not be_success
+    end
+  end
 end

data/spec/helpers/generic_file_helper_spec.rb

@@ -0,0 +1,21 @@
+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=\"accessible-hidden\">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=\"accessible-hidden\">add another test</span></button>"
+  end
+
+  it "draws help_icon" do
+    helper.help_icon(:tag).should == 
+      "<a href=\"#\" data-content=\"Words or phrases you select to describe what the file is about. These are used to search for content. &lt;em&gt;This is a required field&lt;/em&gt;.\" data-original-title=\"Keyword\" id=\"generic_file_tag_help\" rel=\"popover\"><i class=\"icon-question-sign icon-large\"></i></a>"
+  end
+
+end
+
+