sufia 6.2.0 → 6.3.0

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

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
-describe 'users/_following_modal.html.erb', :type => :view do
-
+describe 'users/_following_modal.html.erb', type: :view do
   before do
     assign :following, following
     assign :user, view_user
@@ -14,7 +13,7 @@ describe 'users/_following_modal.html.erb', :type => :view do
   context "when following users" do
     let(:following) { [frank] }
     let(:current_user) { frank }
-    let(:view_user) { }
+    let(:view_user) {}
 
     it "draws user list" do
       expect(page).to have_link "Frank", href: "/users/#{frank.to_param}"
@@ -49,7 +48,7 @@ describe 'users/_following_modal.html.erb', :type => :view do
     end
 
     context "when not logged in" do
-      let(:current_user) { }
+      let(:current_user) {}
       let(:view_user) { frank }
 
       it "indicates the user is not following anyone" do
@@ -57,4 +56,4 @@ describe 'users/_following_modal.html.erb', :type => :view do
       end
     end
   end
-end
+end

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

@@ -1,13 +1,10 @@
 require 'spec_helper'
 
-describe 'users/_notify_number.html.erb', :type => :view do
-
-  it "should draw user list" do
+describe 'users/_notify_number.html.erb', type: :view do
+  it "draws user list" do
     assign :notify_number, 8
     render
     page = Capybara::Node::Simple.new(rendered)
     expect(page).to have_selector("span#notify_number.overlay", text: ' 8')
   end
-
 end
-

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

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
-describe '/_user_util_links.html.erb', :type => :view do
-
+describe '/_user_util_links.html.erb', type: :view do
   let(:join_date) { 5.days.ago }
   before do
     allow(view).to receive(:user_signed_in?).and_return(true)
@@ -12,13 +11,13 @@ describe '/_user_util_links.html.erb', :type => :view do
 
   let(:can_create_file) { true }
 
-  it 'should have link to dashboard' do
+  it 'has link to dashboard' do
     render
     page = Capybara::Node::Simple.new(rendered)
     expect(page).to have_link('userX', href: '/dashboard')
   end
 
-  it 'should have link to user profile' do
+  it 'has link to user profile' do
     render
     page = Capybara::Node::Simple.new(rendered)
     expect(page).to have_link('my profile', href: '/users/userX')
@@ -29,17 +28,15 @@ describe '/_user_util_links.html.erb', :type => :view do
       render
     end
     context "when the user can create generic files" do
-      it "should have a link to upload" do
+      it "has a link to upload" do
         expect(rendered).to have_link('upload', href: '/files/new')
       end
     end
     context "when the user can't create generic files" do
       let(:can_create_file) { false }
-      it "should not have a link to upload" do
+      it "does not have a link to upload" do
         expect(rendered).not_to have_link('upload')
       end
     end
   end
-
 end
-

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

@@ -1,11 +1,10 @@
 require 'spec_helper'
 
-describe 'users/index.html.erb', :type => :view do
-
+describe 'users/index.html.erb', type: :view do
   let(:join_date) { 5.days.ago }
   before do
     users = []
-    (1..25).each  {|i| users << stub_model(User, name: "name#{i}", user_key: "user#{i}", created_at: join_date)}
+    (1..25).each { |i| users << stub_model(User, name: "name#{i}", user_key: "user#{i}", created_at: join_date) }
     allow(User).to receive_message_chain(:all).and_return(users)
     relation = User.all
     allow(relation).to receive(:limit_value).and_return(10)
@@ -14,13 +13,12 @@ describe 'users/index.html.erb', :type => :view do
     assign(:users, relation)
   end
 
-  it "should draw user list" do
+  it "draws user list" do
     render
     page = Capybara::Node::Simple.new(rendered)
     expect(page).to have_content("Sufia Users")
-    (1..10).each  do |i|
+    (1..10).each do |i|
       expect(page).to have_content("user#{i}")
     end
   end
-
 end

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

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
-describe 'users/show.html.erb', :type => :view do
-
+describe 'users/show.html.erb', type: :view do
   let(:join_date) { 5.days.ago }
   before do
     allow(view).to receive(:signed_in?).and_return(true)
@@ -13,7 +12,7 @@ describe 'users/show.html.erb', :type => :view do
     assign(:events, [])
   end
 
-  it "should draw 3 tabs" do
+  it "draws 3 tabs" do
     render
     page = Capybara::Node::Simple.new(rendered)
     expect(page).to have_selector("ul#myTab.nav.nav-tabs > li > a[href='#contributions']")
@@ -24,13 +23,12 @@ describe 'users/show.html.erb', :type => :view do
     expect(page).to have_selector(".tab-content > div#activity_log.tab-pane")
   end
 
-  it "should have the vitals" do
+  it "has the vitals" do
     render
     expect(rendered).to match(/Joined on #{join_date.strftime("%b %d, %Y")}/)
   end
 
   context "with trophy" do
-
     let(:generic_file) { stub_model(GenericFile, title: ["Fake object"], id: "abc123") }
     before do
       allow(view).to receive(:search_session).and_return({})
@@ -39,12 +37,11 @@ describe 'users/show.html.erb', :type => :view do
       assign(:trophies, [generic_file])
     end
 
-    it "should have trophy" do
+    it "has trophy" do
       render
       page = Capybara::Node::Simple.new(rendered)
       expect(page).to have_selector(".tab-content > div#contributions.tab-pane")
       expect(page).to have_selector("#trophyrow_#{generic_file.id}")
-
     end
   end
 end

data/tasks/sufia-dev.rake

@@ -1,17 +1,33 @@
 require 'rspec/core'
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec)
-
 require 'jettywrapper'
-
 require 'engine_cart/rake_task'
+require 'rubocop/rake_task'
+
+desc 'Run style checker'
+RuboCop::RakeTask.new(:rubocop) do |task|
+  task.requires << 'rubocop-rspec'
+  task.fail_on_error = true
+end
+
+desc 'Run specs and style checker'
+task :spec do
+  Rake::Task['rubocop'].invoke
+  RSpec::Core::RakeTask.new(:spec)
+end
 
 desc 'Spin up hydra-jetty and run specs'
 task ci: ['engine_cart:generate', 'jetty:clean', 'sufia:jetty:config'] do
   puts 'running continuous integration'
+  # No need to maintain minter state on Travis
+  reset_statefile! if ENV['TRAVIS'] == 'true'
   jetty_params = Jettywrapper.load_config
   error = Jettywrapper.wrap(jetty_params) do
     Rake::Task['spec'].invoke
   end
   raise "test failures: #{error}" if error
 end
+
+ def reset_statefile!
+   FileUtils.rm_f('/tmp/minter-state')
+ end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sufia
 version: !ruby/object:Gem::Version
-  version: 6.2.0
+  version: 6.3.0
 platform: ruby
 authors:
 - Justin Coyne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sufia-models
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.2.0
+        version: 6.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.2.0
+        version: 6.3.0
 - !ruby/object:Gem::Dependency
   name: blacklight_advanced_search
   requirement: !ruby/object:Gem::Requirement
@@ -476,6 +476,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
@@ -588,6 +589,8 @@ files:
 - app/controllers/batch_controller.rb
 - app/controllers/batch_edits_controller.rb
 - app/controllers/collections_controller.rb
+- app/controllers/concerns/sufia/admin/depositor_stats.rb
+- app/controllers/concerns/sufia/admin/stats_behavior.rb
 - app/controllers/concerns/sufia/batch_controller_behavior.rb
 - app/controllers/concerns/sufia/batch_edits_controller_behavior.rb
 - app/controllers/concerns/sufia/breadcrumbs.rb
@@ -666,11 +669,13 @@ files:
 - app/models/featured_work_list.rb
 - app/models/my_search_builder.rb
 - app/models/tinymce_asset.rb
+- app/models/user_mailbox.rb
 - app/presenters/sufia/collection_presenter.rb
 - app/presenters/sufia/generic_file_presenter.rb
 - app/presenters/sufia/presenter_renderer.rb
 - app/presenters/sufia/version_list_presenter.rb
 - app/presenters/sufia/version_presenter.rb
+- app/search_builders/deposit_search_builder.rb
 - app/search_builders/sufia/my_search_builder_behavior.rb
 - app/search_builders/sufia/search_builder.rb
 - app/uploaders/tinymce_asset_uploader.rb
@@ -683,6 +688,7 @@ files:
 - app/views/_logo.html.erb
 - app/views/_masthead.html.erb
 - app/views/_user_util_links.html.erb
+- app/views/admin/stats/_deposits.html.erb
 - app/views/admin/stats/_files.html.erb
 - app/views/admin/stats/_new_users.html.erb
 - app/views/admin/stats/index.html.erb
@@ -789,6 +795,7 @@ files:
 - app/views/generic_files/upload/_local_file_import_chooser.html.erb
 - app/views/generic_files/upload/_script_templates.html.erb
 - app/views/generic_files/upload/_tos_checkbox.html.erb
+- app/views/homepage/_announcement.html.erb
 - app/views/homepage/_featured.html.erb
 - app/views/homepage/_featured_fields.html.erb
 - app/views/homepage/_featured_researcher.html.erb
@@ -1088,6 +1095,7 @@ files:
 - spec/models/single_use_link_spec.rb
 - spec/models/solr_document_spec.rb
 - spec/models/trophy_spec.rb
+- spec/models/user_mailbox_spec.rb
 - spec/models/user_spec.rb
 - spec/models/user_usage_stats_spec.rb
 - spec/presenters/presenter_renderer_spec.rb
@@ -1131,9 +1139,12 @@ files:
 - spec/views/generic_file/edit.html.erb_spec.rb
 - spec/views/generic_file/show.html.erb_spec.rb
 - spec/views/generic_file/stats.html.erb_spec.rb
+- spec/views/homepage/_announcement.html.erb_spec.rb
 - spec/views/homepage/_featured_works.html.erb_spec.rb
 - spec/views/homepage/_home_header.html.erb_spec.rb
 - spec/views/my/facet.html.erb_spec.rb
+- spec/views/single_use_links/new_download.html.erb_spec.rb
+- spec/views/single_use_links_viewer/show.html.erb_spec.rb
 - spec/views/users/_follower_modal.html.erb_spec.rb
 - spec/views/users/_following_modal.html.erb_spec.rb
 - spec/views/users/_notify_number.html.erb_spec.rb
@@ -1205,7 +1216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Sufia was extracted from ScholarSphere developed by Penn State University
@@ -1363,6 +1374,7 @@ test_files:
 - spec/models/single_use_link_spec.rb
 - spec/models/solr_document_spec.rb
 - spec/models/trophy_spec.rb
+- spec/models/user_mailbox_spec.rb
 - spec/models/user_spec.rb
 - spec/models/user_usage_stats_spec.rb
 - spec/presenters/presenter_renderer_spec.rb
@@ -1406,9 +1418,12 @@ test_files:
 - spec/views/generic_file/edit.html.erb_spec.rb
 - spec/views/generic_file/show.html.erb_spec.rb
 - spec/views/generic_file/stats.html.erb_spec.rb
+- spec/views/homepage/_announcement.html.erb_spec.rb
 - spec/views/homepage/_featured_works.html.erb_spec.rb
 - spec/views/homepage/_home_header.html.erb_spec.rb
 - spec/views/my/facet.html.erb_spec.rb
+- spec/views/single_use_links/new_download.html.erb_spec.rb
+- spec/views/single_use_links_viewer/show.html.erb_spec.rb
 - spec/views/users/_follower_modal.html.erb_spec.rb
 - spec/views/users/_following_modal.html.erb_spec.rb
 - spec/views/users/_notify_number.html.erb_spec.rb