sufia 6.0.0.rc3 → 6.0.0.rc4

data/app/views/homepage/_featured_researcher.html.erb

@@ -1,2 +1,3 @@
 <h2>Featured Researcher</h2>
+<%= link_to 'View other featured researchers', sufia.featured_researchers_path %>
 <%= editable_content_block @featured_researcher, true %>

data/app/views/my/_sort_and_per_page.html.erb

@@ -27,7 +27,7 @@
         <% end %>
         <%= render_hash_as_hidden_fields params_for_search().except(:per_page, :sort, :utf8) %>
         &nbsp;&nbsp;&nbsp;
-        <button class="btn btn-primary" id="dashboard_sort_submit"><i class="glyphicon glyphicon-refresh"></i> Refresh</button>
+        <button class="btn btn-info" id="dashboard_sort_submit"><i class="glyphicon glyphicon-refresh"></i> Refresh</button>
       <% end %>
     <% end unless sort_fields.empty? %>
   </div>

data/config/routes.rb

@@ -118,6 +118,7 @@ Sufia::Engine.routes.draw do
   end
 
   resources :content_blocks, only: ['create', 'update']
+  get 'featured_researchers' => 'content_blocks#index', as: :featured_researchers
   post '/tinymce_assets' => 'tinymce_assets#create'
 
   get 'about' => 'pages#show', id: 'about_page'

data/lib/generators/sufia/install_generator.rb

@@ -15,6 +15,7 @@ module Sufia
    3. Adds controller behavior to the application controller
    4. Copies the catalog controller into the local app
    5. Adds Sufia::SolrDocumentBehavior to app/models/solr_document.rb
+   6. Installs Blacklight gallery
          """
 
     def run_required_generators
@@ -60,6 +61,16 @@ module Sufia
       remove_file 'app/assets/stylesheets/blacklight.css.scss'
     end
 
+    def add_sufia_assets
+      insert_into_file 'app/assets/stylesheets/application.css', after: ' *= require_self' do
+        "\n *= require sufia"
+      end
+
+      gsub_file 'app/assets/javascripts/application.js',
+                '//= require_tree .', '//= require sufia'
+    end
+
+
     def tinymce_config
       copy_file "config/tinymce.yml", "config/tinymce.yml"
     end
@@ -89,5 +100,10 @@ module Sufia
         puts "     \e[31mFailure\e[0m  Sufia requires a SolrDocument object. This generators assumes that the model is defined in the file #{file_path}, which does not exist."
       end
     end
+
+    def install_blacklight_gallery
+      generate "blacklight_gallery:install"
+    end
+
   end
 end

data/lib/sufia/version.rb

@@ -1,3 +1,3 @@
 module Sufia
-  VERSION = "6.0.0.rc3"
+  VERSION = "6.0.0.rc4"
 end

data/spec/controllers/content_blocks_controller_spec.rb

@@ -15,6 +15,20 @@ describe ContentBlocksController, :type => :controller do
         post :create, content_block: { name: 'NNN', value: 'VVV' }
         expect(response).to redirect_to main_app.new_user_session_path
       end
+
+      context "get INDEX" do
+        let!(:current_researcher) { ContentBlock.create(name: ContentBlock::RESEARCHER, created_at: Time.now) }
+        let!(:old_researcher) { ContentBlock.create(name: ContentBlock::RESEARCHER, created_at: 2.hours.ago) }
+        let!(:market_text) { ContentBlock.create(name: ContentBlock::MARKETING) }
+
+        before { get :index }
+
+        it "displays the list of featured researchers" do
+          expect(response).to be_successful
+          expect(response).to render_template(:index)
+          expect(assigns(:content_blocks)).to eq [current_researcher, old_researcher]
+        end
+      end
     end
 
     context "when logged in" do

data/spec/jobs/sufia_resque_queue_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+
+describe Sufia::Resque::Queue do
+  let(:subject) { Sufia::Resque::Queue.new "test_queue" }
+  let(:job) { double('job') }
+
+  context "with no retries" do
+    it "queues the job" do
+      expect(::Resque).to receive(:enqueue_to).once.and_return(true)
+      subject.push(job)
+    end
+  end
+
+  context 'when one run times out' do
+    before do
+      call_count = 0
+      allow(::Resque).to receive(:enqueue_to) do
+        call_count += 1
+        call_count == 1 ? raise(Redis::TimeoutError) : true
+      end
+    end
+
+    it 'retries the job' do
+      expect(::Resque).to receive(:enqueue_to).twice
+      subject.push(job)
+    end
+  end
+
+  context 'when a job times out three times' do
+    before do
+      allow(::Resque).to receive(:enqueue_to).exactly(3).times.and_raise(Redis::TimeoutError)
+    end
+
+    it 'raises an error' do
+      expect { subject.push(job) }.to raise_error Redis::TimeoutError
+    end
+  end
+
+  context 'with no connection to Redis' do
+    before do
+      allow(::Resque).to receive(:enqueue_to).once.and_raise(Redis::CannotConnectError)
+    end
+
+    it 'logs an error' do
+      expect(ActiveFedora::Base.logger).to receive(:error).with("Redis is down!")
+      subject.push(job)
+    end
+  end
+end

data/spec/models/ability_spec.rb

@@ -9,6 +9,7 @@ describe Sufia::Ability, :type => :model do
     it { is_expected.not_to be_able_to(:create, TinymceAsset) }
     it { is_expected.not_to be_able_to(:create, ContentBlock) }
     it { is_expected.not_to be_able_to(:update, ContentBlock) }
+    it { is_expected.to     be_able_to(:read,  ContentBlock) }
   end
 
   describe "a registered user" do
@@ -18,6 +19,7 @@ describe Sufia::Ability, :type => :model do
     it { is_expected.not_to be_able_to(:create, TinymceAsset) }
     it { is_expected.not_to be_able_to(:create, ContentBlock) }
     it { is_expected.not_to be_able_to(:update, ContentBlock) }
+    it { is_expected.to     be_able_to(:read,  ContentBlock) }
   end
 
   describe "a user in the admin group" do
@@ -28,6 +30,7 @@ describe Sufia::Ability, :type => :model do
     it { is_expected.to be_able_to(:create, TinymceAsset) }
     it { is_expected.to be_able_to(:create, ContentBlock) }
     it { is_expected.to be_able_to(:update, ContentBlock) }
+    it { is_expected.to be_able_to(:read,  ContentBlock) }
   end
 
 

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

@@ -27,14 +27,4 @@ class TestAppGenerator < Rails::Generators::Base
     gsub_file "config/initializers/sufia.rb",
               "config.analytics = false", "config.analytics = true"
   end
-
-  def add_sufia_assets
-    insert_into_file 'app/assets/stylesheets/application.css', after: ' *= require_self' do
-      "\n *= require sufia"
-    end
-
-    gsub_file 'app/assets/javascripts/application.js',
-              '//= require_tree .', '//= require sufia'
-  end
-
 end

data/spec/views/dashboard/index_spec.rb

@@ -54,8 +54,8 @@ describe "dashboard/index.html.erb", :type => :view do
     end
 
     it "should have links to view and edit the user's profile" do
-      expect(@sidebar).to include '<a class="btn btn-default btn-raised" href="' + sufia.profile_path(@user) + '">View Profile</a>'
-      expect(@sidebar).to include '<a class="btn btn-default btn-raised" href="' + sufia.edit_profile_path(@user) + '">Edit Profile</a>'
+      expect(@sidebar).to include '<a class="btn btn-default" href="' + sufia.profile_path(@user) + '">View Profile</a>'
+      expect(@sidebar).to include '<a class="btn btn-default" href="' + sufia.edit_profile_path(@user) + '">Edit Profile</a>'
     end
 
     it "should display user statistics" do

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

@@ -28,9 +28,9 @@ describe 'generic_files/show.html.erb', :type => :view do
       subject: ['Biology', 'Physiology', 'Ethnography'])
   end
 
-  let(:presenter) {
+  let(:presenter) do
     Sufia::GenericFilePresenter.new(generic_file)
-  }
+  end
 
   before do
     allow(generic_file).to receive(:content).and_return(content)
@@ -45,6 +45,18 @@ describe 'generic_files/show.html.erb', :type => :view do
     assign(:notify_number, 0)
   end
 
+  describe 'title heading' do
+    before do
+      render template: 'generic_files/show.html.erb', layout: 'layouts/sufia-one-column'
+    end
+    let(:doc) { Nokogiri::HTML(rendered) }
+
+    it 'shows the first title' do
+      h1 = doc.xpath("//h1[@class='visibility']").text
+      expect(h1).to start_with 'My Title'
+    end
+  end
+
   describe 'schema.org' do
     let(:item) { Mida::Document.new(rendered).items.first }
     describe 'descriptive metadata' do

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

@@ -39,6 +39,7 @@ module Sufia
         can :create, TinymceAsset
         can [:create, :update], ContentBlock
       end
+      can :read, ContentBlock
     end
 
     def stats_abilities

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

@@ -10,12 +10,11 @@ This generator makes the following changes to your application:
  3. Creates the sufia.rb configuration file
  4. Generates mailboxer
  5. Generates usage stats config
- 6. Installs Blacklight gallery
- 7. Runs full-text generator
- 8. Runs proxies generator
- 9. Runs cached stats generator
-10. Runs ORCID field generator
-11. Runs user stats generator
+ 6. Runs full-text generator
+ 7. Runs proxies generator
+ 8. Runs cached stats generator
+ 9. Runs ORCID field generator
+10. Runs user stats generator
        """
   def banner
     say_status("warning", "GENERATING SUFIA MODELS", :yellow)
@@ -80,10 +79,6 @@ This generator makes the following changes to your application:
     generate 'sufia:models:usagestats'
   end
 
-  def install_blacklight_gallery
-    generate "blacklight_gallery:install"
-  end
-
   # Sets up full-text indexing (Solr config + jars)
   def full_text_indexing
     generate "sufia:models:fulltext"

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

@@ -10,11 +10,19 @@ module Sufia
       end
 
       def push(job)
+        push_tries = 0
         queue = job.respond_to?(:queue_name) ? job.queue_name : default_queue_name
         begin
           ::Resque.enqueue_to queue, MarshaledJob, Base64.encode64(Marshal.dump(job))
         rescue Redis::CannotConnectError
           ActiveFedora::Base.logger.error "Redis is down!"
+        rescue Redis::TimeoutError => error
+          ActiveFedora::Base.logger.warn "Redis Timed out.  Trying again! #{job.inspect}"
+          push_tries+=1
+          # fail for good if the tries is greater than 3
+          raise error if push_tries >=3
+          sleep 0.01
+          retry
         end
       end
     end

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

@@ -1,5 +1,5 @@
 module Sufia
   module Models
-    VERSION = "6.0.0.rc3"
+    VERSION = "6.0.0.rc4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sufia
 version: !ruby/object:Gem::Version
-  version: 6.0.0.rc3
+  version: 6.0.0.rc4
 platform: ruby
 authors:
 - Justin Coyne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-30 00:00:00.000000000 Z
+date: 2015-02-18 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.0.0.rc3
+        version: 6.0.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc3
+        version: 6.0.0.rc4
 - !ruby/object:Gem::Dependency
   name: blacklight_advanced_search
   requirement: !ruby/object:Gem::Requirement
@@ -493,6 +493,7 @@ files:
 - app/assets/javascripts/sufia/dashboard_actions.js
 - app/assets/javascripts/sufia/edit_metadata.js
 - app/assets/javascripts/sufia/editor.js
+- app/assets/javascripts/sufia/featured_researcher.js
 - app/assets/javascripts/sufia/featured_works.js
 - app/assets/javascripts/sufia/fileupload.js
 - app/assets/javascripts/sufia/ga_events.js
@@ -538,6 +539,7 @@ files:
 - app/controllers/batch_controller.rb
 - app/controllers/batch_edits_controller.rb
 - app/controllers/collections_controller.rb
+- app/controllers/concerns/sufia/batch_controller_behavior.rb
 - app/controllers/concerns/sufia/batch_edits_controller_behavior.rb
 - app/controllers/concerns/sufia/breadcrumbs.rb
 - app/controllers/concerns/sufia/catalog.rb
@@ -553,6 +555,8 @@ files:
 - app/controllers/concerns/sufia/files_controller_behavior.rb
 - app/controllers/concerns/sufia/homepage_controller.rb
 - app/controllers/concerns/sufia/my_controller_behavior.rb
+- app/controllers/concerns/sufia/single_use_links_controller_behavior.rb
+- app/controllers/concerns/sufia/single_use_links_viewer_controller_behavior.rb
 - app/controllers/concerns/sufia/transfers_controller_behavior.rb
 - app/controllers/concerns/sufia/users_controller_behavior.rb
 - app/controllers/contact_form_controller.rb
@@ -678,6 +682,8 @@ files:
 - app/views/contact_form/_directions.html.erb
 - app/views/contact_form/create.html.erb
 - app/views/contact_form/new.html.erb
+- app/views/content_blocks/_featured_researcher.html.erb
+- app/views/content_blocks/index.html.erb
 - app/views/dashboard/_index_partials/_contents.html.erb
 - app/views/dashboard/_index_partials/_heading_actions.html.erb
 - app/views/dashboard/_index_partials/_heading_greetings.html.erb
@@ -961,6 +967,7 @@ files:
 - spec/jobs/event_jobs_spec.rb
 - spec/jobs/import_url_job_spec.rb
 - spec/jobs/ingest_local_file_job_spec.rb
+- spec/jobs/sufia_resque_queue_spec.rb
 - spec/lib/sufia/analytics_spec.rb
 - spec/lib/sufia/breadcrumbs_spec.rb
 - spec/lib/sufia/id_service_spec.rb
@@ -1238,7 +1245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Sufia was extracted from ScholarSphere developed by Penn State University
@@ -1343,6 +1350,7 @@ test_files:
 - spec/jobs/event_jobs_spec.rb
 - spec/jobs/import_url_job_spec.rb
 - spec/jobs/ingest_local_file_job_spec.rb
+- spec/jobs/sufia_resque_queue_spec.rb
 - spec/lib/sufia/analytics_spec.rb
 - spec/lib/sufia/breadcrumbs_spec.rb
 - spec/lib/sufia/id_service_spec.rb