sufia 6.0.0 → 6.1.0

data/spec/tasks/rake_spec.rb

@@ -5,23 +5,21 @@ describe "Rake tasks" do
 
   describe "sufia:empty_batches" do
     before do
-      load File.expand_path("../../../sufia-models/lib/tasks/batch_cleanup.rake", __FILE__)
-      Rake::Task.define_task(:environment)
+      load_rake_environment [File.expand_path("../../../sufia-models/lib/tasks/batch_cleanup.rake", __FILE__)]
     end
-    after { Rake::Task["sufia:empty_batches"].reenable }
-    subject { capture_stdout { Rake::Task["sufia:empty_batches"].invoke } }
+    subject { run_task "sufia:empty_batches" }
     
     context "without an empty batch" do
-      it { is_expected.to be_empty }
+      it { is_expected.to eq "Output: \n Errors:" }
     end
     
     context "with an empty batch" do
       before { Batch.create("empty-batch") }
-      it { is_expected.to start_with("empty-batch contains no files - to delete, rerun with the remove option") }
+      it { is_expected.to start_with("Output: empty-batch contains no files - to delete, rerun with the remove option") }
       
       describe "removing the empty batch" do
-        subject { capture_stdout { Rake::Task["sufia:empty_batches"].invoke("remove") } }
-        it { is_expected.to start_with("empty-batch contains no files - deleted") }
+        subject { run_task "sufia:empty_batches", "remove" }
+        it { is_expected.to start_with("Output: empty-batch contains no files - deleted") }
       end
     end
   end
@@ -30,8 +28,7 @@ describe "Rake tasks" do
     let(:namespaced_id) { "sufia:123" }
     let(:corrected_id)  { "123" }
     before do
-      load File.expand_path("../../../sufia-models/lib/tasks/migrate.rake", __FILE__)
-      Rake::Task.define_task(:environment)
+      load_rake_environment [File.expand_path("../../../sufia-models/lib/tasks/migrate.rake", __FILE__)]
     end
 
     describe "deleting the namespace from ProxyDepositRequest#generic_file_id" do
@@ -39,7 +36,7 @@ describe "Rake tasks" do
       let(:receiver) { FactoryGirl.find_or_create(:archivist) }
       before do
         ProxyDepositRequest.create(generic_file_id: namespaced_id, sending_user: sender, receiving_user: receiver, sender_comment: "please take this")
-        Rake::Task["sufia:migrate:proxy_deposits"].invoke
+        run_task "sufia:migrate:proxy_deposits"
       end
       subject { ProxyDepositRequest.first.generic_file_id }
       it { is_expected.to eql corrected_id }
@@ -48,11 +45,35 @@ describe "Rake tasks" do
     describe "deleting the namespace from ChecksumAuditLog#generic_file_id" do
       before do
         ChecksumAuditLog.create(generic_file_id: namespaced_id)
-        Rake::Task["sufia:migrate:audit_logs"].invoke
+        run_task "sufia:migrate:audit_logs"
       end
       subject { ChecksumAuditLog.first.generic_file_id }
       it { is_expected.to eql corrected_id }
     end
   end
 
+  describe "sufia:user:list_emails" do
+    let!(:user1) { FactoryGirl.create(:user) }
+    let!(:user2) { FactoryGirl.create(:user) }
+
+    before do
+      load_rake_environment [File.expand_path("../../../tasks/sufia-user.rake", __FILE__)]
+    end
+
+    it "creates a file" do
+      run_task "sufia:user:list_emails"
+      expect(File.exist?("user_emails.txt")).to be_truthy
+      expect(IO.read("user_emails.txt")).to include(user1.email, user2.email)
+      File.delete("user_emails.txt")
+    end
+
+    it "creates a file I give it" do
+      run_task "sufia:user:list_emails", "abc123.txt"
+      expect(File.exist?("user_emails.txt")).not_to be_truthy
+      expect(File.exist?("abc123.txt")).to be_truthy
+      expect(IO.read("abc123.txt")).to include(user1.email, user2.email)
+      File.delete("abc123.txt")
+    end
+  end
+
 end

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -11,6 +11,10 @@ class TestAppGenerator < Rails::Generators::Base
     generate "browse_everything:config"
   end
 
+  def banner
+    say_status("info", "TEST ENVIRONMENT OVERRIDES", :blue)
+  end
+
   def add_analytics_config
     append_file 'config/analytics.yml' do
       "\n" +
@@ -27,4 +31,12 @@ class TestAppGenerator < Rails::Generators::Base
     gsub_file "config/initializers/sufia.rb",
               "config.analytics = false", "config.analytics = true"
   end
+
+  def enable_arkivo_api
+    generate 'sufia:models:arkivo_api'
+  end
+
+  def relax_routing_constraint
+    gsub_file 'config/initializers/arkivo_constraint.rb', 'false', 'true'
+  end
 end

data/spec/views/admin/stats/index.html.erb_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+describe "admin/stats/index.html.erb" do
+  context "default depositors" do
+    let(:top_5_active_users) do 
+      users = {}
+      5.times { |i| users[i.to_s] = i}
+      users
+    end
+    before do
+      assign(:files_count, {})
+      assign(:top_formats, [])
+      assign(:users_stats, {})
+      assign(:recent_users, [])
+      assign(:active_users, top_5_active_users)
+      render
+    end
+    it "should show top 5 depositors and option to view more" do
+      expect(rendered).to have_content("(top 5)")
+      expect(rendered).to have_content("View top 20")
+    end
+  end
+
+  context "top 20 depositors" do
+    let(:top_20_active_users) do 
+      users = {}
+      20.times { |i| users[i.to_s] = i}
+      users
+    end
+    before do
+      assign(:files_count, {})
+      assign(:top_formats, [])
+      assign(:users_stats, {})
+      assign(:recent_users, [])
+      assign(:active_users, top_20_active_users)
+      params[:dep_count] = 20
+      render
+    end
+    it "should show top 20 depositors, without an option to view more" do
+      expect(rendered).to have_content("(top 20)")
+      expect(rendered).to_not have_content("View top 20")
+    end
+  end
+
+end

data/spec/views/catalog/sort_and_per_page.html.erb_spec.rb

@@ -24,7 +24,6 @@ describe 'catalog/_sort_and_per_page.html.erb', :type => :view do
   
   it 'displays the relevance option for sorting' do
     render
-    page = Capybara::Node::Simple.new(rendered)
     expect(rendered).to include("<li><a href=\"/catalog?sort=score+desc%2C+date_uploaded_dtsi+desc\">relevance</a></li>")
   end
 

data/spec/views/dashboard/index_spec.rb

@@ -88,7 +88,7 @@ describe "dashboard/index.html.erb", :type => :view do
     end
 
     it "should show the statistics before the profile" do
-      expect(@sidebar).to match /Your Statistics.*Charles Francis Xavier/m
+      expect(@sidebar).to match(/Your Statistics.*Charles Francis Xavier/m)
     end
   end
 

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

@@ -33,7 +33,7 @@ describe 'generic_files/edit.html.erb', :no_clean do
 
     let(:page) do
       render
-      page = Capybara::Node::Simple.new(rendered)
+      Capybara::Node::Simple.new(rendered)
     end
 
     it "should only draw one resource_type multiselect" do

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

@@ -7,9 +7,7 @@ describe 'generic_files/show.html.erb', :type => :view do
       twitter_handle: 'bot4lib')
   }
 
-  let(:content) do
-    content = double('content', versions: [], mimeType: 'application/pdf')
-  end
+  let(:content){ double('content', versions: [], mimeType: 'application/pdf') }
 
   let(:generic_file) do
     stub_model(GenericFile, id: '123',

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

@@ -1,18 +1,55 @@
 require 'spec_helper'
 
 describe 'users/_follower_modal.html.erb', :type => :view do
-  let(:user) { FactoryGirl.create(:user, display_name: "Frank") }
+  let(:frank) { FactoryGirl.create(:user, display_name: "Frank") }
+  let(:page) { Capybara::Node::Simple.new(rendered) }
 
   before do
-    assign :followers, [user]
+    assign :user, view_user
+    allow(controller).to receive(:current_user).and_return(current_user)
+    assign :followers, followers
+    render
   end
 
-  it "should draw user list" do
-    render
-    page = Capybara::Node::Simple.new(rendered)
-    expect(page).to have_link "Frank", href: "/users/#{user.to_param}" 
+  context "when followers" do
+    let(:view_user) { }
+    let(:current_user) { }
+    let(:followers) { [frank]}
+
+    it "draws user list" do
+      expect(page).to have_link "Frank", href: "/users/#{frank.to_param}"
+    end
   end
 
-end
 
+  context "when no followers" do
+    let(:followers) { []}
+    let(:view_user) { frank }
+
+    context "when logged in " do
+      context "when current user has no followers" do
+        let(:current_user) { frank }
+
+        it "indicates the lack of followers for you" do
+          expect(page).to have_text "No one is following you."
+        end
+      end
 
+      context "when another user has no followers" do
+        let(:current_user) { stub_model(User) }
+
+        it "indicates the lack of followers for this user" do
+          expect(page).to have_text "No one is following this user."
+        end
+      end
+    end
+
+    context "when not logged in" do
+      let(:current_user) { }
+
+      it "indicates the lack of followers for this user" do
+        expect(page).to have_text "No one is following this user."
+      end
+    end
+  end
+end

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

@@ -1,18 +1,60 @@
 require 'spec_helper'
 
 describe 'users/_following_modal.html.erb', :type => :view do
-  let(:user) { FactoryGirl.create(:user, display_name: "Frank") }
 
   before do
-    assign :following, [user]
+    assign :following, following
+    assign :user, view_user
+    allow(controller).to receive(:current_user).and_return(current_user)
+    render
   end
+  let(:frank) { FactoryGirl.create(:user, display_name: "Frank") }
+  let(:page) { Capybara::Node::Simple.new(rendered) }
 
-  it "should draw user list" do
-    render
-    page = Capybara::Node::Simple.new(rendered)
-    expect(page).to have_link "Frank", href: "/users/#{user.to_param}" 
+  context "when following users" do
+    let(:following) { [frank] }
+    let(:current_user) { frank }
+    let(:view_user) { }
+
+    it "draws user list" do
+      expect(page).to have_link "Frank", href: "/users/#{frank.to_param}"
+    end
   end
 
-end
+  context "when not following users" do
+    let(:following) { [] }
+
+    context "when logged in" do
+      let(:current_user) { frank }
+
+      before do
+        assign :user, frank
+      end
 
+      context "when current user is not following anyone" do
+        let(:view_user) { frank }
 
+        it "indicates that you are not following anyone" do
+          expect(page).to have_text "You are not following anyone."
+        end
+      end
+
+      context "when another user is not following anyone" do
+        let(:view_user) { stub_model(User) }
+
+        it "indicates the user is not following anyone" do
+          expect(page).to have_text "This user is not following anyone."
+        end
+      end
+    end
+
+    context "when not logged in" do
+      let(:current_user) { }
+      let(:view_user) { frank }
+
+      it "indicates the user is not following anyone" do
+        expect(page).to have_text "This user is not following anyone."
+      end
+    end
+  end
+end

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

@@ -0,0 +1,72 @@
+require 'spec_helper'
+
+describe 'users/edit.html.erb', type: :view do
+  let(:user) { stub_model(User, user_key: 'mjg') }
+
+  before do
+    allow(view).to receive(:signed_in?).and_return(true)
+    allow(view).to receive(:current_user).and_return(user)
+    assign(:user, user)
+    assign(:followers, [])
+    assign(:following, [])
+    assign(:trophies, [])
+    assign(:events, [])
+  end
+
+  it "shows an ORCID field" do
+    render
+    expect(rendered).to match(/ORCID Profile/)
+  end
+
+  context 'with Zotero integration enabled' do
+    before do
+      allow(Sufia.config).to receive(:arkivo_api) { true }
+    end
+
+    it 'shows a Zotero label' do
+      render
+      expect(rendered).to match(/Zotero Profile/)
+    end
+
+    context 'with a userID already set on the user instance' do
+      before do
+        allow(user).to receive(:zotero_userid) { '12345' }
+        render
+      end
+
+      it 'shows a link to the Zotero profile' do
+        expect(rendered).to have_link("Connected!", href: "https://www.zotero.org/users/12345")
+      end
+    end
+
+    context 'with no existing token' do
+      before { render }
+
+      it 'shows a Zotero OAuth button' do
+        expect(rendered).to have_css('a#zotero')
+      end
+    end
+
+    context 'with an existing token, in the production env' do
+      before do
+        allow(Rails.env).to receive(:production?) { true }
+        render
+      end
+
+      it 'shows a Zotero OAuth button' do
+        expect(rendered).to have_css('a#zotero')
+      end
+    end
+  end
+
+  context 'with Zotero integration disabled' do
+    before do
+      allow(Sufia.config).to receive(:arkivo_api) { false }
+    end
+
+    it 'hides a Zotero OAuth button' do
+      render
+      expect(subject).not_to have_css('a#zotero')
+    end
+  end
+end

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

@@ -26,7 +26,7 @@ describe 'users/show.html.erb', :type => :view do
 
   it "should have the vitals" do
     render
-    expect(rendered).to match /Joined on #{join_date.strftime("%b %d, %Y")}/
+    expect(rendered).to match(/Joined on #{join_date.strftime("%b %d, %Y")}/)
   end
 
   context "with trophy" do

data/sufia.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{Sufia was extracted from ScholarSphere developed by Penn State University}
   gem.homepage      = "http://github.com/projecthydra/sufia"
 
-  gem.files         = `git ls-files`.split($\)
+  gem.files         = `git ls-files | grep -v ^sufia-models`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "sufia"
@@ -19,7 +19,8 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'sufia-models', version
   gem.add_dependency 'blacklight_advanced_search', ['>= 5.1.4', '< 6.0']
   gem.add_dependency 'blacklight', '~> 5.12'
-  gem.add_dependency 'tinymce-rails', '~> 4.0.19'
+  gem.add_dependency 'railties', '>= 4.2.0'
+  gem.add_dependency 'tinymce-rails', '~> 4.1'
   gem.add_dependency 'tinymce-rails-imageupload', '~> 4.0.16.beta'
 
   # sass-rails is typically generated into the app's gemfile by `rails new`
@@ -40,6 +41,8 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'breadcrumbs_on_rails', '~> 2.3.0'
   gem.add_dependency 'select2-rails', '~> 3.5.9'
   gem.add_dependency "devise", "~> 3.0"
+  gem.add_dependency 'json-schema'
+  gem.add_dependency 'oauth'
 
   gem.add_development_dependency 'engine_cart', '~> 0.5'
   gem.add_development_dependency 'mida', '~> 0.3'
@@ -51,4 +54,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "poltergeist", "~> 1.5"
   gem.add_development_dependency "factory_girl_rails", '~> 4.4'
   gem.add_development_dependency "equivalent-xml", '~> 0.5'
+  gem.add_development_dependency "jasmine", '~> 2.3'
 end

data/tasks/sufia-user.rake

@@ -0,0 +1,14 @@
+namespace :sufia do
+  namespace :user do
+
+    desc "list user's email"
+    task "list_emails", [:file_name] => :environment do |cmd, args|
+      file_name = args[:file_name]
+      file_name ||= "user_emails.txt"
+      users = User.all.map {|user| user.email}.reject {|email| email.blank?}
+      f = File.new(file_name,  "w")
+      f.write(users.join(", "))
+      f.close
+    end
+  end
+end