sufia-models 3.6.1 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b91fa92969ab94424eb6e9233e404c26ac564568
-  data.tar.gz: 60b9e09af7c7dba110f6184b840070654de5d390
+  metadata.gz: 8cb48f360a3de57734b84c5b0cdbe19d0c154647
+  data.tar.gz: 1c3ad7ad44e77895928cc74957937fe9531a6cda
 SHA512:
-  metadata.gz: e2737bec3c1758c69607aab903e4a4d29a793f8121c8a8ade9d0959c57353c818f6a2c17db8e09028397037819dc2078b9b6dfd5f38e9169b96ead0e1f02b762
-  data.tar.gz: 2e5941ee1cf398cfbba3c6b2714cbe79e72628f5f7dbbd6a3bc7816ef50a53717f723caeadd5c21e21a5522598ccef80cdd00c7e6ae81c26b1f358e209d7eec6
+  metadata.gz: 4bffefa6d93acc03739d56c2cb096f61dee07d70382e919f9aa2090626f559dde23fec752cc355864e84b9e505ffa5c1b8dc2f90338d07da14dbb91751f8f46f
+  data.tar.gz: 51de07fcc95c76d75acbf231057697ff9c782efa7620f802e794ec097f3fb9662c55f15397fdd09a2dae96832e71eeb07951f456e74a5b63dc4b4b5f9602a2e9

data/app/models/checksum_audit_log.rb

@@ -1,5 +1,4 @@
 class ChecksumAuditLog < ActiveRecord::Base
-  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/concerns/sufia/user.rb

@@ -18,11 +18,9 @@ module Sufia::User
     # Users should be followable
     acts_as_followable
 
-    # Setup accessible (or protected) attributes for your model
-    deprecated_attr_accessible  *permitted_attributes
-
     mount_uploader :avatar, AvatarUploader, :mount_on => :avatar_file_name
     validates_with AvatarValidator
+    has_many :trophies
   end
 
   # Format the json for select2 which requires just an id and a field called text.
@@ -45,15 +43,10 @@ module Sufia::User
     user_key.gsub(/\./, '-dot-')
   end
 
-  # method needed for trophies
-  def trophies
-    trophies = Trophy.where(:user_id => self.id)
-    return trophies
-  end
-
-  #method to get the trophy ids without the namespace included
-  def trophy_ids
-    trophies.map { |t| "#{Sufia.config.id_namespace}:#{t.generic_file_id}" }
+  def trophy_files
+    trophies.map do |t|
+      GenericFile.load_instance_from_solr(Sufia::Noid.namespaceize(t.generic_file_id))
+    end
   end
 
   # method needed for messaging
@@ -76,7 +69,7 @@ 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]
+        :twitter_handle, :googleplus_handle, :linkedin_handle]
     end
 
     def current

data/app/models/domain_term.rb

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

data/app/models/local_authority.rb

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

data/app/models/local_authority_entry.rb

@@ -1,4 +1,3 @@
 class LocalAuthorityEntry < ActiveRecord::Base
   belongs_to :local_authority
-  deprecated_attr_accessible  :local_authority, :label, :uri
 end

data/app/models/single_use_link.rb

@@ -1,7 +1,5 @@
 class SingleUseLink < ActiveRecord::Base
 
-  deprecated_attr_accessible :downloadKey, :path, :expires, :itemId
-    
   validate :expiration_date_cannot_be_in_the_past
   validate :cannot_be_destroyed
 
@@ -41,4 +39,4 @@ class SingleUseLink < ActiveRecord::Base
     end
   end
 
-end
+end

data/app/models/trophy.rb

@@ -1,6 +1,4 @@
 class Trophy < ActiveRecord::Base
-  deprecated_attr_accessible  :generic_file_id, :user_id
-
   validate :count_within_limit, :on => :create
 
   def count_within_limit

data/app/models/version_committer.rb

@@ -1,3 +1,2 @@
 class VersionCommitter < ActiveRecord::Base
-  deprecated_attr_accessible  :obj_id, :datastream_id, :version_id, :committer_login
 end

data/lib/sufia/models/engine.rb

@@ -38,8 +38,6 @@ 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
 
       initializer 'requires' do

data/lib/sufia/models/generic_file.rb

@@ -69,6 +69,13 @@ module Sufia
         end
     end
 
+    # Get the files with a sibling relationship (belongs_to :batch)
+    # The batch id is minted when visiting the upload screen and attached
+    # to each file when it is done uploading.  The Batch object is not created
+    # until all objects are done uploading and the user is redirected to
+    # BatchController#edit.  Therefore, we must handle the case where
+    # self.batch_id is set but self.batch returns nil. 
+    # This can get a major overhaul with ActiveFedora 7
     def related_files
       relateds = begin
                    self.batch.generic_files

data/sufia-models.gemspec

@@ -29,7 +29,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rails', '> 4.0.0', '< 5.0'
   spec.add_dependency 'activeresource' # No longer a dependency of rails 4.0
 
-  spec.add_dependency "hydra", "6.1.0"
+  spec.add_dependency "blacklight", "~> 4.7.0"
+  spec.add_dependency "hydra-head", "~> 6.4.1"
+  spec.add_dependency "rubydora", "~> 1.7.0"
   spec.add_dependency 'nest', '~> 1.1.1'
   spec.add_dependency 'resque', '~> 1.23'
   spec.add_dependency 'resque-pool', '0.3.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sufia-models
 version: !ruby/object:Gem::Version
-  version: 3.6.1
+  version: 3.7.0
 platform: ruby
 authors:
 - Jeremy Friesen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-18 00:00:00.000000000 Z
+date: 2014-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,19 +73,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hydra
+  name: blacklight
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 4.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.7.0
+- !ruby/object:Gem::Dependency
+  name: hydra-head
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 6.4.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 6.4.1
+- !ruby/object:Gem::Dependency
+  name: rubydora
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: nest
   requirement: !ruby/object:Gem::Requirement
@@ -275,9 +303,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
 - lib/sufia/models/file_content.rb
 - lib/sufia/models/file_content/versions.rb
@@ -335,9 +361,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Models and services for sufia
 test_files: []
-has_rdoc: 

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

@@ -1,16 +0,0 @@
-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/active_support/core_ext/marshal.rb

@@ -1,22 +0,0 @@
-### This patch is going into active-support (rails 4). https://github.com/rails/rails/pull/8246
-module Marshal
-  class << self
-    def load_with_autoloading(source)
-      begin
-        load_without_autoloading(source)
-      rescue ArgumentError, NameError => exc
-        if exc.message.match(%r|undefined class/module (.+)|)
-          # try loading the class/module
-          $1.constantize
-          # if it is a IO we need to go back to read the object
-          source.rewind if source.respond_to?(:rewind)
-          retry
-        else
-          raise exc
-        end
-      end
-    end
-
-    alias_method_chain :load, :autoloading
-  end
-end