sufia 4.0.0.beta2 → 4.0.0.beta3

data/lib/generators/sufia/templates/sufia_helper.rb

@@ -0,0 +1,5 @@
+module SufiaHelper
+  include ::BlacklightHelper
+  include Sufia::BlacklightOverride
+  include Sufia::SufiaHelperBehavior
+end

data/lib/sufia.rb

@@ -1,8 +1,10 @@
 require "sufia/version"
 require 'blacklight'
 require 'blacklight_advanced_search'
+require 'blacklight/gallery'
 require 'hydra/head'
 require 'hydra-batch-edit'
+require 'hydra-editor'
 require 'browse-everything'
 require 'sufia/models'
 
@@ -25,6 +27,7 @@ module Sufia
     )
 
     config.assets.paths << config.root.join('vendor', 'assets', 'fonts')
+    config.assets.precompile << %r(vjs\.(?:eot|ttf|woff)$)
   end
 
   autoload :Controller
@@ -33,4 +36,5 @@ module Sufia
   autoload :FilesControllerBehavior
   autoload :BatchEditsControllerBehavior
   autoload :DownloadsControllerBehavior
+  autoload :HomepageController
 end

data/spec/{models/generic_file/actions_spec.rb → actors/generic_file/actor_spec.rb}

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe GenericFile do
+describe Sufia::GenericFile::Actor do
   describe "#virus_check" do
     it "should return the results of running ClamAV scanfile method" do
       ClamAV.instance.should_receive(:scanfile).and_return(1)
-      expect { Sufia::GenericFile::Actions.virus_check(File.new(fixture_path + '/world.png')) }.to raise_error(Sufia::VirusFoundError)
+      expect { Sufia::GenericFile::Actor.virus_check(File.new(fixture_path + '/world.png')) }.to raise_error(Sufia::VirusFoundError)
     end
   end
 end

data/spec/controllers/authorities_controller_spec.rb

@@ -3,14 +3,14 @@ require 'spec_helper'
 describe AuthoritiesController do
   describe "#query" do
     it "should return an array of hashes" do
-      mock_hits = [{:label => "English", :uri => "http://example.org/eng"}, 
-                   {:label => "Environment", :uri => "http://example.org/env"}, 
-                   {:label => "Edge", :uri => "http://example.org/edge"}, 
-                   {:label => "Edgar", :uri => "http://example.org/edga"}, 
-                   {:label => "Eddie", :uri => "http://example.org/edd"},
-                   {:label => "Economics", :uri => "http://example.org/eco"}]
+      mock_hits = [{label: "English", uri: "http://example.org/eng"},
+                   {label: "Environment", uri: "http://example.org/env"},
+                   {label: "Edge", uri: "http://example.org/edge"},
+                   {label: "Edgar", uri: "http://example.org/edga"},
+                   {label: "Eddie", uri: "http://example.org/edd"},
+                   {label: "Economics", uri: "http://example.org/eco"}]
       LocalAuthority.should_receive(:entries_by_term).and_return(mock_hits)
-      xhr :get, :query, :model=>"generic_files", :term=>"subject", :q=>"E"
+      xhr :get, :query, model: "generic_files", term: "subject", q: "E"
       response.should be_success
       JSON.parse(response.body).count.should == 6
       JSON.parse(response.body)[0]["label"].should == "English"

data/spec/controllers/batch_controller_spec.rb

@@ -15,10 +15,10 @@ describe BatchController do
     before do
       @batch = Batch.new
       @batch.save
-      @file = GenericFile.new(:batch=>@batch)
+      @file = GenericFile.new(batch: @batch)
       @file.apply_depositor_metadata(@user)
       @file.save
-      @file2 = GenericFile.new(:batch=>@batch)
+      @file2 = GenericFile.new(batch: @batch)
       @file2.apply_depositor_metadata('otherUser')
       @file2.save
     end
@@ -37,60 +37,60 @@ describe BatchController do
       s1 = double('one')
       BatchUpdateJob.should_receive(:new).with(@user.user_key, params).and_return(s1)
       Sufia.queue.should_receive(:push).with(s1).once
-      post :update, :id=>@batch.pid, "generic_file"=>{"read_groups_string"=>"", "read_users_string"=>"archivist1, archivist2", "tag"=>[""]}     
+      post :update, id: @batch.pid, "generic_file" => {"read_groups_string" => "", "read_users_string" => "archivist1, archivist2", "tag" => [""]}
     end
     it "should show flash messages" do
-      post :update, :id=>@batch.pid, "generic_file"=>{"read_groups_string"=>"","read_users_string"=>"archivist1, archivist2", "tag"=>[""]}
-      response.should redirect_to @routes.url_helpers.dashboard_index_path
+      post :update, id: @batch.pid, "generic_file" => {"read_groups_string" => "","read_users_string" => "archivist1, archivist2", "tag" => [""]}
+      response.should redirect_to @routes.url_helpers.dashboard_files_path
       flash[:notice].should_not be_nil
       flash[:notice].should_not be_empty
       flash[:notice].should include("Your files are being processed")
     end
-    
+
     describe "when user has edit permissions on a file" do
       it "should set the groups" do
-        post :update, :id=>@batch.pid, "generic_file"=>{"permissions"=>{"group"=>{"public"=>"1", "registered"=>"2"}}}
+        post :update, id: @batch.pid, "generic_file"=>{"permissions"=>{"group"=>{"public"=>"1", "registered"=>"2"}}}
         @file.reload.read_groups.should == []
         @file.reload.edit_groups.should == []
-        response.should redirect_to @routes.url_helpers.dashboard_index_path
+        response.should redirect_to @routes.url_helpers.dashboard_files_path
       end
 
       it "should set the users with read access" do
-        post :update, :id=>@batch.pid, "generic_file"=>{"read_groups_string"=>"", "read_users_string"=>"archivist1, archivist2", "tag"=>[""]}
+        post :update, id: @batch.pid, "generic_file"=>{"read_groups_string"=>"", "read_users_string"=>"archivist1, archivist2", "tag"=>[""]}
         file = GenericFile.find(@file.pid)
         file.read_users.should == ['archivist1', 'archivist2']
 
-        response.should redirect_to @routes.url_helpers.dashboard_index_path
+        response.should redirect_to @routes.url_helpers.dashboard_files_path
       end
       it "should set the groups with read access" do
-        post :update, :id=>@batch.pid, "generic_file"=>{"read_groups_string"=>"group1, group2", "read_users_string"=>"", "tag"=>[""]}
+        post :update, id: @batch.pid, "generic_file"=>{"read_groups_string"=>"group1, group2", "read_users_string"=>"", "tag"=>[""]}
         file = GenericFile.find(@file.pid)
         file.read_groups.should == ['group1', 'group2']
       end
       it "should set public read access" do
-        post :update, :id=>@batch.pid, "visibility"=>"open", "generic_file"=>{"read_groups_string"=>"", "read_users_string"=>"", "tag"=>[""]}
+        post :update, id: @batch.pid, "visibility"=>"open", "generic_file"=>{"read_groups_string"=>"", "read_users_string"=>"", "tag"=>[""]}
         file = GenericFile.find(@file.pid)
         file.read_groups.should == ['public']
       end
       it "should set public read access and groups at the same time" do
-        post :update, :id=>@batch.pid, "visibility"=>"open", "generic_file"=>{"read_groups_string"=>"group1, group2", "read_users_string"=>"", "tag"=>[""]}
+        post :update, id: @batch.pid, "visibility"=>"open", "generic_file"=>{"read_groups_string"=>"group1, group2", "read_users_string"=>"", "tag"=>[""]}
         file = GenericFile.find(@file.pid)
         file.read_groups.should == ['group1', 'group2', 'public']
       end
       it "should set public discover access and groups at the same time" do
-        post :update, :id=>@batch.pid, "permission"=>{"group"=>{"public"=>"none"}}, "generic_file"=>{"read_groups_string"=>"group1, group2", "read_users_string"=>"", "tag"=>[""]}
+        post :update, id: @batch.pid, "permission"=>{"group"=>{"public"=>"none"}}, "generic_file"=>{"read_groups_string"=>"group1, group2", "read_users_string"=>"", "tag"=>[""]}
         file = GenericFile.find(@file.pid)
         file.read_groups.should == ['group1', 'group2']
         file.discover_groups.should == []
       end
       it "should set metadata like title" do
-        post :update, :id=>@batch.pid, "generic_file"=>{"tag"=>["footag", "bartag"]}, "title"=>{@file.pid=>"New Title"} 
+        post :update, id: @batch.pid, "generic_file"=>{"tag"=>["footag", "bartag"]}, "title"=>{@file.pid=>"New Title"}
         file = GenericFile.find(@file.pid)
         file.title.should == ["New Title"]
         file.tag.should == ["footag", "bartag"]
       end
       it "should not set any tags" do
-        post :update, :id=>@batch.pid, "generic_file"=>{"read_groups_string"=>"", "read_users_string"=>"archivist1", "tag"=>[""]}
+        post :update, id: @batch.pid, "generic_file"=>{"read_groups_string"=>"", "read_users_string"=>"archivist1", "tag"=>[""]}
         file = GenericFile.find(@file.pid)
         file.tag.should be_empty
       end
@@ -101,7 +101,7 @@ describe BatchController do
         file.title = "Original Title"
         file.read_groups.should == []
         file.save
-        post :update, :id=>@batch.pid, "generic_file"=>{"read_groups_string"=>"group1, group2", "read_users_string"=>"", "tag"=>[""]}, "title"=>{@file2.pid=>"Title Wont Change"}
+        post :update, id: @batch.pid, "generic_file"=>{"read_groups_string"=>"group1, group2", "read_users_string"=>"", "tag"=>[""]}, "title"=>{@file2.pid=>"Title Wont Change"}
         file = GenericFile.find(@file2.pid)
         file.title.should == ["Original Title"]
         file.read_groups.should == []
@@ -111,13 +111,12 @@ describe BatchController do
   describe "#edit" do
     before do
       User.any_instance.stub(:display_name).and_return("Jill Z. User")
-      GenericFile.any_instance.stub(:characterize_if_changed).and_yield
       @b1 = Batch.new
       @b1.save
-      @file = GenericFile.new(:batch=>@b1, :label=>'f1')
+      @file = GenericFile.new(batch: @b1, label: 'f1')
       @file.apply_depositor_metadata(@user)
       @file.save
-      @file2 = GenericFile.new(:batch=>@b1, :label=>'f2')
+      @file2 = GenericFile.new(batch: @b1, label: 'f2')
       @file2.apply_depositor_metadata(@user)
       @file2.save
     end
@@ -127,9 +126,9 @@ describe BatchController do
       @file2.delete
     end
     it "should default creator" do
-       get :edit, id: @b1.id
-       assigns[:generic_file].creator[0].should == @user.display_name
-        assigns[:generic_file].title[0].should == 'f1'
+      get :edit, id: @b1.id
+      assigns[:generic_file].creator[0].should == @user.display_name
+      assigns[:generic_file].title[0].should == 'f1'
     end
   end
 end

data/spec/controllers/batch_edits_controller_spec.rb

@@ -14,9 +14,9 @@ describe BatchEditsController do
 
   describe "edit" do
     before do
-      @one = GenericFile.new(:creator=>"Fred", :language=>'en')#, :resource_type=>'foo')
+      @one = GenericFile.new(creator: "Fred", language: 'en')#, resource_type: 'foo')
       @one.apply_depositor_metadata('mjg36')
-      @two = GenericFile.new(:creator=>"Wilma", :publisher=>'Rand McNally', :language=>'en', :resource_type=>'bar')
+      @two = GenericFile.new(creator: "Wilma", publisher: 'Rand McNally', language: 'en', resource_type: 'bar')
       @two.apply_depositor_metadata('mjg36')
       @one.save!
       @two.save!
@@ -37,9 +37,9 @@ describe BatchEditsController do
 
   describe "update" do
     before do
-      @one = GenericFile.new(:creator=>"Fred", :language=>'en')
+      @one = GenericFile.new(creator: "Fred", language: 'en')
       @one.apply_depositor_metadata('mjg36')
-      @two = GenericFile.new(:creator=>"Wilma", :publisher=>'Rand McNally', :language=>'en')
+      @two = GenericFile.new(creator: "Wilma", publisher: 'Rand McNally', language: 'en')
       @two.apply_depositor_metadata('mjg36')
       @one.save!
       @two.save!

data/spec/controllers/catalog_controller_spec.rb

@@ -1,21 +1,30 @@
 require 'spec_helper'
 
 describe CatalogController do
-  let(:user) { FactoryGirl.find_or_create(:jill) }
+  routes { Rails.application.class.routes }
+
+  let(:user) { @user }
+
   before do
-    GenericFile.any_instance.stub(:characterize_if_changed).and_yield
     sign_in user
   end
 
   describe "#index" do
     before (:all) do
+      @user = FactoryGirl.find_or_create(:jill)
       GenericFile.delete_all
       @gf1 =  GenericFile.new(title:'Test Document PDF', filename:'test.pdf', tag:'rocks', read_groups:['public'])
       @gf1.apply_depositor_metadata('mjg36')
       @gf1.save
+
       @gf2 =  GenericFile.new(title:'Test 2 Document', filename:'test2.doc', tag:'clouds', contributor:'Contrib1', read_groups:['public'])
       @gf2.apply_depositor_metadata('mjg36')
       @gf2.save
+
+      @editable_file = GenericFile.new.tap do |gf|
+        gf.apply_depositor_metadata(@user.user_key)
+        gf.save!
+      end
     end
 
     after (:all) do
@@ -24,24 +33,29 @@ describe CatalogController do
     end
 
     describe "term search" do
-      it "should find records" do
-        get :index, q: "pdf"
-        expect(response).to be_success
-        response.should render_template('catalog/index')
-        assigns(:document_list).map(&:id).should == [@gf1.id]
-        assigns(:document_list).count.should eql(1)
-        assigns(:document_list).first['desc_metadata__title_tesim'].should == ['Test Document PDF']
+      context "searching everything" do
+        it "should find records" do
+          get :index, q: "pdf", owner: 'all'
+          expect(response).to be_success
+          response.should render_template('catalog/index')
+          assigns(:document_list).map(&:id).should == [@gf1.id]
+          assigns(:document_list).count.should eql(1)
+          assigns(:document_list).first['desc_metadata__title_tesim'].should == ['Test Document PDF']
+        end
       end
-      it "should search keywords" do
-        get :index, q: "rocks"
-        assigns(:document_list).map(&:id).should == [@gf1.id]
+      context "searching only documents editable to me" do
+        it "should only have records I can edit" do
+          get :index, q: "", owner: 'mine'
+          assigns(:document_list).map(&:id).should == [@editable_file.id]
+          expect(response).to be_success
+        end
       end
     end
 
     describe "facet search" do
       before do
         # TODO: this is not how a facet query is done.
-        get :index, :q=>"{f=desc_metadata__contributor_tesim}Contrib1"
+        get :index, q: "{f=desc_metadata__contributor_tesim}Contrib1"
       end
       it "should find facet files" do
         expect(response).to be_success
@@ -49,29 +63,5 @@ describe CatalogController do
         assigns(:document_list).count.should eql(1)
       end
     end
-
-    describe "without search" do
-      it "should set featured researcher" do
-        get :index
-        expect(response).to be_success
-        assigns(:featured_researcher).tap do |researcher|
-          expect(researcher).to be_kind_of ContentBlock
-          expect(researcher.name).to eq 'featured_researcher'
-        end
-      end
-
-      context "with featured works" do
-        before do
-          FeaturedWork.create!(generic_file_id: @gf1.id)
-        end
-
-        it "should set featured works" do
-          get :index
-          expect(response).to be_success
-          expect(assigns(:featured_work_list)).to be_kind_of FeaturedWorkList
-        end
-      end
-
-    end
   end
 end

data/spec/controllers/collections_controller_spec.rb

@@ -0,0 +1,179 @@
+require 'spec_helper'
+
+describe CollectionsController do
+  before(:each) { @routes = Hydra::Collections::Engine.routes }
+  before do
+    controller.stub(:has_access?).and_return(true)
+    User.any_instance.stub(:groups).and_return([])
+  end
+
+  let(:user) { FactoryGirl.create(:user) }
+
+  after (:all) do
+    Collection.destroy_all
+    GenericFile.destroy_all
+    User.destroy_all
+  end
+
+  describe '#new' do
+    before do 
+      sign_in user
+    end
+
+    it 'should assign @collection' do
+      get :new
+      assigns(:collection).should be_kind_of(Collection)
+    end
+  end
+
+  describe '#create' do
+    before do 
+      sign_in user
+    end
+
+    it "should create a Collection" do
+      controller.should_receive(:has_access?).and_return(true)
+      old_count = Collection.count
+      post :create, collection: {title: "My First Collection ", description: "The Description\r\n\r\nand more"}
+      Collection.count.should == old_count+1
+    end
+    it "should create a Collection with files I can access" do
+      @asset1 = GenericFile.new(title: "First of the Assets")
+      @asset1.apply_depositor_metadata(user.user_key)
+      @asset1.save
+      @asset2 = GenericFile.new(title: "Second of the Assets", depositor: user.user_key)
+      @asset2.apply_depositor_metadata(user.user_key)
+      @asset2.save
+      @asset3 = GenericFile.new(title: "Third of the Assets", depositor:'abc')
+      @asset3.apply_depositor_metadata('abc')
+      @asset3.save
+      controller.should_receive(:has_access?).and_return(true)
+      old_count = Collection.count
+      post :create, collection: {title: "My own Collection ", description: "The Description\r\n\r\nand more"}, batch_document_ids:[@asset1.id, @asset2.id, @asset3.id]
+      Collection.count.should == old_count+1
+      collection = assigns(:collection)
+      collection.members.should include (@asset1)
+      collection.members.should include (@asset2)
+      collection.members.should_not include (@asset3)
+      @asset1.destroy
+      @asset2.destroy
+      @asset3.destroy
+    end
+
+    it "should add docs to collection if batch ids provided and add the collection id to the documents int he colledction" do
+      @asset1 = GenericFile.new(title: "First of the Assets")
+      @asset1.apply_depositor_metadata(user.user_key)
+      @asset1.save
+      post :create, batch_document_ids: [@asset1.id], collection: {title: "My Secong Collection ", description: "The Description\r\n\r\nand more"}
+      assigns[:collection].members.should == [@asset1]
+      asset_results = ActiveFedora::SolrService.instance.conn.get "select", params:{fq:["id:\"#{@asset1.id}\""],fl:['id',Solrizer.solr_name(:collection)]}
+      asset_results["response"]["numFound"].should == 1
+      doc = asset_results["response"]["docs"].first
+      doc["id"].should == @asset1.id
+      afterupdate = GenericFile.find(@asset1.pid)
+      doc[Solrizer.solr_name(:collection)].should == afterupdate.to_solr[Solrizer.solr_name(:collection)]
+    end
+
+  end
+
+  describe "#update" do
+    before do
+      @collection = Collection.new(title: "Collection Title")
+      @collection.apply_depositor_metadata(user.user_key)
+      @collection.save
+      @asset1 = GenericFile.new(title: "First of the Assets")
+      @asset1.apply_depositor_metadata(user.user_key)
+      @asset1.save
+      @asset2 = GenericFile.new(title: "Second of the Assets", depositor: user.user_key)
+      @asset2.apply_depositor_metadata(user.user_key)
+      @asset2.save
+      @asset3 = GenericFile.new(title: "Third of the Assets", depositor:'abc')
+      @asset3.apply_depositor_metadata(user.user_key)
+      @asset3.save
+      sign_in user
+    end
+    after do
+      @collection.destroy
+      @asset1.destroy
+      @asset2.destroy
+      @asset3.destroy
+    end
+
+    it "should set collection on members" do
+      put :update, id: @collection.id, collection: {members:"add"}, batch_document_ids:[@asset3.pid,@asset1.pid, @asset2.pid]
+      response.should redirect_to Hydra::Collections::Engine.routes.url_helpers.collection_path(@collection.noid)
+      assigns[:collection].members.map{|m| m.pid}.sort.should == [@asset2, @asset3, @asset1].map {|m| m.pid}.sort
+      asset_results = ActiveFedora::SolrService.instance.conn.get "select", params:{fq:["id:\"#{@asset2.pid}\""],fl:['id',Solrizer.solr_name(:collection)]}
+      asset_results["response"]["numFound"].should == 1
+      doc = asset_results["response"]["docs"].first
+      doc["id"].should == @asset2.id
+      afterupdate = GenericFile.find(@asset2.pid)
+      doc[Solrizer.solr_name(:collection)].should == afterupdate.to_solr[Solrizer.solr_name(:collection)]
+      put :update, id: @collection.id, collection: {members:"remove"}, batch_document_ids:[@asset2]
+      asset_results = ActiveFedora::SolrService.instance.conn.get "select", params:{fq:["id:\"#{@asset2.pid}\""],fl:['id',Solrizer.solr_name(:collection)]}
+      asset_results["response"]["numFound"].should == 1
+      doc = asset_results["response"]["docs"].first
+      doc["id"].should == @asset2.pid
+      afterupdate = GenericFile.find(@asset2.pid)
+      doc[Solrizer.solr_name(:collection)].should be_nil
+    end
+  end
+
+  describe "#show" do
+    before do
+      @asset1 = GenericFile.new(title: "First of the Assets")
+      @asset1.apply_depositor_metadata(user.user_key)
+      @asset1.save!
+      @asset2 = GenericFile.new(title: "Second of the Assets", depositor:user.user_key)
+      @asset2.apply_depositor_metadata(user.user_key)
+      @asset2.save!
+      @asset3 = GenericFile.new(title: "Third of the Assets", depositor:user.user_key)
+      @asset3.apply_depositor_metadata(user.user_key)
+      @asset3.save!
+      @asset4 = GenericFile.new(title: "Third of the Assets", depositor:user.user_key)
+      @asset4.apply_depositor_metadata(user.user_key)
+      @asset4.save!
+      @collection = Collection.new
+      @collection.title = "My collection"
+      @collection.description = "My incredibly detailed description of the collection"
+      @collection.apply_depositor_metadata(user.user_key)
+      @collection.members = [@asset1,@asset2,@asset3]
+      @collection.save!
+      controller.stub(:authorize!).and_return(true)
+      controller.stub(:apply_gated_search)
+    end
+    context "when signed in" do
+      before do 
+        sign_in user
+      end
+
+      it "should return the collection and its members" do
+        get :show, id: @collection.id
+        expect(response).to be_successful
+        assigns[:collection].title.should == @collection.title
+        ids = assigns[:member_docs].map(&:id)
+        expect(ids).to include @asset1.pid, @asset2.pid, @asset3.pid
+        expect(ids).to_not include @asset4.pid
+      end
+    end
+    context "not signed in" do
+      it "should not show me files in the collection" do
+        get :show, id: @collection.id
+        assigns[:member_docs].count.should == 0
+      end
+    end
+  end
+
+  describe "#edit" do
+    before do
+      @collection = Collection.new(title: "My collection", description: "My incredibly detailed description of the collection")
+      @collection.apply_depositor_metadata(user.user_key)
+      @collection.save
+      sign_in user
+    end
+    it "should not show flash" do
+      get :edit, id: @collection.id
+      flash[:notice].should be_nil
+    end
+  end
+end