sufia 4.0.0 → 4.0.1

data/lib/sufia/version.rb

@@ -1,3 +1,3 @@
 module Sufia
-  VERSION = "4.0.0"
+  VERSION = "4.0.1"
 end

data/spec/controllers/downloads_controller_spec.rb

@@ -33,7 +33,7 @@ describe DownloadsController do
         it "should return requested datastreams" do
           controller.stub(:render) # send_data calls render internally
           expected_content = ActiveFedora::Base.find("sufia:test1", cast: true).descMetadata.content
-          controller.should_receive(:send_file_headers!).with({filename: 'descMetadata', disposition: 'inline', type: 'text/plain' })
+          expect(controller).to receive(:send_file_headers!).with(filename: 'descMetadata', disposition: 'inline', type: 'application/n-triples')
           get "show", id: "test1", datastream_id: "descMetadata"
           response.body.should == expected_content
           response.should be_success

data/spec/controllers/my/files_controller_spec.rb

@@ -14,7 +14,7 @@ describe My::FilesController do
 
   let(:my_collection) do
     Collection.new(title: 'test collection').tap do |c|
-      c.apply_depositor_metadata(@user.user_key)
+      c.apply_depositor_metadata(user.user_key)
       c.save!
     end
   end
@@ -22,15 +22,17 @@ describe My::FilesController do
   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.edit_users += [user.user_key]
       r.save!
     end
   end
 
+  let(:user) { FactoryGirl.find_or_create(:archivist) }
+
+
   before do
-    @user = FactoryGirl.find_or_create(:archivist)
-    sign_in @user
-    @my_file = FactoryGirl.create(:generic_file, depositor: @user)
+    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))
@@ -65,4 +67,23 @@ describe My::FilesController do
     expect(assigns[:document_list].map(&:id)).to_not include(@wrong_type.id)
   end
 
+  describe "batch processing" do
+    include Sufia::Messages
+    let (:batch_noid) {"batch_noid"}
+    let (:batch_noid2) {"batch_noid2"}
+    let (:batch) {double}
+
+    before do
+      allow(batch).to receive(:noid).and_return(batch_noid)
+      User.batchuser().send_message(user, single_success(batch_noid, batch), success_subject, sanitize_text = false)
+      User.batchuser().send_message(user, multiple_success(batch_noid2, [batch]), success_subject, sanitize_text = false)
+      get :index
+    end
+    it "gets batches that are complete" do
+      expect(assigns(:batches).count).to eq(2)
+      expect(assigns(:batches)).to include("ss-"+batch_noid)
+      expect(assigns(:batches)).to include("ss-"+batch_noid2)
+    end
+  end
+
 end

data/spec/helpers/records_helper_spec.rb

@@ -2,10 +2,10 @@ require 'spec_helper'
 
 describe RecordsHelper do
   let(:adder) {
-    "<button class=\"adder btn\" id=\"additional_test_submit\" name=\"additional_test\"><span aria-hidden=\"true\">+</span><span class=\"sr-only\">add another test</span></button>"
+    "<button class=\"adder btn\" id=\"additional_test_submit\" name=\"additional_test\"><span aria-hidden=\"true\"><i class=\"glyphicon glyphicon-plus\"></i></span><span class=\"sr-only\">add another test</span></button>"
   }
   let(:remover) {
-    "<button class=\"remover btn\" id=\"additional_test_submit\" name=\"additional_test\"><span aria-hidden=\"true\">-</span><span class=\"sr-only\">add another test</span></button>"    
+    "<button class=\"remover btn\" id=\"additional_test_submit\" name=\"additional_test\"><span aria-hidden=\"true\"><i class=\"glyphicon glyphicon-remove\"></i></span><span class=\"sr-only\">add another test</span></button>"    
   }
   it "draws add button" do
     expect(helper.add_field(:test)).to eql(adder)

data/spec/jobs/import_url_job_spec.rb

@@ -4,10 +4,12 @@ describe ImportUrlJob do
   let(:user) { FactoryGirl.find_or_create(:jill) }
 
   let(:file_path) { '/world.png' }
+  let(:file_hash)  {'/673467823498723948237462429793840923582'}
 
   let(:generic_file) do
     GenericFile.new.tap do |f|
-      f.import_url = "http://example.org#{file_path}"
+      f.import_url = "http://example.org#{file_hash}"
+      f.label = file_path
       f.apply_depositor_metadata(user.user_key)
       f.save
     end
@@ -44,10 +46,11 @@ describe ImportUrlJob do
     end
 
     it "should create a content datastream" do
-      Net::HTTP.any_instance.should_receive(:request_get).with(file_path).and_yield(mock_response)
+      Net::HTTP.any_instance.should_receive(:request_get).with(file_hash).and_yield(mock_response)
       job.run
       expect(generic_file.reload.content.size).to eq 4218
       expect(generic_file.content.dsLabel).to eq file_path
+      expect(user.mailbox.inbox.first.last_message.body).to eq("The file (#{file_path}) was successfully imported.")
     end
   end
 

data/spec/models/file_usage_spec.rb

@@ -84,8 +84,60 @@ describe FileUsage do
       expect(usage.to_flot[1][:label]).to eq("Downloads")
       expect(usage.to_flot[0][:data]).to include([1388534400000, 4], [1388620800000, 8], [1388707200000, 6], [1388793600000, 10], [1388880000000, 2]) 
       expect(usage.to_flot[1][:data]).to include([1388534400000, 1], [1388620800000, 1], [1388707200000, 2], [1388793600000, 3],  [1388880000000, 5])
-    end 
+    end
+
+    let(:create_date) {DateTime.new(2014, 01, 01)}
+
+    describe "analytics start date set" do
+      let(:earliest) {
+        DateTime.new(2014, 01, 02)
+      }
+
+      before do
+        Sufia.config.analytic_start_date = earliest
+      end
+
+      describe "create date before earliest date set" do
+        let(:usage) {
+          allow_any_instance_of(GenericFile).to receive(:create_date).and_return(create_date.to_s)
+          allow_any_instance_of(FileUsage).to receive(:download_statistics).and_return(sample_download_statistics)
+          allow_any_instance_of(FileUsage).to receive(:pageview_statistics).and_return(sample_pageview_statistics)
+          FileUsage.new(@file.id)
+        }
+        it "should set the created date to the earliest date not the created date" do
+          expect(usage.created).to eq(earliest)
+        end
+
+      end
+
+      describe "create date after earliest" do
+        let(:usage) {
+          allow_any_instance_of(FileUsage).to receive(:download_statistics).and_return(sample_download_statistics)
+          allow_any_instance_of(FileUsage).to receive(:pageview_statistics).and_return(sample_pageview_statistics)
+          Sufia.config.analytic_start_date = earliest
+          FileUsage.new(@file.id)
+        }
+        it "should set the created date to the earliest date not the created date" do
+          expect(usage.created).to eq(@file.create_date)
+        end
+      end
+    end
+    describe "start date not set" do
+      before do
+        Sufia.config.analytic_start_date = nil
+      end
+
+      let(:usage) {
+        allow_any_instance_of(GenericFile).to receive(:create_date).and_return(create_date.to_s)
+        allow_any_instance_of(FileUsage).to receive(:download_statistics).and_return(sample_download_statistics)
+        allow_any_instance_of(FileUsage).to receive(:pageview_statistics).and_return(sample_pageview_statistics)
+        FileUsage.new(@file.id)
+      }
+      it "should set the created date to the earliest date not the created date" do
+        expect(usage.created).to eq(create_date)
+      end
 
+    end
   end
 
 end

data/spec/views/dashboard/index_spec.rb

@@ -50,16 +50,16 @@ describe "dashboard/index.html.erb" do
     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>'
+      expect(@sidebar).to include '<a class="btn btn-default btn-raised" href="' + sufia.profile_path(@user) + '">View Profile</a>'
+      expect(@sidebar).to include '<a class="btn btn-default btn-raised" 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">15</span>'
-      expect(@sidebar).to include '<span class="label label-default">3</span>'
+      expect(@sidebar).to include '<span class="badge">1</span>'
+      expect(@sidebar).to include '<span class="badge">2</span>'
+      expect(@sidebar).to include '<span class="badge">15</span>'
+      expect(@sidebar).to include '<span class="badge">3</span>'
     end
 
     it "should show the statistics before the profile" do
@@ -74,8 +74,8 @@ describe "dashboard/index.html.erb" 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 ) }
+            { action: 'so and so edited their profile', timestamp: @now },
+            { action: 'so and so uploaded a file', timestamp: (@now - 360 ) }
         ])
       end
 

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

@@ -58,7 +58,7 @@ module Sufia::GenericFile
 
     def update_metadata(attributes, visibility)
       generic_file.attributes = generic_file.sanitize_attributes(attributes)
-      generic_file.visibility = visibility
+      update_visibility(visibility)
       generic_file.date_modified = DateTime.now
       remove_from_feature_works if generic_file.visibility_changed? && !generic_file.public?
       save_and_record_committer do
@@ -118,6 +118,13 @@ module Sufia::GenericFile
       end
     end
 
+    protected
+
+      # This method can be overridden in case there is a custom approach for visibility (e.g. embargo)
+      def update_visibility(visibility)
+        generic_file.visibility = visibility
+      end
+
     private
       def remove_from_feature_works
         featured_work = FeaturedWork.find_by_generic_file_id(generic_file.noid)

data/sufia-models/app/jobs/import_url_job.rb

@@ -16,7 +16,7 @@ class ImportUrlJob < ActiveFedoraPidBasedJob
       # attach downloaded file to generic file stubbed out
       if Sufia::GenericFile::Actor.new(generic_file, user).create_content(f, path, 'content')
         # add message to user for downloaded file
-        message = "The file (#{File.basename(path)}) was successfully imported."
+        message = "The file (#{generic_file.content.label}) was successfully imported."
         job_user.send_message(user, message, 'File Import')
       else
         job_user.send_message(user, generic_file.errors.full_messages.join(', '), 'File Import Error')

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

@@ -8,7 +8,7 @@ module Sufia
       def audit(force = false)
         logs = []
         self.per_version do |ver|
-          logs << ::GenericFile.audit(ver, force)
+          logs << audit_each(ver, force)
         end
         logs
       end
@@ -51,23 +51,27 @@ module Sufia
         end
       end
 
+      def audit_each(version, force = false)
+        latest_audit = logs(version.dsid).first
+        return latest_audit unless force || ::GenericFile.needs_audit?(version, latest_audit)
+
+        #  Resque.enqueue(AuditJob, version.pid, version.dsid, version.versionID)
+        Sufia.queue.push(AuditJob.new(version.pid, version.dsid, version.versionID))
+
+        # run the find just incase the job has finished already
+        latest_audit = logs(version.dsid).first
+        latest_audit = ChecksumAuditLog.new(pass: NO_RUNS, pid: version.pid, dsid: version.dsid, version: version.versionID) unless latest_audit
+        latest_audit
+      end
+
+
       module ClassMethods
         def audit!(version)
           ::GenericFile.audit(version, true)
         end
 
         def audit(version, force = false)
-          latest_audit = self.find(version.pid).logs(version.dsid).first
-          unless force
-            return latest_audit unless ::GenericFile.needs_audit?(version, latest_audit)
-          end
-          #  Resque.enqueue(AuditJob, version.pid, version.dsid, version.versionID)
-          Sufia.queue.push(AuditJob.new(version.pid, version.dsid, version.versionID))
-
-          # run the find just incase the job has finished already
-          latest_audit = self.find(version.pid).logs(version.dsid).first
-          latest_audit = ChecksumAuditLog.new(pass: NO_RUNS, pid: version.pid, dsid: version.dsid, version: version.versionID) unless latest_audit
-          latest_audit
+          latest_audit = self.find(version.pid).audit_each( version, force)
         end
 
         def needs_audit?(version, latest_audit)

data/sufia-models/app/models/file_usage.rb

@@ -5,7 +5,9 @@ class FileUsage
   def initialize id
     self.id = id
     self.path = Sufia::Engine.routes.url_helpers.generic_file_path(Sufia::Noid.noidify(id))
+    earliest = Sufia.config.analytic_start_date
     self.created = DateTime.parse(::GenericFile.find(id).create_date)
+    self.created = earliest > created ? earliest : created unless earliest.blank?
     self.downloads = download_statistics
     self.pageviews = pageview_statistics
   end
@@ -31,13 +33,13 @@ class FileUsage
   # Sufia::Download is sent to Sufia::Analytics.profile as #sufia__download
   # see Legato::ProfileMethods.method_name_from_klass
   def download_statistics
-    Sufia::Analytics.profile.sufia__download(sort: 'date').for_file(self.id)
+    Sufia::Analytics.profile.sufia__download(sort: 'date', start_date: created).for_file(self.id)
   end
 
   # Sufia::Pageview is sent to Sufia::Analytics.profile as #sufia__pageview
   # see Legato::ProfileMethods.method_name_from_klass
   def pageview_statistics
-    Sufia::Analytics.profile.sufia__pageview(sort: 'date').for_path(self.path)
+    Sufia::Analytics.profile.sufia__pageview(sort: 'date', start_date: created).for_path(self.path)
   end
 
   def pageviews_to_flot values = Array.new

data/sufia-models/lib/generators/sufia/models/install_generator.rb

@@ -79,6 +79,7 @@ This generator makes the following changes to your application:
                      "\nMime::Type.register 'application/x-endnote-refer', :endnote", {verbose: false }
     copy_file 'config/sufia.rb', 'config/initializers/sufia.rb'
     copy_file 'config/redis.yml', 'config/redis.yml'
+    copy_file 'config/resque-pool.yml', 'config/resque-pool.yml'
     copy_file 'config/redis_config.rb', 'config/initializers/redis_config.rb'
     copy_file 'config/resque_admin.rb', 'config/initializers/resque_admin.rb'
     copy_file 'config/resque_config.rb', 'config/initializers/resque_config.rb'

data/sufia-models/lib/generators/sufia/models/templates/config/resque-pool.yml

@@ -0,0 +1 @@
+ "*": 1

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

@@ -105,6 +105,14 @@ Sufia.config do |config|
   # Specify the path to the file characterization tool:
   # config.fits_path = "fits.sh"
 
+  # Specify how many seconds back from the current time that we should show by default of the user's activity on the user's dashboard
+  # config.activity_to_show_default_seconds_since_now = 24*60*60
+
+  # Specify a date you wish to start collecting Google Analytic statistics for.
+  # Leaving it blank will set the start date to when ever the file was uploaded by
+  # NOTE: if you have always sent analytics to GA for downloads and page views leave this commented out
+  # config.analytic_start_date = DateTime.new(2014,9,10)
+
   # If browse-everything has been configured, load the configs.  Otherwise, set to nil.
   begin
     if defined? BrowseEverything

data/sufia-models/lib/sufia/models/engine.rb

@@ -26,6 +26,10 @@ module Sufia
       config.analytics = false
       config.queue = Sufia::Resque::Queue
       config.max_notifications_for_dashboard = 5
+      config.activity_to_show_default_seconds_since_now = 24*60*60
+
+      # Defaulting analytic start date to when ever the file was uploaded by leaving it blank
+      config.analytic_start_date = nil
 
       config.autoload_paths += %W(
         #{config.root}/app/models/datastreams

data/sufia-models/lib/sufia/models/version.rb

@@ -1,5 +1,5 @@
 module Sufia
   module Models
-    VERSION = "4.0.0"
+    VERSION = "4.0.1"
   end
 end

data/tasks/sufia-dev.rake

@@ -3,6 +3,7 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
 require 'jettywrapper'
+Jettywrapper.hydra_jetty_version = "v7.1.0"
 require 'engine_cart/rake_task'
 
 desc 'Spin up hydra-jetty and run specs'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sufia
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Justin Coyne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-21 00:00:00.000000000 Z
+date: 2014-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sufia-models
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.0.1
 - !ruby/object:Gem::Dependency
   name: blacklight_advanced_search
   requirement: !ruby/object:Gem::Requirement
@@ -490,32 +490,35 @@ files:
 - app/assets/javascripts/sufia/multiForm.js
 - app/assets/javascripts/sufia/permissions.js
 - app/assets/javascripts/sufia/search.js
-- app/assets/javascripts/sufia/single_use_link.js
+- app/assets/javascripts/sufia/single_use_link.js.erb
 - app/assets/javascripts/sufia/tabs.js
+- app/assets/javascripts/sufia/tagcloud.js
 - app/assets/javascripts/sufia/trophy.js
 - app/assets/javascripts/sufia/uploader.js
 - app/assets/javascripts/terms_of_service.js
-- app/assets/stylesheets/batch-edit.css.scss
-- app/assets/stylesheets/catalog.css.scss
-- app/assets/stylesheets/collections.css.scss
-- app/assets/stylesheets/featured.css.scss
-- app/assets/stylesheets/file-listing.css.scss
 - app/assets/stylesheets/fileupload/application.css
 - app/assets/stylesheets/fileupload/jquery.fileupload-ui.css.erb
 - app/assets/stylesheets/fileupload/pbar-ani.gif
 - app/assets/stylesheets/fileupload/style.css
 - app/assets/stylesheets/fileupload/thumbnail-scaling.css
 - app/assets/stylesheets/generic_files.css.erb
-- app/assets/stylesheets/header.css.scss
-- app/assets/stylesheets/home-page.css.scss
 - app/assets/stylesheets/jquery-ui.css
 - app/assets/stylesheets/nestable.css.scss
-- app/assets/stylesheets/settings.css.scss
-- app/assets/stylesheets/styles.css.scss
 - app/assets/stylesheets/sufia-audio-overrides.css
 - app/assets/stylesheets/sufia.css.scss
-- app/assets/stylesheets/tagcloud.css
-- app/assets/stylesheets/usage-stats.css
+- app/assets/stylesheets/sufia/_batch-edit.scss
+- app/assets/stylesheets/sufia/_buttons.scss
+- app/assets/stylesheets/sufia/_catalog.scss
+- app/assets/stylesheets/sufia/_collections.scss
+- app/assets/stylesheets/sufia/_dashboard.scss
+- app/assets/stylesheets/sufia/_featured.scss
+- app/assets/stylesheets/sufia/_file-listing.scss
+- app/assets/stylesheets/sufia/_header.scss
+- app/assets/stylesheets/sufia/_home-page.scss
+- app/assets/stylesheets/sufia/_settings.scss
+- app/assets/stylesheets/sufia/_styles.scss
+- app/assets/stylesheets/sufia/_tagcloud.scss
+- app/assets/stylesheets/sufia/_usage-stats.scss
 - app/builders/sufia/bootstrap_breadcrumbs_builder.rb
 - app/controllers/authorities_controller.rb
 - app/controllers/batch_controller.rb
@@ -1037,6 +1040,7 @@ files:
 - sufia-models/lib/generators/sufia/models/templates/config/mime_types.rb
 - sufia-models/lib/generators/sufia/models/templates/config/redis.yml
 - sufia-models/lib/generators/sufia/models/templates/config/redis_config.rb
+- sufia-models/lib/generators/sufia/models/templates/config/resque-pool.yml
 - sufia-models/lib/generators/sufia/models/templates/config/resque_admin.rb
 - sufia-models/lib/generators/sufia/models/templates/config/resque_config.rb
 - sufia-models/lib/generators/sufia/models/templates/config/setup_mail.rb