sufia 3.7.2 → 4.0.0.beta1

data/lib/generators/sufia/templates/config/tinymce.yml

@@ -0,0 +1,7 @@
+menubar: false
+toolbar1: styleselect | bold italic | link image | undo redo
+toolbar2: table | fullscreen | uploadimage
+plugins:
+  - table
+  - fullscreen
+  - uploadimage

data/lib/sufia.rb

@@ -3,9 +3,13 @@ require 'blacklight'
 require 'blacklight_advanced_search'
 require 'hydra/head'
 require 'hydra-batch-edit'
+require 'browse-everything'
 require 'sufia/models'
 
 require 'rails_autolink'
+require 'font-awesome-sass-rails'
+require 'tinymce-rails'
+require 'tinymce-rails-imageupload'
 
 module Sufia
   extend ActiveSupport::Autoload
@@ -19,9 +23,12 @@ module Sufia
       #{config.root}/app/models/datastreams
       #{Hydra::Engine.root}/app/models/concerns
     )
+
+    config.assets.paths << config.root.join('vendor', 'assets', 'fonts')
   end
 
   autoload :Controller
+  autoload :Ability
   autoload :HttpHeaderAuth
   autoload :FilesControllerBehavior
   autoload :BatchEditsControllerBehavior

data/lib/sufia/downloads_controller_behavior.rb

@@ -7,10 +7,10 @@ module Sufia
       # module mixes in normalize_identifier method
       include Sufia::Noid
 
-      # moved check into the routine so we can handle the user with no access 
-      prepend_before_filter :normalize_identifier 
+      # moved check into the routine so we can handle the user with no access
+      prepend_before_filter :normalize_identifier
     end
-    
+
     def datastream_name
       if datastream.dsid == self.class.default_content_dsid
         params[:filename] || asset.label
@@ -18,6 +18,5 @@ module Sufia
         params[:datastream_id]
       end
     end
-
   end
 end

data/lib/sufia/files_controller_behavior.rb

@@ -9,19 +9,18 @@ module Sufia
 
     included do
       include Hydra::Controller::ControllerBehavior
-      include Blacklight::Configurable # comply with BL 3.7
-      include Sufia::Noid # for normalize_identifier method    
+      include Blacklight::Configurable
+      include Sufia::Noid # for normalize_identifier method
       include Sufia::FilesController::LocalIngestBehavior
       extend Sufia::FilesController::UploadCompleteBehavior
 
       layout "sufia-one-column"
-      
-      # This is needed as of BL 3.7
+
       self.copy_blacklight_config_from(CatalogController)
 
       # Catch permission errors
       rescue_from Hydra::AccessDenied, CanCan::AccessDenied do |exception|
-        if (exception.action == :edit)
+        if exception.action == :edit
           redirect_to(sufia.url_for({:action=>'show'}), :alert => "You do not have sufficient privileges to edit this document")
         elsif current_user and current_user.persisted?
           redirect_to root_url, :alert => exception.message
@@ -31,13 +30,13 @@ module Sufia
         end
       end
 
-      # actions: audit, index, create, new, edit, show, update, destroy, permissions, citation
+      # actions: audit, index, create, new, edit, show, update,
+      #          destroy, permissions, citation, stats
       before_filter :authenticate_user!, :except => [:show, :citation]
       before_filter :has_access?, :except => [:show]
       prepend_before_filter :normalize_identifier, :except => [:index, :create, :new]
       load_resource :only=>[:audit]
       load_and_authorize_resource :except=>[:index, :audit]
-
     end
 
     # routed to /files/new
@@ -52,6 +51,19 @@ module Sufia
       @groups = current_user.groups
     end
 
+    # routed to /files/:id/stats
+    def stats
+      path = sufia.generic_file_path(Sufia::Noid.noidify(params[:id]))
+      # Pull back results from GA, filter them for path, and hashify
+      @created = DateTime.parse(::GenericFile.find(params[:id]).create_date)
+      results_list = Sufia::UsageStatistics.profile.pageview(
+        start_date: @created,
+        end_date: DateTime.now,
+        sort: 'date').for_path(path)
+      @stats_json = Sufia::UsageStatistics.as_flot_json(results_list)
+      @pageviews = Sufia::UsageStatistics.total_pageviews(results_list)
+    end
+
     # routed to /files/:id (DELETE)
     def destroy
       pid = @generic_file.noid
@@ -64,30 +76,31 @@ module Sufia
     def create
       if params[:local_file].present?
         perform_local_ingest
+      elsif params[:selected_files].present?
+        create_from_browse_everything(params)
       else
-        case params['file_coming_from']
-        when 'dropbox'
-          create_from_url(params)
-        else
-          create_from_upload(params)
-        end
+        create_from_upload(params)
       end
     end
-
-
-
-    def create_from_url(params)
-      params[:dropbox_urls].each do |db_file|
-        next if db_file.blank?
-        # do not remove ::
-        @generic_file = ::GenericFile.new
-        @generic_file.import_url = db_file
-        @generic_file.label = File.basename(db_file)
-        create_metadata(@generic_file)
-        Sufia.queue.push(ImportUrlJob.new(@generic_file.pid)) 
+    
+    def create_from_browse_everything(params)
+      params[:selected_files].each_pair do |index, file_info| 
+        next if file_info.blank? || file_info["url"].blank?
+        create_file_from_url(file_info["url"])
       end
       redirect_to self.class.upload_complete_path( params[:batch_id])
     end
+    
+    # Generic utility for creating GenericFile from a URL
+    # Used in to import files using URLs from a file picker like browse_everything 
+    def create_file_from_url(url, batch_id=nil)
+      @generic_file = ::GenericFile.new
+      @generic_file.import_url = url
+      @generic_file.label = File.basename(url)
+      create_metadata(@generic_file)
+      Sufia.queue.push(ImportUrlJob.new(@generic_file.pid))
+      return @generic_file
+    end
 
     def create_from_upload(params)
       # check error condition No files
@@ -171,7 +184,6 @@ module Sufia
 
     protected
 
-
     def json_error(error, name=nil, additional_arguments={})
       args = {:error => error}
       args[:name] = name if name
@@ -226,7 +238,6 @@ module Sufia
       @generic_file.relative_path = params[:relative_path] if params[:relative_path]
     end
 
-
     # this is provided so that implementing application can override this behavior and map params to different attributes
     def update_metadata
       @generic_file.attributes = @generic_file.sanitize_attributes(params[:generic_file])

data/lib/sufia/version.rb

@@ -1,3 +1,3 @@
 module Sufia
-  VERSION = "3.7.2"
+  VERSION = "4.0.0.beta1"
 end

data/spec/controllers/batch_controller_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe BatchController do
   before do
     controller.stub(:has_access?).and_return(true)
-    @user = FactoryGirl.find_or_create(:user)
+    @user = FactoryGirl.find_or_create(:jill)
     sign_in @user
     User.any_instance.stub(:groups).and_return([])
     controller.stub(:clear_session_user) ## Don't clear out the authenticated session

data/spec/controllers/batch_edits_controller_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe BatchEditsController do
   before do
     controller.stub(:has_access?).and_return(true)
-    @user = FactoryGirl.find_or_create(:user)
+    @user = FactoryGirl.find_or_create(:jill)
     sign_in @user
     User.any_instance.stub(:groups).and_return([])
     controller.stub(:clear_session_user) ## Don't clear out the authenticated session
@@ -14,9 +14,9 @@ describe BatchEditsController do
 
   describe "edit" do
     before do
-      @one = GenericFile.new(:creator=>"Fred", :language=>'en')
+      @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')
+      @two = GenericFile.new(:creator=>"Wilma", :publisher=>'Rand McNally', :language=>'en', :resource_type=>'bar')
       @two.apply_depositor_metadata('mjg36')
       @one.save!
       @two.save!
@@ -27,14 +27,14 @@ describe BatchEditsController do
     it "should be successful" do
       get :edit
       response.should be_successful
-      assigns[:terms].should == [:creator, :contributor, :description, :tag, :rights, :publisher, 
+      assigns[:terms].should == [:creator, :contributor, :description, :tag, :rights, :publisher,
                         :date_created, :subject, :language, :identifier, :based_near, :related_url]
       assigns[:show_file].creator.should == ["Fred", "Wilma"]
       assigns[:show_file].publisher.should == ["Rand McNally"]
       assigns[:show_file].language.should == ["en"]
     end
   end
-  
+
   describe "update" do
     before do
       @one = GenericFile.new(:creator=>"Fred", :language=>'en')

data/spec/controllers/catalog_controller_spec.rb

@@ -1,98 +1,77 @@
 require 'spec_helper'
 
 describe CatalogController do
+  let(:user) { FactoryGirl.find_or_create(:jill) }
   before do
     GenericFile.any_instance.stub(:characterize_if_changed).and_yield
-    @user = FactoryGirl.find_or_create(:user)
-    sign_in @user
-    User.any_instance.stub(:groups).and_return([])
-    controller.stub(:clear_session_user) ## Don't clear out the authenticated session
-  end
-  after do
-    @user.delete
+    sign_in user
   end
+
   describe "#index" do
     before (:all) do
-      GenericFile.find_each { |f| f.delete }
-      @gf1 =  GenericFile.new(title:'Test Document PDF', filename:'test.pdf', read_groups:['public'])
+      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', contributor:'Contrib1', read_groups:['public'])
+      @gf2 =  GenericFile.new(title:'Test 2 Document', filename:'test2.doc', tag:'clouds', contributor:'Contrib1', read_groups:['public'])
       @gf2.apply_depositor_metadata('mjg36')
       @gf2.save
     end
+
     after (:all) do
       @gf1.delete
       @gf2.delete
     end
+
     describe "term search" do
-      before do
-         xhr :get, :index, :q =>"pdf"
-      end
-      it "should find pdf files" do
-        response.should be_success
+      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']
       end
+      it "should search keywords" do
+        get :index, q: "rocks"
+        assigns(:document_list).map(&:id).should == [@gf1.id]
+      end
     end
+
     describe "facet search" do
       before do
         # TODO: this is not how a facet query is done.
-        xhr :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
-        response.should be_success
+        expect(response).to be_success
         response.should render_template('catalog/index')
         assigns(:document_list).count.should eql(1)
       end
     end
-  end
 
-  describe "#recent" do
-    before do
-      @gf1 = GenericFile.new(title:'Generic File 1', contributor:'contributor 1', resource_type:'type 1', read_groups:['public'])
-      @gf1.apply_depositor_metadata('mjg36')
-      @gf1.save!
-      sleep 1 # make sure next file is not at the same time compare
-      @gf2 = GenericFile.new(title:'Generic File 2', contributor:'contributor 2', resource_type:'type 2', read_groups:['public'])
-      @gf2.apply_depositor_metadata('mjg36')
-      @gf2.save!
-      sleep 1 # make sure next file is not at the same time compare
-      @gf3 = GenericFile.new(title:'Generic File 3', contributor:'contributor 3', resource_type:'type 3', read_groups:['public'])
-      @gf3.apply_depositor_metadata('mjg36')
-      @gf3.save!
-      sleep 1 # make sure next file is not at the same time compare
-      @gf4 = GenericFile.new(title:'Generic File 4', contributor:'contributor 4', resource_type:'type 4', read_groups:['public'])
-      @gf4.apply_depositor_metadata('mjg36')
-      @gf4.save!
-      xhr :get, :recent
-    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
 
-    after do
-      @gf1.delete
-      @gf2.delete
-      @gf3.delete
-      @gf4.delete
-    end
+      context "with featured works" do
+        before do
+          FeaturedWork.create!(generic_file_id: @gf1.id)
+        end
 
-    it "should find my 4 files" do
-      response.should be_success
-      response.should render_template('catalog/recent')
-      assigns(:recent_documents).count.should eql(4)
-      # the order is reversed since the first in should be the last out in descending time order
-      #assigns(:recent_documents).each {|doc| logger.info doc.fetch(:desc_metadata__title_t)[0]}
-      lgf1 = assigns(:recent_documents)[0]
-      lgf4 = assigns(:recent_documents)[3]
-      lgf4['desc_metadata__title_tesim'].should == ['Generic File 4']
-      lgf4['desc_metadata__contributor_tesim'].should == ['contributor 4']
-      lgf4['desc_metadata__resource_type_tesim'].should == ['type 4']
+        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
 
-      lgf1['desc_metadata__title_tesim'].should == ['Generic File 1']
-      lgf1['desc_metadata__contributor_tesim'].should == ['contributor 1']
-      lgf1['desc_metadata__resource_type_tesim'].should == ['type 1']
     end
   end
 end

data/spec/controllers/content_blocks_controller_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe ContentBlocksController do
+  describe "#update" do
+    let(:content_block) { FactoryGirl.create(:content_block) }
+    before { request.env["HTTP_REFERER"] = "whence_i_came" }
+
+    context "when not logged in" do
+      it "should redirect to root path" do
+        patch :update, id: content_block, content_block: { value: 'foo' }
+        expect(response).to redirect_to main_app.new_user_session_path
+      end
+    end
+
+    context "when logged in" do
+      let(:user) { FactoryGirl.create(:user) }
+      before { controller.stub(current_user: user) }
+
+      context "as a user in the admin group" do
+        before { user.should_receive(:groups).and_return( ['admin', 'registered']) }
+
+        it "should save" do
+          patch :update, id: content_block, content_block: { value: 'foo' }
+          expect(response).to redirect_to "whence_i_came"
+          expect(assigns[:content_block].value).to eq 'foo'
+        end
+      end
+
+      context "as a user without permission" do
+        it "should redirect to root path" do
+          patch :update, id: content_block, content_block: { value: 'foo' }
+          expect(response).to redirect_to root_path
+        end
+      end
+    end
+  end
+end

data/spec/controllers/downloads_controller_spec.rb

@@ -21,10 +21,6 @@ describe DownloadsController do
         User.any_instance.stub(:groups).and_return([])
         controller.stub(:clear_session_user) ## Don't clear out the authenticated session
       end
-      after do
-        arch = FactoryGirl.find(:archivist) rescue
-        arch.delete if arch
-      end
       describe "show" do
         it "should default to returning configured default download" do
           DownloadsController.default_content_dsid.should == "content"
@@ -64,20 +60,16 @@ describe DownloadsController do
 
     describe "when not logged in as reader" do
       before do
-        sign_in FactoryGirl.find_or_create(:user)
+        sign_in FactoryGirl.find_or_create(:jill)
         User.any_instance.stub(:groups).and_return([])
         controller.stub(:clear_session_user) ## Don't clear out the authenticated session
       end
-      after do
-        user = FactoryGirl.find(:user) rescue
-        user.delete if user
-      end
-      
+
       describe "show" do
         it "should deny access" do
           get "show", :id => "test1"
           response.should redirect_to root_path
-          flash[:alert].should == "You do not have sufficient access privileges to read this document, which has been marked private."
+          flash[:alert].should == 'You are not authorized to access this page.'
         end
       end
     end

data/spec/controllers/featured_work_lists_controller_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe FeaturedWorkListsController do
+  describe "#create" do
+    before do
+      expect(controller).to receive(:authorize!).with(:update, FeaturedWork)
+    end
+
+    let(:feature1) { FactoryGirl.create(:featured_work) }
+    let(:feature2) { FactoryGirl.create(:featured_work) }
+
+    it "should be successful" do
+      post :create, format: :json, featured_work_list: {
+        featured_works_attributes: [{id: feature1.id, order: "2"},
+                                    {id: feature2.id, order: "1"}]
+      }
+      expect(feature1.reload.order).to eq 2
+    end
+  end
+end