sufia 3.1.0 → 3.2.1

data/sufia-models/lib/tasks/resque.rake

@@ -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.
-
 require 'resque/pool/tasks'
 
 # This provides access to the Rails env within all Resque workers

data/sufia-models/sufia-models.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
 
   # This is a temporary homepage until we've had a chance to review the
   # process
-  spec.homepage      = "https://github.com/jeremyf/sufia"
+  spec.homepage      = "https://github.com/projecthydra/sufia"
   spec.license       = "Apache"
 
   spec.files         = `git ls-files`.split($/)
@@ -30,13 +30,13 @@ 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.4.0"
+  spec.add_dependency 'active-fedora', "~> 6.5.0"
 
   spec.add_dependency 'nest', '~> 1.1.1'
   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'

data/tasks/release.rake

@@ -32,6 +32,7 @@ tag     = "v#{version}"
         File.open(file, 'w') { |f| f.write ruby }
       end
     end
+    task :pkg
     task gem => %w(update_version_rb pkg) do
       cmd = ""
       cmd << "cd #{framework} && " unless framework == "sufia"
@@ -47,7 +48,7 @@ tag     = "v#{version}"
     task :prep_release => [:ensure_clean_state, :build]
 
     task :push => :build do
-      sh "gem push #{gem}"
+      # sh "gem push #{gem}"
     end
   end
 end

data/tasks/sufia-db.rake

@@ -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.
-
 namespace :sufia do
   namespace :db do
     desc "delete all Generic Files in Fedora and Solr (This may take some time...)."

data/tasks/sufia-dev.rake

@@ -22,7 +22,6 @@ task :spec => :generate do
   end
 end
 
-gem_home = File.expand_path('../../', __FILE__)
 
 desc "Run specs"
 RSpec::Core::RakeTask.new(:rspec) do |t|

data/tasks/sufia-fixtures.rake

@@ -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.
-
 # sufia-fixtures
 #
 # This was extracted from the original Hydra version in 

data/tasks/sufia.rake

@@ -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.
-
 require 'rdf'
 require 'rdf/rdfxml'
 require 'rubygems'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sufia
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-09 00:00:00.000000000 Z
+date: 2013-09-10 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.0
+        version: 3.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.1
 - !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
@@ -476,14 +477,6 @@ files:
 - lib/generators/sufia/sufia_generator.rb
 - lib/generators/sufia/templates/catalog_controller.rb
 - lib/generators/sufia/templates/config/action_dispatch_http_upload_monkey_patch.rb
-- lib/generators/sufia/templates/config/clamav.rb
-- lib/generators/sufia/templates/config/mailboxer.rb
-- lib/generators/sufia/templates/config/redis.yml
-- lib/generators/sufia/templates/config/redis_config.rb
-- lib/generators/sufia/templates/config/resque_admin.rb
-- lib/generators/sufia/templates/config/resque_config.rb
-- lib/generators/sufia/templates/config/setup_mail.rb
-- lib/generators/sufia/templates/config/sufia.rb
 - lib/generators/sufia/templates/migrations/acts_as_follower_migration.rb
 - lib/generators/sufia/templates/migrations/add_avatars_to_users.rb
 - lib/generators/sufia/templates/migrations/add_groups_to_users.rb
@@ -588,6 +581,7 @@ files:
 - spec/jobs/ingest_local_file_job_spec.rb
 - spec/lib/sufia/id_service_spec.rb
 - spec/lib/sufia/upload_complete_behavior_spec.rb
+- spec/models/access_right_spec.rb
 - spec/models/audit_job_spec.rb
 - spec/models/batch_spec.rb
 - spec/models/batch_update_job_spec.rb
@@ -597,6 +591,7 @@ files:
 - spec/models/file_content_datastream_spec.rb
 - spec/models/fits_datastream_spec.rb
 - spec/models/generic_file/actions_spec.rb
+- spec/models/generic_file/visibility_spec.rb
 - spec/models/generic_file/web_form_spec.rb
 - spec/models/generic_file_spec.rb
 - spec/models/local_authority_spec.rb
@@ -624,6 +619,8 @@ files:
 - sufia-models/Rakefile
 - sufia-models/app/models/batch.rb
 - sufia-models/app/models/checksum_audit_log.rb
+- sufia-models/app/models/concerns/sufia/models/access_right.rb
+- sufia-models/app/models/concerns/sufia/models/with_access_right.rb
 - sufia-models/app/models/datastreams/batch_rdf_datastream.rb
 - sufia-models/app/models/datastreams/file_content_datastream.rb
 - sufia-models/app/models/datastreams/fits_datastream.rb
@@ -642,8 +639,28 @@ files:
 - sufia-models/app/models/trophy.rb
 - sufia-models/app/models/version_committer.rb
 - sufia-models/config/locales/sufia.en.yml
+- sufia-models/lib/generators/sufia/models/install_generator.rb
+- sufia-models/lib/generators/sufia/models/templates/config/clamav.rb
+- sufia-models/lib/generators/sufia/models/templates/config/mailboxer.rb
+- sufia-models/lib/generators/sufia/models/templates/config/redis.yml
+- sufia-models/lib/generators/sufia/models/templates/config/redis_config.rb
+- sufia-models/lib/generators/sufia/models/templates/config/resque_admin.rb
+- sufia-models/lib/generators/sufia/models/templates/config/resque_config.rb
+- sufia-models/lib/generators/sufia/models/templates/config/setup_mail.rb
+- sufia-models/lib/generators/sufia/models/templates/config/sufia.rb
+- sufia-models/lib/generators/sufia/models/templates/migrations/acts_as_follower_migration.rb
+- sufia-models/lib/generators/sufia/models/templates/migrations/add_avatars_to_users.rb
+- sufia-models/lib/generators/sufia/models/templates/migrations/add_groups_to_users.rb
+- sufia-models/lib/generators/sufia/models/templates/migrations/add_ldap_attrs_to_user.rb
+- sufia-models/lib/generators/sufia/models/templates/migrations/add_social_to_users.rb
+- sufia-models/lib/generators/sufia/models/templates/migrations/create_checksum_audit_logs.rb
+- sufia-models/lib/generators/sufia/models/templates/migrations/create_local_authorities.rb
+- sufia-models/lib/generators/sufia/models/templates/migrations/create_single_use_links.rb
+- sufia-models/lib/generators/sufia/models/templates/migrations/create_trophies.rb
+- sufia-models/lib/generators/sufia/models/templates/migrations/create_version_committers.rb
 - sufia-models/lib/sufia/models.rb
 - sufia-models/lib/sufia/models/active_fedora/redis.rb
+- sufia-models/lib/sufia/models/active_record/deprecated_attr_accessible.rb
 - sufia-models/lib/sufia/models/active_record/redis.rb
 - sufia-models/lib/sufia/models/active_support/core_ext/marshal.rb
 - sufia-models/lib/sufia/models/engine.rb
@@ -659,6 +676,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
@@ -736,7 +754,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Sufia was extracted from ScholarSphere developed by Penn State University
@@ -817,6 +835,7 @@ test_files:
 - spec/jobs/ingest_local_file_job_spec.rb
 - spec/lib/sufia/id_service_spec.rb
 - spec/lib/sufia/upload_complete_behavior_spec.rb
+- spec/models/access_right_spec.rb
 - spec/models/audit_job_spec.rb
 - spec/models/batch_spec.rb
 - spec/models/batch_update_job_spec.rb
@@ -826,6 +845,7 @@ test_files:
 - spec/models/file_content_datastream_spec.rb
 - spec/models/fits_datastream_spec.rb
 - spec/models/generic_file/actions_spec.rb
+- spec/models/generic_file/visibility_spec.rb
 - spec/models/generic_file/web_form_spec.rb
 - spec/models/generic_file_spec.rb
 - spec/models/local_authority_spec.rb
@@ -846,4 +866,3 @@ test_files:
 - spec/support/lib/generators/test_app_generator.rb
 - spec/support/uploaded_file_monkeypatch.rb
 - spec/views/batch_edits/check_all_spec.rb
-has_rdoc: 

data/lib/generators/sufia/templates/config/clamav.rb

@@ -1,14 +0,0 @@
-# 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.
-ClamAV.instance.loaddb() if defined? ClamAV

data/lib/generators/sufia/templates/config/mailboxer.rb

@@ -1,31 +0,0 @@
-# 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.
-
-Mailboxer.setup do |config|
-  
-  #Configures if you applications uses or no the email sending for Notifications and Messages
-  config.uses_emails = true
-  
-  #Configures the default from for the email sent for Messages and Notifications of Mailboxer
-  config.default_from = "no-reply@mailboxer.com"
-  
-  #Configures the methods needed by mailboxer
-  config.email_method = :mailboxer_email
-  config.name_method = :name
-
-  #Configures if you use or not a search engine and wich one are you using
-  #Supported enignes: [:solr,:sphinx] 
-  config.search_enabled = false
-  config.search_engine = :solr
-end

data/lib/generators/sufia/templates/config/setup_mail.rb

@@ -1,17 +0,0 @@
-# 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.
-
-ActionMailer::Base.smtp_settings = {
-   :address                  => "smtp.psu.edu"
-}

data/lib/generators/sufia/templates/config/sufia.rb

@@ -1,82 +0,0 @@
-# Returns an array containing the vhost 'CoSign service' value and URL
-Sufia.config do |config|
-
-  config.fits_to_desc_mapping= {
-      :file_title => :title,
-      :file_author => :creator
-    }
-
-  # Specify a different template for your repositories unique identifiers
-  # config.noid_template = ".reeddeeddk"
-
-  config.max_days_between_audits = 7
-
-      config.cc_licenses = {
-      'Attribution 3.0 United States' => 'http://creativecommons.org/licenses/by/3.0/us/',
-      'Attribution-ShareAlike 3.0 United States' => 'http://creativecommons.org/licenses/by-sa/3.0/us/',
-      'Attribution-NonCommercial 3.0 United States' => 'http://creativecommons.org/licenses/by-nc/3.0/us/',
-      'Attribution-NoDerivs 3.0 United States' => 'http://creativecommons.org/licenses/by-nd/3.0/us/',
-      'Attribution-NonCommercial-NoDerivs 3.0 United States' => 'http://creativecommons.org/licenses/by-nc-nd/3.0/us/',
-      'Attribution-NonCommercial-ShareAlike 3.0 United States' => 'http://creativecommons.org/licenses/by-nc-sa/3.0/us/',
-      'Public Domain Mark 1.0' => 'http://creativecommons.org/publicdomain/mark/1.0/',
-      'CC0 1.0 Universal' => 'http://creativecommons.org/publicdomain/zero/1.0/',
-      'All rights reserved' => 'All rights reserved'
-    }
-
-    config.cc_licenses_reverse = Hash[*config.cc_licenses.to_a.flatten.reverse]
-
-    config.resource_types = {
-      "Article" => "Article",
-      "Audio" => "Audio",
-      "Book" => "Book",
-      "Capstone Project" => "Capstone Project",
-      "Conference Proceeding" => "Conference Proceeding",
-      "Dataset" => "Dataset",
-      "Dissertation" => "Dissertation",
-      "Image" => "Image",
-      "Journal" => "Journal",
-      "Map or Cartographic Material" => "Map or Cartographic Material",
-      "Masters Thesis" => "Masters Thesis",
-      "Part of Book" => "Part of Book",
-      "Poster" => "Poster",
-      "Presentation" => "Presentation",
-      "Project" => "Project",
-      "Report" => "Report",
-      "Research Paper" => "Research Paper",
-      "Software or Program Code" => "Software or Program Code",
-      "Video" => "Video",
-      "Other" => "Other",
-    }
-
-    config.permission_levels = {
-      "Choose Access"=>"none",
-      "View/Download" => "read",
-      "Edit" => "edit"
-    }
-
-    config.owner_permission_levels = {
-      "Edit" => "edit"
-    }
-
-    config.queue = Sufia::Resque::Queue
-
-    # Map hostnames onto Google Analytics tracking IDs
-    # config.google_analytics_id = 'UA-99999999-1'
-
-    
-    # Where to store tempfiles, leave blank for the system temp directory (e.g. /tmp)
-    # config.temp_file_base = '/home/developer1'
-
-    # If you have ffmpeg installed and want to transcode audio and video uncomment this line
-    # config.enable_ffmpeg = true
-    
-    # Specify the Fedora pid prefix:
-    # config.id_namespace = "sufia"
-    
-    # Specify the path to the file characterization tool:
-    # config.fits_path = "fits.sh"
-
-end
-
-Date::DATE_FORMATS[:standard] = "%m/%d/%Y"
-