sufia 3.1.0 → 3.2.1

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

@@ -0,0 +1,81 @@
+# Returns an array containing the vhost 'CoSign service' value and URL
+Sufia.config do |config|
+
+  config.fits_to_desc_mapping= {
+    :file_title => :title,
+    :file_author => :creator
+  }
+
+  # Specify a different template for your repositories unique identifiers
+  # config.noid_template = ".reeddeeddk"
+
+  config.max_days_between_audits = 7
+
+  config.cc_licenses = {
+    'Attribution 3.0 United States' => 'http://creativecommons.org/licenses/by/3.0/us/',
+    'Attribution-ShareAlike 3.0 United States' => 'http://creativecommons.org/licenses/by-sa/3.0/us/',
+    'Attribution-NonCommercial 3.0 United States' => 'http://creativecommons.org/licenses/by-nc/3.0/us/',
+    'Attribution-NoDerivs 3.0 United States' => 'http://creativecommons.org/licenses/by-nd/3.0/us/',
+    'Attribution-NonCommercial-NoDerivs 3.0 United States' => 'http://creativecommons.org/licenses/by-nc-nd/3.0/us/',
+    'Attribution-NonCommercial-ShareAlike 3.0 United States' => 'http://creativecommons.org/licenses/by-nc-sa/3.0/us/',
+    'Public Domain Mark 1.0' => 'http://creativecommons.org/publicdomain/mark/1.0/',
+    'CC0 1.0 Universal' => 'http://creativecommons.org/publicdomain/zero/1.0/',
+    'All rights reserved' => 'All rights reserved'
+  }
+
+  config.cc_licenses_reverse = Hash[*config.cc_licenses.to_a.flatten.reverse]
+
+  config.resource_types = {
+    "Article" => "Article",
+    "Audio" => "Audio",
+    "Book" => "Book",
+    "Capstone Project" => "Capstone Project",
+    "Conference Proceeding" => "Conference Proceeding",
+    "Dataset" => "Dataset",
+    "Dissertation" => "Dissertation",
+    "Image" => "Image",
+    "Journal" => "Journal",
+    "Map or Cartographic Material" => "Map or Cartographic Material",
+    "Masters Thesis" => "Masters Thesis",
+    "Part of Book" => "Part of Book",
+    "Poster" => "Poster",
+    "Presentation" => "Presentation",
+    "Project" => "Project",
+    "Report" => "Report",
+    "Research Paper" => "Research Paper",
+    "Software or Program Code" => "Software or Program Code",
+    "Video" => "Video",
+    "Other" => "Other",
+  }
+
+  config.permission_levels = {
+    "Choose Access"=>"none",
+    "View/Download" => "read",
+    "Edit" => "edit"
+  }
+
+  config.owner_permission_levels = {
+    "Edit" => "edit"
+  }
+
+  config.queue = Sufia::Resque::Queue
+
+  # Map hostnames onto Google Analytics tracking IDs
+  # config.google_analytics_id = 'UA-99999999-1'
+
+
+  # Where to store tempfiles, leave blank for the system temp directory (e.g. /tmp)
+  # config.temp_file_base = '/home/developer1'
+
+  # If you have ffmpeg installed and want to transcode audio and video uncomment this line
+  # config.enable_ffmpeg = true
+
+  # Specify the Fedora pid prefix:
+  # config.id_namespace = "sufia"
+
+  # Specify the path to the file characterization tool:
+  # config.fits_path = "fits.sh"
+
+end
+
+Date::DATE_FORMATS[:standard] = "%m/%d/%Y"

data/sufia-models/lib/generators/sufia/models/templates/migrations/acts_as_follower_migration.rb

@@ -0,0 +1,17 @@
+class ActsAsFollowerMigration < ActiveRecord::Migration
+  def self.up
+    create_table :follows, :force => true do |t|
+      t.references :followable, :polymorphic => true, :null => false
+      t.references :follower,   :polymorphic => true, :null => false
+      t.boolean :blocked, :default => false, :null => false
+      t.timestamps
+    end
+
+    add_index :follows, ["follower_id", "follower_type"],     :name => "fk_follows"
+    add_index :follows, ["followable_id", "followable_type"], :name => "fk_followables"
+  end
+
+  def self.down
+    drop_table :follows
+  end
+end

data/sufia-models/lib/generators/sufia/models/templates/migrations/add_avatars_to_users.rb

@@ -0,0 +1,9 @@
+class AddAvatarsToUsers < ActiveRecord::Migration
+  def self.up
+    add_attachment :users, :avatar
+  end
+
+  def self.down
+    remove_attachment :users, :avatar
+  end
+end

data/sufia-models/lib/generators/sufia/models/templates/migrations/add_groups_to_users.rb

@@ -0,0 +1,11 @@
+class AddGroupsToUsers < ActiveRecord::Migration
+  def self.up
+    add_column :users, :group_list, :text
+    add_column :users, :groups_last_update, :datetime
+  end
+
+  def self.down
+    remove_column :users, :group_list
+    remove_column :users, :groups_last_update
+  end
+end

data/sufia-models/lib/generators/sufia/models/templates/migrations/add_ldap_attrs_to_user.rb

@@ -0,0 +1,27 @@
+class AddLdapAttrsToUser < ActiveRecord::Migration
+  def self.up
+    add_column :users, :display_name, :string
+    add_column :users, :address, :string
+    add_column :users, :admin_area, :string
+    add_column :users, :department, :string
+    add_column :users, :title, :string
+    add_column :users, :office, :string
+    add_column :users, :chat_id, :string
+    add_column :users, :website, :string
+    add_column :users, :affiliation, :string
+    add_column :users, :telephone, :string
+  end
+
+  def self.down
+    remove_column :users, :display_name
+    remove_column :users, :address
+    remove_column :users, :admin_area
+    remove_column :users, :department
+    remove_column :users, :title
+    remove_column :users, :office
+    remove_column :users, :chat_id
+    remove_column :users, :website
+    remove_column :users, :affiliation
+    remove_column :users, :telephone
+  end
+end

data/sufia-models/lib/generators/sufia/models/templates/migrations/add_social_to_users.rb

@@ -0,0 +1,13 @@
+class AddSocialToUsers < ActiveRecord::Migration
+  def self.up
+    add_column :users, :facebook_handle, :string
+    add_column :users, :twitter_handle, :string
+    add_column :users, :googleplus_handle, :string
+  end
+
+  def self.down
+    remove_column :users, :facebook_handle, :string
+    remove_column :users, :twitter_handle, :string
+    remove_column :users, :googleplus_handle, :string
+  end
+end

data/sufia-models/lib/generators/sufia/models/templates/migrations/create_checksum_audit_logs.rb

@@ -0,0 +1,20 @@
+class CreateChecksumAuditLogs < ActiveRecord::Migration
+  def self.up
+    create_table :checksum_audit_logs do |t|
+      t.string :pid
+      t.string :dsid
+      t.string :version
+      t.integer :pass
+      t.string :expected_result
+      t.string :actual_result
+      t.timestamps
+    end
+    add_index :checksum_audit_logs, [:pid, :dsid], :name=>'by_pid_and_dsid', :order => {:created_at => "DESC" }
+
+  end
+
+  def self.down
+    remove_index(:checksum_audit_logs, :name => 'by_pid_and_dsid')
+    drop_table :checksum_audit_logs
+  end
+end

data/sufia-models/lib/generators/sufia/models/templates/migrations/create_local_authorities.rb

@@ -0,0 +1,50 @@
+class CreateLocalAuthorities < ActiveRecord::Migration
+  def self.up
+    create_table :local_authority_entries, :force => true do |t|
+      t.integer :local_authority_id
+      t.string :label
+      t.string :uri
+    end
+
+    create_table :local_authorities, :force => true do |t|
+      t.string :name, :unique => true
+    end
+
+    create_table :domain_terms, :force => true do |t|
+      t.string :model
+      t.string :term
+    end
+
+    create_table :domain_terms_local_authorities, :id => false do |t|
+      t.integer :domain_term_id, :foreign_key => true
+      t.integer :local_authority_id, :foreign_key => true
+    end
+
+    create_table :subject_local_authority_entries, :force => true  do |t|
+      t.string :label
+      t.string :lowerLabel
+      t.string :url
+    end
+
+    add_index :local_authority_entries, [:local_authority_id, :label], :name => 'entries_by_term_and_label'
+    add_index :local_authority_entries, [:local_authority_id, :uri], :name => 'entries_by_term_and_uri'
+    add_index :domain_terms, [:model, :term], :name => 'terms_by_model_and_term'
+    add_index :domain_terms_local_authorities, [:local_authority_id, :domain_term_id], :name => 'dtla_by_ids1'
+    add_index :domain_terms_local_authorities, [:domain_term_id, :local_authority_id], :name => 'dtla_by_ids2'
+    add_index :subject_local_authority_entries, [:lowerLabel], :name => 'entries_by_lower_label'
+  end
+
+  def self.down
+    drop_table :local_authority_entries
+    drop_table :local_authorities
+    drop_table :domain_terms
+    drop_table :domain_terms_local_authorities
+    drop_table :subject_local_authority_entries
+    remove_index :local_authority_entries, :name => "entries_by_term_and_label"
+    remove_index :local_authority_entries, :name => "entries_by_term_and_uri"
+    remove_index :domain_terms, :name => "terms_by_model_and_term"
+    remove_index :subject_local_authority_entries, :name => 'entries_by_lower_label'
+    remove_index :domain_terms_local_authorities, :name => 'dtla_by_ids1'
+    remove_index :domain_terms_local_authorities, :name => 'dtla_by_ids2'
+  end
+end

data/sufia-models/lib/generators/sufia/models/templates/migrations/create_single_use_links.rb

@@ -0,0 +1,12 @@
+class CreateSingleUseLinks < ActiveRecord::Migration
+  def change
+    create_table :single_use_links do |t|
+      t.string :downloadKey
+      t.string :path
+      t.string :itemId
+      t.datetime :expires
+
+      t.timestamps
+    end
+  end
+end

data/sufia-models/lib/generators/sufia/models/templates/migrations/create_trophies.rb

@@ -0,0 +1,10 @@
+class CreateTrophies < ActiveRecord::Migration
+  def change
+    create_table :trophies do |t|
+      t.integer :user_id
+      t.string :generic_file_id
+
+      t.timestamps
+    end
+  end
+end

data/sufia-models/lib/generators/sufia/models/templates/migrations/create_version_committers.rb

@@ -0,0 +1,15 @@
+class CreateVersionCommitters < ActiveRecord::Migration
+  def self.up
+    create_table :version_committers do |t|
+      t.string :obj_id
+      t.string :datastream_id
+      t.string :version_id
+      t.string :committer_login
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :version_committers
+  end
+end

data/sufia-models/lib/sufia/models/active_record/deprecated_attr_accessible.rb

@@ -0,0 +1,16 @@
+module ActiveRecord
+  module DeprecatedAttrAccessible
+    extend ActiveSupport::Concern
+    module ClassMethods
+      def deprecated_attr_accessible(*args)
+        if Rails::VERSION::MAJOR < 4 || defined?(ProtectedAttributes)
+          ActiveSupport::Deprecation.warn("deprecated_attr_accessible  is, wait for it, deprecated. It will be removed when Sufia stops support Rails 3.")
+          attr_accessible(*args)
+        end
+      end
+    end
+  end
+end
+ActiveRecord::Base.class_eval do
+  include ActiveRecord::DeprecatedAttrAccessible
+end

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

@@ -37,6 +37,7 @@ module Sufia
       initializer "patches" do
         require 'sufia/models/active_fedora/redis'
         require 'sufia/models/active_record/redis'
+        require 'sufia/models/active_record/deprecated_attr_accessible'
         require 'sufia/models/active_support/core_ext/marshal' unless Rails::VERSION::MAJOR == 4
       end
 
@@ -46,13 +47,11 @@ module Sufia
         require 'sufia/models/noid'
         require 'sufia/models/file_content'
         require 'sufia/models/file_content/versions'
-        require 'sufia/models/generic_file/actions'
         require 'sufia/models/generic_file/audit'
         require 'sufia/models/generic_file/characterization'
         require 'sufia/models/generic_file/derivatives'
         require 'sufia/models/generic_file/export'
         require 'sufia/models/generic_file/mime_types'
-        require 'sufia/models/generic_file/permissions'
         require 'sufia/models/generic_file/thumbnail'
         require 'sufia/models/generic_file'
         require 'sufia/models/user'

data/sufia-models/lib/sufia/models/generic_file/permissions.rb

@@ -4,26 +4,13 @@ module Sufia
       extend ActiveSupport::Concern
       #we're overriding the permissions= method which is in RightsMetadata
       include Hydra::ModelMixins::RightsMetadata
+      include Sufia::GenericFile::Visibility
+
       included do
         has_metadata :name => "rightsMetadata", :type => ParanoidRightsDatastream
         validate :paranoid_permissions
       end
 
-      def set_visibility(visibility)
-        # only set explicit permissions
-        case visibility
-        when "open"
-          self.datastreams["rightsMetadata"].permissions({:group=>"public"}, "read")
-        when "psu"
-          self.datastreams["rightsMetadata"].permissions({:group=>"registered"}, "read")
-          self.datastreams["rightsMetadata"].permissions({:group=>"public"}, "none")
-        when "restricted" 
-          self.datastreams["rightsMetadata"].permissions({:group=>"registered"}, "none")
-          self.datastreams["rightsMetadata"].permissions({:group=>"public"}, "none")
-        end
-      end
-
-
       def paranoid_permissions
         # let the rightsMetadata ds make this determination
         # - the object instance is passed in for easier access to the props ds
@@ -57,8 +44,6 @@ module Sufia
         end
         {'person'=>user_perms, 'group'=>group_perms}
       end
-
-
     end
   end
 end

data/sufia-models/lib/sufia/models/generic_file/visibility.rb

@@ -0,0 +1,65 @@
+module Sufia
+  module GenericFile
+    module Visibility
+      extend ActiveSupport::Concern
+      extend Deprecation
+
+      def visibility=(value)
+        return if value.nil?
+        # only set explicit permissions
+        case value
+        when Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
+          public_visibility!
+        when Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
+          registered_visibility!
+        when Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
+          private_visibility!
+        else
+          raise ArgumentError, "Invalid visibility: #{value.inspect}"
+        end
+      end
+
+      def visibility
+        if read_groups.include? Sufia::Models::AccessRight::PERMISSION_TEXT_VALUE_PUBLIC
+          Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
+        elsif read_groups.include? Sufia::Models::AccessRight::PERMISSION_TEXT_VALUE_AUTHENTICATED
+          Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
+        else
+          Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
+        end
+      end
+
+      def set_visibility(visibility)
+        Deprecation.warn Visibility, "set_visibility is deprecated, use visibility= instead.  set_visibility will be removed in sufia 3.0", caller
+        self.visibility= visibility
+      end
+
+      def visibility_changed?
+        @visibility_will_change
+      end
+
+      private
+      def visibility_will_change!
+        @visibility_will_change = true
+      end
+
+      def public_visibility!
+        visibility_will_change! unless visibility == Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
+        self.datastreams["rightsMetadata"].permissions({:group=>Sufia::Models::AccessRight::PERMISSION_TEXT_VALUE_PUBLIC}, "read")
+      end
+
+      def registered_visibility!
+        visibility_will_change! unless visibility == Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
+        self.datastreams["rightsMetadata"].permissions({:group=>Sufia::Models::AccessRight::PERMISSION_TEXT_VALUE_AUTHENTICATED}, "read")
+        self.datastreams["rightsMetadata"].permissions({:group=>Sufia::Models::AccessRight::PERMISSION_TEXT_VALUE_PUBLIC}, "none")
+      end
+
+      def private_visibility!
+        visibility_will_change! unless visibility == Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
+        self.datastreams["rightsMetadata"].permissions({:group=>Sufia::Models::AccessRight::PERMISSION_TEXT_VALUE_AUTHENTICATED}, "none")
+        self.datastreams["rightsMetadata"].permissions({:group=>Sufia::Models::AccessRight::PERMISSION_TEXT_VALUE_PUBLIC}, "none")
+      end
+
+    end
+  end
+end

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

@@ -2,8 +2,9 @@ module Sufia
   module GenericFile
     extend ActiveSupport::Concern
     extend ActiveSupport::Autoload
-    autoload :Actions
-    autoload :Permissions
+    autoload :Actions, 'sufia/models/generic_file/actions'
+    autoload :Permissions, 'sufia/models/generic_file/permissions'
+    autoload :Visibility, 'sufia/models/generic_file/visibility'
     autoload :WebForm, 'sufia/models/generic_file/web_form'
     autoload :AccessibleAttributes, 'sufia/models/generic_file/accessible_attributes'
     include Sufia::ModelMethods

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

@@ -1,17 +1,3 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 require 'noid'
 
 module Sufia

data/sufia-models/lib/sufia/models/jobs/audit_job.rb

@@ -1,17 +1,3 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 class AuditJob < ActiveFedoraPidBasedJob
   def queue_name
     :audit

data/sufia-models/lib/sufia/models/jobs/batch_update_job.rb

@@ -1,17 +1,3 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 class BatchUpdateJob
   include Hydra::PermissionsQuery
   include Rails.application.routes.url_helpers 
@@ -44,10 +30,10 @@ class BatchUpdateJob
     
     job_user = User.batchuser()
     
-    message = '<a class="batchid ui-helper-hidden">ss-'+batch.noid+'</a>The file(s) '+ file_list(@saved)+ " have been saved." unless @saved.empty?
+    message = '<span class="batchid ui-helper-hidden">ss-'+batch.noid+'</span>The file(s) '+ file_list(@saved)+ " have been saved." unless @saved.empty?
     job_user.send_message(user, message, 'Batch upload complete') unless @saved.empty?
  
-    message = '<a class="batchid ui-helper-hidden">'+batch.noid+'</a>The file(s) '+ file_list(@denied)+" could not be updated.  You do not have sufficient privileges to edit it." unless @denied.empty?
+    message = '<span class="batchid ui-helper-hidden">'+batch.noid+'</span>The file(s) '+ file_list(@denied)+" could not be updated.  You do not have sufficient privileges to edit it." unless @denied.empty?
     job_user.send_message(user, message, 'Batch upload permission denied') unless @denied.empty?
      
   end
@@ -60,7 +46,7 @@ class BatchUpdateJob
     end
     gf.title = title[gf.pid] if title[gf.pid] rescue gf.label
     gf.attributes=file_attributes
-    gf.set_visibility(visibility)
+    gf.visibility= visibility
 
     save_tries = 0
     begin

data/sufia-models/lib/sufia/models/jobs/characterize_job.rb

@@ -1,17 +1,3 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 class CharacterizeJob < ActiveFedoraPidBasedJob
 
   def queue_name

data/sufia-models/lib/sufia/models/jobs/resolrize_job.rb

@@ -1,17 +1,3 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 class ResolrizeJob
   def queue_name
     :resolrize

data/sufia-models/lib/sufia/models/jobs/unzip_job.rb

@@ -1,17 +1,3 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 class UnzipJob < ActiveFedoraPidBasedJob
   def queue_name
     :unzip

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

@@ -1,17 +1,3 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 module Sufia
   module Noid
     def Noid.noidify(identifier)

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

@@ -1,17 +1,3 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 # -*- encoding : utf-8 -*-
 module Sufia
   module SolrDocumentBehavior

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

@@ -1,17 +1,3 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 module Sufia::User
   extend ActiveSupport::Concern
 
@@ -33,7 +19,7 @@ module Sufia::User
     acts_as_followable
 
     # Setup accessible (or protected) attributes for your model
-    attr_accessible *permitted_attributes if Rails::VERSION::MAJOR == 3
+    deprecated_attr_accessible  *permitted_attributes
 
     # Add user avatar (via paperclip library)
     has_attached_file :avatar, :styles => { medium: "300x300>", thumb: "100x100>" }, :default_url => '/assets/missing_:style.png'

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

@@ -1,17 +1,3 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 module Sufia
   module Utils
     extend ActiveSupport::Concern

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

@@ -1,5 +1,5 @@
 module Sufia
   module Models
-    VERSION = "3.1.0"
+    VERSION = "3.2.1"
   end
 end