sufia-models 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae36845b3a2212024c47f63c3f191ae3ddce2d44
-  data.tar.gz: 7156562bbb3c3a435beb3317ab420b597065b4ce
+  metadata.gz: 225e822263154c92055f19c4a792469b2ce46065
+  data.tar.gz: 710dd7bb7969847ac3362645003d0fc8b0533fde
 SHA512:
-  metadata.gz: 9a420c8a86700d0f47e3d9bf29b5f27a488340cb40561476d78d8cb73a267e4389f1e200a7e97ffcfc53c95026230c1b0a340b6ee1e71250198ac1a731082afa
-  data.tar.gz: ab6402e7739924eb275f012dadb3ce47af4e31d92277f6f747b3ca9d991bd2f665fdb5e246e7e4dfc775ad4dd35cb5a83b48c1a137036776fef6763618943898
+  metadata.gz: 43c341a486f46e61218acb3db3b75cf15fc6e981da57517357fb2c483faf8c22358940510e0edb4f52427e58167f4f4a4902dd317630873179bc96ca70c2a909
+  data.tar.gz: a5469d79e6280e930455bfa6b7241e3c467dfc970a704aae4129bab69c0563783ca913ed2022cb5a7ae8e8260ca5e6d9513a7095e9129ae9503574099d035ff6

data/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/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/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/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/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/lib/generators/sufia/models/templates/config/resque-pool.yml

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

data/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/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/lib/sufia/models/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sufia-models
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Jeremy Friesen
 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: bundler
@@ -339,6 +339,7 @@ files:
 - lib/generators/sufia/models/templates/config/mime_types.rb
 - lib/generators/sufia/models/templates/config/redis.yml
 - lib/generators/sufia/models/templates/config/redis_config.rb
+- lib/generators/sufia/models/templates/config/resque-pool.yml
 - lib/generators/sufia/models/templates/config/resque_admin.rb
 - lib/generators/sufia/models/templates/config/resque_config.rb
 - lib/generators/sufia/models/templates/config/setup_mail.rb