sufia-models 3.3.1 → 3.4.0.rc1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MmExNjViYTQzYTZhY2FhZWEwMTc2OWFjYjNiZmI5ODlhODU2YTg0OQ==
-  data.tar.gz: !binary |-
-    YmIyNzdkOGRjNzRhZTY3NmMxZDhjNGE4N2FmMWE0MjQwODk0NjY0NA==
+SHA1:
+  metadata.gz: 864fcf836acb9a34187c342354bf943a736988f5
+  data.tar.gz: 02fa325f9ec39f51169643e79d6ed0a5dc41de89
 SHA512:
-  metadata.gz: !binary |-
-    Mzc4ZTZjZWQzMGMwNTc5NDU4N2ZjYWFlZmM3MmFlNTJiM2UyZWM2OTNiY2Rh
-    MzU1NjY5MzBkMTJhNzhjNTQwMDUyOTgxMmQxMWU5MDJhYzk3MjBhZTI2MDAw
-    NTU0Y2EyOTI0MDg1NDRjZTMxNGU3ZmYyNzdhN2Y4OTFhYTdjZjE=
-  data.tar.gz: !binary |-
-    ZTBiYzI1ZjE1MjVmY2I4NWEzOGVlM2QwYmQ5ZjE2ZDEyZTFiNDE4MGQwY2M4
-    OGFjZTQ4Y2U5MzExY2VmMjU1MmM3OGVlZTU2NTc1MjNiNmE4OTA3NDkzYWQ5
-    MTFjZWQ3NDIwYmI3Zjc3ZTEyYzkyYjFiNmE5NDg4YmZkNzJiMTg=
+  metadata.gz: fa522802062007fedff7c959cb3b1b5da39c2d61fab46fc81a86f982a5c67fa8c5267b0110fe50beec4f803266ac672ca5e69c041c02a061832bfc40f4e290f9
+  data.tar.gz: 9f6713b40affc73f74b88140ac3755c8909a22ed88ac60647f28b4b009f502293a3602a67e8f06d243d52e6f4e0c4615e68753cc35e9f146239ed490ee0d908e

data/app/models/batch.rb

@@ -1,6 +1,5 @@
 class Batch < ActiveFedora::Base
-  include Hydra::ModelMixins::CommonMetadata
-  include Hydra::ModelMixins::RightsMetadata
+  include Hydra::AccessControls::Permissions
   include Sufia::ModelMethods
   include Sufia::Noid
 
@@ -9,10 +8,10 @@ class Batch < ActiveFedora::Base
   belongs_to :user, :property => "creator"
   has_many :generic_files, :property => :is_part_of
 
-  delegate :title, :to => :descMetadata
-  delegate :creator, :to => :descMetadata
-  delegate :part, :to => :descMetadata
-  delegate :status, :to => :descMetadata
+  delegate :title, :to => :descMetadata, multiple: true
+  delegate :creator, :to => :descMetadata, multiple: true
+  delegate :part, :to => :descMetadata, multiple: true
+  delegate :status, :to => :descMetadata, multiple: true
 
   def self.find_or_create(pid)
     begin

data/lib/sufia/models/generic_file.rb

@@ -4,7 +4,6 @@ module Sufia
     extend ActiveSupport::Autoload
     autoload :Actions, 'sufia/models/generic_file/actions'
     autoload :Permissions, 'sufia/models/generic_file/permissions'
-    autoload :Visibility, 'sufia/models/generic_file/visibility'
     autoload :WebForm, 'sufia/models/generic_file/web_form'
     autoload :AccessibleAttributes, 'sufia/models/generic_file/accessible_attributes'
     include Sufia::ModelMethods
@@ -26,12 +25,12 @@ module Sufia
 
       belongs_to :batch, :property => :is_part_of
 
-      delegate_to :properties, [:relative_path, :depositor, :import_url], :unique => true
-      delegate_to :descMetadata, [:date_uploaded, :date_modified], :unique => true
+      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]
+                                  :resource_type, :identifier, :language], multiple: true
 
       around_save :characterize_if_changed, :retry_warming
       before_destroy :cleanup_trophies

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

@@ -4,7 +4,7 @@ module Sufia
       extend ActiveSupport::Concern
       included do
         has_metadata :name => "characterization", :type => FitsDatastream
-        delegate :mime_type, :to => :characterization, :unique => true
+        delegate :mime_type, :to => :characterization, multiple: false
         delegate_to :characterization, [:format_label, :file_size, :last_modified,
                                         :filename, :original_checksum, :rights_basis,
                                         :copyright_basis, :copyright_note,
@@ -20,7 +20,7 @@ module Sufia
                                         :gps_timestamp, :latitude, :longitude,
                                         :character_set, :markup_basis,
                                         :markup_language, :duration, :bit_depth,
-                                        :sample_rate, :channels, :data_format, :offset]
+                                        :sample_rate, :channels, :data_format, :offset], multiple: true
 
       end
 

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

@@ -2,12 +2,12 @@ module Sufia
   module GenericFile
     module Permissions
       extend ActiveSupport::Concern
-      #we're overriding the permissions= method which is in RightsMetadata
-      include Hydra::ModelMixins::RightsMetadata
-      include Sufia::GenericFile::Visibility
+      #we're overriding the permissions= method which is in Hydra::AccessControls::Permissions
+      include Hydra::AccessControls::Permissions
+      include Hydra::AccessControls::Visibility
 
       included do
-        has_metadata :name => "rightsMetadata", :type => ParanoidRightsDatastream
+        has_metadata "rightsMetadata", :type => ParanoidRightsDatastream
         validate :paranoid_permissions
       end
 
@@ -29,6 +29,11 @@ module Sufia
         rightsMetadata.update_permissions(perm_hash)
       end
 
+      def permissions
+        perms = super
+        perms.map {|p| { name: p.name, access: p.access, type:p.type } }
+      end
+
       private
 
       def permission_hash

data/lib/sufia/models/version.rb

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

data/sufia-models.gemspec

@@ -29,8 +29,12 @@ 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.5.0"
+
+  # spec.add_dependency "hydra", "6.1.0.rc1"
+  # 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 'active-fedora', "~> 6.6.0.rc1"
 
   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.3.1
+  version: 3.4.0.rc1
 platform: ruby
 authors:
 - Jeremy Friesen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-09 00:00:00.000000000 Z
+date: 2013-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,21 +28,21 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.13
     - - <
@@ -52,7 +52,7 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.13
     - - <
@@ -62,14 +62,14 @@ dependencies:
   name: activeresource
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -78,28 +78,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 6.3.0
+        version: 6.4.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 6.3.0
+        version: 6.4.0.rc1
 - !ruby/object:Gem::Dependency
   name: active-fedora
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 6.5.0
+        version: 6.6.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 6.5.0
+        version: 6.6.0.rc1
 - !ruby/object:Gem::Dependency
   name: nest
   requirement: !ruby/object:Gem::Requirement
@@ -174,7 +174,7 @@ dependencies:
   name: acts_as_follower
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.1
     - - <
@@ -184,7 +184,7 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.1
     - - <
@@ -303,7 +303,6 @@ files:
 - 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/visibility.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
@@ -336,18 +335,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.4
+rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
 summary: Models and services for sufia
 test_files: []
+has_rdoc: 

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

@@ -1,65 +0,0 @@
-module Sufia
-  module GenericFile
-    module Visibility
-      extend ActiveSupport::Concern
-      extend Deprecation
-
-      def visibility=(value)
-        return if value.nil?
-        # only set explicit permissions
-        case value
-        when Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
-          public_visibility!
-        when Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
-          registered_visibility!
-        when Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
-          private_visibility!
-        else
-          raise ArgumentError, "Invalid visibility: #{value.inspect}"
-        end
-      end
-
-      def visibility
-        if read_groups.include? Sufia::Models::AccessRight::PERMISSION_TEXT_VALUE_PUBLIC
-          Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
-        elsif read_groups.include? Sufia::Models::AccessRight::PERMISSION_TEXT_VALUE_AUTHENTICATED
-          Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_AUTHENTICATED
-        else
-          Sufia::Models::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
-        end
-      end
-
-      def set_visibility(visibility)
-        Deprecation.warn Visibility, "set_visibility is deprecated, use visibility= instead.  set_visibility will be removed in sufia 3.0", caller
-        self.visibility= visibility
-      end
-
-      def visibility_changed?
-        @visibility_will_change
-      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
-
-    end
-  end
-end