hydra-head 4.0.3 → 4.1.0

data/lib/hydra/ui/controller.rb

@@ -33,7 +33,6 @@ module Hydra::UI::Controller
   end
 
   def load_css
-    stylesheet_links << ["hydra/html_refactor", {:media=>"all"}]
   end
 
   def load_js
@@ -44,4 +43,4 @@ module Hydra::UI::Controller
     javascript_includes << ['spin.min.js' ]
   end
 
-end
+end

data/lib/hydra/user.rb

@@ -1,23 +1,35 @@
-# will move to lib/hydra/access_control folder/namespace in release 5.x
 # Injects behaviors into User model so that it will work with Hydra Access Controls
 # By default, this module assumes you are using the User model created by Blacklight, which uses Devise.
 # To integrate your own User implementation into Hydra, override this Module or define your own User model in app/models/user.rb within your Hydra head.
+require 'deprecation'
 module Hydra::User
+  extend Deprecation
   
   def self.included(klass)
     # Other modules to auto-include
     klass.send(:include, Hydra::SuperuserAttributes)
   end
 
+  # This method should display the unique identifier for this user as defined by devise.
+  # The unique identifier is what access controls will be enforced against. 
+  def user_key
+    send(Devise.authentication_keys.first)
+  end
+
+
   # This method should display the unique identifier for this user
   # the unique identifier is what access controls will be enforced against. 
   def unique_id
     return to_s
   end
+  deprecation_deprecate :unique_id
+
+  
 
   # For backwards compatibility with the Rails2 User models in Hydra/Blacklight
   def login
     return unique_id
   end
+  deprecation_deprecate :login
   
 end

data/lib/railties/hydra-fixtures.rake

@@ -23,7 +23,7 @@ namespace :hydra do
           foo = loader.reload(pid)
           puts "Updated #{pid}"
         rescue Errno::ECONNREFUSED => e
-          puts "Can't connect to Fedora! Are you sure jetty is running?"
+          puts "Can't connect to Fedora! Are you sure jetty is running? (#{ActiveFedora::Base.connection_for_pid(pid).inspect})"
         rescue Exception => e
           puts("Received a Fedora error while loading #{pid}\n#{e}")
           logger.error("Received a Fedora error while loading #{pid}\n#{e}")

data/tasks/hydra-head.rake

@@ -132,6 +132,8 @@ namespace :hyhead do
 
       puts "Copying Gemfile from test_support/etc"
       FileUtils.cp('../../test_support/etc/Gemfile','./Gemfile')
+      puts "Copying test model CommonMetadataAsset from test_support/etc"
+      FileUtils.cp('../../test_support/etc/common_metadata_asset.rb','./app/models/')
 
       puts "Copying fixtures into test app spec/fixtures directory"
       FileUtils.mkdir_p( File.join('.','spec') )

data/{app/models → test_support/etc}/common_metadata_asset.rb

@@ -1,4 +1,4 @@
-# @deprecated This is intended as an EXAMPLE of mixing in model behavior and will be moved to hydra-wiki documentation.  This will be removed no later than 6.x
+# @deprecated This is intended as a model used for testing (to cover all views).  This will be removed no later than 6.x
 # EXAMPLE of a basic model that conforms to Hydra commonMetadata cModel and has basic MODS metadata (currently "Article" is the MODS exemplar)
 class CommonMetadataAsset < ActiveFedora::Base
   
@@ -16,4 +16,3 @@ class CommonMetadataAsset < ActiveFedora::Base
   include Hydra::ModelMethods
   
 end
-

data/test_support/features/mods_asset_show.feature

@@ -29,7 +29,7 @@ Feature: ModsAsset Show View
   
   Scenario: Public visit Document Show Page for a private document  
     Given I am on the show document page for hydrangea:fixture_archivist_only_mods_article
-    Then I should be on the search page
+    Then I should be on the login page
     And I should see "You do not have sufficient access privileges to read this document, which has been marked private" within ".alert"
   
   @overwritten

data/test_support/features/support/env.rb

@@ -53,3 +53,5 @@ ActionController::Base.allow_rescue = false
 # warning: regexp match /.../n against to UTF-8 string
 $VERBOSE = nil
 
+require 'deprecation'
+Deprecation.default_deprecation_behavior = :silence

data/test_support/features/support/paths.rb

@@ -15,6 +15,8 @@ module NavigationHelpers
       '/'
     when /logout/
       destroy_user_session_path
+    when /login/
+      new_user_session_path
     when /my account info/
       edit_user_registration_path
     when /the base search page/

data/test_support/spec/controllers/catalog_controller_spec.rb

@@ -10,6 +10,14 @@ require 'mocha'
 # rake cucumber
 
 describe CatalogController do
+  before :all do
+    @behavior = Hydra::Controller::CatalogControllerBehavior.deprecation_behavior
+    Hydra::Controller::CatalogControllerBehavior.deprecation_behavior = :silence
+  end
+
+  after :all do
+    Hydra::Controller::CatalogControllerBehavior.deprecation_behavior = @behavior
+  end
   
   before do
     #controller.stubs(:protect_from_forgery).returns("meh")

data/test_support/spec/controllers/catalog_controller_viewing_context_spec.rb

@@ -9,6 +9,15 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 # rake cucumber
 
 describe CatalogController do
+  before :all do
+    @behavior = Hydra::Controller::CatalogControllerBehavior.deprecation_behavior
+    Hydra::Controller::CatalogControllerBehavior.deprecation_behavior = :silence
+  end
+
+  after :all do
+    Hydra::Controller::CatalogControllerBehavior.deprecation_behavior = @behavior
+  end
+  
   
   before do
     controller.stubs(:load_fedora_document)
@@ -46,7 +55,7 @@ describe CatalogController do
       
       get :edit, :id=>"hydrangea:fixture_mods_article1"
       response.should redirect_to(:action => 'show')
-      flash[:notice].should == "You do not have sufficient privileges to edit this document. You have been redirected to the read-only view."
+      flash[:alert].should == "You do not have sufficient privileges to edit this document. You have been redirected to the read-only view."
     end
     it "should render normally if user has edit permissions" do
       controller.expects(:can?).with(:edit, anything()).returns(true)

data/test_support/spec/controllers/catalog_valid_html_spec.rb

@@ -33,6 +33,14 @@ end
 
 
 describe CatalogController do
+  before :all do
+    @behavior = Hydra::Controller::ControllerBehavior.deprecation_behavior
+    Hydra::Controller::ControllerBehavior.deprecation_behavior = :silence
+  end
+
+  after :all do
+    Hydra::Controller::ControllerBehavior.deprecation_behavior = @behavior
+  end
   describe "Home Page" do
     
     it "Should have Valid HTML when not logged in" do

data/test_support/spec/controllers/contributors_controller_spec.rb

@@ -9,6 +9,16 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 # rake cucumber
 
 describe Hydra::ContributorsController do
+  before :all do
+    @behavior = Hydra::ContributorsController.deprecation_behavior
+    Hydra::ContributorsController.deprecation_behavior = :silence
+
+  end
+
+  after :all do
+    Hydra::ContributorsController.deprecation_behavior = @behavior 
+
+  end
   
   describe "create" do
     it "should support adding new person / contributor / organization nodes" do

data/test_support/spec/controllers/file_assets_controller_spec.rb

@@ -2,7 +2,6 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Hydra::FileAssetsController do
   include Devise::TestHelpers
-
   before do
     session[:user]='bob'
   end
@@ -53,11 +52,24 @@ describe Hydra::FileAssetsController do
       mock_user = mock("User")
       mock_user.stubs(:email).returns("fake_user@example.com")
       mock_user.stubs(:is_being_superuser?).returns(false)
+      mock_user.stubs(:persisted?).returns(true)
       mock_user.stubs(:new_record?).returns(false)
       controller.stubs(:current_user).returns(mock_user)
       request.env["HTTP_REFERER"] = "http://example.com/?q=search"
       get(:show, :id=>"hydrangea:fixture_file_asset1")
-      response.should redirect_to("http://example.com/?q=search")
+      response.should redirect_to(root_url)
+    end
+     it "should redirect to the login page if the user is not logged in" do
+      mock_user = mock("User")
+      mock_user.stubs(:email).returns("fake_user@example.com")
+      mock_user.stubs(:is_being_superuser?).returns(false)
+      mock_user.stubs(:persisted?).returns(false)
+      mock_user.stubs(:new_record?).returns(true)
+      controller.stubs(:current_user).returns(mock_user)
+      request.env["HTTP_REFERER"] = "http://example.com/?q=search"
+      get(:show, :id=>"hydrangea:fixture_file_asset1")
+      response.should redirect_to("http://test.host/users/sign_in")
+      session['user_return_to'].should =~ /fixture_file_asset1/
     end
     it "should redirect to index view if the file does not exist" do
       get(:show, :id=>"example:invalid_object")
@@ -149,7 +161,7 @@ describe Hydra::FileAssetsController do
     describe "create" do
       before :each do
         mock_user = mock("User")
-        mock_user.stubs(:email).returns('user@example.com')
+        mock_user.stubs(:user_key).returns('user@example.com')
         mock_warden = mock("Warden")
         mock_warden.stubs(:authenticate).returns(mock_user)
         request.env['warden'] = mock_warden

data/test_support/spec/controllers/hydra-assets_controller_spec.rb

@@ -9,9 +9,19 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 # rake cucumber
 
 describe Hydra::AssetsController do
+  before :all do
+    @behavior = Hydra::AssetsController.deprecation_behavior
+    Hydra::AssetsController.deprecation_behavior = :silence
+  end
+
+  after :all do
+    Hydra::AssetsController.deprecation_behavior = @behavior 
+  end
   
   before do
-    request.env['WEBAUTH_USER']='bob'
+      @user = FactoryGirl.create(:user)
+      sign_in @user
+      controller.stubs(:enforce_access_controls).returns(true)
   end
   
   it "should use DocumentController" do

data/test_support/spec/controllers/hydra_controller_spec.rb

@@ -1,9 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-class HydraControllerTest < ApplicationController
-  include Hydra::Controller
+class HydraControllerTest < ActionController::Base
 end
-
 describe HydraControllerTest do
   
   after :all do
@@ -14,10 +12,23 @@ describe HydraControllerTest do
     HydraControllerTest.expects(:helper).with(:hydra)
     HydraControllerTest.expects(:helper).with(:hydra_assets)
     HydraControllerTest.stubs(:before_filter)
-    HydraControllerTest.send(:include, Hydra::Controller)
+    HydraControllerTest.send(:include, Hydra::Controller::ControllerBehavior)
   end
   
   describe "load_fedora_document" do
+    before :all do
+      @behavior = Hydra::Controller::ControllerBehavior.deprecation_behavior
+      Hydra::Controller::ControllerBehavior.deprecation_behavior = :silence
+    end
+
+    after :all do
+      Hydra::Controller::ControllerBehavior.deprecation_behavior = @behavior
+    end
+
+    before do
+      HydraControllerTest.send(:include, Hydra::Controller::ControllerBehavior)
+    end
+
 
     it "should load @document_fedora and @file_assets" do
       controller.params[:id] = 'hydrangea:fixture_mods_article1'

data/test_support/spec/controllers/permissions_controller_spec.rb

@@ -1,6 +1,14 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Hydra::PermissionsController do
+  before :all do
+    @behavior = Hydra::PermissionsController.deprecation_behavior
+    Hydra::PermissionsController.deprecation_behavior = :silence
+  end
+
+  after :all do
+    Hydra::PermissionsController.deprecation_behavior = @behavior 
+  end
   describe "create" do
     it "should create a new permissions entry" do
       @asset = ModsAsset.create

data/test_support/spec/helpers/access_controls_enforcement_spec.rb

@@ -39,8 +39,7 @@ describe Hydra::AccessControlsEnforcement do
       helper.stubs(:can?).with(:read, nil).returns(true)
       helper.stubs(:redirect_to)
       @permissions_solr_document = SolrDocument.new({"edit_access_person_t"=>["testuser@example.com"], "embargo_release_date_dt"=>(Date.parse(Time.now.to_s)+2).to_s})
-      helper.send(:enforce_show_permissions, {})
-      flash[:alert].should == "This item is under embargo.  You do not have sufficient access privileges to read this document."
+      lambda {helper.send(:enforce_show_permissions, {})}.should raise_error Hydra::AccessDenied, "This item is under embargo.  You do not have sufficient access privileges to read this document."
     end
   end
   describe "apply_gated_discovery" do

data/test_support/spec/helpers/file_assets_helper_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-describe Hydra::FileAssetsHelper do
+describe Hydra::Controller::UploadBehavior do
 
   it "should respond to datastream_id" do
     helper.should respond_to :datastream_id  ### API method, test that it's there to be overridden

data/test_support/spec/helpers/generic_content_objects_helper_spec.rb

@@ -1,8 +1,17 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe GenericContentObjectsHelper do
+  before :all do
+    @behavior = Hydra::GenericContentObjectsHelperBehavior.deprecation_behavior
+    Hydra::GenericContentObjectsHelperBehavior.deprecation_behavior = :silence
+  end
+
+  after :all do
+    Hydra::GenericContentObjectsHelperBehavior.deprecation_behavior = @behavior
+  end
+  
   it "should have a url for a pid" do
-    helper.datastream_disseminator_url('hydra:123', 'sampleDs').should match /http:\/\/127.0.0.1:898\d\/fedora-test\/get\/hydra:123\/sampleDs/
+    helper.datastream_disseminator_url('hydra:123', 'sampleDs').should match /http:\/\/127.0.0.1:\d+\/fedora-test\/get\/hydra:123\/sampleDs/
   end
 
 end

data/test_support/spec/helpers/hydra-repository_controller_spec.rb

@@ -8,7 +8,7 @@ require File.expand_path( File.join( File.dirname(__FILE__),'..','spec_helper')
 # or
 # rake cucumber
 
-describe Hydra::RepositoryController do
+describe Hydra::Controller::RepositoryControllerBehavior do
   
   describe "load_document_from_params" do
     it "should choose which model to use based on submitted params" do

data/test_support/spec/helpers/hydra_assets_helper_spec.rb

@@ -1,6 +1,14 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe HydraAssetsHelper do
+  before :all do
+    @behavior = Hydra::HydraAssetsHelperBehavior.deprecation_behavior
+    Hydra::HydraAssetsHelperBehavior.deprecation_behavior = :silence
+  end
+
+  after :all do
+    Hydra::HydraAssetsHelperBehavior.deprecation_behavior = @behavior
+  end
   include HydraAssetsHelper
   
   describe "link_to_create_asset" do

data/test_support/spec/helpers/hydra_fedora_metadata_helper_spec.rb

@@ -1,6 +1,17 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe HydraFedoraMetadataHelper do
+  before :all do
+    @behavior = Hydra::HydraFedoraMetadataHelperBehavior.deprecation_behavior
+    @form_behavior = Hydra::HydraFedoraMetadataHelperBehavior::HydraFormFor.deprecation_behavior
+    Hydra::HydraFedoraMetadataHelperBehavior.deprecation_behavior = :silence
+    Hydra::HydraFedoraMetadataHelperBehavior::HydraFormFor.deprecation_behavior = :silence
+  end
+
+  after :all do
+    Hydra::HydraFedoraMetadataHelperBehavior.deprecation_behavior = @behavior 
+    Hydra::HydraFedoraMetadataHelperBehavior::HydraFormFor.deprecation_behavior = @form_behavior 
+  end
   
   before(:all) do
     @resource = mock("fedora object")

data/test_support/spec/helpers/hydra_helper_spec.rb

@@ -12,6 +12,15 @@ describe HydraHelper do
   end
   
   describe "get_html_data_with_label" do
+    before :all do
+      @behavior = Hydra::HydraHelperBehavior.deprecation_behavior
+      Hydra::HydraHelperBehavior.deprecation_behavior = :silence
+    end
+
+    after :all do
+      Hydra::HydraHelperBehavior.deprecation_behavior = @behavior
+    end
+
     before(:all) do
       @default_html = " <p>Default Hello</p><ol>
            <li>1</li>
@@ -56,6 +65,15 @@ describe HydraHelper do
   end
   
   describe "get_textile_data_with_label" do
+    before :all do
+      @behavior = Hydra::HydraHelperBehavior.deprecation_behavior
+      Hydra::HydraHelperBehavior.deprecation_behavior = :silence
+    end
+
+    after :all do
+      Hydra::HydraHelperBehavior.deprecation_behavior = @behavior
+    end
+
     before(:all) do
       @sample_document = {'relation_t'=>['http://example.com','"Salt Dev":https://salt-dev.stanford.edu/catalog']}
     end

data/test_support/spec/helpers/hydra_model_methods_spec.rb

@@ -2,18 +2,6 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Hydra::ModelMethods do
   
-  describe "apply_depositor_metadata" do
-    it "should set the depositor metadata field and assign edit permissions to the given depositor_id" do
-      prop_ds = mock("properties ds")
-      rights_ds = mock("rights ds")
-      prop_ds.expects(:respond_to?).with(:depositor_values).returns(true)
-      prop_ds.expects(:depositor_values=).with("foouser")
-      rights_ds.expects(:update_indexed_attributes).with([:edit_access, :person]=>"foouser")
-
-      helper.stubs(:datastreams).returns({"rightsMetadata"=>rights_ds,"properties"=>prop_ds})
-      helper.apply_depositor_metadata("foouser")
-    end
-  end
   
   describe "set_title_and_label" do
     before(:each) do

data/test_support/spec/helpers/hydra_uploader_helper_spec.rb

@@ -1,6 +1,14 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe HydraUploaderHelper do
+  before :all do
+    @behavior = Hydra::HydraUploaderHelperBehavior.deprecation_behavior
+    Hydra::HydraUploaderHelperBehavior.deprecation_behavior = :silence
+  end
+
+  after :all do
+    Hydra::HydraUploaderHelperBehavior.deprecation_behavior = @behavior
+  end
   
   describe "upload_url" do
     it "should use container_id if its available" do