sufia 3.5.0 → 3.6.0

data/spec/support/features.rb

@@ -1,6 +1,8 @@
 # spec/support/features.rb
 require File.expand_path('../features/session_helpers', __FILE__)
+require File.expand_path('../fixture_helpers', __FILE__)
 
 RSpec.configure do |config|
   config.include Features::SessionHelpers, type: :feature
+  config.include FixtureHelpers
 end

data/spec/support/features/session_helpers.rb

@@ -11,7 +11,15 @@ module Features
     end
 
     def sign_in(who = :user)
-      user = FactoryGirl.create(who)
+      if who.instance_of?(User)
+        user = who
+      else
+        user = FactoryGirl.find_or_create(who)
+        if user.password.nil?   # get the password from the factory if user was retrieved from database
+          tmpl = FactoryGirl.build(who)
+          user.password = tmpl.password
+        end
+      end
       visit new_user_session_path
       fill_in 'Email', with: user.email
       fill_in 'Password', with: user.password

data/spec/support/fixture_helpers.rb

@@ -0,0 +1,10 @@
+# spec/support/fixture_helpers.rb
+module FixtureHelpers
+  def find_or_create_file_fixtures
+    handles = [:public_pdf, :public_mp3, :public_wav]
+    fixtures = []
+    handles.each {|handle| fixtures << FactoryGirl.create(handle) }
+    return fixtures
+  end
+end
+

data/spec/views/dashboard/facet_limit.html.erb_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe 'dashboard/_facet_limit.html.erb' do
+
+  it "should draw facet links" do
+    allow(view).to receive(:display_facet).and_return(double(items: [double(value: 'Audio', hits: 3), double(value: 'Video', hits:2)]))
+    allow(view).to receive(:solr_field).and_return('desc_metadata__resource_type_sim')
+    allow(view).to receive(:facet_limit_for).and_return(5)
+    allow(view).to receive(:blacklight_config).and_return(DashboardController.blacklight_config)
+    allow(view).to receive(:params).and_return({controller: 'dashboard'})
+    render
+    expect(rendered).to match /<a class="facet_select" href="\/dashboard\?f%5Bdesc_metadata__resource_type_sim%5D%5B%5D=Audio">Audio<\/a> <span class="count">3<\/span>/
+
+  end
+end

data/spec/views/dashboard/index_partials/_thumbnail_display.html.erb_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe "dashboard/_index_partials/_thumbnail_display.html.erb" do
+  describe "for an audio object" do
+    before do
+      allow(view).to receive(:document).and_return(stub_model(GenericFile, mime_type: 'audio/wav', noid: '123'))
+    end
+    it "should show the audio thumbnail" do
+      render
+      rendered.should match /src="\/assets\/audio.png"/
+    end
+  end
+  describe "for an document object" do
+    before do
+      allow(view).to receive(:document).and_return(stub_model(GenericFile, mime_type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', noid: '123'))
+    end
+    it "should show the default thumbnail" do
+      render
+      rendered.should match /src="\/assets\/default.png"/
+    end
+  end
+end

data/spec/views/generic_file/edit.html.erb_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe 'generic_files/edit.html.erb' do
+  describe 'when the file has two or more resource types' do
+    let(:generic_file) {
+      content = double('content', versions: [])
+      stub_model(GenericFile, noid: '123',
+                                       depositor: 'bob',
+                                       resource_type: ['Book', 'Dataset'],
+                                       content: content)
+    }
+
+    before do
+      allow(controller).to receive(:current_user).and_return(stub_model(User))
+      assign(:generic_file, generic_file)
+    end
+
+    it "should only draw one resource_type multiselect" do
+      render
+      page = Capybara::Node::Simple.new(rendered)
+      expect(page).to have_selector("select#generic_file_resource_type", count: 1)
+    end
+  end
+end

data/spec/views/users/show.html.erb_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe 'users/show.html.erb' do
+
+  let(:join_date) { 5.days.ago }
+  before do
+    allow(view).to receive(:signed_in?).and_return(true)
+    allow(view).to receive(:current_user).and_return(stub_model(User, user_key: 'mjg'))
+    assign(:user, stub_model(User, user_key: 'cam156', created_at: join_date))
+    assign(:followers, [])
+    assign(:following, [])
+    assign(:trophies, [])
+    assign(:events, [])
+  end
+
+  it "should draw 3 tabs" do
+    render
+    page = Capybara::Node::Simple.new(rendered)
+    expect(page).to have_selector("ul#myTab.nav.nav-tabs > li > a[href='#contributions']")
+    expect(page).to have_selector("ul#myTab.nav.nav-tabs > li > a[href='#profile']")
+    expect(page).to have_selector("ul#myTab.nav.nav-tabs > li > a[href='#activity_log']")
+    expect(page).to have_selector(".tab-content > div#contributions.tab-pane")
+    expect(page).to have_selector(".tab-content > div#profile.tab-pane")
+    expect(page).to have_selector(".tab-content > div#activity_log.tab-pane")
+  end
+
+  it "should have the vitals" do
+    render
+    rendered.should match /Joined on #{join_date.strftime("%b %d, %Y")}/
+  end
+end

data/sufia-models/app/models/concerns/sufia/user.rb

@@ -66,11 +66,11 @@ module Sufia::User
 
   # The basic groups method, override or will fallback to Sufia::Ldap::User
   def groups
-    return self.group_list ? self.group_list.split(";?;") : []
+    @groups ||= self.group_list ? self.group_list.split(";?;") : []
   end
 
   def ability
-    @ability ||= Ability.new(self)
+    @ability ||= ::Ability.new(self)
   end
 
   module ClassMethods

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

@@ -45,7 +45,8 @@ This generator makes the following changes to your application:
       "create_version_committers.rb",
       "add_groups_to_users.rb",
       "create_local_authorities.rb",
-      "create_trophies.rb"
+      "create_trophies.rb",
+      'add_linkedin_to_users.rb'
     ].each do |file|
       better_migration_template file
     end

data/sufia-models/lib/generators/sufia/models/templates/migrations/add_linkedin_to_users.rb

@@ -0,0 +1,5 @@
+class AddLinkedinToUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :linkedin_handle, :string
+  end
+end

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

@@ -32,7 +32,6 @@ module Sufia::GenericFile
       end
 
       generic_file.record_version_committer(user)
-      Sufia.queue.push(UnzipJob.new(generic_file.pid)) if generic_file.content.mimeType == 'application/zip'
       if Sufia.config.respond_to?(:after_create_content)
         Sufia.config.after_create_content.call(generic_file, user)
       end

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

@@ -1,5 +1,5 @@
 module Sufia
   module Models
-    VERSION = "3.5.0"
+    VERSION = "3.6.0"
   end
 end

data/sufia-models/sufia-models.gemspec

@@ -1,10 +1,9 @@
 # coding: utf-8
 version = File.read(File.expand_path("../../SUFIA_VERSION", __FILE__)).strip
 
-
 Gem::Specification.new do |spec|
   spec.name          = "sufia-models"
-  spec.version       = version 
+  spec.version       = version
   spec.authors       = [
     "Jeremy Friesen",
   ]
@@ -27,11 +26,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 
-  spec.add_dependency 'rails', '>= 3.2.13', '< 5.0'
+  spec.add_dependency 'rails', '> 4.0.0', '< 5.0'
   spec.add_dependency 'activeresource' # No longer a dependency of rails 4.0
 
   # spec.add_dependency "hydra", "6.1.0.rc2"
-  # Since hydra 6.1 isn't out yet, we'll just build it so that it's compatible 
+  # 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 "active-fedora", "~> 6.7.0"
   spec.add_dependency "blacklight", "~> 4.5.0"
@@ -44,7 +43,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'mailboxer', '~> 0.11.0'
   spec.add_dependency 'acts_as_follower', '>= 0.1.1', '< 0.3'
   spec.add_dependency 'paperclip', '~> 3.4.0'
-  spec.add_dependency 'zipruby', '0.3.6'
   spec.add_dependency 'hydra-derivatives', '~> 0.0.5'
   spec.add_dependency 'activerecord-import'
 end

data/tasks/sufia-dev.rake

@@ -29,16 +29,6 @@ RSpec::Core::RakeTask.new(:rspec) do |t|
   t.rspec_opts = ["--colour -I ../", '--backtrace', '--profile 20']
 end
 
-desc "Load fixtures"
-task :fixtures => :generate do# => ['sufia:fixtures:refresh'] do
-  #NOTE do we need fixtures:create, fixtures:generate
-  within_test_app do
-    puts "Loading fixtures "
-    ENV["RAILS_ENV"] = 'test'
-    puts `rake sufia:fixtures:refresh`
-  end
-end
-
 
 desc "Create the test rails app"
 task :generate do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sufia
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.6.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-05 00:00:00.000000000 Z
+date: 2013-12-18 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.5.0
+        version: 3.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: blacklight_advanced_search
   requirement: !ruby/object:Gem::Requirement
@@ -163,6 +163,7 @@ files:
 - Releasing_sufia.md
 - SUFIA_VERSION
 - UpgradeGuide.md
+- app/assets/images/audio.png
 - app/assets/images/blacklight/bg.png
 - app/assets/images/blacklight/border.png
 - app/assets/images/blacklight/bul_sq_gry.gif
@@ -266,7 +267,9 @@ files:
 - app/helpers/batch_edits_helper.rb
 - app/helpers/blacklight/render_constraints_helper_behavior.rb
 - app/helpers/contact_form_helper.rb
+- app/helpers/facets_helper.rb
 - app/helpers/generic_file_helper.rb
+- app/helpers/sufia/facets_helper_behavior.rb
 - app/helpers/sufia_helper.rb
 - app/helpers/trophy_helper.rb
 - app/jobs/content_delete_event_job.rb
@@ -412,7 +415,6 @@ files:
 - app/views/generic_files/edit_fields/_resource_type.html.erb
 - app/views/generic_files/edit_fields/_rights.html.erb
 - app/views/generic_files/edit_fields/_suffix.html.erb
-- app/views/generic_files/edit_fields/_type.html.erb
 - app/views/generic_files/new.html.erb
 - app/views/generic_files/show.html.erb
 - app/views/generic_files/show_fields/_default.html.erb
@@ -447,12 +449,22 @@ files:
 - app/views/static/subject_libraries.html.erb
 - app/views/static/terms.html.erb
 - app/views/static/zotero.html.erb
+- app/views/users/_activity.html.erb
 - app/views/users/_activity_log.html.erb
+- app/views/users/_contributions.html.erb
+- app/views/users/_follower_modal.html.erb
+- app/views/users/_following_modal.html.erb
+- app/views/users/_left_sidebar.html.erb
 - app/views/users/_notify_link.html.erb
 - app/views/users/_notify_number.html.erb
+- app/views/users/_profile.html.erb
+- app/views/users/_profile_actions.html.erb
+- app/views/users/_profile_tabs.html.erb
 - app/views/users/_search_form.html.erb
+- app/views/users/_social_media_info.html.erb
 - app/views/users/_trophy_edit.html.erb
 - app/views/users/_user_info.html.erb
+- app/views/users/_vitals.html.erb
 - app/views/users/edit.html.erb
 - app/views/users/index.html.erb
 - app/views/users/notifications_number.js.erb
@@ -480,7 +492,6 @@ files:
 - lib/sufia/single_use_error.rb
 - lib/sufia/version.rb
 - lib/sufia/virus_found_error.rb
-- lib/tasks/fixtures.rake
 - public/.gitkeep
 - public/favicon.ico
 - solr_conf/conf/schema.xml
@@ -501,13 +512,15 @@ files:
 - spec/controllers/single_use_links_viewer_controller_spec.rb
 - spec/controllers/users_controller_spec.rb
 - spec/factories/checksum_audit_logs.rb
+- spec/factories/generic_files.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/browse_dashboard_files_spec.rb
+- spec/features/browse_files_spec.rb
+- spec/features/contact_form_spec.rb
+- spec/features/display_dashboard_spec.rb
+- spec/features/ingest_upload_files_spec.rb
+- spec/features/notifications_spec.rb
 - spec/features/single_use_links_spec.rb
 - spec/features/users_spec.rb
 - spec/fixtures/4-20.png
@@ -516,8 +529,6 @@ files:
 - spec/fixtures/countdown.avi
 - spec/fixtures/docx_fits.xml
 - spec/fixtures/dublin_core_rdf_descMetadata.nt
-- spec/fixtures/empty_file.txt
-- spec/fixtures/fits_datastream.xml
 - spec/fixtures/genreForms.nt
 - spec/fixtures/icons.zip
 - spec/fixtures/image.jp2
@@ -532,29 +543,8 @@ files:
 - spec/fixtures/sample_mpeg4.mp4
 - spec/fixtures/small_file.txt
 - spec/fixtures/sufia/.gitignore
-- spec/fixtures/sufia/bg_header.jpg
-- spec/fixtures/sufia/sufia_test1.descMeta.txt
-- spec/fixtures/sufia/sufia_test1.foxml.erb
-- spec/fixtures/sufia/sufia_test1.txt
-- spec/fixtures/sufia/sufia_test2.descMeta.txt
-- spec/fixtures/sufia/sufia_test2.docx
-- spec/fixtures/sufia/sufia_test2.foxml.erb
-- spec/fixtures/sufia/sufia_test3.descMeta.txt
-- spec/fixtures/sufia/sufia_test3.foxml.erb
-- spec/fixtures/sufia/sufia_test3.xls
-- spec/fixtures/sufia/sufia_test4.descMeta.txt
-- spec/fixtures/sufia/sufia_test4.foxml.erb
 - spec/fixtures/sufia/sufia_test4.pdf
-- spec/fixtures/sufia/sufia_test5.descMeta.txt
-- spec/fixtures/sufia/sufia_test5.foxml.erb
 - spec/fixtures/sufia/sufia_test5.mp3
-- spec/fixtures/sufia/sufia_test5.txt
-- spec/fixtures/sufia/sufia_test6.descMeta.txt
-- spec/fixtures/sufia/sufia_test6.foxml.erb
-- spec/fixtures/sufia/sufia_test6.jp2
-- spec/fixtures/sufia/sufia_test6.txt
-- spec/fixtures/sufia_generic_stub.descMeta.txt
-- spec/fixtures/sufia_generic_stub.foxml.erb
 - spec/fixtures/sufia_generic_stub.txt
 - spec/fixtures/txt_fits.xml
 - spec/fixtures/world.png
@@ -586,17 +576,20 @@ files:
 - spec/models/transcode_audio_job_spec.rb
 - spec/models/transcode_video_job_spec.rb
 - spec/models/trophy_spec.rb
-- spec/models/unzip_job_spec.rb
 - spec/models/user_spec.rb
-- spec/rake/sufia_fixtures_spec.rb
 - spec/routing/route_spec.rb
 - spec/spec_helper.rb
 - spec/support/features.rb
 - spec/support/features/session_helpers.rb
 - spec/support/fedora_conf/fedora.fcfg
+- spec/support/fixture_helpers.rb
 - spec/support/lib/generators/test_app_generator.rb
 - spec/support/uploaded_file_monkeypatch.rb
 - spec/views/batch_edits/check_all_spec.rb
+- spec/views/dashboard/facet_limit.html.erb_spec.rb
+- spec/views/dashboard/index_partials/_thumbnail_display.html.erb_spec.rb
+- spec/views/generic_file/edit.html.erb_spec.rb
+- spec/views/users/show.html.erb_spec.rb
 - sufia-models/.gitignore
 - sufia-models/Gemfile
 - sufia-models/LICENSE.md
@@ -636,6 +629,7 @@ files:
 - 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_linkedin_to_users.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
@@ -674,7 +668,6 @@ files:
 - sufia-models/lib/sufia/models/jobs/resolrize_job.rb
 - sufia-models/lib/sufia/models/jobs/transcode_audio_job.rb
 - sufia-models/lib/sufia/models/jobs/transcode_video_job.rb
-- sufia-models/lib/sufia/models/jobs/unzip_job.rb
 - sufia-models/lib/sufia/models/model_methods.rb
 - sufia-models/lib/sufia/models/noid.rb
 - sufia-models/lib/sufia/models/resque.rb
@@ -690,7 +683,6 @@ files:
 - tasks/release.rake
 - tasks/sufia-db.rake
 - tasks/sufia-dev.rake
-- tasks/sufia-fixtures.rake
 - tasks/sufia.rake
 - vendor/assets/fonts/Lato-Light.eot
 - vendor/assets/fonts/Lato-Light.ttf
@@ -740,7 +732,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Sufia was extracted from ScholarSphere developed by Penn State University
@@ -760,13 +752,15 @@ test_files:
 - spec/controllers/single_use_links_viewer_controller_spec.rb
 - spec/controllers/users_controller_spec.rb
 - spec/factories/checksum_audit_logs.rb
+- spec/factories/generic_files.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/browse_dashboard_files_spec.rb
+- spec/features/browse_files_spec.rb
+- spec/features/contact_form_spec.rb
+- spec/features/display_dashboard_spec.rb
+- spec/features/ingest_upload_files_spec.rb
+- spec/features/notifications_spec.rb
 - spec/features/single_use_links_spec.rb
 - spec/features/users_spec.rb
 - spec/fixtures/4-20.png
@@ -775,8 +769,6 @@ test_files:
 - spec/fixtures/countdown.avi
 - spec/fixtures/docx_fits.xml
 - spec/fixtures/dublin_core_rdf_descMetadata.nt
-- spec/fixtures/empty_file.txt
-- spec/fixtures/fits_datastream.xml
 - spec/fixtures/genreForms.nt
 - spec/fixtures/icons.zip
 - spec/fixtures/image.jp2
@@ -791,29 +783,8 @@ test_files:
 - spec/fixtures/sample_mpeg4.mp4
 - spec/fixtures/small_file.txt
 - spec/fixtures/sufia/.gitignore
-- spec/fixtures/sufia/bg_header.jpg
-- spec/fixtures/sufia/sufia_test1.descMeta.txt
-- spec/fixtures/sufia/sufia_test1.foxml.erb
-- spec/fixtures/sufia/sufia_test1.txt
-- spec/fixtures/sufia/sufia_test2.descMeta.txt
-- spec/fixtures/sufia/sufia_test2.docx
-- spec/fixtures/sufia/sufia_test2.foxml.erb
-- spec/fixtures/sufia/sufia_test3.descMeta.txt
-- spec/fixtures/sufia/sufia_test3.foxml.erb
-- spec/fixtures/sufia/sufia_test3.xls
-- spec/fixtures/sufia/sufia_test4.descMeta.txt
-- spec/fixtures/sufia/sufia_test4.foxml.erb
 - spec/fixtures/sufia/sufia_test4.pdf
-- spec/fixtures/sufia/sufia_test5.descMeta.txt
-- spec/fixtures/sufia/sufia_test5.foxml.erb
 - spec/fixtures/sufia/sufia_test5.mp3
-- spec/fixtures/sufia/sufia_test5.txt
-- spec/fixtures/sufia/sufia_test6.descMeta.txt
-- spec/fixtures/sufia/sufia_test6.foxml.erb
-- spec/fixtures/sufia/sufia_test6.jp2
-- spec/fixtures/sufia/sufia_test6.txt
-- spec/fixtures/sufia_generic_stub.descMeta.txt
-- spec/fixtures/sufia_generic_stub.foxml.erb
 - spec/fixtures/sufia_generic_stub.txt
 - spec/fixtures/txt_fits.xml
 - spec/fixtures/world.png
@@ -845,15 +816,18 @@ test_files:
 - spec/models/transcode_audio_job_spec.rb
 - spec/models/transcode_video_job_spec.rb
 - spec/models/trophy_spec.rb
-- spec/models/unzip_job_spec.rb
 - spec/models/user_spec.rb
-- spec/rake/sufia_fixtures_spec.rb
 - spec/routing/route_spec.rb
 - spec/spec_helper.rb
 - spec/support/features.rb
 - spec/support/features/session_helpers.rb
 - spec/support/fedora_conf/fedora.fcfg
+- spec/support/fixture_helpers.rb
 - spec/support/lib/generators/test_app_generator.rb
 - spec/support/uploaded_file_monkeypatch.rb
 - spec/views/batch_edits/check_all_spec.rb
+- spec/views/dashboard/facet_limit.html.erb_spec.rb
+- spec/views/dashboard/index_partials/_thumbnail_display.html.erb_spec.rb
+- spec/views/generic_file/edit.html.erb_spec.rb
+- spec/views/users/show.html.erb_spec.rb
 has_rdoc: