sufia 3.6.0 → 3.7.0

data/spec/features/browse_files_spec.rb

@@ -3,28 +3,30 @@ require 'spec_helper'
 describe "Browse files" do
 
   before(:all) do
-    find_or_create_file_fixtures
+    @fixtures = find_or_create_file_fixtures
+    (1..25).each do |i|
+      @fixtures[0].tag << i
+    end
+    @fixtures[0].save
   end
 
   describe "when not logged in" do
     it "should let us browse some of the fixtures" do
       visit '/'
-      #click_link "more Keywords"
-      #click_link "test"
-      #page.should have_content "1 - 5 of 5"
-      click_link "Fake Document Title"
+      click_link "more Keywords"
+      click_link "18"
+      page.should have_content "1 Search Results"
+      click_link @fixtures[0].title[0]
       page.should have_content "Download"
       page.should_not have_content "Edit"
     end
-    it "should allow you to browse facets" do
+    it "should allow you to click next" do
       # TODO: fix more facets link!
-      pending "Until more facets link is fixed..."
       visit '/'
-      click_link "more Subjects"
-      click_link "consectetur"
-      click_link "Test Document MP3.mp3"
-      page.should have_content "Download"
-      page.should_not have_content "Edit"
+      click_link "more Keywords"
+      first(:link, 'Next').click
+      page.should have_content "5"
+      page.should_not have_content "11"
     end
   end
 end

data/spec/helpers/sufia_helper_spec.rb

@@ -10,6 +10,27 @@ describe SufiaHelper do
     end
   end
 
+  describe "link_back_to_catalog" do
+    let(:query_params)  {{:q => "query", :f => "facets", :per_page => "10", :page => "2", :controller=>'catalog'}}
+    let(:dashboard_query_params) {{ :page => "2", :controller=>'dashboard'}}
+
+    it "should build a link tag to catalog using session[:search] for query params" do
+      helper.stub(:current_search_session).and_return double(:query_params => query_params)
+      tag = helper.link_back_to_catalog
+      tag.should =~ /q=query/
+      tag.should =~ /f=facets/
+      tag.should =~ /per_page=10/
+      tag.should =~ /page=2/
+    end
+
+    it "should build a link tag to bookmarks using session[:search] for query params" do
+      helper.stub(:current_search_session).and_return double(:query_params => dashboard_query_params)
+      tag = helper.link_back_to_catalog(route_set: sufia)
+      tag.should =~ /Back to Search/
+      tag.should =~ /\/dashboard\/page\/2/
+    end
+  end
+
   describe "number_of_deposits" do
     let(:conn) { ActiveFedora::SolrService.instance.conn }
     before do

data/spec/models/generic_file_spec.rb

@@ -448,81 +448,39 @@ describe GenericFile do
     end
   end
   describe "related_files" do
-    before(:all) do
-      @batch_id = "foobar:100"
-    end
+    let(:batch_id) { "foobar:100" }
     before(:each) do
-      @f1 = GenericFile.new(:pid => "foobar:1")
-      @f2 = GenericFile.new(:pid => "foobar:2")
-      @f3 = GenericFile.new(:pid => "foobar:3")
+      @f1 = GenericFile.new
+      @f2 = GenericFile.new
+      @f3 = GenericFile.new
       @f1.apply_depositor_metadata('mjg36')
       @f2.apply_depositor_metadata('mjg36')
       @f3.apply_depositor_metadata('mjg36')
     end
-    after(:each) do
-      @f1.delete if @f1.persisted?
-      @f2.delete if @f2.persisted?
-      @f3.delete if @f3.persisted?
-    end
-    it "should never return a file in its own related_files method" do
-      @f1.add_relationship("isPartOf", "info:fedora/#{@batch_id}")
-      @f2.add_relationship("isPartOf", "info:fedora/#{@batch_id}")
-      @f3.add_relationship("isPartOf", "info:fedora/#{@batch_id}")
-      @f1.save
-      @f2.save
-      @f3.save
-      @f1.related_files.should_not include(@f1)
-      @f1.related_files.should include(@f2)
-      @f1.related_files.should include(@f3)
-      @f2.related_files.should_not include(@f2)
-      @f2.related_files.should include(@f1)
-      @f2.related_files.should include(@f3)
-      @f3.related_files.should_not include(@f3)
-      @f3.related_files.should include(@f1)
-      @f3.related_files.should include(@f2)
+
+    describe "when the files belong to a batch" do
+      after(:each) do
+        @f1.delete
+        @f2.delete
+        @f3.delete
+      end
+      before do
+        @f1.add_relationship("isPartOf", "info:fedora/#{@batch_id}")
+        @f2.add_relationship("isPartOf", "info:fedora/#{@batch_id}")
+        @f3.add_relationship("isPartOf", "info:fedora/#{@batch_id}")
+        @f1.save!
+        @f2.save!
+        @f3.save!
+      end
+      it "should never return a file in its own related_files method" do
+        @f1.related_files.should match_array [@f2, @f3]
+        @f2.related_files.should match_array [@f1, @f3]
+        @f3.related_files.should match_array [@f1, @f2]
+      end
     end
     it "should return an empty array when there are no related files" do
       @f1.related_files.should == []
     end
-    it "should work when batch is defined" do
-      @f1.add_relationship("isPartOf", "info:fedora/#{@batch_id}")
-      @f2.add_relationship("isPartOf", "info:fedora/#{@batch_id}")
-      @f1.save
-      @f2.save
-      mock_batch = double("batch")
-      mock_batch.stub(:generic_files => [@f1, @f2])
-      @f1.should_receive(:batch).and_return(mock_batch)
-      @f1.related_files.should == [@f2]
-    end
-    it "should work when batch is not defined by querying solr" do
-      @f1.add_relationship("isPartOf", "info:fedora/#{@batch_id}")
-      @f2.add_relationship("isPartOf", "info:fedora/#{@batch_id}")
-      @f1.save
-      @f2.save
-      @f1.should_receive(:batch).twice.and_raise(NoMethodError)
-      lambda { @f1.related_files }.should_not raise_error
-      @f1.related_files.should == [@f2]
-    end
-    it "should work when batch is not defined by querying solr" do
-      @f1.add_relationship(:is_part_of, "info:fedora/#{@batch_id}")
-      @f2.add_relationship(:is_part_of, "info:fedora/#{@batch_id}")
-      @f1.save
-      @f2.save
-      @f1.should_receive(:batch).twice.and_raise(NoMethodError)
-      lambda { @f1.related_files }.should_not raise_error
-      @f1.related_files.should == [@f2]
-    end
-    it "should work when batch.generic_files is not defined by querying solr" do
-      @f1.add_relationship("isPartOf", "info:fedora/#{@batch_id}")
-      @f2.add_relationship("isPartOf", "info:fedora/#{@batch_id}")
-      @f1.save
-      @f2.save
-      mock_batch = double("batch")
-      mock_batch.stub(:generic_files).and_raise(NoMethodError)
-      @f1.should_receive(:batch).twice
-      lambda { @f1.related_files }.should_not raise_error
-      @f1.related_files.should == [@f2]
-    end
   end
   describe "noid integration" do
     before(:all) do

data/spec/models/user_spec.rb

@@ -9,10 +9,6 @@ describe User do
     @user.delete
     @another_user.delete
   end
-  it "should have a login" do
-    pending "Move to scholarsphere"
-    @user.login.should == "jilluser"
-  end
   it "should have an email" do
     @user.user_key.should == "jilluser@example.com"
   end
@@ -28,6 +24,7 @@ describe User do
     @user.should respond_to(:twitter_handle)
     @user.should respond_to(:facebook_handle)
     @user.should respond_to(:googleplus_handle)
+    @user.should respond_to(:linkedin_handle)
   end
   it "should redefine to_param to make redis keys more recognizable (and useable within Rails URLs)" do
     @user.to_param.should == "jilluser@example-dot-com"
@@ -61,4 +58,19 @@ describe User do
       @another_user.followed_by?(@user).should be_false
     end
   end
+
+  describe "trophy_files" do
+    let(:user) { @user } 
+    let(:file1) { GenericFile.new.tap { |f| f.apply_depositor_metadata(user); f.save! } } 
+    let(:file2) { GenericFile.new.tap { |f| f.apply_depositor_metadata(user); f.save! } } 
+    let(:file3) { GenericFile.new.tap { |f| f.apply_depositor_metadata(user); f.save! } } 
+    let!(:trophy1) { user.trophies.create!(generic_file_id: file1.noid) }
+    let!(:trophy2) { user.trophies.create!(generic_file_id: file2.noid) }
+    let!(:trophy3) { user.trophies.create!(generic_file_id: file3.noid) }
+
+    it "should return a list of generic files" do
+      expect(user.trophy_files).to eq [file1, file2, file3]
+    end
+
+  end
 end

data/sufia-models/app/models/checksum_audit_log.rb

@@ -1,5 +1,4 @@
 class ChecksumAuditLog < ActiveRecord::Base
-  deprecated_attr_accessible :pass, :pid, :dsid, :version, :created_at
 
   def ChecksumAuditLog.get_audit_log(version)
     ChecksumAuditLog.find_or_create_by_pid_and_dsid_and_version(:pid => version.pid,

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

@@ -18,17 +18,12 @@ module Sufia::User
     # Users should be followable
     acts_as_followable
 
-    # Setup accessible (or protected) attributes for your model
-    deprecated_attr_accessible  *permitted_attributes
-
-    # Add user avatar (via paperclip library)
-    has_attached_file :avatar, :styles => { medium: "300x300>", thumb: "100x100>" }, :default_url => '/assets/missing_:style.png'
-    validates :avatar, :attachment_content_type => { :content_type => /^image\/(jpg|jpeg|pjpeg|png|x-png|gif)$/ }, :if => Proc.new { |p| p.avatar.file? }
-    validates :avatar, :attachment_size => { :less_than => 2.megabytes }, :if => Proc.new { |p| p.avatar.file? }
-
+    mount_uploader :avatar, AvatarUploader, :mount_on => :avatar_file_name
+    validates_with AvatarValidator
+    has_many :trophies
   end
 
-  # Format the json for select2 which requires just an id and a field called text. 
+  # Format the json for select2 which requires just an id and a field called text.
   # If we need an alternate format we should probably look at a json template gem
   def as_json(opts = nil)
     {id: user_key, text: display_name ? "#{display_name} (#{user_key})" : user_key}
@@ -48,15 +43,10 @@ module Sufia::User
     user_key.gsub(/\./, '-dot-')
   end
 
-  # method needed for trophies
-  def trophies
-    trophies = Trophy.where(:user_id => self.id)
-    return trophies
-  end
-
-  #method to get the trophy ids without the namespace included
-  def trophy_ids
-    trophies.map { |t| "#{Sufia.config.id_namespace}:#{t.generic_file_id}" }
+  def trophy_files
+    trophies.map do |t|
+      GenericFile.load_instance_from_solr(Sufia::Noid.namespaceize(t.generic_file_id))
+    end
   end
 
   # method needed for messaging
@@ -76,10 +66,10 @@ module Sufia::User
   module ClassMethods
 
     def permitted_attributes
-      [:email, :login, :display_name, :address, :admin_area, 
-        :department, :title, :office, :chat_id, :website, :affiliation, 
+      [: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]
+        :twitter_handle, :googleplus_handle, :linkedin_handle]
     end
 
     def current

data/sufia-models/app/models/domain_term.rb

@@ -1,10 +1,5 @@
 class DomainTerm < ActiveRecord::Base
-  deprecated_attr_accessible  :model, :term
 
   # TODO we should add an index on this join table and remove the uniq query
-  if Rails::VERSION::MAJOR > 3
-    has_and_belongs_to_many :local_authorities, -> {uniq}
-  else
-    has_and_belongs_to_many :local_authorities, :uniq=> true 
-  end
+  has_and_belongs_to_many :local_authorities, -> {uniq}
 end

data/sufia-models/app/models/local_authority.rb

@@ -1,15 +1,7 @@
-require 'rdf'
-require 'rdf/rdfxml'
-
 class LocalAuthority < ActiveRecord::Base
-  deprecated_attr_accessible :name
 
-  if Rails::VERSION::MAJOR >= 4
-    # TODO we should add an index on this join table and remove the uniq query
-    has_and_belongs_to_many :domain_terms, -> { uniq }
-  else
-    has_and_belongs_to_many :domain_terms, :uniq=> true 
-  end
+  # TODO we should add an index on this join table and remove the uniq query
+  has_and_belongs_to_many :domain_terms, -> { uniq }
   
   has_many :local_authority_entries
 

data/sufia-models/app/models/local_authority_entry.rb

@@ -1,4 +1,3 @@
 class LocalAuthorityEntry < ActiveRecord::Base
   belongs_to :local_authority
-  deprecated_attr_accessible  :local_authority, :label, :uri
 end

data/sufia-models/app/models/single_use_link.rb

@@ -1,7 +1,5 @@
 class SingleUseLink < ActiveRecord::Base
 
-  deprecated_attr_accessible :downloadKey, :path, :expires, :itemId
-    
   validate :expiration_date_cannot_be_in_the_past
   validate :cannot_be_destroyed
 
@@ -41,4 +39,4 @@ class SingleUseLink < ActiveRecord::Base
     end
   end
 
-end
+end

data/sufia-models/app/models/sufia/avatar_uploader.rb

@@ -0,0 +1,22 @@
+class Sufia::AvatarUploader < CarrierWave::Uploader::Base
+  include CarrierWave::MiniMagick
+  include CarrierWave::Compatibility::Paperclip
+
+  process convert: 'png'
+
+  version :medium do
+    process resize_to_limit: [300, 300]
+  end
+
+  version :thumb do
+    process resize_to_limit: [100, 100]
+  end
+
+  def default_url
+    "/assets/missing_#{version_name}.png"
+  end
+
+  def extension_white_list
+    %w(jpg jpeg png gif bmp tif tiff)
+  end
+end

data/sufia-models/app/models/sufia/avatar_validator.rb

@@ -0,0 +1,8 @@
+module Sufia
+  class AvatarValidator < ActiveModel::Validator
+    def validate(record)
+      return unless record.avatar?
+      record.errors.add(:avatar_file_size, 'must be less than 2MB') if record.avatar.size > 2.megabytes.to_i
+    end
+  end
+end

data/sufia-models/app/models/trophy.rb

@@ -1,6 +1,4 @@
 class Trophy < ActiveRecord::Base
-  deprecated_attr_accessible  :generic_file_id, :user_id
-
   validate :count_within_limit, :on => :create
 
   def count_within_limit

data/sufia-models/app/models/version_committer.rb

@@ -1,3 +1,2 @@
 class VersionCommitter < ActiveRecord::Base
-  deprecated_attr_accessible  :obj_id, :datastream_id, :version_id, :committer_login
 end

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

@@ -1,9 +1,15 @@
 class AddAvatarsToUsers < ActiveRecord::Migration
   def self.up
-    add_attachment :users, :avatar
+    add_column :users, "avatar_file_name",    :string
+    add_column :users, "avatar_content_type", :string
+    add_column :users, "avatar_file_size",    :integer
+    add_column :users, "avatar_updated_at",   :datetime
   end
 
   def self.down
-    remove_attachment :users, :avatar
+    remove_column :users, "avatar_file_name"
+    remove_column :users, "avatar_content_type"
+    remove_column :users, "avatar_file_size"
+    remove_column :users, "avatar_updated_at"
   end
 end

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

@@ -22,7 +22,7 @@ module Sufia
       config.fits_path = "fits.sh"
       config.enable_contact_form_delivery = false
       config.dropbox_api_key = nil
-      config.enable_local_ingest = nil      
+      config.enable_local_ingest = nil
       config.queue = Sufia::Resque::Queue
 
       config.autoload_paths += %W(
@@ -38,8 +38,6 @@ module Sufia
       initializer "patches" do
         require 'sufia/models/active_fedora/redis'
         require 'sufia/models/active_record/redis'
-        require 'sufia/models/active_record/deprecated_attr_accessible'
-        require 'sufia/models/active_support/core_ext/marshal' unless Rails::VERSION::MAJOR == 4
       end
 
       initializer 'requires' do

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

@@ -69,6 +69,13 @@ module Sufia
         end
     end
 
+    # Get the files with a sibling relationship (belongs_to :batch)
+    # The batch id is minted when visiting the upload screen and attached
+    # to each file when it is done uploading.  The Batch object is not created
+    # until all objects are done uploading and the user is redirected to
+    # BatchController#edit.  Therefore, we must handle the case where
+    # self.batch_id is set but self.batch returns nil. 
+    # This can get a major overhaul with ActiveFedora 7
     def related_files
       relateds = begin
                    self.batch.generic_files

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

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

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

@@ -4,7 +4,7 @@ require 'hydra/head'
 require 'nest'
 require 'mailboxer'
 require 'acts_as_follower'
-require 'paperclip'
+require 'carrierwave'
 require "active_resource" # used by GenericFile to catch errors & by GeoNamesResource
 require 'resque/server'
 

data/sufia-models/sufia-models.gemspec

@@ -29,20 +29,16 @@ Gem::Specification.new do |spec|
   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
-  # without an explicit dependency
-  spec.add_dependency "active-fedora", "~> 6.7.0"
-  spec.add_dependency "blacklight", "~> 4.5.0"
-  spec.add_dependency "hydra-head", "~> 6.4.0"
-
+  spec.add_dependency "blacklight", "~> 4.7.0"
+  spec.add_dependency "hydra-head", "~> 6.4.1"
+  spec.add_dependency "rubydora", "~> 1.7.0"
   spec.add_dependency 'nest', '~> 1.1.1'
   spec.add_dependency 'resque', '~> 1.23'
   spec.add_dependency 'resque-pool', '0.3.0'
   spec.add_dependency 'noid', '~> 0.6.6'
   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 'carrierwave', '~> 0.9.0'
   spec.add_dependency 'hydra-derivatives', '~> 0.0.5'
   spec.add_dependency 'activerecord-import'
 end

data/sufia.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'sufia-models', version
   gem.add_dependency 'blacklight_advanced_search', '~> 2.1.0'
+  gem.add_dependency 'blacklight', '>= 4.5'
 
   gem.add_dependency 'hydra-batch-edit', '>= 1.1.1', '< 2.0.0'
 
@@ -26,6 +27,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'mail_form'
   gem.add_dependency 'rails_autolink', '~> 1.1.0'
   gem.add_dependency 'yaml_db', '0.2.3'
-  gem.add_dependency 'rainbow', '1.1.4'
   gem.add_dependency 'font-awesome-sass-rails', '~>3.0'
 end

data/tasks/sufia-dev.rake

@@ -38,7 +38,6 @@ task :generate do
     puts "Updating gemfile"
 
     `echo "gem 'sufia', :path=>'../../../sufia'
-gem 'clamav'
 gem 'capybara'
 gem 'factory_girl_rails'
 gem 'kaminari', github: 'harai/kaminari', branch: 'route_prefix_prototype'" >> spec/internal/Gemfile`