sufia 3.1.1 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9537c0a90f4be9d2b36af8a62645507199ffc77a
-  data.tar.gz: e536d9a829d4be48d76cbbdbf2eb12a3950f044f
+  metadata.gz: 413ec81618f38ebb069ddb76be614f250017bbc2
+  data.tar.gz: 64cc681395618ad10e3ca14d94a8f85a5993d2e2
 SHA512:
-  metadata.gz: 6f23c82aa2258904b7cf4e5d15b898f0b03b0ece32b811fe2ef8b24625e554ddae9bbb4df1e2f82f96a618974d4060264499c60759129e20e48bf02f2ba5b284
-  data.tar.gz: 2e1a0d550205dc06fec99458409b305e527d87d605e1720bfb99c42e228008c31cbc321e8bdf57fe39356d3c7b52ea6f6ec9264e1eeb42e1c74822d503bb0ec1
+  metadata.gz: a255e2a1a59251ad230385c752e455ec6abeb70d7ff9955c13065875c7db0c5a8e02b55e69be71788292e1346b256e28175488d6a57d9604e08cdb304f2e91a1
+  data.tar.gz: f032a37d6afd48c48e9abf58240330e30ba2589dabd85f0ae42aba33025b4cf256cd310b583f22309802a29786cf3c6a688e75b4418f182e6a0568765acbfe37

data/History.md

@@ -1,4 +1,15 @@
 # History of Sufia releases
+## 3.1.2
+* Track changes on visibility [Justin Coyne]
+
+* Use an ideomatic setter for visibility [Justin Coyne]
+
+* Upgrade mailboxer [Justin Coyne]
+
+* Adding a partial for the header of the dashboard to make the wording easier to
+override. [Carolyn Cole]
+
+* Improving the better migration template [Jeremy Friesen]
 
 ## 3.1.1
 * Extracting sufia generator behavior [Jeremy Friesen]

data/SUFIA_VERSION

@@ -1 +1 @@
-3.1.1
+3.1.2

data/app/views/dashboard/_heading.html.erb

@@ -0,0 +1 @@
+<h2 class="heading1">My Dashboard</h2>

data/app/views/dashboard/index.html.erb

@@ -70,7 +70,7 @@ limitations under the License.
   <div class="accessible-hidden" id="current_user"><%=@user.user_key%></div>
   <div class="row">
     <%= render :partial => 'search_form' %>
-    <h2 class="heading1">My Dashboard</h2>
+    <%= render :partial => 'heading' %>
   </div>
 
   <% extra_head_content << render_opensearch_response_metadata.html_safe %>

data/lib/sufia/batch_edits_controller_behavior.rb

@@ -46,7 +46,7 @@ module Sufia
     def update_document(obj)
       super
       obj.date_modified = Time.now.ctime
-      obj.set_visibility(params[:visibility])
+      obj.visibility = params[:visibility]
     end
 
     def update

data/lib/sufia/files_controller_behavior.rb

@@ -1,18 +1,3 @@
-# -*- coding: utf-8 -*-
-# 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.
-
 module Sufia
   module FilesController
     autoload :LocalIngestBehavior, 'sufia/files_controller/local_ingest_behavior'
@@ -241,7 +226,7 @@ module Sufia
     # this is provided so that implementing application can override this behavior and map params to different attributes
     def update_metadata
       @generic_file.attributes = @generic_file.sanitize_attributes(params[:generic_file])
-      @generic_file.set_visibility(params[:visibility])
+      @generic_file.visibility = params[:visibility]
       @generic_file.date_modified = DateTime.now
     end
 

data/lib/sufia/version.rb

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

data/spec/models/generic_file_spec.rb

@@ -90,22 +90,38 @@ describe GenericFile do
     end
   end
 
+  describe "visibility" do
+    it "should not be changed when it's new" do
+      subject.should_not be_visibility_changed
+    end
+    it "should be changed when it has been changed" do
+      subject.visibility= 'open'
+      subject.should be_visibility_changed
+    end
+
+    it "should not be changed when it's set to its previous value" do
+      subject.visibility= 'private'
+      subject.should_not be_visibility_changed
+    end
+
+  end
+
   describe "attributes" do
     it "should have rightsMetadata" do
-      @file.rightsMetadata.should be_instance_of ParanoidRightsDatastream
+      subject.rightsMetadata.should be_instance_of ParanoidRightsDatastream
     end
     it "should have properties datastream for depositor" do
-      @file.properties.should be_instance_of PropertiesDatastream
+      subject.properties.should be_instance_of PropertiesDatastream
     end
     it "should have apply_depositor_metadata" do
-      @file.rightsMetadata.edit_access.should == ['jcoyne']
-      @file.depositor.should == 'jcoyne'
+      subject.rightsMetadata.edit_access.should == ['jcoyne']
+      subject.depositor.should == 'jcoyne'
     end
     it "should have a set of permissions" do
-      @file.read_groups=['group1', 'group2']
-      @file.edit_users=['user1']
-      @file.read_users=['user2', 'user3']
-      @file.permissions.should == [{:type=>"group", :access=>"read", :name=>"group1"},
+      subject.read_groups=['group1', 'group2']
+      subject.edit_users=['user1']
+      subject.read_users=['user2', 'user3']
+      subject.permissions.should == [{:type=>"group", :access=>"read", :name=>"group1"},
           {:type=>"group", :access=>"read", :name=>"group2"},
           {:type=>"user", :access=>"read", :name=>"user2"},
           {:type=>"user", :access=>"read", :name=>"user3"},
@@ -113,51 +129,51 @@ describe GenericFile do
     end
     describe "updating permissions" do
       it "should create new group permissions" do
-        @file.permissions = {:new_group_name => {'group1'=>'read'}}
-        @file.permissions.should == [{:type=>"group", :access=>"read", :name=>"group1"},
+        subject.permissions = {:new_group_name => {'group1'=>'read'}}
+        subject.permissions.should == [{:type=>"group", :access=>"read", :name=>"group1"},
                                      {:type=>"user", :access=>"edit", :name=>"jcoyne"}]
       end
       it "should create new user permissions" do
-        @file.permissions = {:new_user_name => {'user1'=>'read'}}
-        @file.permissions.should == [{:type=>"user", :access=>"read", :name=>"user1"},
+        subject.permissions = {:new_user_name => {'user1'=>'read'}}
+        subject.permissions.should == [{:type=>"user", :access=>"read", :name=>"user1"},
                                      {:type=>"user", :access=>"edit", :name=>"jcoyne"}]
       end
       it "should not replace existing groups" do
-        @file.permissions = {:new_group_name=> {'group1' => 'read'}}
-        @file.permissions = {:new_group_name=> {'group2' => 'read'}}
-        @file.permissions.should == [{:type=>"group", :access=>"read", :name=>"group1"},
+        subject.permissions = {:new_group_name=> {'group1' => 'read'}}
+        subject.permissions = {:new_group_name=> {'group2' => 'read'}}
+        subject.permissions.should == [{:type=>"group", :access=>"read", :name=>"group1"},
                                      {:type=>"group", :access=>"read", :name=>"group2"},
                                      {:type=>"user", :access=>"edit", :name=>"jcoyne"}]
       end
       it "should not replace existing users" do
-        @file.permissions = {:new_user_name=>{'user1'=>'read'}}
-        @file.permissions = {:new_user_name=>{'user2'=>'read'}}
-        @file.permissions.should == [{:type=>"user", :access=>"read", :name=>"user1"},
+        subject.permissions = {:new_user_name=>{'user1'=>'read'}}
+        subject.permissions = {:new_user_name=>{'user2'=>'read'}}
+        subject.permissions.should == [{:type=>"user", :access=>"read", :name=>"user1"},
                                      {:type=>"user", :access=>"read", :name=>"user2"},
                                      {:type=>"user", :access=>"edit", :name=>"jcoyne"}]
       end
       it "should update permissions on existing users" do
-        @file.permissions = {:new_user_name=>{'user1'=>'read'}}
-        @file.permissions = {:user=>{'user1'=>'edit'}}
-        @file.permissions.should == [{:type=>"user", :access=>"edit", :name=>"user1"},
+        subject.permissions = {:new_user_name=>{'user1'=>'read'}}
+        subject.permissions = {:user=>{'user1'=>'edit'}}
+        subject.permissions.should == [{:type=>"user", :access=>"edit", :name=>"user1"},
                                      {:type=>"user", :access=>"edit", :name=>"jcoyne"}]
       end
       it "should update permissions on existing groups" do
-        @file.permissions = {:new_group_name=>{'group1'=>'read'}}
-        @file.permissions = {:group=>{'group1'=>'edit'}}
-        @file.permissions.should == [{:type=>"group", :access=>"edit", :name=>"group1"},
+        subject.permissions = {:new_group_name=>{'group1'=>'read'}}
+        subject.permissions = {:group=>{'group1'=>'edit'}}
+        subject.permissions.should == [{:type=>"group", :access=>"edit", :name=>"group1"},
                                      {:type=>"user", :access=>"edit", :name=>"jcoyne"}]
       end
     end
     it "should have a characterization datastream" do
-      @file.characterization.should be_kind_of FitsDatastream
+      subject.characterization.should be_kind_of FitsDatastream
     end
     it "should have a dc desc metadata" do
-      @file.descMetadata.should be_kind_of GenericFileRdfDatastream
+      subject.descMetadata.should be_kind_of GenericFileRdfDatastream
     end
     it "should have content datastream" do
-      @file.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
-      @file.content.should be_kind_of FileContentDatastream
+      subject.add_file(File.open(fixture_path + '/world.png'), 'content', 'world.png')
+      subject.content.should be_kind_of FileContentDatastream
     end
   end
   describe "delegations" do

data/sufia-models/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/sufia-models/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/sufia-models/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/sufia-models/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/sufia-models/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/sufia-models/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/sufia-models/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/sufia-models/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/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
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: ruby
 authors:
 - Justin Coyne
 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: sufia-models
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.1.2
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
@@ -376,6 +376,7 @@ files:
 - app/views/dashboard/_facet_pagination.html.erb
 - app/views/dashboard/_facet_selected.html.erb
 - app/views/dashboard/_facets.html.erb
+- app/views/dashboard/_heading.html.erb
 - app/views/dashboard/_index_partials/_default_group.html.erb
 - app/views/dashboard/_index_partials/_list_files.html.erb
 - app/views/dashboard/_index_partials/_thumbnail_display.html.erb
@@ -670,6 +671,7 @@ files:
 - sufia-models/lib/sufia/models/generic_file/mime_types.rb
 - sufia-models/lib/sufia/models/generic_file/permissions.rb
 - sufia-models/lib/sufia/models/generic_file/thumbnail.rb
+- sufia-models/lib/sufia/models/generic_file/visibility.rb
 - sufia-models/lib/sufia/models/generic_file/web_form.rb
 - sufia-models/lib/sufia/models/id_service.rb
 - sufia-models/lib/sufia/models/jobs/active_fedora_pid_based_job.rb