sufia-models 6.0.0.beta1 → 6.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4314a9ee6401c790ffce36c91f621c9c3fa9ec4a
-  data.tar.gz: d8cb9e5007c3d8130ceaf6e59a279f88a03ec622
+  metadata.gz: b91961eb43dcfd1c29bfafc09c472ee106c6f44c
+  data.tar.gz: 73a99ff722911ef488be5ecc5b6ee5c12a4d10df
 SHA512:
-  metadata.gz: b1e0ab2d2b46c88005855ae5d609a9d1f4a474a4c5cfa912ca0f59d29f72f486fbc6d062f04c0949c1287d36a28d17e100747d31fab6eb6b0111be93c2d43a63
-  data.tar.gz: b174426b321d1921c85264409f27c7f6a5b984a690061a5e81e32755bc309b2f0c5e37abbd4348fe1d8eed293def5fca38e7482eb0aee7207f61cef022be842e
+  metadata.gz: bbd507e709ff276f2fbd63571b23c9ecb7b0ba006781a8851ae5cda68e2da671ab118137372763f6373fd9bcea4d4aa476b1e672a8213a4c29b9ac23d2f2fe36
+  data.tar.gz: 08cf35ef184ec551b484a199a03accbfa281b8ff414f5d2202f82a2588a5dc684d5b33df2e7831bd2616e266e504845bcdb3abb99a772e7c534f156f65dc9a0f

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

@@ -56,7 +56,7 @@ module Sufia::GenericFile
     end
 
     def update_metadata(attributes, visibility)
-      generic_file.attributes = generic_file.sanitize_attributes(attributes)
+      generic_file.attributes = attributes
       update_visibility(visibility)
       generic_file.date_modified = DateTime.now
       remove_from_feature_works if generic_file.visibility_changed? && !generic_file.public?

data/app/jobs/batch_update_job.rb

@@ -8,12 +8,12 @@ class BatchUpdateJob
 
   attr_accessor :login, :title, :file_attributes, :batch_id, :visibility, :saved, :denied
 
-  def initialize(login, params)
+  def initialize(login, batch_id, title, file_attributes, visibility)
     self.login = login
-    self.title = params[:title] || {}
-    self.file_attributes = params[:generic_file]
-    self.visibility = params[:visibility]
-    self.batch_id = params[:id]
+    self.title = title || {}
+    self.file_attributes = file_attributes
+    self.visibility = visibility
+    self.batch_id = batch_id
     self.saved = []
     self.denied = []
   end

data/app/models/batch.rb

@@ -10,6 +10,9 @@ class Batch < ActiveFedora::Base
   property :status, predicate: ::RDF::DC.type
 
   def self.find_or_create(id)
+    # FIXME potential race condition in this method. Consider that `find' may raise
+    # ObjectNotFound in multiple processes. However, Fedora should raise an error
+    # if we try to create two objects with the same id.
     begin
       Batch.find(id)
     rescue ActiveFedora::ObjectNotFoundError
@@ -17,9 +20,10 @@ class Batch < ActiveFedora::Base
     end
   end
 
-  def to_solr(solr_doc={})
-    super.tap do |solr_doc|
-      solr_doc[Solrizer.solr_name('noid', Sufia::GenericFile::Indexing.noid_indexer)] = noid
+  class << self
+    # override the default indexing service
+    def indexer
+      Sufia::IndexingService
     end
   end
 end

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

@@ -5,41 +5,16 @@ module Sufia
     include Sufia::ModelMethods
     include Sufia::Noid
     include Sufia::GenericFile::Permissions
-    include Sufia::GenericFile::WebForm # provides initialize_fields method
 
     included do
       before_save :update_permissions
       validates :title, presence: true
-
-    end
-
-    def terms_for_display
-      terms_for_editing - [:title, :description]
-    end
-
-    def terms_for_editing
-      [:resource_type, :title, :creator, :contributor, :description, :tag,
-        :rights, :publisher, :date_created, :subject, :language, :identifier,
-        :based_near, :related_url]
-    end
-
-    # Test to see if the given field is required
-    # @param [Symbol] key a field
-    # @return [Boolean] is it required or not
-    def required?(key)
-      self.class.validators_on(key).any?{|v| v.kind_of? ActiveModel::Validations::PresenceValidator}
     end
 
     def to_param
       noid
     end
 
-    def to_solr(solr_doc={})
-      super.tap do |solr_doc|
-        solr_doc[Solrizer.solr_name("noid", Sufia::GenericFile::Indexing.noid_indexer)] = noid
-      end
-    end
-
     def update_permissions
       self.visibility = "open"
     end
@@ -50,5 +25,12 @@ module Sufia
       members.reduce(0) { |sum, gf| sum + gf.file_size.first.to_i }
     end
 
+    module ClassMethods
+      # override the default indexing service
+      def indexer
+        Sufia::IndexingService
+      end
+    end
+
   end
 end

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

@@ -9,7 +9,6 @@ module Sufia
     include Sufia::GenericFile::Export
     include Sufia::GenericFile::Characterization
     include Sufia::GenericFile::Permissions
-    include Sufia::GenericFile::WebForm
     include Sufia::GenericFile::Derivatives
     include Sufia::GenericFile::Trophies
     include Sufia::GenericFile::Featured

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

@@ -21,8 +21,8 @@ module Sufia
           '%G' => [:language],
           '%[' => [:date_modified],
           '%9' => [:resource_type],
-          '%~' => Application.config.application_name,
-          '%W' => t('sufia.institution_name')
+          '%~' => I18n.t('sufia.product_name'),
+          '%W' => I18n.t('sufia.institution_name')
         }
         text = []
         text << "%0 GenericFile"

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

@@ -3,19 +3,10 @@ module Sufia
     module Indexing
       extend ActiveSupport::Concern
 
-      # Unstemmed, searchable, stored
-      def self.noid_indexer
-        @noid_indexer ||= Solrizer::Descriptor.new(:text, :indexed, :stored)
-      end
-
-      def to_solr(solr_doc={})
-        super.tap do |solr_doc|
-          solr_doc[Solrizer.solr_name('label')] = label
-          solr_doc[Solrizer.solr_name('noid', Sufia::GenericFile::Indexing.noid_indexer)] = noid
-          solr_doc[Solrizer.solr_name('file_format')] = file_format
-          solr_doc[Solrizer.solr_name('file_format', :facetable)] = file_format
-          solr_doc['all_text_timv'] = full_text.content
-          solr_doc = index_collection_ids(solr_doc)
+      module ClassMethods
+        # override the default indexing service
+        def indexer
+          Sufia::GenericFileIndexingService
         end
       end
     end

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

@@ -5,7 +5,7 @@ module Sufia
 
       included do
 
-        property :label, predicate: ::RDF::DC.title, multiple: false
+        property :label, predicate: ActiveFedora::RDF::Fcrepo::Model.downloadFilename, multiple: false
 
         property :depositor, predicate: ::RDF::URI.new("http://id.loc.gov/vocabulary/relators/dpt"), multiple: false do |index|
           index.as :symbol, :stored_searchable

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
@@ -80,14 +97,6 @@ module Sufia::User
   end
 
   module ClassMethods
-
-    def permitted_attributes
-      [: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]
-    end
-
     def current
       Thread.current[:user]
     end
@@ -119,7 +128,5 @@ module Sufia::User
     def from_url_component(component)
       User.find_by_user_key(component.gsub(/-dot-/, '.'))
     end
-
   end
-
 end

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/services/sufia/generic_file_indexing_service.rb

@@ -0,0 +1,13 @@
+module Sufia
+  class GenericFileIndexingService < IndexingService
+    def generate_solr_document
+      super.tap do |solr_doc|
+        solr_doc[Solrizer.solr_name('label')] = object.label
+        solr_doc[Solrizer.solr_name('file_format')] = object.file_format
+        solr_doc[Solrizer.solr_name('file_format', :facetable)] = object.file_format
+        solr_doc['all_text_timv'] = object.full_text.content
+        solr_doc = object.index_collection_ids(solr_doc)
+      end
+    end
+  end
+end

data/app/services/sufia/indexing_service.rb

@@ -0,0 +1,15 @@
+module Sufia
+  class IndexingService < ActiveFedora::IndexingService
+
+    # Unstemmed, searchable, stored
+    def self.noid_indexer
+      @noid_indexer ||= Solrizer::Descriptor.new(:text, :indexed, :stored)
+    end
+
+    def generate_solr_document
+      super.tap do |solr_doc|
+        solr_doc[Solrizer.solr_name("noid", Sufia::IndexingService.noid_indexer)] = object.noid
+      end
+    end
+  end
+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,32 +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__)
-  argument :model_name, type: :string , default: "user"
 
   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
- 2. Adds stats methods to the user model
        """
-  # 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)
@@ -34,35 +14,11 @@ 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',
-      'create_user_stats.rb'
+      'create_file_download_stats.rb'
     ].each do |file|
       better_migration_template file
     end
   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 generators 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 client"
-    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/redis.yml

@@ -4,3 +4,6 @@ development:
 test:
   host: localhost
   port: 6379
+production:
+  host: localhost
+  port: 6379

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

@@ -99,6 +99,9 @@ Sufia.config do |config|
   # Where to store tempfiles, leave blank for the system temp directory (e.g. /tmp)
   # config.temp_file_base = '/home/developer1'
 
+  # Specify the form of hostpath to be used in Endnote exports
+  # config.persistent_hostpath = 'http://localhost/files/'
+
   # If you have ffmpeg installed and want to transcode audio and video uncomment this line
   # config.enable_ffmpeg = true
 

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/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/engine.rb

@@ -12,6 +12,7 @@ module Sufia
       require 'sufia/models/resque'
 
       # Set some configuration defaults
+      config.persistent_hostpath = "http://localhost/files/"
       config.enable_ffmpeg = false
       config.noid_template = '.reeddeeddk'
       config.ffmpeg_path = 'ffmpeg'

data/lib/sufia/models/version.rb

@@ -1,5 +1,5 @@
 module Sufia
   module Models
-    VERSION = "6.0.0.beta1"
+    VERSION = "6.0.0.rc1"
   end
 end

data/sufia-models.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   # This is a temporary homepage until we've had a chance to review the
   # process
   spec.homepage      = "https://github.com/projecthydra/sufia"
-  spec.license       = "Apache"
+  spec.license       = "Apache2"
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -29,10 +29,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rails', '~> 4.0', '< 5.0.0'
   spec.add_dependency 'activeresource', "~> 4.0" # No longer a dependency of rails 4.0
 
-  spec.add_dependency "hydra-head", "~> 9.0.0.beta1"
-  spec.add_dependency "active-fedora", "~> 9.0.0.beta5"
-  spec.add_dependency "hydra-collections", "~> 4.0.0.beta1"
-  spec.add_dependency 'hydra-derivatives', '~> 1.0.0.beta1'
+  spec.add_dependency "hydra-head", "~> 9.0.0.rc2"
+  spec.add_dependency "active-fedora", "~> 9.0.0.rc2"
+  spec.add_dependency "hydra-collections", "~> 4.0.0.rc2"
+  spec.add_dependency 'hydra-derivatives', '~> 1.0.0.rc1'
   spec.add_dependency 'nest', '~> 1.1'
   spec.add_dependency 'resque', '~> 1.23'
   spec.add_dependency 'resque-pool', '~> 0.3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sufia-models
 version: !ruby/object:Gem::Version
-  version: 6.0.0.beta1
+  version: 6.0.0.rc1
 platform: ruby
 authors:
 - Jeremy Friesen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-12 00:00:00.000000000 Z
+date: 2015-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,56 +78,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.0.0.beta1
+        version: 9.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.0.0.beta1
+        version: 9.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: active-fedora
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.0.0.beta5
+        version: 9.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.0.0.beta5
+        version: 9.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: hydra-collections
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta1
+        version: 4.0.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta1
+        version: 4.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: hydra-derivatives
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta1
+        version: 1.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta1
+        version: 1.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: nest
   requirement: !ruby/object:Gem::Requirement
@@ -329,7 +329,6 @@ files:
 - app/models/concerns/sufia/collection.rb
 - app/models/concerns/sufia/file_stat_utils.rb
 - app/models/concerns/sufia/generic_file.rb
-- app/models/concerns/sufia/generic_file/accessible_attributes.rb
 - app/models/concerns/sufia/generic_file/batches.rb
 - app/models/concerns/sufia/generic_file/characterization.rb
 - app/models/concerns/sufia/generic_file/content.rb
@@ -345,7 +344,6 @@ files:
 - app/models/concerns/sufia/generic_file/trophies.rb
 - app/models/concerns/sufia/generic_file/versions.rb
 - app/models/concerns/sufia/generic_file/virus_check.rb
-- app/models/concerns/sufia/generic_file/web_form.rb
 - app/models/concerns/sufia/model_methods.rb
 - app/models/concerns/sufia/user.rb
 - app/models/concerns/sufia/user_usage_stats.rb
@@ -369,19 +367,24 @@ 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/generic_file_audit_service.rb
+- app/services/sufia/generic_file_indexing_service.rb
 - app/services/sufia/id_service.rb
+- app/services/sufia/indexing_service.rb
 - app/services/sufia/noid.rb
 - app/services/sufia/repository_audit_service.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
@@ -400,6 +403,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
@@ -416,6 +420,7 @@ files:
 - 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
@@ -438,7 +443,7 @@ files:
 - sufia-models.gemspec
 homepage: https://github.com/projecthydra/sufia
 licenses:
-- Apache
+- Apache2
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -456,7 +461,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Models and services for sufia

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

@@ -1,87 +0,0 @@
-module Sufia
-  module GenericFile
-    module AccessibleAttributes
-      extend ActiveSupport::Concern
-      included do
-        class_attribute :_accessible_attributes
-        self._accessible_attributes = {}
-      end
-
-      def accessible_attributes(role = :default)
-         self.class._accessible_attributes[role] || []
-      end
-
-      # Sanitize the provided attributes using only those that are specified
-      # as accessible by attr_accessor
-      # @param [Hash] attributes the raw parameters
-      # @param [Hash] args a hash of options
-      # @option args [Symbol] :as (:default) the role to use
-      # @return A sanitized hash of parameters
-      def sanitize_attributes(attributes = {}, args = {})
-        role = args[:as] || :default
-        attributes.select { |k,v| accessible_attributes.include?(k.to_sym)}
-      end
-
-      module ClassMethods
-        # Specifies a white list of model attributes that can be set via
-        # mass-assignment.
-        #
-        # Like +attr_protected+, a role for the attributes is optional,
-        # if no role is provided then :default is used. A role can be defined by
-        # using the :as option.
-        #
-        # Mass-assignment will only set attributes in this list, to assign to
-        # the rest of # attributes you can use direct writer methods. This is
-        # meant to protect sensitive attributes from being overwritten by 
-        # malicious users # tampering with URLs or forms. 
-        #
-        #   class Customer
-        #     include ActiveModel::MassAssignmentSecurity
-        #
-        #     attr_accessor :name, :credit_rating
-        #
-        #     attr_accessible :name
-        #     attr_accessible :name, :credit_rating, as: :admin
-        #
-        #     def assign_attributes(values, options = {})
-        #       sanitize_for_mass_assignment(values, options[:as]).each do |k, v|
-        #         send("#{k}=", v)
-        #       end
-        #     end
-        #   end
-        #
-        # When using the :default role:
-        #
-        #   customer = Customer.new
-        #   customer.assign_attributes({ "name" => "David", "credit_rating" => "Excellent", last_login: 1.day.ago }, as: :default)
-        #   customer.name          # => "David"
-        #   customer.credit_rating # => nil
-        #
-        #   customer.credit_rating = "Average"
-        #   customer.credit_rating # => "Average"
-        #
-        # And using the :admin role:
-        #
-        #   customer = Customer.new
-        #   customer.assign_attributes({ "name" => "David", "credit_rating" => "Excellent", last_login: 1.day.ago }, as: :admin)
-        #   customer.name          # => "David"
-        #   customer.credit_rating # => "Excellent"
-        #
-        # Note that using <tt>Hash#except</tt> or <tt>Hash#slice</tt> in place of
-        # +attr_accessible+ to sanitize attributes provides basically the same
-        # functionality, but it makes a bit tricky to deal with nested attributes.
-        def attr_accessible(*args)
-          options = args.extract_options!
-          role = options[:as] || :default
-
-          self._accessible_attributes ||= {}
-
-          Array.wrap(role).each do |name|
-            self._accessible_attributes[name] = args.map &:to_sym
-          end
-        end
-
-      end
-    end
-  end
-end

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

@@ -1,62 +0,0 @@
-module Sufia
-  module GenericFile
-    module WebForm
-      extend ActiveSupport::Concern
-      include Sufia::GenericFile::AccessibleAttributes
-      included do
-        before_save :remove_blank_assertions
-        attr_accessible *(terms_for_display + [:part_of, :permissions_attributes])
-      end
-
-      def remove_blank_assertions
-        terms_for_editing.each do |key|
-          if self[key] == ['']
-            self[key] = []
-            changed_attributes.delete(key) if attribute_was(key) == []
-          end
-        end
-      end
-
-      # override this method if you need to initialize more complex RDF assertions (b-nodes)
-      def initialize_fields
-        terms_for_editing.select { |key| self[key].blank? }.each do |key|
-          # if value is empty, we create an one element array to loop over for output
-          if self.class.multiple?(key)
-            self[key] = ['']
-          else
-            self[key] = ''
-          end
-        end
-      end
-
-      def terms_for_editing
-        terms_for_display - [:date_modified, :date_uploaded, :format]
-      end
-
-      def terms_for_display
-        # 'type' is the RDF.type assertion, which is not present by default, but may be
-        # provided in some RDF schemas
-        self.class.terms_for_display
-      end
-
-      module ClassMethods
-        def terms_for_display
-          [:resource_type, :title, :creator, :contributor, :description, :tag, :rights, :publisher, :date_created,
-           :subject, :language, :identifier, :based_near, :related_url]
-        end
-      end
-
-      def to_jq_upload
-        return {
-          "name" => title,
-          "size" => file_size,
-          "url" => "/files/#{noid}",
-          "thumbnail_url" => id,
-          "delete_url" => "deleteme", # generic_file_path(id: id),
-          "delete_type" => "DELETE"
-        }
-      end
-
-    end
-  end
-end