worthwhile 0.0.1 → 0.0.2

data/config/locales/sufia.en.yml

@@ -1,6 +1,6 @@
 en:
   sufia:
-    product_name:       "Curate"
+    product_name:       "Repository"
     institution_name:   "Your Institution"
     institution_homepage_url:   "#"
     division_name:      "Your Division at Institution"
@@ -8,7 +8,7 @@ en:
     search:
       form:
         q:
-          label:        "Search Curate"
+          label:        "Search Repository"
           placeholder:  "Type keywords in here"
     search_facets:
       label:            "View:"

data/lib/generators/worthwhile/install_generator.rb

@@ -20,13 +20,18 @@ module Worthwhile
       say_status("warning", "Removing Blacklight's generated CatalogController...", :yellow)
       remove_file('app/controllers/catalog_controller.rb')
     end
-    
+
     def inject_application_controller_behavior
       inject_into_file 'app/controllers/application_controller.rb', :after => /Blacklight::Controller\s*\n/ do
         "  include Worthwhile::ApplicationControllerBehavior\n"
       end
     end
 
+    def replace_blacklight_layout
+      gsub_file 'app/controllers/application_controller.rb', /layout 'blacklight'/,
+        "include Worthwhile::ThemedLayoutController\n  with_themed_layout '1_column'\n"
+    end
+
     def inject_routes
       inject_into_file 'config/routes.rb', :after => /devise_for :users\s*\n/ do
         "  mount Hydra::Collections::Engine => '/'\n"\

data/lib/generators/worthwhile/templates/worthwhile.css.scss

@@ -1,3 +1 @@
-@import 'worthwhile/variables_bootstrap';
-@import 'bootstrap';
 @import 'worthwhile/worthwhile';

data/lib/worthwhile/rails/routes.rb

@@ -1,7 +1,7 @@
 module ActionDispatch::Routing
   class Mapper
-    
-    def worthwhile_curation_concerns 
+
+    def worthwhile_curation_concerns
       resources :downloads, only: :show
       namespace :curation_concern, path: :concern do
         Worthwhile.configuration.registered_curation_concern_types.map(&:tableize).each do |curation_concern_name|
@@ -37,7 +37,6 @@ module ActionDispatch::Routing
           get 'facet/:id', action: :facet, as: :dashboard_facet
         end
         collection do
-          get :add_member_form
           put '', action: :update
           put :remove_member
         end
@@ -56,7 +55,7 @@ module ActionDispatch::Routing
         end
       end
     end
-    
+
     private
     # Namespaces routes appropriately
     # @example route_namespaced_target("worthwhile/generic_work") is equivalent to
@@ -67,7 +66,7 @@ module ActionDispatch::Routing
       if target.include?("/")
         the_namespace = target[0..target.index("/")-1]
         new_target = target[target.index("/")+1..-1]
-        namespace the_namespace do 
+        namespace the_namespace do
           namespaced_resources(new_target, opts)
         end
       else

data/lib/worthwhile/version.rb

@@ -1,3 +1,3 @@
 module Worthwhile
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/controllers/collections_controller_spec.rb

@@ -119,7 +119,7 @@ describe CollectionsController do
       end
       it "should remove members and update all of the relevant solr documents" do
         # BUG: This is returning inaccurate information
-        #     collection.reload.members.should include public_asset_not_mine
+        #     expect(collection.reload.members).to include public_asset_not_mine
         solr_doc_before_remove = ActiveFedora::SolrInstanceLoader.new(ActiveFedora::Base, public_asset_not_mine.pid).send(:solr_doc)
         expect(solr_doc_before_remove[Solrizer.solr_name(:collection)]).to eq [collection.pid]
         put :update, id: collection.id, collection: {members:"remove"}, batch_document_ids:[public_asset_not_mine.pid]

data/spec/controllers/curation_concern/permissions_controller_spec.rb

@@ -15,11 +15,11 @@ describe CurationConcern::PermissionsController do
 
   describe "#copy" do
     let(:generic_work) { FactoryGirl.create(:generic_work, user: user) }
+    let(:worker) { double }
 
     it "should add a worker to the queue" do
-      worker = double
-      VisibilityCopyWorker.should_receive(:new).with(generic_work.pid).and_return(worker)
-      Sufia.queue.should_receive(:push).with(worker)
+      expect(VisibilityCopyWorker).to receive(:new).with(generic_work.pid).and_return(worker)
+      expect(Sufia.queue).to receive(:push).with(worker)
       post :copy, id: generic_work
       expect(response).to redirect_to controller.polymorphic_path([:curation_concern, generic_work])
       expect(flash[:notice]).to eq 'Updating file permissions. This may take a few minutes. You may want to refresh your browser or return to this record later to see the updated file permissions.'

data/spec/controllers/downloads_controller_spec.rb

@@ -39,7 +39,7 @@ describe DownloadsController do
       generic_file
       sign_in user
       get :show, id: generic_file.to_param
-      response.body.should == generic_file.content.content
+      expect(response.body).to eq generic_file.content.content
     end
 
     it 'sends requested datastream content' do
@@ -47,7 +47,7 @@ describe DownloadsController do
       generic_file.save!
       sign_in user
       get :show, id: generic_file.to_param, datastream_id: 'thumbnail'
-      response.body.should == generic_file.thumbnail.content
+      expect(response.body).to eq generic_file.thumbnail.content
     end
   end
 end

data/spec/controllers/worthwhile/classify_concerns_controller_spec.rb

@@ -17,19 +17,27 @@ describe Worthwhile::ClassifyConcernsController do
   end
 
   describe '#create' do
-    it 'redirect to login page if user is not logged in' do
-      post :create, classify: { curation_concern_type: 'GenericWork' }
-      expect(response).to redirect_to(main_app.user_session_path)
+    context 'without logging in' do
+      it 'redirect to login page if user is not logged in' do
+        post :create, classify: { curation_concern_type: 'GenericWork' }
+        expect(response).to redirect_to(main_app.user_session_path)
+      end
     end
 
-    it 'requires authentication' do
-      sign_in(user)
-      # Had to stub the actual handling of curation_concern paths since those paths live outside the engine while the path to this controller lives inside the engine.
-      new_curation_concern_generic_work_path = "/stub/path"
-      subject.should_receive(:new_polymorphic_path).with([:curation_concern, GenericWork]).and_return(new_curation_concern_generic_work_path)
-      post :create, classify_concern: { curation_concern_type: 'GenericWork' }
-      expect(response).to redirect_to(new_curation_concern_generic_work_path)
-    end
+    context 'when logged in' do
+      before do
+        sign_in(user)
+        # Had to stub the actual handling of curation_concern paths since those paths live outside the engine while the path to this controller lives inside the engine.
+        expect(subject).to receive(:new_polymorphic_path).with([:curation_concern, GenericWork]).and_return(new_curation_concern_generic_work_path)
+      end
+
+      let(:new_curation_concern_generic_work_path) { "/stub/path" }
+
+      it 'requires authentication' do
+        post :create, classify_concern: { curation_concern_type: 'GenericWork' }
+        expect(response).to redirect_to(new_curation_concern_generic_work_path)
+      end
+   end
 
   end
 end

data/spec/features/collection_spec.rb

@@ -84,12 +84,12 @@ describe 'collection' do
     end
 
     it "should delete a collection" do
-      page.should have_content(@collection.title)
+      expect(page).to have_content(@collection.title)
       within("#document_#{@collection.noid}") do
         first(".itemtrash").click
       end
-      page.should_not have_content(@collection.title)
-      page.should have_content("Collection was successfully deleted.")
+      expect(page).to_not have_content(@collection.title)
+      expect(page).to have_content("Collection was successfully deleted.")
     end
   end
 
@@ -105,16 +105,16 @@ describe 'collection' do
     end
 
     it "should show a collection with a listing of Descriptive Metadata and catalog-style search results" do
-      page.should have_content(@collection.title)
+      expect(page).to have_content(@collection.title)
       within('#document_'+@collection.noid) do
         click_link("collection title")
       end
-      page.should have_content(@collection.title)
-      page.should have_content(@collection.description)
+      expect(page).to have_content(@collection.title)
+      expect(page).to have_content(@collection.description)
       # Should have search results / contents listing
-      page.should have_content(@gw1.title.first)
-      page.should have_content(@gw2.title.first)
-      page.should_not have_css(".pager")
+      expect(page).to have_content(@gw1.title.first)
+      expect(page).to have_content(@gw2.title.first)
+      expect(page).to_not have_css(".pager")
 
       #click_link "Gallery"
       #expect(page).to have_content(@gw1.title)
@@ -122,25 +122,25 @@ describe 'collection' do
     end
 
     it "should hide collection descriptive metadata when searching a collection" do
-      page.should have_content(@collection.title)
+      expect(page).to have_content(@collection.title)
       within("#document_#{@collection.noid}") do
         click_link("collection title")
       end
-      page.should have_content(@collection.title)
-      page.should have_content(@collection.description)
-      page.should have_content(@gw1.title.first)
-      page.should have_content(@gw2.title.first)
+      expect(page).to have_content(@collection.title)
+      expect(page).to have_content(@collection.description)
+      expect(page).to have_content(@gw1.title.first)
+      expect(page).to have_content(@gw2.title.first)
       fill_in('collection_search', with: @gw1.title.first)
       click_button('collection_submit')
       # Should not have Collection Descriptive metadata table
-      page.should_not have_content("Descriptions")
-      page.should have_content(@collection.title)
-      page.should have_content(@collection.description)
+      expect(page).to_not have_content("Descriptions")
+      expect(page).to have_content(@collection.title)
+      expect(page).to have_content(@collection.description)
       # Should have search results / contents listing
-      page.should have_content(@gw1.title.first)
-      page.should_not have_content(@gw2.title.first)
+      expect(page).to have_content(@gw1.title.first)
+      expect(page).to_not have_content(@gw2.title.first)
       # Should not have Dashboard content in contents listing
-      page.should_not have_content("Visibility")
+      expect(page).to_not have_content("Visibility")
     end
   end
 
@@ -156,12 +156,12 @@ describe 'collection' do
     end
 
     it "should edit and update collection metadata" do
-      page.should have_content(@collection.title)
+      expect(page).to have_content(@collection.title)
       within("#document_#{@collection.noid}") do
         click_link('Edit Collection')
       end
-      page.should have_field('collection_title', with: @collection.title)
-      page.should have_field('collection_description', with: @collection.description)
+      expect(page).to have_field('collection_title', with: @collection.title)
+      expect(page).to have_field('collection_description', with: @collection.description)
       new_title = "Altered Title"
       new_description = "Completely new Description text."
       creators = ["Dorje Trollo", "Vajrayogini"]
@@ -171,48 +171,48 @@ describe 'collection' do
       #within('.form-actions') do
         click_button('Update Collection')
       #end
-      page.should_not have_content(@collection.title)
-      page.should_not have_content(@collection.description)
-      page.should have_content(new_title)
-      page.should have_content(new_description)
-      page.should have_content(creators.first)
+      expect(page).to_not have_content(@collection.title)
+      expect(page).to_not have_content(@collection.description)
+      expect(page).to have_content(new_title)
+      expect(page).to have_content(new_description)
+      expect(page).to have_content(creators.first)
     end
 
     it "should remove a work from a collection" do
       skip "BUG removing works from a collection"
-      page.should have_content(@collection.title)
+      expect(page).to have_content(@collection.title)
       within("#document_#{@collection.noid}") do
         click_link('Edit Collection')
       end
-      page.should have_field('collection_title', with: @collection.title)
-      page.should have_field('collection_description', with: @collection.description)
-      page.should have_content(@gw1.title)
-      page.should have_content(@gw2.title)
+      expect(page).to have_field('collection_title', with: @collection.title)
+      expect(page).to have_field('collection_description', with: @collection.description)
+      expect(page).to have_content(@gw1.title)
+      expect(page).to have_content(@gw2.title)
       within("#document_#{@gw1.noid}") do
         click_button('Remove From Collection')
       end
-      page.should have_content(@collection.title)
-      page.should have_content(@collection.description)
-      page.should_not have_content(@gw1.title)
-      page.should have_content(@gw2.title)
+      expect(page).to have_content(@collection.title)
+      expect(page).to have_content(@collection.description)
+      expect(page).to_not have_content(@gw1.title)
+      expect(page).to have_content(@gw2.title)
     end
 
     it "should remove all works from a collection" do
       skip "batch collection operations (add/remove)"
-      page.should have_content(@collection.title)
+      expect(page).to have_content(@collection.title)
       within('#document_'+@collection.noid) do
         click_link('Edit Collection')
       end
-      page.should have_field('collection_title', with: @collection.title)
-      page.should have_field('collection_description', with: @collection.description)
-      page.should have_content(@gw1.title)
-      page.should have_content(@gw2.title)
+      expect(page).to have_field('collection_title', with: @collection.title)
+      expect(page).to have_field('collection_description', with: @collection.description)
+      expect(page).to have_content(@gw1.title)
+      expect(page).to have_content(@gw2.title)
       first('input#check_all').click
       click_button('Remove From Collection')
-      page.should have_content(@collection.title)
-      page.should have_content(@collection.description)
-      page.should_not have_content(@gw1.title)
-      page.should_not have_content(@gw2.title)
+      expect(page).to have_content(@collection.title)
+      expect(page).to have_content(@collection.description)
+      expect(page).to_not have_content(@gw1.title)
+      expect(page).to_not have_content(@gw2.title)
     end
   end
 
@@ -228,11 +228,11 @@ describe 'collection' do
     end
 
     it "should show a collection with a listing of Descriptive Metadata and catalog-style search results" do
-      page.should have_content(@collection.title)
+      expect(page).to have_content(@collection.title)
       within('#document_'+@collection.noid) do
         click_link("collection title")
       end
-      page.should have_css(".pager")
+      expect(page).to have_css(".pager")
     end
   end
 end

data/spec/helpers/worthwhile/collections_helper_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Worthwhile::CollectionsHelper do
+  describe "#link_to_remove_from_collection" do
+    let(:collection) { double(id: '123') }
+    let(:collectible) { double(id: '456') }
+    before do
+      assign(:collection, collection)
+    end
+    subject { helper.link_to_remove_from_collection(collectible) }
+
+    it "should have a form that routes to remove the collectible" do
+      expect(subject).to have_selector 'a[data-method=put]'
+      expect(subject).to have_link 'Remove From Collection',
+        href: collections.collection_path('123', collection: { members: 'remove'},
+                                          batch_document_ids: [ '456' ])
+    end
+  end
+end

data/spec/matchers/metadata_field_matchers.rb

@@ -2,7 +2,7 @@
 
 RSpec::Matchers.define :have_unique_field do |expected_field_name|
   match do |subject|
-    subject.should respond_to(expected_field_name)
+    expect(subject).to respond_to(expected_field_name)
     field_value = subject.send(expected_field_name)
     field_value.nil? || !field_value.kind_of?(Array)
   end
@@ -18,8 +18,8 @@ end
 
 RSpec::Matchers.define :have_multivalue_field do |expected_field_name|
   match do |subject|
-    subject.should respond_to(expected_field_name)
-    subject.send(expected_field_name).should be_instance_of Array
+    expect(subject).to respond_to(expected_field_name)
+    expect(subject.send(expected_field_name)).to be_instance_of Array
   end
 
   description do

data/spec/models/collection_spec.rb

@@ -14,41 +14,41 @@ describe Collection do
   it 'can contain another collection' do
     another_collection = FactoryGirl.create(:collection)
     subject.members << another_collection
-    subject.members.should == [another_collection]
+    expect(subject.members).to eq [another_collection]
   end
 
   it 'updates solr with pids of its parent collections' do
     another_collection = FactoryGirl.create(:collection)
     another_collection.members << subject
     another_collection.save
-    subject.reload.to_solr[Solrizer.solr_name(:collection)].should == [another_collection.pid]
+    expect(subject.reload.to_solr[Solrizer.solr_name(:collection)]).to eq [another_collection.pid]
   end
 
   it 'cannot contain itself' do
     subject.members << subject
     subject.save
-    reloaded_subject.members.should == []
+    expect(reloaded_subject.members).to eq []
   end
 
   describe "when visibility is private" do
     it "should not be open_access?" do
-      subject.should_not be_open_access
+      expect(subject).to_not be_open_access
     end
     it "should not be authenticated_only_access?" do
-      subject.should_not be_authenticated_only_access
+      expect(subject).to_not be_authenticated_only_access
     end
     it "should not be private_access?" do
-      subject.should be_private_access
+      expect(subject).to be_private_access
     end
   end
 
   describe "visibility" do
     it "should have visibility accessor" do
-      subject.visibility.should == Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
+      expect(subject.visibility).to eq Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PRIVATE
     end
     it "should have visibility writer" do
       subject.visibility = Hydra::AccessControls::AccessRight::VISIBILITY_TEXT_VALUE_PUBLIC
-      subject.should be_open_access
+      expect(subject).to be_open_access
     end
   end
 
@@ -68,19 +68,19 @@ describe Collection do
 
   describe '#human_readable_type' do
     it "indicates collection" do
-      subject.human_readable_type.should == 'Collection'
+      expect(subject.human_readable_type).to eq 'Collection'
     end
   end
 
   describe '#add_member' do
     it 'adds the member to the collection and returns true' do
       work = FactoryGirl.create(:generic_work)
-      subject.add_member(work).should be true
-      reloaded_subject.members.should == [work]
+      expect(subject.add_member(work)).to be true
+      expect(reloaded_subject.members).to eq [work]
 
       work.reload
-      work.collections.should == [subject]
-      work.to_solr["collection_sim"].should == [subject.pid]
+      expect(work.collections).to eq [subject]
+      expect(work.to_solr["collection_sim"]).to eq [subject.pid]
     end
 
     it 'returns nil if there is nothing to add' do
@@ -92,7 +92,7 @@ describe Collection do
       work = FactoryGirl.create(:generic_work)
       allow(subject).to receive(:save).and_return(false)
       expect(subject.add_member(work)).to be false
-      reloaded_subject.members.should == []
+      expect(reloaded_subject.members).to eq []
     end
   end
 
@@ -100,26 +100,26 @@ describe Collection do
     it 'removes the member from the collection and returns true' do
       work = FactoryGirl.create(:generic_work)
       subject.members << work
-      subject.members.should == [work]
+      expect(subject.members).to eq [work]
       subject.save
 
       work.reload
-      work.collections.should == [subject]
-      work.to_solr["collection_tesim"].should == [subject.pid]
+      expect(work.collections).to eq [subject]
+      expect(work.to_solr["collection_tesim"]).to eq [subject.pid]
       solr_doc = ActiveFedora::SolrInstanceLoader.new(ActiveFedora::Base, work.pid).send(:solr_doc)
-      solr_doc["collection_tesim"].should == [subject.pid]
+      expect(solr_doc["collection_tesim"]).to eq [subject.pid]
 
-      subject.members.delete(work).should == [work]
+      expect(subject.members.delete(work)).to eq [work]
       subject.save!
-      reloaded_subject.members.should == []
+      expect(reloaded_subject.members).to eq []
 
       solr_doc = ActiveFedora::SolrInstanceLoader.new(ActiveFedora::Base, work.pid).send(:solr_doc)
-      solr_doc["collection_tesim"].should be_nil
+      expect(solr_doc["collection_tesim"]).to be_nil
 
 
       work.reload
-      work.collections.should == []
-      work.to_solr["collection_tesim"].should == []
+      expect(work.collections).to eq []
+      expect(work.to_solr["collection_tesim"]).to eq []
     end
   end
 

data/spec/models/curation_concern/collection_model_spec.rb

@@ -17,8 +17,8 @@ describe CurationConcern::CollectionModel do
     let(:proposed_collectible) { double(collections: []) }
     subject { EssentialCollection.new }
     before(:each) {
-      proposed_collectible.stub(:can_be_member_of_collection?).with(subject).and_return(collectible?)
-      proposed_collectible.stub(:save).and_return(true)
+      allow(proposed_collectible).to receive(:can_be_member_of_collection?).with(subject).and_return(collectible?)
+      allow(proposed_collectible).to receive(:save).and_return(true)
     }
 
     context 'with itself' do

data/spec/models/worthwhile/content_version_spec.rb

@@ -9,8 +9,8 @@ module Worthwhile
     let(:raw_version) { double(dsCreateDate: created_on, versionID: version_id) }
     subject { described_class.new(content, raw_version) }
 
-    before(:each) do
-      content.stub(:version_committer).with(raw_version).and_return(committer_name)
+    before do
+      expect(content).to receive(:version_committer).with(raw_version).and_return(committer_name)
     end
     its(:created_on) { should eq(created_on) }
     its(:committer_name) { should eq(committer_name) }

data/spec/models/worthwhile/linked_resource_spec.rb

@@ -6,27 +6,27 @@ describe Worthwhile::LinkedResource do
   it { should respond_to(:human_readable_type) }
 
   it 'has a #human_readable_short_description' do
-    subject.human_readable_short_description.length.should_not == 0
+    expect(subject.human_readable_short_description.length).to_not eq 0
   end
 
   it 'has a .human_readable_short_description' do
-    subject.class.human_readable_short_description.length.should_not == 0
+    expect(subject.class.human_readable_short_description.length).to_not eq 0
   end
 
   it 'uses #noid for #to_param' do
-    subject.stub(:persisted?).and_return(true)
-    subject.to_param.should == subject.noid
+    allow(subject).to receive(:persisted?).and_return(true)
+    expect(subject.to_param).to eq subject.noid
   end
 
   it 'has no url to display' do
-    subject.to_s.should == nil
+    expect(subject.to_s).to eq nil
   end
 
   describe "validating" do
     subject {Worthwhile::LinkedResource.new}
     it "should not validate and have an error" do
-      subject.should_not be_valid
-      subject.errors[:url].should == ["can't be blank"]
+      expect(subject).to_not be_valid
+      expect(subject.errors[:url]).to eq ["can't be blank"]
     end
   end
 
@@ -34,7 +34,7 @@ describe Worthwhile::LinkedResource do
     context "javascript uri" do
       subject { FactoryGirl.build(:linked_resource, url: "javascript:void(alert('Hello'));") }
       it "should be cleared" do
-        subject.url.should be_nil
+        expect(subject.url).to be_nil
       end
     end
     context "http uri" do

data/spec/routing/worthwhile/routes_spec.rb

@@ -2,13 +2,12 @@ require "spec_helper"
 
 module Worthwhile
   describe "routing" do
-    
 
     describe "Classify concerns" do
       routes { Worthwhile::Engine.routes }
       it "routes to #new" do
         expect(new_classify_concern_path).to eq '/classify_concerns/new'
-        get("/classify_concerns/new").should route_to("worthwhile/classify_concerns#new")
+        expect(get("/classify_concerns/new")).to route_to("worthwhile/classify_concerns#new")
       end
     end
 
@@ -16,7 +15,7 @@ module Worthwhile
       routes { Rails.application.routes }
       it 'routes to #new' do
         expect(new_curation_concern_generic_work_path).to eq '/concern/generic_works/new'
-        get("/concern/generic_works/new").should route_to("curation_concern/generic_works#new")
+        expect(get("/concern/generic_works/new")).to route_to("curation_concern/generic_works#new")
       end
     end
   end

data/spec/spec_helper.rb

@@ -15,22 +15,15 @@ require 'capybara/rspec'
 require 'capybara/rails'
 
 
-if ENV['COVERAGE']
+if ENV['COVERAGE'] || ENV['CI']
   require 'simplecov'
+  require 'coveralls'
 
   ENGINE_ROOT = File.expand_path('../..', __FILE__)
-
-  # Out of the box, SimpleCov was looking at file in ENGINE_ROOT/spec/internal;
-  # After all that was where Rails was pointed at.
-  SimpleCov.root(ENGINE_ROOT)
-  SimpleCov.start 'rails' do
-    filters.clear
-    add_filter do |src|
-      src.filename !~ /^#{ENGINE_ROOT}/
-    end
+  SimpleCov.formatter = Coveralls::SimpleCov::Formatter if ENV["CI"]
+  SimpleCov.start do
     add_filter '/spec/'
   end
-  SimpleCov.command_name "spec"
 end
 
 require 'worthwhile'
@@ -59,6 +52,7 @@ RSpec.configure do |config|
     DatabaseCleaner.clean
   end
 
+  config.include FactoryGirl::Syntax::Methods
   config.include Devise::TestHelpers, type: :controller
   config.include Devise::TestHelpers, type: :view
   config.include Warden::Test::Helpers, type: :feature