sufia 3.1.3 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1aa23489833763f7e8ffcd0c510ba8a2218af2b
-  data.tar.gz: 0a9ce2418842b3fefd0112df841e17ae937a3a81
+  metadata.gz: ffa4a49e5c8afcbf9f0ef5a16f0ed722505de7c0
+  data.tar.gz: 255f5e0b340379b077a64e2cee5b1db7d9dfa362
 SHA512:
-  metadata.gz: 62ee1f3d317dffbb1818da196511edc65279a594d98f1353facf6840c1bc9cbe4e123b33d45dbbe04a66a152dcc6a3dd4cebcd6fee0eb136fe3f39ad2895f260
-  data.tar.gz: f94eb66b9f1db63ee57140bf3d535bde13ea41433667711a3e62a764472acc0c085af4ddacfd2d6df1d7aa303f2d3975f1c95ca561e224be867997750a0ffb73
+  metadata.gz: 46d39fa82b03a024b14b1481c02cd631eb5948e476ea533bc43fcc8b8a52d97f83f6cf1cd1833f8f16960ac7993785653294c08c8e8cd037dd19dcc83de5bf27
+  data.tar.gz: 5e2acc470ce6e34839fa45707a2c9174fd34eaa42d64c025c5a8d19dc395023b7f6e925e26b75efae2cc96f1321ab637fd87ac9cb9d97c7e5fc84f326ccaa69c

data/History.md

@@ -1,4 +1,16 @@
 # History of Sufia releases
+
+## 3.2.1
+* Updating gemspec to not limit on sufia-models [Jeremy Friesen]
+
+## 3.2.0 - YANKED
+* Including on sufia-models subdir in gemspec [Jeremy Friesen]
+* Restoring the exception catching for migrations [Jeremy Friesen]
+* Publicizing #visibility_changed? [Jeremy Friesen]
+* Indicating attr_accessible is deprecated [Jeremy Friesen]
+* Removing ActiveModel::Dirty [Jeremy Friesen]
+* Upgrading ActiveFedora to latest 6.5 version [Adam Wead]
+
 ## 3.1.3
 * Removed old PSU licence [Justin Coyne]
 

data/SUFIA_VERSION

@@ -1 +1 @@
-3.1.3
+3.2.1

data/lib/sufia/version.rb

@@ -1,3 +1,3 @@
 module Sufia
-  VERSION = "3.1.3"
+  VERSION = "3.2.1"
 end

data/spec/models/generic_file/visibility_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Sufia::GenericFile::Visibility do
+  module VisibilityOverride
+    extend ActiveSupport::Concern
+    include Sufia::GenericFile::Permissions
+    def visibility; super; end
+    def visibility=(value); super(value); end
+  end
+  class MockParent < ActiveFedora::Base
+    include VisibilityOverride
+  end
+
+  it 'allows for overrides of visibility' do
+    expect{
+      MockParent.new(visibility: Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE)
+    }.to_not raise_error
+  end
+end

data/sufia-models/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/sufia-models/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/sufia-models/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/sufia-models/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/sufia-models/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/sufia-models/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/sufia-models/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/sufia-models/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/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
 

data/sufia-models/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/sufia-models/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/sufia-models/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/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'

data/tasks/release.rake

@@ -32,6 +32,7 @@ tag     = "v#{version}"
         File.open(file, 'w') { |f| f.write ruby }
       end
     end
+    task :pkg
     task gem => %w(update_version_rb pkg) do
       cmd = ""
       cmd << "cd #{framework} && " unless framework == "sufia"
@@ -47,7 +48,7 @@ tag     = "v#{version}"
     task :prep_release => [:ensure_clean_state, :build]
 
     task :push => :build do
-      sh "gem push #{gem}"
+      # sh "gem push #{gem}"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sufia
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.2.1
 platform: ruby
 authors:
 - Justin Coyne
 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: sufia-models
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: 3.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.3
+        version: 3.2.1
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
@@ -591,6 +591,7 @@ files:
 - spec/models/file_content_datastream_spec.rb
 - spec/models/fits_datastream_spec.rb
 - spec/models/generic_file/actions_spec.rb
+- spec/models/generic_file/visibility_spec.rb
 - spec/models/generic_file/web_form_spec.rb
 - spec/models/generic_file_spec.rb
 - spec/models/local_authority_spec.rb
@@ -659,6 +660,7 @@ files:
 - sufia-models/lib/generators/sufia/models/templates/migrations/create_version_committers.rb
 - sufia-models/lib/sufia/models.rb
 - sufia-models/lib/sufia/models/active_fedora/redis.rb
+- sufia-models/lib/sufia/models/active_record/deprecated_attr_accessible.rb
 - sufia-models/lib/sufia/models/active_record/redis.rb
 - sufia-models/lib/sufia/models/active_support/core_ext/marshal.rb
 - sufia-models/lib/sufia/models/engine.rb
@@ -752,7 +754,7 @@ 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: Sufia was extracted from ScholarSphere developed by Penn State University
@@ -843,6 +845,7 @@ test_files:
 - spec/models/file_content_datastream_spec.rb
 - spec/models/fits_datastream_spec.rb
 - spec/models/generic_file/actions_spec.rb
+- spec/models/generic_file/visibility_spec.rb
 - spec/models/generic_file/web_form_spec.rb
 - spec/models/generic_file_spec.rb
 - spec/models/local_authority_spec.rb
@@ -863,4 +866,3 @@ test_files:
 - spec/support/lib/generators/test_app_generator.rb
 - spec/support/uploaded_file_monkeypatch.rb
 - spec/views/batch_edits/check_all_spec.rb
-has_rdoc: