sufia 2.0.1 → 3.0.0

data/sufia-models/lib/sufia/models/generic_file/web_form.rb

@@ -2,6 +2,7 @@ module Sufia
   module GenericFile
     module WebForm
       extend ActiveSupport::Concern
+      include Sufia::GenericFile::AccessibleAttributes
       included do
         before_save :remove_blank_assertions
       end
@@ -26,7 +27,9 @@ module Sufia
       end
 
       def terms_for_display
-        self.descMetadata.class.config.keys
+        # 'type' is the RDF.type assertion, which is not present by default, but may be
+        # provided in some RDF schemas
+        self.descMetadata.class.fields
       end
 
       def to_jq_upload

data/sufia-models/lib/sufia/models/user.rb

@@ -33,8 +33,7 @@ module Sufia::User
     acts_as_followable
 
     # Setup accessible (or protected) attributes for your model
-    attr_accessible :email, :login, :display_name, :address, :admin_area, :department, :title, :office, :chat_id, :website, :affiliation, :telephone, :avatar, 
-    :group_list, :groups_last_update, :facebook_handle, :twitter_handle, :googleplus_handle
+    attr_accessible *permitted_attributes if Rails::VERSION::MAJOR == 3
 
     # Add user avatar (via paperclip library)
     has_attached_file :avatar, :styles => { medium: "300x300>", thumb: "100x100>" }, :default_url => '/assets/missing_:style.png'
@@ -89,6 +88,14 @@ module Sufia::User
   end
 
   module ClassMethods
+
+    def permitted_attributes
+      [:email, :login, :display_name, :address, :admin_area, 
+        :department, :title, :office, :chat_id, :website, :affiliation, 
+        :telephone, :avatar, :group_list, :groups_last_update, :facebook_handle,
+        :twitter_handle, :googleplus_handle]
+    end
+
     def current
       Thread.current[:user]
     end

data/sufia-models/lib/sufia/models/version.rb

@@ -1,5 +1,5 @@
 module Sufia
   module Models
-    VERSION = "2.0.1"
+    VERSION = "3.0.0"
   end
 end

data/sufia-models/sufia-models.gemspec

@@ -1,11 +1,10 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'sufia/models/version'
+version = File.read(File.expand_path("../../SUFIA_VERSION", __FILE__)).strip
+
 
 Gem::Specification.new do |spec|
   spec.name          = "sufia-models"
-  spec.version       = Sufia::Models::VERSION
+  spec.version       = version 
   spec.authors       = [
     "Jeremy Friesen",
   ]
@@ -27,18 +26,21 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_dependency "rails", "~> 3.2.13"
-  spec.add_dependency 'hydra-head', '~> 6.0'
+
+  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 '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 'mailboxer', '0.8.0'
+  spec.add_dependency 'curationexperts-mailboxer', '0.10.3'
   spec.add_dependency 'acts_as_follower', '0.1.1'
   spec.add_dependency 'rmagick'
-  spec.add_dependency 'paperclip', '3.3.0'
+  spec.add_dependency 'paperclip', '~> 3.4.0'
   spec.add_dependency 'zipruby', '0.3.6'
-  spec.add_dependency 'activerecord-import', '0.3.0' # 0.3.1 caused a bug in testing: "SQLite3::SQLException: near ",": syntax error: INSERT INTO..."
-  spec.add_dependency 'devise'
-
+  # https://github.com/zdennis/activerecord-import/pull/79
+  #spec.add_dependency 'activerecord-import', '0.3.0' # 0.3.1 caused a bug in testing: "SQLite3::SQLException: near ",": syntax error: INSERT INTO..."
 end

data/sufia.gemspec

@@ -16,11 +16,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = version 
 
-  gem.add_dependency 'rails', '~> 3.2.13'
   gem.add_dependency 'sufia-models', version
   gem.add_dependency 'blacklight', '~> 4.0'
-  gem.add_dependency 'blacklight_advanced_search'
-  gem.add_dependency "hydra-head", "~> 6.0"
+  gem.add_dependency 'blacklight_advanced_search', '~> 2.1.0'
 
   gem.add_dependency 'hydra-batch-edit', '~> 1.0'
 

data/tasks/sufia-dev.rake

@@ -2,7 +2,7 @@ require 'rspec/core'
 require 'rspec/core/rake_task'
 APP_ROOT="." # for jettywrapper
 require 'jettywrapper'
-ENV["RAILS_ROOT"] ||= 'spec/internal'
+#ENV["RAILS_ROOT"] ||= 'spec/internal'
 
 desc 'Spin up hydra-jetty and run specs'
 task :ci => ['jetty:config'] do
@@ -10,18 +10,23 @@ task :ci => ['jetty:config'] do
   jetty_params = Jettywrapper.load_config
   error = Jettywrapper.wrap(jetty_params) do
     Rake::Task['spec'].invoke
-    Rake::Task['cucumber:all'].invoke
   end
   raise "test failures: #{error}" if error
 end
 
+task :spec => :generate do
+  Bundler.with_clean_env do
+    within_test_app do
+      Rake::Task['rspec'].invoke
+    end
+  end
+end
+
+gem_home = File.expand_path('../../', __FILE__)
+
 desc "Run specs"
-RSpec::Core::RakeTask.new(:spec => [:generate]) do |t|
-  puts 'running specs'
-  # if ENV['COVERAGE'] and RUBY_VERSION =~ /^1.8/
-  #   t.rcov = true
-  #   t.rcov_opts = %w{--exclude spec\/*,gems\/*,ruby\/* --aggregate coverage.data}
-  # end
+RSpec::Core::RakeTask.new(:rspec) do |t|
+  t.pattern = '../**/*_spec.rb'
   t.rspec_opts = "--colour"
 end
 
@@ -41,8 +46,12 @@ task :generate do
   unless File.exists?('spec/internal/Rakefile')
     puts "Generating rails app"
     `rails new spec/internal`
-    puts "Copying gemfile"
-    `cp spec/support/Gemfile spec/internal`
+    puts "Updating gemfile"
+
+    `echo "gem 'sufia', :path=>'../../../sufia'
+gem 'capybara'
+gem 'factory_girl_rails'
+gem 'kaminari', github: 'harai/kaminari', branch: 'route_prefix_prototype'" >> spec/internal/Gemfile`
     puts "Copying generator"
     `cp -r spec/support/lib/generators spec/internal/lib`
     Bundler.with_clean_env do
@@ -52,6 +61,8 @@ task :generate do
         puts "running test_app_generator"
         system "rails generate test_app"
 
+        # These factories are autogenerated and conflict with our factories
+        system 'rm test/factories/users.rb'
         puts "running migrations"
         puts `rake db:migrate db:test:prepare`
       end

metadata

@@ -1,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: sufia
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-19 00:00:00.000000000 Z
+date: 2013-07-22 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.13
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.2.13
 - !ruby/object:Gem::Dependency
   name: sufia-models
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
@@ -54,32 +40,18 @@ dependencies:
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: blacklight_advanced_search
-  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
-  name: hydra-head
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: hydra-batch-edit
   requirement: !ruby/object:Gem::Requirement
@@ -190,6 +162,7 @@ files:
 - .gitmodules
 - .rspec
 - .travis.yml
+- CONTRIBUTING.md
 - Gemfile
 - History.md
 - LICENSE.md
@@ -267,10 +240,10 @@ files:
 - app/assets/javascripts/sufia/trophy.js
 - app/assets/javascripts/sufia/uploader.js
 - app/assets/javascripts/terms_of_service.js
-- app/assets/stylesheets/application-bootstrap.css
+- app/assets/stylesheets/application-bootstrap.css.erb
 - app/assets/stylesheets/audio-js.css
 - app/assets/stylesheets/blacklight_more_facets.css
-- app/assets/stylesheets/bootstrap.min.css
+- app/assets/stylesheets/bootstrap.min.css.erb
 - app/assets/stylesheets/contact_form.css
 - app/assets/stylesheets/dashboard.css.scss
 - app/assets/stylesheets/fileupload/application.css
@@ -464,7 +437,7 @@ files:
 - app/views/kaminari/blacklight/_page.html.erb
 - app/views/kaminari/blacklight/_paginator.html.erb
 - app/views/kaminari/blacklight/_prev_page.html.erb
-- app/views/layouts/_head-tag-content.html.erb
+- app/views/layouts/_head_tag_content.html.erb
 - app/views/layouts/error.html.erb
 - app/views/layouts/homepage.html.erb
 - app/views/layouts/sufia-one-column.html.erb
@@ -491,29 +464,12 @@ files:
 - app/views/users/notifications_number.js.erb
 - app/views/users/show.html.erb
 - bin/audit_repository
-- config/cucumber.yml
 - config/initializers/sufia_events.rb
 - config/jetty.yml
 - config/locales/sufia.en.yml
 - config/routes.rb
 - db/data.yml
 - db/seeds.rb
-- features/browse_dashboard_files.feature
-- features/browse_files.feature
-- features/contact_form.feature
-- features/display_dashboard.feature
-- features/ingest_upload_files.feature
-- features/step_definitions/edit_metadata_steps.rb
-- features/step_definitions/fixture_steps.rb
-- features/step_definitions/show_document_steps.rb
-- features/step_definitions/sufia.rb
-- features/step_definitions/user_steps.rb
-- features/step_definitions/web_steps.rb
-- features/support/cleanup.rb
-- features/support/env.rb
-- features/support/headless.rb
-- features/support/paths.rb
-- features/users.feature
 - fedora_conf/conf/development/fedora.fcfg
 - fedora_conf/conf/test/fedora.fcfg
 - lib/generators/sufia/sufia_generator.rb
@@ -548,7 +504,6 @@ files:
 - lib/sufia/single_use_error.rb
 - lib/sufia/version.rb
 - lib/tasks/fixtures.rake
-- lib/tasks/resque.rake
 - public/.gitkeep
 - public/favicon.ico
 - solr_conf/conf/schema.xml
@@ -570,6 +525,12 @@ files:
 - spec/factories/checksum_audit_logs.rb
 - spec/factories/single_use_links.rb
 - spec/factories/users.rb
+- spec/features/browse_dashboard_files.rb
+- spec/features/browse_files.rb
+- spec/features/contact_form.rb
+- spec/features/display_dashboard.rb
+- spec/features/ingest_upload_files.rb
+- spec/features/users_spec.rb
 - spec/fixtures/4-20.png
 - spec/fixtures/Example.ogg
 - spec/fixtures/cities15000.tsv
@@ -620,7 +581,6 @@ files:
 - spec/helpers/generic_file_helper_spec.rb
 - spec/helpers/sufia_helper_spec.rb
 - spec/lib/sufia/id_service_spec.rb
-- spec/lib/sufia/role_mapper_spec.rb
 - spec/models/audit_job_spec.rb
 - spec/models/batch_spec.rb
 - spec/models/batch_update_job_spec.rb
@@ -629,6 +589,7 @@ files:
 - spec/models/event_jobs_spec.rb
 - spec/models/file_content_datastream_spec.rb
 - spec/models/fits_datastream_spec.rb
+- spec/models/generic_file/web_form_spec.rb
 - spec/models/generic_file_spec.rb
 - spec/models/local_authority_spec.rb
 - spec/models/properties_datastream_spec.rb
@@ -642,15 +603,12 @@ files:
 - spec/rake/sufia_fixtures_spec.rb
 - spec/routing/route_spec.rb
 - spec/spec_helper.rb
-- spec/support/Gemfile
+- spec/support/features.rb
+- spec/support/features/session_helpers.rb
 - spec/support/fedora_conf/fedora.fcfg
 - spec/support/lib/generators/test_app_generator.rb
 - spec/support/uploaded_file_monkeypatch.rb
 - spec/views/batch_edits/check_all_spec.rb
-- spec/views/single_user_link/download.html.erb_spec.rb
-- spec/views/single_user_link/generate_download.html.erb_spec.rb
-- spec/views/single_user_link/generate_show.html.erb_spec.rb
-- spec/views/single_user_link/show.html.erb_spec.rb
 - sufia-models/.gitignore
 - sufia-models/Gemfile
 - sufia-models/LICENSE.md
@@ -685,6 +643,7 @@ files:
 - sufia-models/lib/sufia/models/file_content/extract_metadata.rb
 - sufia-models/lib/sufia/models/file_content/versions.rb
 - sufia-models/lib/sufia/models/generic_file.rb
+- sufia-models/lib/sufia/models/generic_file/accessible_attributes.rb
 - sufia-models/lib/sufia/models/generic_file/actions.rb
 - sufia-models/lib/sufia/models/generic_file/audit.rb
 - sufia-models/lib/sufia/models/generic_file/characterization.rb
@@ -709,10 +668,10 @@ files:
 - sufia-models/lib/sufia/models/user.rb
 - sufia-models/lib/sufia/models/utils.rb
 - sufia-models/lib/sufia/models/version.rb
+- sufia-models/lib/tasks/resque.rake
 - sufia-models/lib/tasks/sufia-models_tasks.rake
 - sufia-models/sufia-models.gemspec
 - sufia.gemspec
-- tasks/cucumber.rake
 - tasks/jetty.rake
 - tasks/release.rake
 - tasks/sufia-db.rake
@@ -771,22 +730,6 @@ signing_key:
 specification_version: 4
 summary: Sufia was extracted from ScholarSphere developed by Penn State University
 test_files:
-- features/browse_dashboard_files.feature
-- features/browse_files.feature
-- features/contact_form.feature
-- features/display_dashboard.feature
-- features/ingest_upload_files.feature
-- features/step_definitions/edit_metadata_steps.rb
-- features/step_definitions/fixture_steps.rb
-- features/step_definitions/show_document_steps.rb
-- features/step_definitions/sufia.rb
-- features/step_definitions/user_steps.rb
-- features/step_definitions/web_steps.rb
-- features/support/cleanup.rb
-- features/support/env.rb
-- features/support/headless.rb
-- features/support/paths.rb
-- features/users.feature
 - spec/.gitignore
 - spec/active_fedora/unsaved_digital_object_spec.rb
 - spec/controllers/_sort_and_per_page.html.erb
@@ -803,6 +746,12 @@ test_files:
 - spec/factories/checksum_audit_logs.rb
 - spec/factories/single_use_links.rb
 - spec/factories/users.rb
+- spec/features/browse_dashboard_files.rb
+- spec/features/browse_files.rb
+- spec/features/contact_form.rb
+- spec/features/display_dashboard.rb
+- spec/features/ingest_upload_files.rb
+- spec/features/users_spec.rb
 - spec/fixtures/4-20.png
 - spec/fixtures/Example.ogg
 - spec/fixtures/cities15000.tsv
@@ -853,7 +802,6 @@ test_files:
 - spec/helpers/generic_file_helper_spec.rb
 - spec/helpers/sufia_helper_spec.rb
 - spec/lib/sufia/id_service_spec.rb
-- spec/lib/sufia/role_mapper_spec.rb
 - spec/models/audit_job_spec.rb
 - spec/models/batch_spec.rb
 - spec/models/batch_update_job_spec.rb
@@ -862,6 +810,7 @@ test_files:
 - spec/models/event_jobs_spec.rb
 - spec/models/file_content_datastream_spec.rb
 - spec/models/fits_datastream_spec.rb
+- spec/models/generic_file/web_form_spec.rb
 - spec/models/generic_file_spec.rb
 - spec/models/local_authority_spec.rb
 - spec/models/properties_datastream_spec.rb
@@ -875,13 +824,10 @@ test_files:
 - spec/rake/sufia_fixtures_spec.rb
 - spec/routing/route_spec.rb
 - spec/spec_helper.rb
-- spec/support/Gemfile
+- spec/support/features.rb
+- spec/support/features/session_helpers.rb
 - spec/support/fedora_conf/fedora.fcfg
 - spec/support/lib/generators/test_app_generator.rb
 - spec/support/uploaded_file_monkeypatch.rb
 - spec/views/batch_edits/check_all_spec.rb
-- spec/views/single_user_link/download.html.erb_spec.rb
-- spec/views/single_user_link/generate_download.html.erb_spec.rb
-- spec/views/single_user_link/generate_show.html.erb_spec.rb
-- spec/views/single_user_link/show.html.erb_spec.rb
 has_rdoc: