sufia-models 3.1.3 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72c416d322fb3bea980a2eccd7f10da2788bfc6c
-  data.tar.gz: 6d00d262f2085368c8bae2a406b6db69ba0a0ca8
+  metadata.gz: 79d76149b1df8f00315c569a3e43db45937c92b7
+  data.tar.gz: 6bd416eab76f790a73f16a07a2abd337cfcd4e4e
 SHA512:
-  metadata.gz: e38dc785cbd05a8404999089dabf5b76a920db07cc852bd961b1e0182ba227d477b5f3be19aca01174285e0786761e6afe184ab3410ace1868ca1fe59eae9b60
-  data.tar.gz: 7ab56759eced4a028a5a23891618c3cc9ca303f877a7dc50eef59722aba6fbb99f0d22d4d69e8b4e23f5532ad7575ac078203e3d75def697a8c5ee6f5a12271e
+  metadata.gz: b776c781c53753d4de08fced94345ed0b45117c63012f8b2042fd18a6633d5c4ac1cb9a2c38cf666b7238b2307de0fd2deffda00db2d14721ec06d66ced04131
+  data.tar.gz: 70e8d9b4d5dc61fac26a93b76a45ca8deb743fec41a396c97b3f51d2a0f705ae5306841f33a9a30717eb1feadf346198dc613abd4f72592e2b4a6176f37e0a89

data/app/models/checksum_audit_log.rb

@@ -1,5 +1,5 @@
 class ChecksumAuditLog < ActiveRecord::Base
-  attr_accessible :pass, :pid, :dsid, :version, :created_at if Rails::VERSION::MAJOR == 3
+  deprecated_attr_accessible :pass, :pid, :dsid, :version, :created_at
 
   def ChecksumAuditLog.get_audit_log(version)
     ChecksumAuditLog.find_or_create_by_pid_and_dsid_and_version(:pid => version.pid,

data/app/models/domain_term.rb

@@ -1,5 +1,5 @@
 class DomainTerm < ActiveRecord::Base
-  attr_accessible :model, :term if Rails::VERSION::MAJOR == 3
+  deprecated_attr_accessible  :model, :term
 
   # TODO we should add an index on this join table and remove the uniq query
   has_and_belongs_to_many :local_authorities, :uniq=> true 

data/app/models/local_authority.rb

@@ -2,7 +2,7 @@ require 'rdf'
 require 'rdf/rdfxml'
 
 class LocalAuthority < ActiveRecord::Base
-  attr_accessible :name if Rails::VERSION::MAJOR == 3
+  deprecated_attr_accessible  :name
   # TODO we should add an index on this join table and remove the uniq query
   has_and_belongs_to_many :domain_terms, :uniq=> true 
   has_many :local_authority_entries

data/app/models/local_authority_entry.rb

@@ -1,4 +1,4 @@
 class LocalAuthorityEntry < ActiveRecord::Base
   belongs_to :local_authority
-  attr_accessible :local_authority, :label, :uri if Rails::VERSION::MAJOR == 3
+  deprecated_attr_accessible  :local_authority, :label, :uri
 end

data/app/models/single_use_link.rb

@@ -1,6 +1,6 @@
 class SingleUseLink < ActiveRecord::Base
 
-  attr_accessible :downloadKey, :expires, :itemId, :path if Rails::VERSION::MAJOR == 3
+  deprecated_attr_accessible  :downloadKey, :expires, :itemId, :path
     
   
   def self.create_show(item_id)

data/app/models/trophy.rb

@@ -1,5 +1,5 @@
 class Trophy < ActiveRecord::Base
-  attr_accessible :generic_file_id, :user_id if Rails::VERSION::MAJOR == 3
+  deprecated_attr_accessible  :generic_file_id, :user_id
 
   validate :count_within_limit, :on => :create
 

data/app/models/version_committer.rb

@@ -1,3 +1,3 @@
 class VersionCommitter < ActiveRecord::Base
-  attr_accessible :obj_id, :datastream_id, :version_id, :committer_login if Rails::VERSION::MAJOR == 3
+  deprecated_attr_accessible  :obj_id, :datastream_id, :version_id, :committer_login
 end

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

@@ -92,7 +92,11 @@ This generator makes the following changes to your application:
   private
 
   def better_migration_template(file)
-    migration_template "migrations/#{file}", "db/migrate/#{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/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/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
 

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

@@ -3,13 +3,8 @@ module Sufia
     module Visibility
       extend ActiveSupport::Concern
       extend Deprecation
-      include ActiveModel::Dirty
 
-      included do
-        define_attribute_methods :visibility
-      end
-
-      def visibility= (value)
+      def visibility=(value)
         return if value.nil?
         # only set explicit permissions
         case value
@@ -17,7 +12,7 @@ module Sufia
           public_visibility!
         when Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
           registered_visibility!
-        when Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE 
+        when Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
           private_visibility!
         else
           raise ArgumentError, "Invalid visibility: #{value.inspect}"
@@ -39,25 +34,32 @@ module Sufia
         self.visibility= visibility
       end
 
-      private 
-        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 visibility_changed?
+        @visibility_will_change
+      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
+      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
 
-        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/lib/sufia/models/user.rb

@@ -19,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/lib/sufia/models/version.rb

@@ -1,5 +1,5 @@
 module Sufia
   module Models
-    VERSION = "3.1.3"
+    VERSION = "3.2.1"
   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/jeremyf/sufia"
+  spec.homepage      = "https://github.com/projecthydra/sufia"
   spec.license       = "Apache"
 
   spec.files         = `git ls-files`.split($/)
@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rails', '>= 3.2.13', '< 5.0'
   spec.add_dependency 'activeresource' # No longer a dependency of rails 4.0
   spec.add_dependency "hydra-head", "~> 6.3.0"
-  spec.add_dependency 'active-fedora', "~> 6.4.0"
+  spec.add_dependency 'active-fedora', "~> 6.5.0"
 
   spec.add_dependency 'nest', '~> 1.1.1'
   spec.add_dependency 'resque', '~> 1.23.0'#, :require => 'resque/server'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sufia-models
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.2.1
 platform: ruby
 authors:
 - Jeremy Friesen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-28 00:00:00.000000000 Z
+date: 2013-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 6.4.0
+        version: 6.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 6.4.0
+        version: 6.5.0
 - !ruby/object:Gem::Dependency
   name: nest
   requirement: !ruby/object:Gem::Requirement
@@ -281,6 +281,7 @@ files:
 - lib/generators/sufia/models/templates/migrations/create_version_committers.rb
 - lib/sufia/models.rb
 - lib/sufia/models/active_fedora/redis.rb
+- lib/sufia/models/active_record/deprecated_attr_accessible.rb
 - lib/sufia/models/active_record/redis.rb
 - lib/sufia/models/active_support/core_ext/marshal.rb
 - lib/sufia/models/engine.rb
@@ -319,7 +320,7 @@ files:
 - lib/tasks/resque.rake
 - lib/tasks/sufia-models_tasks.rake
 - sufia-models.gemspec
-homepage: https://github.com/jeremyf/sufia
+homepage: https://github.com/projecthydra/sufia
 licenses:
 - Apache
 metadata: {}
@@ -339,9 +340,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Models and services for sufia
 test_files: []
-has_rdoc: