sufia-models 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f262e81abc28d0f72840dbdc78a95e3b6d52b57
-  data.tar.gz: 1f94f581db6d3c3bdfe2b7853ae8835a14d884e4
+  metadata.gz: e29c38959e535f4f8e74a7882bad04666274b672
+  data.tar.gz: 302f04b6b382cc2edcbd11bf80bd9ea5928f6466
 SHA512:
-  metadata.gz: 10168f401439a85afcd7cd6e99069f803a2541ed5558002403951082991c36016de287d8cdf37dec099bb5bb203a42310a8bad75f32c5c06059113cd2e2c8b6c
-  data.tar.gz: 55243f46216539e011da9fe4ccb69481394cc29c66459ea9b5599523526c95f1ffd14b80279f92524376c544a5eb3eae10f4eef1ece20e8a3fdf0eb69d135cdb
+  metadata.gz: 0f709335f5a92ad6fc59b442c4ac92255e378710fa6b071bc62eab05fa001f7a5985452c90781ea08da15346bfdc2384778de07667a45f7c4d7388e6a8b0dbe5
+  data.tar.gz: ce166166966b2686d676887e96f821aaadaca158c8f916748933103e889c74bba39dd4ea72374697998c39db62d47dba52c3dc41108f3d3f4d31def396fceee1

data/app/models/generic_file.rb

@@ -1,16 +1,3 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
 class GenericFile < ActiveFedora::Base
   include Sufia::GenericFile
 end

data/lib/generators/sufia/models/install_generator.rb

@@ -20,10 +20,14 @@ This generator makes the following changes to your application:
   # Implement the required interface for Rails::Generators::Migration.
   # taken from http://github.com/rails/rails/blob/master/activerecord/lib/generators/active_record.rb
   def self.next_migration_number(path)
-    unless @prev_migration_nr
-      @prev_migration_nr = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
-    else
+    if @prev_migration_nr
       @prev_migration_nr += 1
+    else
+      if last_migration = Dir[File.join(path, '*.rb')].sort.last
+        @prev_migration_nr = last_migration.sub(File.join(path, '/'), '').to_i + 1
+      else
+        @prev_migration_nr = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
+      end
     end
     @prev_migration_nr.to_s
   end
@@ -42,8 +46,8 @@ This generator makes the following changes to your application:
       "add_groups_to_users.rb",
       "create_local_authorities.rb",
       "create_trophies.rb"
-    ].each do |f|
-      better_migration_template f
+    ].each do |file|
+      better_migration_template file
     end
   end
 
@@ -88,12 +92,7 @@ This generator makes the following changes to your application:
   private
 
   def better_migration_template(file)
-    begin
-      migration_template "migrations/#{file}", "db/migrate/#{file}"
-      sleep 1 # ensure scripts have different time stamps
-    rescue
-      puts "  \e[1m\e[34mMigrations\e[0m  " + $!.message
-    end
+    migration_template "migrations/#{file}", "db/migrate/#{file}"
   end
 
 end

data/lib/sufia/models/engine.rb

@@ -46,13 +46,11 @@ module Sufia
         require 'sufia/models/noid'
         require 'sufia/models/file_content'
         require 'sufia/models/file_content/versions'
-        require 'sufia/models/generic_file/actions'
         require 'sufia/models/generic_file/audit'
         require 'sufia/models/generic_file/characterization'
         require 'sufia/models/generic_file/derivatives'
         require 'sufia/models/generic_file/export'
         require 'sufia/models/generic_file/mime_types'
-        require 'sufia/models/generic_file/permissions'
         require 'sufia/models/generic_file/thumbnail'
         require 'sufia/models/generic_file'
         require 'sufia/models/user'

data/lib/sufia/models/generic_file.rb

@@ -2,8 +2,9 @@ module Sufia
   module GenericFile
     extend ActiveSupport::Concern
     extend ActiveSupport::Autoload
-    autoload :Actions
-    autoload :Permissions
+    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

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

@@ -4,26 +4,13 @@ module Sufia
       extend ActiveSupport::Concern
       #we're overriding the permissions= method which is in RightsMetadata
       include Hydra::ModelMixins::RightsMetadata
+      include Sufia::GenericFile::Visibility
+
       included do
         has_metadata :name => "rightsMetadata", :type => ParanoidRightsDatastream
         validate :paranoid_permissions
       end
 
-      def set_visibility(visibility)
-        # only set explicit permissions
-        case visibility
-        when "open"
-          self.datastreams["rightsMetadata"].permissions({:group=>"public"}, "read")
-        when "psu"
-          self.datastreams["rightsMetadata"].permissions({:group=>"registered"}, "read")
-          self.datastreams["rightsMetadata"].permissions({:group=>"public"}, "none")
-        when "restricted" 
-          self.datastreams["rightsMetadata"].permissions({:group=>"registered"}, "none")
-          self.datastreams["rightsMetadata"].permissions({:group=>"public"}, "none")
-        end
-      end
-
-
       def paranoid_permissions
         # let the rightsMetadata ds make this determination
         # - the object instance is passed in for easier access to the props ds
@@ -57,8 +44,6 @@ module Sufia
         end
         {'person'=>user_perms, 'group'=>group_perms}
       end
-
-
     end
   end
 end

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

@@ -0,0 +1,59 @@
+module Sufia
+  module GenericFile
+    module Visibility
+      extend ActiveSupport::Concern
+      extend Deprecation
+      include ActiveModel::Dirty
+
+      included do
+        define_attribute_methods :visibility
+      end
+
+      def visibility= (value)
+        # only set explicit permissions
+        case value
+        when "open"
+          public_visibility!
+        when "psu"
+          registered_visibility!
+        when "restricted" 
+          private_visibility!
+        end
+      end
+
+      def public_visibility!
+        visibility_will_change! unless visibility == 'public'
+        self.datastreams["rightsMetadata"].permissions({:group=>"public"}, "read")
+      end
+
+      def registered_visibility!
+        visibility_will_change! unless visibility == 'registered'
+        self.datastreams["rightsMetadata"].permissions({:group=>"registered"}, "read")
+        self.datastreams["rightsMetadata"].permissions({:group=>"public"}, "none")
+      end
+
+      def private_visibility!
+        visibility_will_change! unless visibility == 'private'
+        self.datastreams["rightsMetadata"].permissions({:group=>"registered"}, "none")
+        self.datastreams["rightsMetadata"].permissions({:group=>"public"}, "none")
+      end
+
+      def visibility
+        if read_groups.include? 'public'
+          'public'
+        elsif read_groups.include? 'registered'
+          'registered'
+        else
+          'private'
+        end
+      end
+
+      def set_visibility(visibility)
+        Deprecation.warn Permissions, "set_visibility is deprecated, use visibility= instead.  set_visibility will be removed in sufia 3.0", caller
+        self.visibility= visibility
+      end
+    end
+  end
+end
+
+

data/lib/sufia/models/jobs/batch_update_job.rb

@@ -1,17 +1,3 @@
-# Copyright © 2012 The Pennsylvania State University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 class BatchUpdateJob
   include Hydra::PermissionsQuery
   include Rails.application.routes.url_helpers 
@@ -60,7 +46,7 @@ class BatchUpdateJob
     end
     gf.title = title[gf.pid] if title[gf.pid] rescue gf.label
     gf.attributes=file_attributes
-    gf.set_visibility(visibility)
+    gf.visibility= visibility
 
     save_tries = 0
     begin

data/lib/sufia/models/version.rb

@@ -1,5 +1,5 @@
 module Sufia
   module Models
-    VERSION = "3.1.1"
+    VERSION = "3.1.2"
   end
 end

data/sufia-models.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'resque', '~> 1.23.0'#, :require => 'resque/server'
   spec.add_dependency 'resque-pool', '0.3.0'
   spec.add_dependency 'noid', '~> 0.6.6'
-  spec.add_dependency 'curationexperts-mailboxer', '0.10.3'
+  spec.add_dependency 'mailboxer', '~> 0.11.0'
   spec.add_dependency 'acts_as_follower', '0.1.1'
   spec.add_dependency 'paperclip', '~> 3.4.0'
   spec.add_dependency 'zipruby', '0.3.6'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sufia-models
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Jeremy Friesen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-20 00:00:00.000000000 Z
+date: 2013-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -157,19 +157,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.6.6
 - !ruby/object:Gem::Dependency
-  name: curationexperts-mailboxer
+  name: mailboxer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.3
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.3
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: acts_as_follower
   requirement: !ruby/object:Gem::Requirement
@@ -294,6 +294,7 @@ 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