sufia 4.0.0.beta3 → 4.0.0.beta4

data/config/locales/sufia.en.yml

@@ -4,6 +4,8 @@ en:
     deposit_agreement:  "Sufia's Deposit Agreement"
     upload_tooltip:     "Please accept Deposit Agreement before you can upload."
     share_button:       "Share Your Work"
+    view_profile:       "View Profile"
+    edit_profile:       "Edit Profile"
     directory:
       suffix:           "@example.org"
     search:
@@ -15,9 +17,18 @@ en:
           all:
             label_short:  "All"
             label_long:   "All of Sufia"
-          mine:
+          my_files:
             label_short:  "My Files" 
             label_long:   "My Files"
+          my_collections:
+            label_short:  "My Collections" 
+            label_long:   "My Collections"
+          my_highlights:
+            label_short:  "My Highlights" 
+            label_long:   "My Highlights"
+          my_shares:
+            label_short:  "My Shares" 
+            label_long:   "My Shares"      
     upload:
       my_computer:
         tab_label: "My Computer"
@@ -34,6 +45,20 @@ en:
       date_created:     "Date Created"
       related_url:      "Related URL"
 
+    dashboard:
+      title:                "My Dashboard"
+      greeting:             "Hello, "
+      upload:               "Upload"
+      create_collection:    "Create Collection"
+      view_files:           "View Files"
+      user_activity:        "User Activity"
+      user_notiticiations:  "User Notifications"
+      stats:
+        heading:    "Your Statistics"
+        deposits:   "Files you've deposited into Sufia"
+        following:  "People you follow"
+        followers:  "People who are following you"
+
     metadata_help:
       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."
       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>."
@@ -53,4 +78,4 @@ en:
     bread_crumb:
       file_list: "Your File Listing"
       previous:  "Back to Previous"
-      search_results: "Back to search results"
+      search_results: "Back to search results"

data/config/routes.rb

@@ -47,40 +47,36 @@ Sufia::Engine.routes.draw do
     end
   end
 
-  # Dashboard routes (based partly on catalog routes)
+  # Dashboard page
   resources 'dashboard', only: :index do
     collection do
-      get 'page/:page', action: :index
       get 'activity', action: :activity, as: :dashboard_activity
-      get 'facet/:id', action: :facet, as: :dashboard_facet
     end
   end
+
+  # Routes for user's files, collections, highlights and shares
   namespace :dashboard do
-    resources :files, only: :index do
+    resources :files, only: :index, controller: "/my/files" do
       collection do
         get 'page/:page', action: :index
-        get 'activity', action: :activity, as: :dashboard_activity
         get 'facet/:id', action: :facet, as: :dashboard_facet
       end
     end
-    resources :collections, only: :index do
+    resources :collections, only: :index, controller: "/my/collections" do
       collection do
         get 'page/:page', action: :index
-        get 'activity', action: :activity, as: :dashboard_activity
         get 'facet/:id', action: :facet, as: :dashboard_facet
       end
     end
-    resources :highlights, only: :index do
+    resources :highlights, only: :index, controller: "/my/highlights" do
       collection do
         get 'page/:page', action: :index
-        get 'activity', action: :activity, as: :dashboard_activity
         get 'facet/:id', action: :facet, as: :dashboard_facet
       end
     end
-    resources :shares, only: :index do
+    resources :shares, only: :index, controller: "/my/shares" do
       collection do
         get 'page/:page', action: :index
-        get 'activity', action: :activity, as: :dashboard_activity
         get 'facet/:id', action: :facet, as: :dashboard_facet
       end
     end

data/lib/generators/sufia/sufia_generator.rb

@@ -14,6 +14,7 @@ This generator makes the following changes to your application:
  2. Adds Sufia's abilities into the Ability class
  3. Adds controller behavior to the application controller
  4. Copies the catalog controller into the local app
+ 5. Adds Sufia::SolrDocumentBehavior to app/models/solr_document.rb
        """
 
   def run_required_generators
@@ -71,4 +72,18 @@ This generator makes the following changes to your application:
     sentinel = /devise_for :users/
     inject_into_file 'config/routes.rb', routing_code, { after: sentinel, verbose: false }
   end
+
+  # Add behaviors to the SolrDocument model
+  def inject_sufia_solr_document_behavior
+    file_path = "app/models/solr_document.rb"
+    if File.exists?(file_path)
+      inject_into_file file_path, after: /include Blacklight::Solr::Document.*$/ do
+        "\n  # Adds Sufia behaviors to the SolrDocument.\n" +
+          "  include Sufia::SolrDocumentBehavior\n"
+      end
+    else
+      puts "     \e[31mFailure\e[0m  Sufia requires a SolrDocument object. This generators assumes that the model is defined in the file #{file_path}, which does not exist."
+    end
+  end
+
 end

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

@@ -35,8 +35,8 @@ class CatalogController < ApplicationController
       qt: "search",
       rows: 10
     }
-    
-    # Specify which field to use in the tag cloud on the homepage.  
+
+    # Specify which field to use in the tag cloud on the homepage.
     # To disable the tag cloud, comment out this line.
     config.tag_cloud_field_name = Solrizer.solr_name("desc_metadata__tag", :facetable)
 
@@ -63,18 +63,18 @@ class CatalogController < ApplicationController
 
     # solr fields to be displayed in the index (search results) view
     #   The ordering of the field names is the order of the display
-    config.add_index_field solr_name("desc_metadata__title", :stored_searchable), label: "Title"
-    config.add_index_field solr_name("desc_metadata__description", :stored_searchable), label: "Description"
-    config.add_index_field solr_name("desc_metadata__tag", :stored_searchable), label: "Keyword"
-    config.add_index_field solr_name("desc_metadata__subject", :stored_searchable), label: "Subject"
-    config.add_index_field solr_name("desc_metadata__creator", :stored_searchable), label: "Creator"
-    config.add_index_field solr_name("desc_metadata__contributor", :stored_searchable), label: "Contributor"
-    config.add_index_field solr_name("desc_metadata__publisher", :stored_searchable), label: "Publisher"
-    config.add_index_field solr_name("desc_metadata__based_near", :stored_searchable), label: "Location"
-    config.add_index_field solr_name("desc_metadata__language", :stored_searchable), label: "Language"
-    config.add_index_field solr_name("desc_metadata__date_uploaded", :stored_searchable), label: "Date Uploaded"
-    config.add_index_field solr_name("desc_metadata__date_modified", :stored_searchable), label: "Date Modified"
-    config.add_index_field solr_name("desc_metadata__date_created", :stored_searchable), label: "Date Created"
+    config.add_index_field solr_name("desc_metadata__title", :stored_searchable), label: "Title", itemprop: 'name'
+    config.add_index_field solr_name("desc_metadata__description", :stored_searchable), label: "Description", itemprop: 'description'
+    config.add_index_field solr_name("desc_metadata__tag", :stored_searchable), label: "Keyword", itemprop: 'keywords'
+    config.add_index_field solr_name("desc_metadata__subject", :stored_searchable), label: "Subject", itemprop: 'about'
+    config.add_index_field solr_name("desc_metadata__creator", :stored_searchable), label: "Creator", itemprop: 'creator'
+    config.add_index_field solr_name("desc_metadata__contributor", :stored_searchable), label: "Contributor", itemprop: 'contributor'
+    config.add_index_field solr_name("desc_metadata__publisher", :stored_searchable), label: "Publisher", itemprop: 'publisher'
+    config.add_index_field solr_name("desc_metadata__based_near", :stored_searchable), label: "Location", itemprop: 'contentLocation'
+    config.add_index_field solr_name("desc_metadata__language", :stored_searchable), label: "Language", itemprop: 'inLanguage'
+    config.add_index_field solr_name("desc_metadata__date_uploaded", :stored_searchable), label: "Date Uploaded", itemprop: 'datePublished'
+    config.add_index_field solr_name("desc_metadata__date_modified", :stored_searchable), label: "Date Modified", itemprop: 'dateModified'
+    config.add_index_field solr_name("desc_metadata__date_created", :stored_searchable), label: "Date Created", itemprop: 'dateCreated'
     config.add_index_field solr_name("desc_metadata__rights", :stored_searchable), label: "Rights"
     config.add_index_field solr_name("desc_metadata__resource_type", :stored_searchable), label: "Resource Type"
     config.add_index_field solr_name("desc_metadata__format", :stored_searchable), label: "File Format"

data/lib/sufia.rb

@@ -37,4 +37,5 @@ module Sufia
   autoload :BatchEditsControllerBehavior
   autoload :DownloadsControllerBehavior
   autoload :HomepageController
+  autoload :MyControllerBehavior
 end

data/lib/sufia/version.rb

@@ -1,3 +1,3 @@
 module Sufia
-  VERSION = "4.0.0.beta2"
+  VERSION = "4.0.0.beta4"
 end

data/spec/controllers/catalog_controller_spec.rb

@@ -33,22 +33,13 @@ describe CatalogController do
     end
 
     describe "term search" do
-      context "searching everything" do
-        it "should find records" do
-          get :index, q: "pdf", owner: 'all'
-          expect(response).to be_success
-          response.should render_template('catalog/index')
-          assigns(:document_list).map(&:id).should == [@gf1.id]
-          assigns(:document_list).count.should eql(1)
-          assigns(:document_list).first['desc_metadata__title_tesim'].should == ['Test Document PDF']
-        end
-      end
-      context "searching only documents editable to me" do
-        it "should only have records I can edit" do
-          get :index, q: "", owner: 'mine'
-          assigns(:document_list).map(&:id).should == [@editable_file.id]
-          expect(response).to be_success
-        end
+      it "should find records" do
+        get :index, q: "pdf", owner: 'all'
+        expect(response).to be_success
+        response.should render_template('catalog/index')
+        assigns(:document_list).map(&:id).should == [@gf1.id]
+        assigns(:document_list).count.should eql(1)
+        assigns(:document_list).first['desc_metadata__title_tesim'].should == ['Test Document PDF']
       end
     end
 

data/spec/controllers/dashboard_controller_spec.rb

@@ -1,41 +1,74 @@
 require 'spec_helper'
 
 describe DashboardController do
-  before do
-    User.any_instance.stub(:groups).and_return([])
-    controller.stub(:clear_session_user) ## Don't clear out the authenticated session
+  
+  context "with an unauthenticated user" do
+
+    it "redirects to sign-in page" do
+      get :index
+      expect(response).to be_redirect
+      expect(flash[:alert]).to eq("You need to sign in or sign up before continuing.")
+    end
+
   end
-  # This doesn't really belong here, but it works for now
-  describe "authenticate!" do
-    # move to scholarsphere
-    # before(:each) do
-    #   @user = FactoryGirl.find_or_create(:archivist)
-    #   request.stub(:headers).and_return('REMOTE_USER' => @user.login).at_least(:once)
-    #   @strategy = Devise::Strategies::HttpHeaderAuthenticatable.new(nil)
-    #   @strategy.should_receive(:request).and_return(request).at_least(:once)
-    # end
-    # after(:each) do
-    #   @user.delete
-    # end
-    it "should populate LDAP attrs if user is new" do
-      pending "This should only be in scholarsphere"
-      User.stub(:find_by_login).with(@user.login).and_return(nil)
-      User.should_receive(:create).with(login: @user.login).and_return(@user).once
-      User.any_instance.should_receive(:populate_attributes).once
-      @strategy.should be_valid
-      @strategy.authenticate!.should == :success
+
+  context "with an authenticated user" do
+
+    before do
+      @user = FactoryGirl.find_or_create(:user_with_mail)
       sign_in @user
+    end
+
+    it "renders the dashboard with the user's info" do
       get :index
+      expect(response).to be_successful
+      expect(assigns(:user)).to eq(@user)
     end
-    it "should not populate LDAP attrs if user is not new" do
-      pending "This should only be in scholarsphere"
-      User.stub(:find_by_login).with(@user.login).and_return(@user)
-      User.should_receive(:create).with(login: @user.login).never
-      User.any_instance.should_receive(:populate_attributes).never
-      @strategy.should be_valid
-      @strategy.authenticate!.should == :success
-      sign_in @user
+
+    it "gathers the user's recent activity" do
+      get :index
+      expect(assigns(:activity)).to be_empty
+    end
+
+    it "gathers the user's notifications" do
       get :index
+      expect(assigns(:notifications)).to be_true
+    end
+
+    context "with activities" do
+
+      before :all do
+        @now = DateTime.now.to_i
+      end
+
+      before do
+        allow_any_instance_of(User).to receive(:events).and_return(activities)
+      end
+
+      def activities
+        [
+          { action: 'so and so edited their profile', timestamp: @now },
+          { action: 'so and so uploaded a file', timestamp: (@now - 360 ) }
+        ]
+      end
+
+      it "gathers the user's recent activity within the default amount of time" do
+        get :index
+        expect(assigns(:activity)).to eq(activities.reverse)
+      end
+
+      it "gathers the user's recent activity within a given timestamp" do
+        get :index, { since: (@now - 60 ) }
+        expect(assigns(:activity)).to eq([activities.first])
+      end
+
+      it "returns results in JSON" do
+        get :activity
+        expect(response).to be_successful
+      end 
+
     end
+
   end
+
 end

data/spec/controllers/generic_files_controller_spec.rb

@@ -246,7 +246,7 @@ describe GenericFilesController do
     end
     it "should spawn a content delete event job" do
       s1 = double('one')
-      ContentDeleteEventJob.should_receive(:new).with(@generic_file.noid, @user.user_key).and_return(s1)
+      ContentDeleteEventJob.should_receive(:new).with(@generic_file.pid, @user.user_key).and_return(s1)
       Sufia.queue.should_receive(:push).with(s1).once
       delete :destroy, id: @generic_file.pid
     end

data/spec/controllers/{dashboard → my}/collections_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Dashboard::CollectionsController do
+describe My::CollectionsController do
   describe "logged in user" do
     before (:each) do
       @user = FactoryGirl.find_or_create(:archivist)
@@ -24,11 +24,6 @@ describe Dashboard::CollectionsController do
       it "should respond with success" do
         get :index
         expect(response).to be_successful
-        expect(response).to render_template('dashboard/lists/index')
-      end
-
-      it "sets the controller name" do
-        expect(controller.controller_name).to eq :dashboard
       end
 
       it "should paginate" do          
@@ -59,13 +54,4 @@ describe Dashboard::CollectionsController do
     end
   end
 
-  describe "not logged in as a user" do
-    describe "#index" do
-      it "should return an error" do
-        get :index
-        expect(response).to be_redirect
-      end
-    end
-  end
 end
-

data/spec/controllers/my/files_controller_spec.rb

@@ -0,0 +1,68 @@
+require 'spec_helper'
+
+describe My::FilesController do
+
+  before :all do
+    GenericFile.destroy_all
+    Collection.destroy_all
+  end
+
+  after :all do
+    GenericFile.destroy_all
+    Collection.destroy_all
+  end
+
+  let(:my_collection) do
+    Collection.new(title: 'test collection').tap do |c|
+      c.apply_depositor_metadata(@user.user_key)
+      c.save!
+    end
+  end
+
+  let(:shared_file) do
+    FactoryGirl.build(:generic_file).tap do |r|
+      r.apply_depositor_metadata FactoryGirl.create(:user)
+      r.edit_users += [@user.user_key]
+      r.save!
+    end
+  end
+
+  before do
+    @user = FactoryGirl.find_or_create(:archivist)
+    sign_in @user
+    @my_file = FactoryGirl.create(:generic_file, depositor: @user)
+    @my_collection = my_collection
+    @shared_file = shared_file
+    @unrelated_file = FactoryGirl.create(:generic_file, depositor: FactoryGirl.create(:user))
+    @wrong_type = Batch.create
+  end
+
+  it "should respond with success" do
+    get :index
+    expect(response).to be_successful
+  end
+
+  it "should paginate" do          
+    FactoryGirl.create(:generic_file)
+    FactoryGirl.create(:generic_file)
+    get :index, per_page: 2
+    expect(assigns[:document_list].length).to eq 2
+    get :index, per_page: 2, page: 2
+    expect(assigns[:document_list].length).to be >= 1
+  end
+
+  it "shows the correct files" do
+    get :index
+    # shows documents I deposited
+    expect(assigns[:document_list].map(&:id)).to include(@my_file.id)
+    # doesn't show collections
+    expect(assigns[:document_list].map(&:id)).to_not include(@my_collection.id)
+    # doesn't show shared files
+    expect(assigns[:document_list].map(&:id)).to_not include(@shared_file.id)
+    # doesn't show other users' files
+    expect(assigns[:document_list].map(&:id)).to_not include(@unrelated_file.id)
+    # doesn't show non-generic files
+    expect(assigns[:document_list].map(&:id)).to_not include(@wrong_type.id)
+  end
+
+end

data/spec/controllers/{dashboard → my}/highlights_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Dashboard::HighlightsController do
+describe My::HighlightsController do
   describe "logged in user" do
     before (:each) do
       @user = FactoryGirl.find_or_create(:archivist)
@@ -26,11 +26,6 @@ describe Dashboard::HighlightsController do
       it "should respond with success" do
         get :index
         expect(response).to be_successful
-        expect(response).to render_template('dashboard/lists/index')
-      end
-
-      it "sets the controller name" do
-        expect(controller.controller_name).to eq :dashboard
       end
 
       it "should paginate" do          
@@ -54,13 +49,4 @@ describe Dashboard::HighlightsController do
     end
   end
 
-  describe "not logged in as a user" do
-    describe "#index" do
-      it "should return an error" do
-        get :index
-        expect(response).to be_redirect
-      end
-    end
-  end
 end
-