sufia-models 3.4.0.rc1 → 3.4.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 864fcf836acb9a34187c342354bf943a736988f5
-  data.tar.gz: 02fa325f9ec39f51169643e79d6ed0a5dc41de89
+  metadata.gz: 1b7a4b3cdaff9deeb0daf9a3187c248a84187e43
+  data.tar.gz: fb13bbf2f95b343425790369e7fe7274cd00aa5d
 SHA512:
-  metadata.gz: fa522802062007fedff7c959cb3b1b5da39c2d61fab46fc81a86f982a5c67fa8c5267b0110fe50beec4f803266ac672ca5e69c041c02a061832bfc40f4e290f9
-  data.tar.gz: 9f6713b40affc73f74b88140ac3755c8909a22ed88ac60647f28b4b009f502293a3602a67e8f06d243d52e6f4e0c4615e68753cc35e9f146239ed490ee0d908e
+  metadata.gz: 156794daad36670ca931d967e88351953a152654517ad278b006cbff3603b68cbb0d11d6f91684f74edf641df1a0e46397dd48b59ea4d67e8f62c2cffb73403b
+  data.tar.gz: fc3ed4678add11ee8f51c55c8d691b4984b835acf29d362ac7ec86d6adc7e23c4be2e8a5e22ad18b655a190b792a2eec49f85c9e335bfd6a423a062340e9f961

data/lib/sufia/models/generic_file.rb

@@ -6,6 +6,9 @@ module Sufia
     autoload :Permissions, 'sufia/models/generic_file/permissions'
     autoload :WebForm, 'sufia/models/generic_file/web_form'
     autoload :AccessibleAttributes, 'sufia/models/generic_file/accessible_attributes'
+    autoload :Trophies, 'sufia/models/generic_file/trophies'
+    autoload :Metadata, 'sufia/models/generic_file/metadata'
+    autoload :Versions, 'sufia/models/generic_file/versions'
     include Sufia::ModelMethods
     include Sufia::Noid
     include Sufia::GenericFile::MimeTypes
@@ -16,55 +19,18 @@ module Sufia
     include Sufia::GenericFile::Permissions
     include Sufia::GenericFile::WebForm
     include Sufia::GenericFile::Derivatives
+    include Sufia::GenericFile::Trophies
+    include Sufia::GenericFile::Metadata
+    include Sufia::GenericFile::Versions
 
     included do
-      has_metadata :name => "descMetadata", :type => GenericFileRdfDatastream
-      has_metadata :name => "properties", :type => PropertiesDatastream
-      has_file_datastream :name => "content", :type => FileContentDatastream
-      has_file_datastream :name => "thumbnail"
-
       belongs_to :batch, :property => :is_part_of
 
-      delegate_to :properties, [:relative_path, :depositor, :import_url], multiple: false
-      delegate_to :descMetadata, [:date_uploaded, :date_modified], multiple: false 
-      delegate_to :descMetadata, [:related_url, :based_near, :part_of, :creator,
-                                  :contributor, :title, :tag, :description, :rights,
-                                  :publisher, :date_created, :subject,
-                                  :resource_type, :identifier, :language], multiple: true
-
       around_save :characterize_if_changed, :retry_warming
-      before_destroy :cleanup_trophies
 
       attr_accessible *(ds_specs['descMetadata'][:type].fields + [:permissions])
     end
 
-
-    def record_version_committer(user)
-      version = content.latest_version
-      # content datastream not (yet?) present
-      return if version.nil?
-      VersionCommitter.create(:obj_id => version.pid,
-                              :datastream_id => version.dsid,
-                              :version_id => version.versionID,
-                              :committer_login => user.user_key)
-    end
-
-    def pdf?
-      self.class.pdf_mime_types.include? self.mime_type
-    end
-
-    def image?
-      self.class.image_mime_types.include? self.mime_type
-    end
-
-    def video?
-      self.class.video_mime_types.include? self.mime_type
-    end
-
-    def audio?
-      self.class.audio_mime_types.include? self.mime_type
-    end
-
     def persistent_url
       "#{Sufia.config.persistent_hostpath}#{noid}"
     end
@@ -100,10 +66,6 @@ module Sufia
         end
     end
 
-    def cleanup_trophies
-      Trophy.destroy_all(generic_file_id: self.noid)
-    end
-
     def related_files
       relateds = begin
                    self.batch.generic_files
@@ -130,13 +92,6 @@ module Sufia
       return solr_doc
     end
 
-    def file_format
-      return nil if self.mime_type.blank? and self.format_label.blank?
-      return self.mime_type.split('/')[1]+ " ("+self.format_label.join(", ")+")" unless self.mime_type.blank? or self.format_label.blank?
-      return self.mime_type.split('/')[1] unless self.mime_type.blank?
-      return self.format_label
-    end
-
     # Redefine this for more intuitive keys in Redis
     def to_param
       noid

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

@@ -0,0 +1,22 @@
+module Sufia
+  module GenericFile
+    module Metadata
+      extend ActiveSupport::Concern
+
+      included do
+        has_metadata "descMetadata", type: GenericFileRdfDatastream
+        has_metadata "properties", type: PropertiesDatastream
+        has_file_datastream "content", type: FileContentDatastream
+        has_file_datastream "thumbnail"
+
+
+        delegate_to :properties, [:relative_path, :depositor, :import_url], multiple: false
+        delegate_to :descMetadata, [:date_uploaded, :date_modified], multiple: false 
+        delegate_to :descMetadata, [:related_url, :based_near, :part_of, :creator,
+                                    :contributor, :title, :tag, :description, :rights,
+                                    :publisher, :date_created, :subject,
+                                    :resource_type, :identifier, :language], multiple: true
+      end
+    end
+  end
+end

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

@@ -3,6 +3,29 @@ module Sufia
     module MimeTypes
       extend ActiveSupport::Concern
 
+      def pdf?
+        self.class.pdf_mime_types.include? self.mime_type
+      end
+
+      def image?
+        self.class.image_mime_types.include? self.mime_type
+      end
+
+      def video?
+        self.class.video_mime_types.include? self.mime_type
+      end
+
+      def audio?
+        self.class.audio_mime_types.include? self.mime_type
+      end
+
+      def file_format
+        return nil if self.mime_type.blank? and self.format_label.blank?
+        return self.mime_type.split('/')[1]+ " ("+self.format_label.join(", ")+")" unless self.mime_type.blank? or self.format_label.blank?
+        return self.mime_type.split('/')[1] unless self.mime_type.blank?
+        return self.format_label
+      end
+
       module ClassMethods
         def image_mime_types
           ['image/png','image/jpeg', 'image/jpg', 'image/jp2', 'image/bmp', 'image/gif']

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

@@ -0,0 +1,15 @@
+module Sufia
+  module GenericFile
+    module Trophies
+      extend ActiveSupport::Concern
+      included do
+        before_destroy :cleanup_trophies
+      end
+
+      def cleanup_trophies
+        Trophy.destroy_all(generic_file_id: self.noid)
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module Sufia
+  module GenericFile
+    module Versions
+      def record_version_committer(user)
+        version = content.latest_version
+        # content datastream not (yet?) present
+        return if version.nil?
+        VersionCommitter.create(:obj_id => version.pid,
+                                :datastream_id => version.dsid,
+                                :version_id => version.versionID,
+                                :committer_login => user.user_key)
+      end
+
+    end
+  end
+end

data/lib/sufia/models/version.rb

@@ -1,5 +1,5 @@
 module Sufia
   module Models
-    VERSION = "3.4.0.rc1"
+    VERSION = "3.4.0.rc2"
   end
 end

data/sufia-models.gemspec

@@ -30,10 +30,10 @@ 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", "6.1.0.rc1"
+  # spec.add_dependency "hydra", "6.1.0.rc2"
   # Since hydra 6.1 isn't out yet, we'll just build it so that it's compatible 
   # without an explicit dependency
-  spec.add_dependency "hydra-head", "~> 6.4.0.rc1"
+  spec.add_dependency "hydra-head", "~> 6.4.0.rc2"
   spec.add_dependency 'active-fedora', "~> 6.6.0.rc1"
 
   spec.add_dependency 'nest', '~> 1.1.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sufia-models
 version: !ruby/object:Gem::Version
-  version: 3.4.0.rc1
+  version: 3.4.0.rc2
 platform: ruby
 authors:
 - Jeremy Friesen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-01 00:00:00.000000000 Z
+date: 2013-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 6.4.0.rc1
+        version: 6.4.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 6.4.0.rc1
+        version: 6.4.0.rc2
 - !ruby/object:Gem::Dependency
   name: active-fedora
   requirement: !ruby/object:Gem::Requirement
@@ -246,8 +246,6 @@ files:
 - Rakefile
 - app/models/batch.rb
 - app/models/checksum_audit_log.rb
-- app/models/concerns/sufia/models/access_right.rb
-- app/models/concerns/sufia/models/with_access_right.rb
 - app/models/datastreams/batch_rdf_datastream.rb
 - app/models/datastreams/file_content_datastream.rb
 - app/models/datastreams/fits_datastream.rb
@@ -300,9 +298,12 @@ files:
 - lib/sufia/models/generic_file/characterization.rb
 - lib/sufia/models/generic_file/derivatives.rb
 - lib/sufia/models/generic_file/export.rb
+- lib/sufia/models/generic_file/metadata.rb
 - lib/sufia/models/generic_file/mime_types.rb
 - lib/sufia/models/generic_file/permissions.rb
 - lib/sufia/models/generic_file/thumbnail.rb
+- lib/sufia/models/generic_file/trophies.rb
+- lib/sufia/models/generic_file/versions.rb
 - lib/sufia/models/generic_file/web_form.rb
 - lib/sufia/models/id_service.rb
 - lib/sufia/models/jobs/active_fedora_pid_based_job.rb

data/app/models/concerns/sufia/models/access_right.rb

@@ -1,79 +0,0 @@
-module Sufia
-  module Models
-    class AccessRight
-      PERMISSION_TEXT_VALUE_PUBLIC = 'public'.freeze
-      PERMISSION_TEXT_VALUE_AUTHENTICATED = 'registered'.freeze
-      VISIBILITY_TEXT_VALUE_PUBLIC = 'open'.freeze
-      VISIBILITY_TEXT_VALUE_EMBARGO = 'open_with_embargo_release_date'.freeze
-      VISIBILITY_TEXT_VALUE_AUTHENTICATED = 'psu'.freeze
-      VISIBILITY_TEXT_VALUE_PRIVATE = 'restricted'.freeze
-
-      # @param permissionable [#visibility, #permissions]
-      # @example
-      #   file = GenericFile.find('sufia:1234')
-      #   access = Sufia::AccessRight.new(file)
-      def initialize(permissionable)
-        @permissionable = permissionable
-      end
-
-      attr_reader :permissionable
-      delegate :persisted?, :permissions, :visibility, to: :permissionable
-      protected :persisted?, :permissions, :visibility
-
-
-      def open_access?
-        return true if has_visibility_text_for?(VISIBILITY_TEXT_VALUE_PUBLIC)
-        # We don't want to know if its under embargo, simply does it have a date.
-        # In this way, we can properly inform the label input
-        persisted_open_access_permission? && !permissionable.embargo_release_date.present?
-      end
-
-      def open_access_with_embargo_release_date?
-        return false unless permissionable_is_embargoable?
-        return true if has_visibility_text_for?(VISIBILITY_TEXT_VALUE_EMBARGO)
-        # We don't want to know if its under embargo, simply does it have a date.
-        # In this way, we can properly inform the label input
-        persisted_open_access_permission? && permissionable.embargo_release_date.present?
-      end
-
-      def authenticated_only?
-        return false if open_access?
-        has_permission_text_for?(PERMISSION_TEXT_VALUE_AUTHENTICATED) ||
-          has_visibility_text_for?(VISIBILITY_TEXT_VALUE_AUTHENTICATED)
-      end
-
-      def private?
-        return false if open_access?
-        return false if authenticated_only?
-        return false if open_access_with_embargo_release_date?
-        true
-      end
-
-      private
-
-        def persisted_open_access_permission?
-          if persisted?
-            has_permission_text_for?(PERMISSION_TEXT_VALUE_PUBLIC)
-          else
-            visibility.to_s == ''
-          end
-        end
-
-        def on_or_after_any_embargo_release_date?
-          return true unless permissionable.embargo_release_date
-          permissionable.embargo_release_date.to_date < Date.today
-        end
-
-        def permissionable_is_embargoable?
-          permissionable.respond_to?(:embargo_release_date)
-        end
-
-        def has_visibility_text_for?(text)
-          visibility == text
-        end
-        def has_permission_text_for?(text)
-          !!permissions.detect { |perm| perm[:name] == text }
-        end
-    end
-  end
-end

data/app/models/concerns/sufia/models/with_access_right.rb

@@ -1,33 +0,0 @@
-module Sufia
-  module Models
-    module WithAccessRight
-      extend ActiveSupport::Concern
-
-      def under_embargo?
-        @under_embargo ||= rightsMetadata.under_embargo?
-      end
-
-      def open_access?
-        access_rights.open_access?
-      end
-
-      def open_access_with_embargo_release_date?
-        access_rights.open_access_with_embargo_release_date?
-      end
-
-      def authenticated_only_access?
-        access_rights.authenticated_only?
-      end
-
-      def private_access?
-        access_rights.private?
-      end
-
-      def access_rights
-        @access_rights ||= AccessRight.new(self)
-      end
-      protected :access_rights
-
-    end
-  end
-end