sufia-models 4.2.0 → 4.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1400794c267e0bde112c7a4668b7ee6e06e9b327
-  data.tar.gz: 298a15cf5c6e769a2526d81cbb815916d5fe3630
+  metadata.gz: c4b6c01683739e17c53f491882eb8c50ead27577
+  data.tar.gz: 2b780079c2b52e9f076df2e50e61835bc1f3ab2a
 SHA512:
-  metadata.gz: f112d21ca35fef090bbe579b096d758eb17e4c592bc16c40f7f4a2a94c646e9859ce733aadeb9580acacee22495934eed3f764e14701068c2c772fe142a299dc
-  data.tar.gz: 6b8047750da470d340a0a985a3ffdd722b2a09dc6ecf04da43eed32c18e8b9559abaf3a44152144d83bc12d0dfbe01db16a73eaeb4e69b1c346397bb26ca09c9
+  metadata.gz: 8fdfc3fdd81834097e68d9180cd860edb2f9813226532dd6fe06d643dddce743513556fb1a5f1af7e6bae93a662d6438ab0a6ef25d7521569127c4fcb321a489
+  data.tar.gz: 3249a331ab148fad1979b43b27fee9bf56ef1299061fde4f4ac0489effb9bee1a4d8357464de85350b2b78996d5f9e584565ffca94da43628b44405f895b3c7a

data/app/models/concerns/sufia/file_stat_utils.rb

@@ -17,13 +17,13 @@ module Sufia
       {ga_start_date: ga_start_date, cached_stats: stats.to_a }
     end
 
-    def combined_stats file_id, start_date, object_method, ga_key
+    def combined_stats file_id, start_date, object_method, ga_key, user_id=nil
       stat_cache_info = cached_stats( file_id, start_date, object_method)
       stats = stat_cache_info[:cached_stats]
       if stat_cache_info[:ga_start_date] < Date.today
         ga_stats =  ga_statistics(stat_cache_info[:ga_start_date], file_id)
         ga_stats.each do |stat|
-          lstat = self.new file_id:file_id, date: stat[:date], object_method => stat[ga_key]
+          lstat = self.new file_id: file_id, date: stat[:date], object_method => stat[ga_key], user_id: user_id
           lstat.save unless Date.parse(stat[:date]) == Date.today
           stats << lstat
         end
@@ -32,4 +32,4 @@ module Sufia
     end
 
   end
-end
+end

data/app/models/concerns/sufia/user.rb

@@ -18,33 +18,50 @@ module Sufia::User
     # Users should be followable
     acts_as_followable
 
-    # Setup accessible (or protected) attributes for your model
+    # Set up proxy-related relationships
     has_many :proxy_deposit_requests, foreign_key: 'receiving_user_id'
-
     has_many :deposit_rights_given, foreign_key: 'grantor_id', class_name: 'ProxyDepositRights', dependent: :destroy
     has_many :can_receive_deposits_from, through: :deposit_rights_given, source: :grantee
-
     has_many :deposit_rights_received, foreign_key: 'grantee_id', class_name: 'ProxyDepositRights', dependent: :destroy
     has_many :can_make_deposits_for, through: :deposit_rights_received, source: :grantor
 
+    # Validate and normalize ORCIDs
+    validates_with OrcidValidator
+    after_validation :normalize_orcid
+
+    # Set up user profile avatars
     mount_uploader :avatar, AvatarUploader, mount_on: :avatar_file_name
     validates_with AvatarValidator
+
     has_many :trophies
     attr_accessor :update_directory
   end
 
+  # Coerce the ORCID into URL format
+  def normalize_orcid
+    # Skip normalization if:
+    #   1. validation has already flagged the ORCID as invalid
+    #   2. the orcid field is blank
+    #   3. the orcid is already in its normalized form
+    return if self.errors[:orcid].first.present? || self.orcid.blank? || self.orcid.starts_with?('http://orcid.org/')
+    bare_orcid = /\d{4}-\d{4}-\d{4}-\d{4}/.match(self.orcid).string
+    self.orcid = "http://orcid.org/#{bare_orcid}"
+  end
+
   # Format the json for select2 which requires just an id and a field called text.
   # If we need an alternate format we should probably look at a json template gem
   def as_json(opts = nil)
-    {id: user_key, text: display_name ? "#{display_name} (#{user_key})" : user_key}
+    { id: user_key, text: display_name ? "#{display_name} (#{user_key})" : user_key }
   end
 
   def email_address
-    return self.email
+    self.email
   end
 
   def name
-    return self.display_name.titleize || self.user_key rescue self.user_key
+    self.display_name.titleize || raise
+  rescue
+    self.user_key
   end
 
   # Redefine this for more intuitive keys in Redis
@@ -61,7 +78,7 @@ module Sufia::User
 
   # method needed for messaging
   def mailboxer_email(obj=nil)
-    return nil
+    nil
   end
 
   # The basic groups method, override or will fallback to Sufia::Ldap::User
@@ -85,7 +102,9 @@ module Sufia::User
       [:email, :login, :display_name, :address, :admin_area,
         :department, :title, :office, :chat_id, :website, :affiliation,
         :telephone, :avatar, :group_list, :groups_last_update, :facebook_handle,
-        :twitter_handle, :googleplus_handle, :linkedin_handle, :remove_avatar]
+        :twitter_handle, :googleplus_handle, :linkedin_handle, :remove_avatar,
+        :orcid
+      ]
     end
 
     def current
@@ -119,7 +138,5 @@ module Sufia::User
     def from_url_component(component)
       User.find_by_user_key(component.gsub(/-dot-/, '.'))
     end
-
   end
-
 end

data/app/models/concerns/sufia/user_usage_stats.rb

@@ -0,0 +1,15 @@
+module Sufia::UserUsageStats
+
+  def stats
+    @stats ||= UserStat.where(user_id: id).order(date: :asc)
+  end
+
+  def total_file_views
+    stats.reduce(0) { |total, stat| total + stat.file_views }
+  end
+
+  def total_file_downloads
+    stats.reduce(0) { |total, stat| total + stat.file_downloads }
+  end
+
+end

data/app/models/file_download_stat.rb

@@ -5,8 +5,8 @@ class FileDownloadStat < ActiveRecord::Base
     [ self.class.convert_date(date), downloads ]
   end
 
-  def self.statistics file_id, start_date
-    combined_stats file_id, start_date, :downloads, :totalEvents
+  def self.statistics file_id, start_date, user_id=nil
+    combined_stats file_id, start_date, :downloads, :totalEvents, user_id
   end
 
   # Sufia::Download is sent to Sufia::Analytics.profile as #sufia__download

data/app/models/file_usage.rb

@@ -3,13 +3,17 @@ class FileUsage
   attr_accessor :id, :created, :path, :downloads, :pageviews
 
   def initialize id
+    file = ::GenericFile.find(id)
+    user = User.where(email: file.depositor).first
+    user_id = user ? user.id : nil
+
     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 = DateTime.parse(file.create_date)
     self.created = earliest > created ? earliest : created unless earliest.blank?
-    self.downloads = FileDownloadStat.to_flots FileDownloadStat.statistics(id, created)
-    self.pageviews = FileViewStat.to_flots FileViewStat.statistics(id, created)
+    self.downloads = FileDownloadStat.to_flots FileDownloadStat.statistics(id, created, user_id)
+    self.pageviews = FileViewStat.to_flots FileViewStat.statistics(id, created, user_id)
   end
 
   def total_downloads

data/app/models/file_view_stat.rb

@@ -5,8 +5,8 @@ class FileViewStat < ActiveRecord::Base
     [ self.class.convert_date(date), views ]
   end
 
-  def self.statistics file_id, start_date
-    combined_stats file_id, start_date, :views, :pageviews
+  def self.statistics file_id, start_date, user_id=nil
+    combined_stats file_id, start_date, :views, :pageviews, user_id
   end
 
   # Sufia::Download is sent to Sufia::Analytics.profile as #sufia__download

data/app/models/sufia/orcid_validator.rb

@@ -0,0 +1,8 @@
+module Sufia
+  class OrcidValidator < ActiveModel::Validator
+    def validate(record)
+      return if record.orcid.blank?
+      record.errors.add(:orcid, 'must be a string of 19 characters, e.g., "0000-0000-0000-0000"') unless /\d{4}-\d{4}-\d{4}-\d{4}/.match(record.orcid)
+    end
+  end
+end

data/app/models/user_stat.rb

@@ -0,0 +1,2 @@
+class UserStat < ActiveRecord::Base
+end

data/lib/generators/sufia/models/abstract_migration_generator.rb

@@ -0,0 +1,30 @@
+# -*- encoding : utf-8 -*-
+require 'rails/generators'
+require 'rails/generators/migration'
+
+class Sufia::Models::AbstractMigrationGenerator < Rails::Generators::Base
+  include Rails::Generators::Migration
+
+  # Implement the required interface for Rails::Generators::Migration.
+  # taken from http://github.com/rails/rails/blob/master/activerecord/lib/generators/active_record.rb
+  def self.next_migration_number(path)
+    if @prev_migration_nr
+      @prev_migration_nr += 1
+    else
+      if last_migration = Dir[File.join(path, '*.rb')].sort.last
+        @prev_migration_nr = last_migration.sub(File.join(path, '/'), '').to_i + 1
+      else
+        @prev_migration_nr = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
+      end
+    end
+    @prev_migration_nr.to_s
+  end
+
+  protected
+
+  def better_migration_template(file)
+    migration_template "migrations/#{file}", "db/migrate/#{file}"
+  rescue Rails::Generators::Error => e
+    say_status("warning", e.message, :yellow)
+  end
+end

data/lib/generators/sufia/models/cached_stats_generator.rb

@@ -1,30 +1,12 @@
-# -*- encoding : utf-8 -*-
-require 'rails/generators'
-require 'rails/generators/migration'
-
-class Sufia::Models::CachedStatsGenerator < Rails::Generators::Base
-  include Rails::Generators::Migration
+require_relative 'abstract_migration_generator'
 
+class Sufia::Models::CachedStatsGenerator < Sufia::Models::AbstractMigrationGenerator
   source_root File.expand_path('../templates', __FILE__)
 
   desc """
 This generator adds the ability to cache usage stats to your application:
  1. Creates several database migrations if they do not exist in /db/migrate
        """
-  # Implement the required interface for Rails::Generators::Migration.
-  # taken from http://github.com/rails/rails/blob/master/activerecord/lib/generators/active_record.rb
-  def self.next_migration_number(path)
-    if @prev_migration_nr
-      @prev_migration_nr += 1
-    else
-      if last_migration = Dir[File.join(path, '*.rb')].sort.last
-        @prev_migration_nr = last_migration.sub(File.join(path, '/'), '').to_i + 1
-      else
-        @prev_migration_nr = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
-      end
-    end
-    @prev_migration_nr.to_s
-  end
 
   def banner
     say_status("warning", "ADDING STATS CACHING-RELATED SUFIA MODELS", :yellow)
@@ -32,7 +14,6 @@ This generator adds the ability to cache usage stats to your application:
 
   # Setup the database migrations
   def copy_migrations
-    # Can't get this any more DRY, because we need this order.
     [
       'create_file_view_stats.rb',
       'create_file_download_stats.rb'
@@ -40,14 +21,4 @@ This generator adds the ability to cache usage stats to your application:
       better_migration_template file
     end
   end
-
-  private
-
-  def better_migration_template(file)
-    begin
-      migration_template "migrations/#{file}", "db/migrate/#{file}"
-    rescue Rails::Generators::Error => e
-      say_status("warning", e.message, :yellow)
-    end
-  end
 end

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

@@ -1,12 +1,7 @@
-# -*- encoding : utf-8 -*-
-require 'rails/generators'
-require 'rails/generators/migration'
-
-class Sufia::Models::InstallGenerator < Rails::Generators::Base
-  include Rails::Generators::Migration
+require_relative 'abstract_migration_generator'
 
+class Sufia::Models::InstallGenerator < Sufia::Models::AbstractMigrationGenerator
   source_root File.expand_path('../templates', __FILE__)
-
   argument     :model_name, type: :string , default: "user"
   desc """
 This generator makes the following changes to your application:
@@ -19,30 +14,15 @@ This generator makes the following changes to your application:
  7. Runs full-text generator
  8. Runs proxies generator
  9. Runs cached stats generator
+10. Runs ORCID field generator
+11. Runs user stats generator
        """
-
-  # Implement the required interface for Rails::Generators::Migration.
-  # taken from http://github.com/rails/rails/blob/master/activerecord/lib/generators/active_record.rb
-  def self.next_migration_number(path)
-    if @prev_migration_nr
-      @prev_migration_nr += 1
-    else
-      if last_migration = Dir[File.join(path, '*.rb')].sort.last
-        @prev_migration_nr = last_migration.sub(File.join(path, '/'), '').to_i + 1
-      else
-        @prev_migration_nr = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
-      end
-    end
-    @prev_migration_nr.to_s
-  end
-
   def banner
     say_status("warning", "GENERATING SUFIA MODELS", :yellow)
   end
 
   # Setup the database migrations
   def copy_migrations
-    # Can't get this any more DRY, because we need this order.
     [
       "acts_as_follower_migration.rb",
       "add_social_to_users.rb",
@@ -114,13 +94,13 @@ This generator makes the following changes to your application:
     generate 'sufia:models:cached_stats'
   end
 
-  private
+  # Adds orcid field to user model
+  def orcid_field
+    generate 'sufia:models:orcid_field'
+  end
 
-  def better_migration_template(file)
-    begin
-      migration_template "migrations/#{file}", "db/migrate/#{file}"
-    rescue Rails::Generators::Error => e
-      say_status("warning", e.message, :yellow)
-    end
+  # Adds user stats-related migration & methods
+  def user_stats
+    generate 'sufia:models:user_stats'
   end
 end

data/lib/generators/sufia/models/orcid_field_generator.rb

@@ -0,0 +1,19 @@
+require_relative 'abstract_migration_generator'
+
+class Sufia::Models::OrcidFieldGenerator < Sufia::Models::AbstractMigrationGenerator
+  source_root File.expand_path('../templates', __FILE__)
+
+  desc """
+This generator adds a field to hold users' ORCIDs to your application:
+ 1. Creates a database migration if they do not exist in /db/migrate
+       """
+
+  def banner
+    say_status("warning", "ADDING ORCID FIELD TO USER MODEL", :yellow)
+  end
+
+  # Setup the database migration
+  def copy_migrations
+    better_migration_template 'add_orcid_to_users.rb'
+  end
+end

data/lib/generators/sufia/models/proxies_generator.rb

@@ -1,30 +1,12 @@
-# -*- encoding : utf-8 -*-
-require 'rails/generators'
-require 'rails/generators/migration'
-
-class Sufia::Models::ProxiesGenerator < Rails::Generators::Base
-  include Rails::Generators::Migration
+require_relative 'abstract_migration_generator'
 
+class Sufia::Models::ProxiesGenerator < Sufia::Models::AbstractMigrationGenerator
   source_root File.expand_path('../templates', __FILE__)
 
   desc """
 This generator adds proxies and transfers to your application:
  1. Creates several database migrations if they do not exist in /db/migrate
        """
-  # Implement the required interface for Rails::Generators::Migration.
-  # taken from http://github.com/rails/rails/blob/master/activerecord/lib/generators/active_record.rb
-  def self.next_migration_number(path)
-    if @prev_migration_nr
-      @prev_migration_nr += 1
-    else
-      if last_migration = Dir[File.join(path, '*.rb')].sort.last
-        @prev_migration_nr = last_migration.sub(File.join(path, '/'), '').to_i + 1
-      else
-        @prev_migration_nr = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
-      end
-    end
-    @prev_migration_nr.to_s
-  end
 
   def banner
     say_status("warning", "ADDING PROXY/TRANSFER-RELATED SUFIA MODELS", :yellow)
@@ -32,7 +14,6 @@ This generator adds proxies and transfers to your application:
 
   # Setup the database migrations
   def copy_migrations
-    # Can't get this any more DRY, because we need this order.
     [
       'create_proxy_deposit_rights.rb',
       'create_proxy_deposit_requests.rb'
@@ -40,14 +21,4 @@ This generator adds proxies and transfers to your application:
       better_migration_template file
     end
   end
-
-  private
-
-  def better_migration_template(file)
-    begin
-      migration_template "migrations/#{file}", "db/migrate/#{file}"
-    rescue Rails::Generators::Error => e
-      say_status("warning", e.message, :yellow)
-    end
-  end
 end

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

@@ -93,6 +93,9 @@ Sufia.config do |config|
   # Specify a Google Analytics tracking ID to gather usage statistics
   # config.google_analytics_id = 'UA-99999999-1'
 
+  # Specify a date you wish to start collecting Google Analytic statistics for.
+  # config.analytic_start_date = DateTime.new(2014,9,10)
+
   # Where to store tempfiles, leave blank for the system temp directory (e.g. /tmp)
   # config.temp_file_base = '/home/developer1'
 
@@ -108,11 +111,6 @@ Sufia.config do |config|
   # 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/generators/sufia/models/templates/migrations/add_orcid_to_users.rb

@@ -0,0 +1,5 @@
+class AddOrcidToUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :orcid, :string
+  end
+end

data/lib/generators/sufia/models/templates/migrations/create_user_stats.rb

@@ -0,0 +1,19 @@
+class CreateUserStats < ActiveRecord::Migration
+  def change
+    create_table :user_stats do |t|
+      t.integer :user_id
+      t.datetime :date
+      t.integer :file_views
+      t.integer :file_downloads
+
+      t.timestamps
+    end
+
+    add_column :file_view_stats, :user_id, :integer
+    add_column :file_download_stats, :user_id, :integer
+
+    add_index :user_stats, :user_id
+    add_index :file_view_stats, :user_id
+    add_index :file_download_stats, :user_id
+  end
+end

data/lib/generators/sufia/models/upgrade400_generator.rb

@@ -1,13 +1,8 @@
-# -*- encoding : utf-8 -*-
-require 'rails/generators'
-require 'rails/generators/migration'
-
-class Sufia::Models::Upgrade400Generator < Rails::Generators::Base
-  include Rails::Generators::Migration
+require_relative 'abstract_migration_generator'
 
+class Sufia::Models::Upgrade400Generator < Sufia::Models::AbstractMigrationGenerator
   source_root File.expand_path('../templates', __FILE__)
 
-  argument     :model_name, type: :string , default: "user"
   desc """
 This generator for upgrading sufia-models from 3.7.2 to 4.0 makes the following changes to your application:
  1. Creates several database migrations if they do not exist in /db/migrate
@@ -16,28 +11,12 @@ This generator for upgrading sufia-models from 3.7.2 to 4.0 makes the following
  4. Runs full-text generator
        """
 
-  # Implement the required interface for Rails::Generators::Migration.
-  # taken from http://github.com/rails/rails/blob/master/activerecord/lib/generators/active_record.rb
-  def self.next_migration_number(path)
-    if @prev_migration_nr
-      @prev_migration_nr += 1
-    else
-      if last_migration = Dir[File.join(path, '*.rb')].sort.last
-        @prev_migration_nr = last_migration.sub(File.join(path, '/'), '').to_i + 1
-      else
-        @prev_migration_nr = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
-      end
-    end
-    @prev_migration_nr.to_s
-  end
-
   def banner
     say_status("warning", "UPGRADING SUFIA MODELS", :yellow)
   end
 
   # Setup the database migrations
   def copy_migrations
-    # Can't get this any more DRY, because we need this order.
     [
       'create_tinymce_assets.rb',
       'create_content_blocks.rb',
@@ -72,14 +51,4 @@ This generator for upgrading sufia-models from 3.7.2 to 4.0 makes the following
   def full_text_indexing
     generate "sufia:models:fulltext"
   end
-
-  private
-
-  def better_migration_template(file)
-    begin
-      migration_template "migrations/#{file}", "db/migrate/#{file}"
-    rescue Rails::Generators::Error => e
-      say_status("warning", e.message, :yellow)
-    end
-  end
 end

data/lib/generators/sufia/models/user_stats_generator.rb

@@ -0,0 +1,31 @@
+require_relative 'abstract_migration_generator'
+
+class Sufia::Models::UserStatsGenerator < Sufia::Models::AbstractMigrationGenerator
+  source_root File.expand_path('../templates', __FILE__)
+  argument :model_name, type: :string , default: "user"
+
+  desc """
+This generator adds usage stats methods to the user model in your application:
+       """
+
+  def banner
+    say_status("warning", "ADDING USER STATS-RELATED ABILITIES TO SUFIA MODELS", :yellow)
+  end
+
+  # Setup the database migrations
+  def copy_migrations
+    better_migration_template 'create_user_stats.rb'
+  end
+
+  def add_stats_mixin_to_user_model
+    file_path = "app/models/#{model_name.underscore}.rb"
+
+    if File.exists?(file_path)
+      inject_into_file file_path, after: /include Sufia\:\:User.*$/ do
+        "\n  include Sufia::UserUsageStats"
+      end
+    else
+      puts "     \e[31mFailure\e[0m  Sufia requires a user object. This generator assumes that the model is defined in the file #{file_path}, which does not exist.  If you used a different name, please re-run the generator and provide that name as an argument. Such as \b  rails g sufia:models:user_stats client"
+    end
+  end
+end

data/lib/sufia/models/stats/user_stat_importer.rb

@@ -0,0 +1,85 @@
+module Sufia
+  class UserStatImporter
+
+    def initialize(options={})
+      @verbose = options[:verbose]
+      @logging = options[:logging]
+    end
+
+    def import
+      log_message('Begin import of User stats.')
+      ::User.find_each do |user|
+        start_date = date_since_last_cache(user)
+
+        stats = {}
+        files_for_user(user).each do |file|
+          view_stats = FileViewStat.statistics(file.id, start_date, user.id)
+          stats = tally_results(view_stats, :views, stats)
+
+          dl_stats = FileDownloadStat.statistics(file.id, start_date, user.id)
+          stats = tally_results(dl_stats, :downloads, stats)
+        end
+
+        create_or_update_user_stats(stats, user)
+      end
+      log_message('User stats import complete.')
+    end
+
+
+private
+
+    def date_since_last_cache(user)
+      last_cached_stat = UserStat.where(user_id: user.id).order(date: :asc).last
+
+      if last_cached_stat
+        last_cached_stat.date + 1.day
+      else
+        Sufia.config.analytic_start_date
+      end
+    end
+
+    def files_for_user(user)
+      ::GenericFile.where(Solrizer.solr_name('depositor', :symbol) => user.user_key)
+    end
+
+    # For each date, add the view and download counts for this
+    # file to the view & download sub-totals for that day.
+    # The resulting hash will look something like this:
+    # {"2014-11-30 00:00:00 UTC" => {:views=>2, :downloads=>5},
+    #  "2014-12-01 00:00:00 UTC" => {:views=>4, :downloads=>4}}
+    def tally_results(file_stats, stat_name, total_stats)
+      file_stats.each do |stats|
+        # Exclude the stats from today since it will only be a partial day's worth of data
+        break if stats.date == Date.today
+
+        date_key = stats.date.to_s
+        old_count = total_stats[date_key] ? total_stats[date_key].fetch(stat_name) { 0 } : 0
+        new_count = old_count + stats.method(stat_name).call
+
+        old_values = total_stats[date_key] || {}
+        total_stats.store(date_key, old_values)
+        total_stats[date_key].store(stat_name, new_count)
+      end
+      total_stats
+    end
+
+    def create_or_update_user_stats(stats, user)
+      stats.each do |date_string, data|
+        date = Time.zone.parse(date_string)
+
+        user_stat = UserStat.where(user_id: user.id).where(date: date).first
+        user_stat ||= UserStat.new(user_id: user.id, date: date)
+
+        user_stat.file_views = data[:views] || 0
+        user_stat.file_downloads = data[:downloads] || 0
+        user_stat.save!
+      end
+    end
+
+    def log_message(message)
+      puts message if @verbose
+      Rails.logger.info "#{self.class}: #{message}" if @logging
+    end
+
+  end
+end

data/lib/sufia/models/version.rb

@@ -1,5 +1,5 @@
 module Sufia
   module Models
-    VERSION = "4.2.0"
+    VERSION = "4.3.1"
   end
 end

data/lib/tasks/stats_tasks.rake

@@ -0,0 +1,12 @@
+namespace :sufia do
+  namespace :stats do
+
+    desc "Cache file view & download stats for all users"
+    task :user_stats => :environment do
+      require 'sufia/models/stats/user_stat_importer'
+      importer = Sufia::UserStatImporter.new(verbose: true, logging: true)
+      importer.import
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sufia-models
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.3.1
 platform: ruby
 authors:
 - Jeremy Friesen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-25 00:00:00.000000000 Z
+date: 2014-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -320,6 +320,7 @@ files:
 - app/models/concerns/sufia/model_methods.rb
 - app/models/concerns/sufia/properties_datastream_behavior.rb
 - app/models/concerns/sufia/user.rb
+- app/models/concerns/sufia/user_usage_stats.rb
 - app/models/datastreams/batch_rdf_datastream.rb
 - app/models/datastreams/file_content_datastream.rb
 - app/models/datastreams/fits_datastream.rb
@@ -344,16 +345,20 @@ files:
 - app/models/sufia/avatar_uploader.rb
 - app/models/sufia/avatar_validator.rb
 - app/models/sufia/download.rb
+- app/models/sufia/orcid_validator.rb
 - app/models/sufia/pageview.rb
 - app/models/trophy.rb
+- app/models/user_stat.rb
 - app/models/version_committer.rb
 - app/services/sufia/analytics.rb
 - app/services/sufia/id_service.rb
 - app/services/sufia/noid.rb
 - config/locales/sufia.en.yml
+- lib/generators/sufia/models/abstract_migration_generator.rb
 - lib/generators/sufia/models/cached_stats_generator.rb
 - lib/generators/sufia/models/fulltext_generator.rb
 - lib/generators/sufia/models/install_generator.rb
+- lib/generators/sufia/models/orcid_field_generator.rb
 - lib/generators/sufia/models/proxies_generator.rb
 - lib/generators/sufia/models/templates/config/analytics.yml
 - lib/generators/sufia/models/templates/config/clamav.rb
@@ -372,6 +377,7 @@ files:
 - lib/generators/sufia/models/templates/migrations/add_groups_to_users.rb
 - lib/generators/sufia/models/templates/migrations/add_ldap_attrs_to_user.rb
 - lib/generators/sufia/models/templates/migrations/add_linkedin_to_users.rb
+- lib/generators/sufia/models/templates/migrations/add_orcid_to_users.rb
 - lib/generators/sufia/models/templates/migrations/add_social_to_users.rb
 - lib/generators/sufia/models/templates/migrations/create_checksum_audit_logs.rb
 - lib/generators/sufia/models/templates/migrations/create_content_blocks.rb
@@ -384,9 +390,11 @@ files:
 - lib/generators/sufia/models/templates/migrations/create_single_use_links.rb
 - lib/generators/sufia/models/templates/migrations/create_tinymce_assets.rb
 - lib/generators/sufia/models/templates/migrations/create_trophies.rb
+- lib/generators/sufia/models/templates/migrations/create_user_stats.rb
 - lib/generators/sufia/models/templates/migrations/create_version_committers.rb
 - lib/generators/sufia/models/upgrade400_generator.rb
 - lib/generators/sufia/models/usagestats_generator.rb
+- lib/generators/sufia/models/user_stats_generator.rb
 - lib/sufia/messages.rb
 - lib/sufia/models.rb
 - lib/sufia/models/active_fedora/redis.rb
@@ -395,6 +403,7 @@ files:
 - lib/sufia/models/file_content.rb
 - lib/sufia/models/file_content/versions.rb
 - lib/sufia/models/resque.rb
+- lib/sufia/models/stats/user_stat_importer.rb
 - lib/sufia/models/user_local_directory_behavior.rb
 - lib/sufia/models/utils.rb
 - lib/sufia/models/version.rb
@@ -403,6 +412,7 @@ files:
 - lib/sufia/permissions/readable.rb
 - lib/sufia/permissions/writable.rb
 - lib/tasks/resque.rake
+- lib/tasks/stats_tasks.rake
 - lib/tasks/sufia-models_tasks.rake
 - sufia-models.gemspec
 homepage: https://github.com/projecthydra/sufia