sufia-models 3.2.1 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79d76149b1df8f00315c569a3e43db45937c92b7
-  data.tar.gz: 6bd416eab76f790a73f16a07a2abd337cfcd4e4e
+  metadata.gz: c502e9e177160c114e97d7b850a36882f4856d86
+  data.tar.gz: d51f3556a0339952d45c88c41fc246c520a5052c
 SHA512:
-  metadata.gz: b776c781c53753d4de08fced94345ed0b45117c63012f8b2042fd18a6633d5c4ac1cb9a2c38cf666b7238b2307de0fd2deffda00db2d14721ec06d66ced04131
-  data.tar.gz: 70e8d9b4d5dc61fac26a93b76a45ca8deb743fec41a396c97b3f51d2a0f705ae5306841f33a9a30717eb1feadf346198dc613abd4f72592e2b4a6176f37e0a89
+  metadata.gz: 71e5ffd3b6af3eaf136ae260a90b6f121475bdfbb1e118b9676474b41b2f2f2daa124b131bcd184dba9a3af9375f9036e743ccb72703c7f1b2982edeee9b704d
+  data.tar.gz: 7821ecfc6d249c2d1bcfcac3567463942d07f81a7040ae49ba3b15ea7bc8cac058defa121116334a6351e9d840b222610d0b697653865212e6e9bd7731cc3216

data/app/models/domain_term.rb

@@ -2,5 +2,9 @@ class DomainTerm < ActiveRecord::Base
   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 
+  if Rails::VERSION::MAJOR > 3
+    has_and_belongs_to_many :local_authorities, -> {uniq}
+  else
+    has_and_belongs_to_many :local_authorities, :uniq=> true 
+  end
 end

data/app/models/local_authority.rb

@@ -2,9 +2,15 @@ require 'rdf'
 require 'rdf/rdfxml'
 
 class LocalAuthority < ActiveRecord::Base
-  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 
+  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
+  
   has_many :local_authority_entries
 
   def self.harvest_rdf(name, sources, opts = {})
@@ -57,7 +63,7 @@ class LocalAuthority < ActiveRecord::Base
     authority = self.find_by_name(name)
     return if authority.blank?
     model = model.to_s.sub(/RdfDatastream$/, '').underscore.pluralize
-    domain_term = DomainTerm.find_or_create_by_model_and_term(:model => model, :term => term)
+    domain_term = DomainTerm.find_or_create_by(model: model, term: term)
     return if domain_term.local_authorities.include? authority
     domain_term.local_authorities << authority
   end

data/app/models/single_use_link.rb

@@ -1,25 +1,44 @@
 class SingleUseLink < ActiveRecord::Base
 
-  deprecated_attr_accessible  :downloadKey, :expires, :itemId, :path
+  deprecated_attr_accessible :downloadKey, :path, :expires, :itemId
     
-  
-  def self.create_show(item_id)
-     create_path(item_id, Sufia::Engine.routes.url_helpers.generic_file_path(item_id) )     
-  end
+  validate :expiration_date_cannot_be_in_the_past
+  validate :cannot_be_destroyed
+
+  after_initialize :set_defaults
 
-  def self.create_download(item_id)
-     create_path(item_id, Sufia::Engine.routes.url_helpers.download_path(item_id) )
+  def create_for_path path
+    self.class.create :itemId => itemId, :path => path
   end
-  
+
   def expired?
-     now = DateTime.now
-     return (now > expires)
+    DateTime.now > expires
   end
-  
+
+
+  def to_param
+    downloadKey
+  end
+
   protected
-  def self.create_path(itemId, path)
-     expires = DateTime.now.advance(hours:24)
-     key = Digest::SHA2.new << rand(1000000000).to_s
-     return create({downloadKey:key.to_s, expires:expires, path:path, itemId:itemId} )
+
+  def expiration_date_cannot_be_in_the_past
+    if expired?
+       errors.add(:expires, "can't be in the past")
+    end
+  end
+
+  def cannot_be_destroyed
+    if destroyed?
+      errors[:base] << "Single Use Link has already been used"
+    end
   end
-end
+
+  def set_defaults
+    if new_record?
+      self.expires ||= DateTime.now.advance(hours:24)
+      self.downloadKey ||= (Digest::SHA2.new << rand(1000000000).to_s).to_s
+    end
+  end
+
+end

data/lib/sufia/models/version.rb

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

data/sufia-models.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'resque-pool', '0.3.0'
   spec.add_dependency 'noid', '~> 0.6.6'
   spec.add_dependency 'mailboxer', '~> 0.11.0'
-  spec.add_dependency 'acts_as_follower', '0.1.1'
+  spec.add_dependency 'acts_as_follower', '>= 0.1.1', '< 0.3'
   spec.add_dependency 'paperclip', '~> 3.4.0'
   spec.add_dependency 'zipruby', '0.3.6'
   spec.add_dependency 'hydra-derivatives', '~> 0.0.5'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sufia-models
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.3.0
 platform: ruby
 authors:
 - Jeremy Friesen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-10 00:00:00.000000000 Z
+date: 2013-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -174,16 +174,22 @@ dependencies:
   name: acts_as_follower
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
@@ -340,8 +346,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
 summary: Models and services for sufia
 test_files: []
+has_rdoc: