sufia 4.0.0.beta3 → 4.0.0.beta4

data/spec/jobs/event_jobs_spec.rb

@@ -157,7 +157,7 @@ describe 'event jobs' do
     @another_user.events.length.should == 0
     @third_user.events.length.should == 0
     Time.should_receive(:now).at_least(:once).and_return(1)
-    event = {action: 'User <a href="/users/jilluser@example-dot-com">jilluser@example.com</a> has deleted file \'test:123\'', timestamp: '1' }
+    event = {action: 'User <a href="/users/jilluser@example-dot-com">jilluser@example.com</a> has deleted file \'123\'', timestamp: '1' }
     ContentDeleteEventJob.new('test:123', @user.user_key).run
     @user.profile_events.length.should == 1
     @user.profile_events.first.should == event

data/spec/models/generic_file/web_form_spec.rb

@@ -15,16 +15,15 @@ describe GenericFile do
     it "should return a list" do
       expect(subject.terms_for_display).to eq([:resource_type, :title,
         :creator, :contributor, :description, :tag, :rights, :publisher,
-        :date_created, :date_uploaded, :date_modified, :subject, :language,
-        :identifier, :based_near, :related_url])
+        :date_created, :subject, :language, :identifier, :based_near,
+        :related_url])
     end
   end
 
   describe "accessible_attributes" do
     it "should have a list" do
       subject.accessible_attributes.should include(:part_of, :resource_type, :title, :creator, :contributor, :description,
-        :tag, :rights, :publisher, :date_created, :date_uploaded, :date_modified, :subject, :language, :identifier,
-        :based_near, :related_url, :permissions)
+        :tag, :rights, :publisher, :date_created, :subject, :language, :identifier, :based_near, :related_url, :permissions)
     end
 
     it "should sanitize them" do

data/spec/models/generic_file_spec.rb

@@ -264,49 +264,53 @@ describe GenericFile do
       end
     end
   end
-  it "supports to_solr" do
-    allow(subject).to receive(:pid).and_return('stubbed_pid')
-    subject.part_of = "Arabiana"
-    subject.contributor = "Mohammad"
-    subject.creator = "Allah"
-    subject.title = "The Work"
-    subject.description = "The work by Allah"
-    subject.publisher = "Vertigo Comics"
-    subject.date_created = "1200-01-01"
-    subject.date_uploaded = Date.parse("2011-01-01")
-    subject.date_modified = Date.parse("2012-01-01")
-    subject.subject = "Theology"
-    subject.language = "Arabic"
-    subject.rights = "Wide open, buddy."
-    subject.resource_type = "Book"
-    subject.identifier = "urn:isbn:1234567890"
-    subject.based_near = "Medina, Saudi Arabia"
-    subject.related_url = "http://example.org/TheWork/"
-    subject.mime_type = "image/jpeg"
-    subject.format_label = "JPEG Image"
-    local = subject.to_solr
-    local.should_not be_nil
-    local[Solrizer.solr_name("desc_metadata__part_of")].should be_nil
-    local[Solrizer.solr_name("desc_metadata__date_uploaded")].should be_nil
-    local[Solrizer.solr_name("desc_metadata__date_modified")].should be_nil
-    local[Solrizer.solr_name("desc_metadata__date_uploaded", :stored_sortable, type: :date)].should == '2011-01-01T00:00:00Z'
-    local[Solrizer.solr_name("desc_metadata__date_modified", :stored_sortable, type: :date)].should == '2012-01-01T00:00:00Z'
-    local[Solrizer.solr_name("desc_metadata__rights")].should == ["Wide open, buddy."]
-    local[Solrizer.solr_name("desc_metadata__related_url")].should == ["http://example.org/TheWork/"]
-    local[Solrizer.solr_name("desc_metadata__contributor")].should == ["Mohammad"]
-    local[Solrizer.solr_name("desc_metadata__creator")].should == ["Allah"]
-    local[Solrizer.solr_name("desc_metadata__title")].should == ["The Work"]
-    local[Solrizer.solr_name("desc_metadata__description")].should == ["The work by Allah"]
-    local[Solrizer.solr_name("desc_metadata__publisher")].should == ["Vertigo Comics"]
-    local[Solrizer.solr_name("desc_metadata__subject")].should == ["Theology"]
-    local[Solrizer.solr_name("desc_metadata__language")].should == ["Arabic"]
-    local[Solrizer.solr_name("desc_metadata__date_created")].should == ["1200-01-01"]
-    local[Solrizer.solr_name("desc_metadata__resource_type")].should == ["Book"]
-    local[Solrizer.solr_name("file_format")].should == "jpeg (JPEG Image)"
-    local[Solrizer.solr_name("desc_metadata__identifier")].should == ["urn:isbn:1234567890"]
-    local[Solrizer.solr_name("desc_metadata__based_near")].should == ["Medina, Saudi Arabia"]
-    local[Solrizer.solr_name("mime_type")].should == ["image/jpeg"]
-    local["noid_tsi"].should eq('stubbed_pid')
+  describe "to_solr" do
+    before do
+      allow(subject).to receive(:pid).and_return('stubbed_pid')
+      subject.part_of = "Arabiana"
+      subject.contributor = "Mohammad"
+      subject.creator = "Allah"
+      subject.title = "The Work"
+      subject.description = "The work by Allah"
+      subject.publisher = "Vertigo Comics"
+      subject.date_created = "1200-01-01"
+      subject.date_uploaded = Date.parse("2011-01-01")
+      subject.date_modified = Date.parse("2012-01-01")
+      subject.subject = "Theology"
+      subject.language = "Arabic"
+      subject.rights = "Wide open, buddy."
+      subject.resource_type = "Book"
+      subject.identifier = "urn:isbn:1234567890"
+      subject.based_near = "Medina, Saudi Arabia"
+      subject.related_url = "http://example.org/TheWork/"
+      subject.mime_type = "image/jpeg"
+      subject.format_label = "JPEG Image"
+    end
+    it "supports to_solr" do
+      local = subject.to_solr
+      expect(local[Solrizer.solr_name("desc_metadata__part_of")]).to be_nil
+      expect(local[Solrizer.solr_name("desc_metadata__date_uploaded")]).to be_nil
+      expect(local[Solrizer.solr_name("desc_metadata__date_modified")]).to be_nil
+      expect(local[Solrizer.solr_name("desc_metadata__date_uploaded", :stored_sortable, type: :date)]).to eq '2011-01-01T00:00:00Z'
+      expect(local[Solrizer.solr_name("desc_metadata__date_modified", :stored_sortable, type: :date)]).to eq '2012-01-01T00:00:00Z'
+      expect(local[Solrizer.solr_name("desc_metadata__rights")]).to eq ["Wide open, buddy."]
+      expect(local[Solrizer.solr_name("desc_metadata__related_url")]).to eq ["http://example.org/TheWork/"]
+      expect(local[Solrizer.solr_name("desc_metadata__contributor")]).to eq ["Mohammad"]
+      expect(local[Solrizer.solr_name("desc_metadata__creator")]).to eq ["Allah"]
+      expect(local[Solrizer.solr_name("desc_metadata__title")]).to eq ["The Work"]
+      expect(local["desc_metadata__title_sim"]).to eq ["The Work"]
+      expect(local[Solrizer.solr_name("desc_metadata__description")]).to eq ["The work by Allah"]
+      expect(local[Solrizer.solr_name("desc_metadata__publisher")]).to eq ["Vertigo Comics"]
+      expect(local[Solrizer.solr_name("desc_metadata__subject")]).to eq ["Theology"]
+      expect(local[Solrizer.solr_name("desc_metadata__language")]).to eq ["Arabic"]
+      expect(local[Solrizer.solr_name("desc_metadata__date_created")]).to eq ["1200-01-01"]
+      expect(local[Solrizer.solr_name("desc_metadata__resource_type")]).to eq ["Book"]
+      expect(local[Solrizer.solr_name("file_format")]).to eq "jpeg (JPEG Image)"
+      expect(local[Solrizer.solr_name("desc_metadata__identifier")]).to eq ["urn:isbn:1234567890"]
+      expect(local[Solrizer.solr_name("desc_metadata__based_near")]).to eq ["Medina, Saudi Arabia"]
+      expect(local[Solrizer.solr_name("mime_type")]).to eq ["image/jpeg"]
+      expect(local["noid_tsi"]).to eq 'stubbed_pid'
+    end
   end
   it "should support multi-valued fields in solr" do
     subject.tag = ["tag1", "tag2"]

data/spec/routing/route_spec.rb

@@ -72,28 +72,24 @@ describe 'Routes' do
       { get: '/dashboard' }.should route_to(controller: 'dashboard', action: 'index')
     end
 
-    it "should route to dashboard files tab" do
-      { get: '/dashboard/files' }.should route_to(controller: 'dashboard/files', action: 'index')
-    end
-
-    it "should route to dashboard collections tab" do
-      { get: '/dashboard/collections' }.should route_to(controller: 'dashboard/collections', action: 'index')
+      it "should route to dashboard activity" do
+      { get: '/dashboard/activity' }.should route_to(controller: 'dashboard', action: 'activity')
     end
 
-    it "should route to dashboard highlighted tab" do
-      { get: '/dashboard/highlights' }.should route_to(controller: 'dashboard/highlights', action: 'index')
+    it "should route to my files tab" do
+      { get: '/dashboard/files' }.should route_to(controller: 'my/files', action: 'index')
     end
 
-    it "should route to dashboard shared tab" do
-      { get: '/dashboard/shares' }.should route_to(controller: 'dashboard/shares', action: 'index')
+    it "should route to my collections tab" do
+      { get: '/dashboard/collections' }.should route_to(controller: 'my/collections', action: 'index')
     end
 
-    it "should route to dashboard facet" do
-      { get: '/dashboard/facet/1' }.should route_to(controller: 'dashboard', action: 'facet', id: '1')
+    it "should route to my highlighted tab" do
+      { get: '/dashboard/highlights' }.should route_to(controller: 'my/highlights', action: 'index')
     end
 
-    it "should route to dashboard activity" do
-      { get: '/dashboard/activity' }.should route_to(controller: 'dashboard', action: 'activity')
+    it "should route to my shared tab" do
+      { get: '/dashboard/shares' }.should route_to(controller: 'my/shares', action: 'index')
     end
   end
 

data/spec/views/batch_edits/check_all_spec.rb

@@ -8,15 +8,15 @@ describe 'Check All' do
   end
 
   it 'should render batch edits actions' do
-    controller.stub(:controller_name).and_return('batch_edits')
+    allow(controller).to receive(:controller_name).and_return('batch_edits')
     controller.prepend_view_path "app/views/batch_edits"
     html = render partial: 'batch_edits/check_all'
     html.should have_selector("li[data-behavior='batch-edit-select-abc']")
   end
 
-  it 'should render dashboard actions' do
-    controller.stub(:controller_name).and_return('dashboard')
-    controller.prepend_view_path "app/views/dashboard"
+  it 'should render actions for my items' do
+    allow(controller).to receive(:controller_name).and_return('my')
+    controller.prepend_view_path "app/views/my"
     html = render partial: 'batch_edits/check_all'
     html.should have_selector("li[data-behavior='batch-edit-select-none']")
     html.should have_selector("li[data-behavior='batch-edit-select-page']")

data/spec/views/catalog/sort_and_per_pange.html.erb_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe 'catalog/_sort_and_per_page.html.erb' do
+  before do
+    allow(controller).to receive(:current_user).and_return(stub_model(User))
+    allow_any_instance_of(Ability).to receive(:can?).and_return(true)
+    @resp = ["a","b","c"]
+    assign(:response, @resp )
+    allow(@resp).to receive(:total_count).and_return(20)
+    allow(@resp).to receive(:limit_value).and_return(3)
+    allow(@resp).to receive(:rows).and_return(3)
+    allow(@resp).to receive(:offset_value).and_return(3)
+    allow(@resp).to receive(:current_page).and_return(2)
+    allow(@resp).to receive(:total_pages).and_return(7)
+    allow(view).to receive(:blacklight_config).and_return(CatalogController.blacklight_config)
+  end
+
+
+
+  it 'appears on page without error' do
+    render
+    page = Capybara::Node::Simple.new(rendered)
+    expect(page).to have_selector('span.page_entries', count: 1)
+    expect(rendered).to include("<strong>4</strong> - <strong>6</strong> of <strong>20</strong>")
+  end
+
+end

data/spec/views/dashboard/index_spec.rb

@@ -0,0 +1,105 @@
+require 'spec_helper'
+
+describe "dashboard/index.html.erb" do
+
+  before do
+    @user = mock_model(User, name: "Charles Francis Xavier", user_key: "charles")
+    allow(@user).to receive(:title).and_return("Professor, Head")
+    allow(@user).to receive(:department).and_return("Xavier’s School for Gifted Youngsters")
+    allow(@user).to receive(:telephone).and_return("814.865.8399")
+    allow(@user).to receive(:email).and_return("chuck@xsgy.edu")
+    allow(@user).to receive(:all_following).and_return(["magneto"])
+    allow(@user).to receive(:followers).and_return(["wolverine","storm"])
+    allow(controller).to receive(:current_user).and_return(@user)
+    assign(:activity, [])
+    assign(:notifications, [])
+  end
+
+  describe "heading" do
+
+    before do
+      render
+      @heading = view.content_for(:heading)
+    end
+
+    it "should display welcome message and links" do
+      expect(@heading).to have_link("Upload", sufia.new_generic_file_path)
+      expect(@heading).to have_link("Create Collection", collections.new_collection_path)
+      expect(@heading).to have_link("View Files", sufia.dashboard_files_path)
+      expect(@heading).to include "My Dashboard"
+      expect(@heading).to include "Hello, Charles Francis Xavier"
+    end
+
+  end
+
+  describe "sidebar" do
+
+    before do
+      render
+      @sidebar = view.content_for(:sidebar)
+    end
+
+    it "should display information about the user" do
+      expect(@sidebar).to include "Charles Francis Xavier"
+      expect(@sidebar).to include "Professor, Head"
+      expect(@sidebar).to include "Xavier’s School for Gifted Youngsters"
+      expect(@sidebar).to include "814.865.8399"
+      expect(@sidebar).to include "chuck@xsgy.edu"
+    end
+
+    it "should have links to view and edit the user's profile" do
+      expect(@sidebar).to include '<a class="btn btn-info" href="' + sufia.profile_path(@user) + '">View Profile</a>'
+      expect(@sidebar).to include '<a class="btn btn-info" href="' + sufia.edit_profile_path(@user) + '">Edit Profile</a>'
+    end
+
+    it "should display user statistics" do
+      expect(@sidebar).to include "Your Statistics"
+      expect(@sidebar).to include '<span class="label label-default">1</span>'
+      expect(@sidebar).to include '<span class="label label-default">2</span>'
+      expect(@sidebar).to include '<span class="label label-default">0</span>'
+    end
+
+  end
+
+  describe "main" do
+
+    context "with activities and notifications" do
+
+      before do
+        @now = DateTime.now.to_i
+        assign(:activity, [
+          { action: 'so and so edited their profile', timestamp: @now },
+          { action: 'so and so uploaded a file', timestamp: (@now - 360 ) }
+        ])
+        assign(:notifications, FactoryGirl.create(:user_with_mail).mailbox.inbox)
+      end
+
+      it "should include recent activities and notifications" do
+        render
+        expect(rendered).to include "so and so edited their profile"
+        expect(rendered).to include "6 minutes ago"
+        expect(rendered).to include "You've got mail"
+        expect(rendered).to include "Sample notification"
+      end
+
+    end
+
+    context "without activities and notifications" do
+
+      it "should include headings for activities and notifications" do
+        render
+        expect(rendered).to include "User Activity"
+        expect(rendered).to include "User Notifications"
+      end
+
+      it "should show no activities or notifications" do
+        render
+        expect(rendered).to include "User has no notifications"
+        expect(rendered).to include "User has no recent activity"
+      end
+
+    end
+
+  end
+
+end

data/spec/views/{dashboard → my}/facet_limit.html.erb_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
-describe 'dashboard/_facet_limit.html.erb' do
+describe 'my/_facet_limit.html.erb' do
 
   it "should draw facet links" do
     allow(view).to receive(:display_facet).and_return(double(items: [double(value: 'Audio', hits: 3), double(value: 'Video', hits:2)]))
     allow(view).to receive(:solr_field).and_return('desc_metadata__resource_type_sim')
     allow(view).to receive(:facet_limit_for).and_return(5)
-    allow(view).to receive(:blacklight_config).and_return(DashboardController.blacklight_config)
+    allow(view).to receive(:blacklight_config).and_return(MyController.blacklight_config)
     allow(view).to receive(:search_action_path).and_return('/search')
     allow(view).to receive(:params).and_return({controller: 'dashboard'})
     render

data/sufia-models/app/actors/sufia/generic_file/actor.rb

@@ -39,19 +39,39 @@ module Sufia::GenericFile
     def revert_content(revision_id, datastream_id)
       revision = generic_file.content.get_version(revision_id)
       generic_file.add_file(revision.content, datastream_id, revision.label)
-      save_characterize_and_record_committer
+      save_characterize_and_record_committer do
+        if Sufia.config.respond_to?(:after_revert_content)
+          Sufia.config.after_revert_content.call(generic_file, user, revision_id)
+        end
+      end
     end
 
     def update_content(file, datastream_id)
       generic_file.add_file(file, datastream_id, file.original_filename)
-      save_characterize_and_record_committer
+      save_characterize_and_record_committer do
+        if Sufia.config.respond_to?(:after_update_content)
+          Sufia.config.after_update_content.call(generic_file, user)
+        end
+      end
     end
 
     def update_metadata(attributes, visibility)
       generic_file.attributes = generic_file.sanitize_attributes(attributes)
       generic_file.visibility = visibility
       generic_file.date_modified = DateTime.now
-      save_and_record_committer
+      save_and_record_committer do
+        if Sufia.config.respond_to?(:after_update_metadata)
+          Sufia.config.after_update_metadata.call(generic_file, user)
+        end
+      end
+    end
+
+    def destroy
+      pid = generic_file.pid  #Work around for https://github.com/projecthydra/active_fedora/issues/422
+      generic_file.destroy
+      if Sufia.config.respond_to?(:after_destroy)
+        Sufia.config.after_destroy.call(pid, user)
+      end
     end
 
     # Takes an optional block and executes the block if the save was successful.

data/sufia-models/app/models/concerns/sufia/generic_file.rb

@@ -97,11 +97,6 @@ module Sufia
       end
     end
 
-    # Redefine this for more intuitive keys in Redis
-    def to_param
-      noid
-    end
-
     def label=(new_label)
       @inner_object.label = new_label
       if self.title.empty?

data/sufia-models/app/models/concerns/sufia/generic_file/metadata.rb

@@ -9,14 +9,21 @@ module Sufia
         has_file_datastream "content", type: FileContentDatastream
         has_file_datastream "thumbnail"
 
-
         has_attributes :relative_path, :depositor, :import_url, datastream: :properties, multiple: false
-        has_attributes :date_uploaded, :date_modified, datastream: :descMetadata, multiple: false 
+        has_attributes :date_uploaded, :date_modified, datastream: :descMetadata, multiple: false
         has_attributes :related_url, :based_near, :part_of, :creator,
                                     :contributor, :title, :tag, :description, :rights,
                                     :publisher, :date_created, :subject,
                                     :resource_type, :identifier, :language, datastream: :descMetadata, multiple: true
       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
 end

data/sufia-models/app/models/concerns/sufia/generic_file/web_form.rb

@@ -16,7 +16,7 @@ module Sufia
       # override this method if you need to initialize more complex RDF assertions (b-nodes)
       def initialize_fields
         terms_for_editing.each do |key|
-          # if value is empty, we create an one element array to loop over for output 
+          # if value is empty, we create an one element array to loop over for output
           self[key] = [''] if self[key].empty?
         end
       end
@@ -34,7 +34,7 @@ module Sufia
       module ClassMethods
         def terms_for_display
           [:resource_type, :title, :creator, :contributor, :description, :tag, :rights, :publisher, :date_created,
-           :date_uploaded, :date_modified, :subject, :language, :identifier, :based_near, :related_url]
+           :subject, :language, :identifier, :based_near, :related_url]
         end
       end
 

data/sufia-models/app/models/datastreams/generic_file_rdf_datastream.rb

@@ -4,7 +4,7 @@ class GenericFileRdfDatastream < ActiveFedora::NtriplesRDFDatastream
     index.as :stored_searchable, :facetable
   end
   property :title, predicate: RDF::DC.title do |index|
-    index.as :stored_searchable
+    index.as :stored_searchable, :facetable
   end
   property :creator, predicate: RDF::DC.creator do |index|
     index.as :stored_searchable, :facetable

data/sufia-models/app/services/sufia/noid.rb

@@ -1,28 +1,33 @@
 module Sufia
   module Noid
-    def Noid.noidify(identifier)
-      String(identifier).split(":").last
-    end
-
-    def Noid.namespaceize(identifier)
-      if identifier.start_with?(Noid.namespace)
-        identifier
-      else
-        "#{Noid.namespace}:#{identifier}"
-      end
-    end
 
     def noid
       Noid.noidify(self.pid)
     end
 
-    def normalize_identifier
-      params[:id] = Noid.namespaceize(params[:id])
+    # Redefine this for more intuitive keys in Redis
+    def to_param
+      noid
     end
 
-    protected
-    def Noid.namespace
-      Sufia.config.id_namespace
+    class << self
+      def noidify(identifier)
+        String(identifier).split(":").last
+      end
+
+      def namespaceize(identifier)
+        if identifier.start_with?(namespace)
+          identifier
+        else
+          "#{namespace}:#{identifier}"
+        end
+      end
+
+      protected
+
+      def namespace
+        Sufia.config.id_namespace
+      end
     end
   end
 end