hydra-head 3.1.0.pre2 → 3.1.0.pre3

data/Gemfile.lock

@@ -144,7 +144,7 @@ GEM
     httpi (0.9.5)
       rack
     i18n (0.5.0)
-    jettywrapper (1.0.2)
+    jettywrapper (1.0.4)
       activesupport (>= 3.0.0)
       childprocess
       i18n
@@ -213,19 +213,19 @@ GEM
       builder (>= 2.1.2)
     rsolr-ext (1.0.3)
       rsolr (>= 1.0.2)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    rspec-rails (2.6.1)
+    rspec-mocks (2.7.0)
+    rspec-rails (2.7.0)
       actionpack (~> 3.0)
       activesupport (~> 3.0)
       railties (~> 3.0)
-      rspec (~> 2.6.0)
+      rspec (~> 2.7.0)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
@@ -295,12 +295,10 @@ DEPENDENCIES
   factory_girl
   gherkin
   hydra-head!
-  jettywrapper (>= 1.0.0)
+  jettywrapper (>= 1.0.4)
   mocha
   rake
-  rest-client
-  rspec (>= 2.0.0)
-  rspec-rails (>= 2.0.0)
+  rspec-rails (>= 2.7.0)
   ruby-debug
   ruby-debug-base
   yard

data/app/helpers/application_helper.rb

@@ -164,4 +164,5 @@ module ApplicationHelper
     new_params
   end
 
+
 end

data/app/helpers/hydra_helper.rb

@@ -175,5 +175,10 @@ module HydraHelper
       return "Save and Continue"
     end
   end
-  
+
+  ### TODO this method is also in Hydra::Controller -- DRY it out
+  def user_key
+    current_user.send(Devise.authentication_keys.first)
+  end
+
 end

data/app/views/_user_util_links.html.erb

@@ -11,7 +11,7 @@
     <% end %>
     <%= link_to "Log Out", destroy_user_session_path %>
     [
-    <%= link_to current_user.login, edit_user_registration_path %>
+    <%= link_to current_user.to_s, edit_user_registration_path %>
     ]
     | 
     <%= link_to 'Your Bookmarks', bookmarks_path %>

data/app/views/permissions/_edit_person_permissions.html.erb

@@ -9,7 +9,7 @@
 -# In the future, we should show current_user's permissions and just disable the ability to modify
  %>
 
-<% if person_id != current_user.login %>
+<% if person_id != user_key %>
 	<% field_name = "#{person_id}_access" %>
 	<% choices = [{"No Access" => "none"},{"Discover" => "discover"}, {"Read & Download" => "read"}, {"Edit & Upload" => "edit"}] %>
 	<% current_permissions = @document_fedora.datastreams["rightsMetadata"].permissions({"person"=>person_id}) %>

data/hydra-head.gemspec

@@ -48,12 +48,12 @@ Gem::Specification.new do |s|
   s.add_dependency 'sanitize'
   
   s.add_development_dependency 'yard'
-  s.add_development_dependency 'jettywrapper', ">=1.0.0"
+  s.add_development_dependency 'jettywrapper', ">=1.0.4"
   s.add_development_dependency 'ruby-debug'
   s.add_development_dependency 'ruby-debug-base'
-  s.add_development_dependency 'rspec', '>= 2.0.0'  
-  s.add_development_dependency 'rspec-rails', '>= 2.0.0' # rspec-rails 2.0.0 requires Rails 3.
-  s.add_development_dependency 'rest-client'
+#  s.add_development_dependency 'rspec', '>= 2.0.0'  
+  s.add_development_dependency 'rspec-rails', '>= 2.7.0'
+#  s.add_development_dependency 'rest-client'
   s.add_development_dependency 'mocha'
   s.add_development_dependency 'cucumber', '>=0.8.5'
   s.add_development_dependency 'cucumber-rails', '>=1.0.0'

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "3.1.0.pre2"
+  VERSION = "3.1.0.pre3"
 end
 

data/lib/hydra/access_controls_enforcement.rb

@@ -96,8 +96,9 @@ module Hydra::AccessControlsEnforcement
       if @permissions_solr_document["embargo_release_date_dt"] 
         embargo_date = Date.parse(@permissions_solr_document["embargo_release_date_dt"].split(/T/)[0])
         if embargo_date > Date.parse(Time.now.to_s)
-          # check for depositor raise "#{@document["depositor_t"].first} --- #{current_user.login}"
-          unless current_user && current_user.login == @permissions_solr_document["depositor_t"].first
+          # check for depositor raise "#{@document["depositor_t"].first} --- #{user_key}"
+          ### Assuming we're using devise and have only one authentication key
+          unless current_user && user_key == @permissions_solr_document["depositor_t"].first
             flash[:notice] = "This item is under embargo.  You do not have sufficient access privileges to read this document."
             redirect_to(:action=>'index', :q=>nil, :f=>nil) and return false
           end
@@ -184,14 +185,14 @@ module Hydra::AccessControlsEnforcement
     # Grant access based on user id & role
     unless current_user.nil?
       # for roles
-      RoleMapper.roles(current_user.login).each_with_index do |role, i|
+      RoleMapper.roles(user_key).each_with_index do |role, i|
         permission_types.each do |type|
           user_access_filters << "#{type}_access_group_t:#{role}"
         end
       end
       # for individual person access
       permission_types.each do |type|
-        user_access_filters << "#{type}_access_person_t:#{current_user.login}"        
+        user_access_filters << "#{type}_access_person_t:#{user_key}"        
       end
       if current_user.is_being_superuser?(session)
         permission_types.each do |type|
@@ -203,8 +204,8 @@ module Hydra::AccessControlsEnforcement
       # If you want to do this, set up your own solr_search_params before_filter that injects the appropriate :fq constraints for a field that expresses your objects' embargo status.
       #
       # include docs in results if the embargo date is NOT in the future OR if the current user is depositor
-      # embargo_query = "(NOT embargo_release_date_dt:[NOW TO *]) OR depositor_t:#{current_user.login}"
-      # embargo_query = "(NOT embargo_release_date_dt:[NOW TO *]) OR (embargo_release_date_dt:[NOW TO *] AND  depositor_t:#{current_user.login}) AND NOT (NOT depositor_t:#{current_user.login} AND embargo_release_date_dt:[NOW TO *])"
+      # embargo_query = "(NOT embargo_release_date_dt:[NOW TO *]) OR depositor_t:#{user_key}"
+      # embargo_query = "(NOT embargo_release_date_dt:[NOW TO *]) OR (embargo_release_date_dt:[NOW TO *] AND  depositor_t:#{user_key}) AND NOT (NOT depositor_t:#{user_key} AND embargo_release_date_dt:[NOW TO *])"
       # solr_parameters[:fq] << embargo_query         
     end
     solr_parameters[:fq] << user_access_filters.join(" OR ")
@@ -252,14 +253,14 @@ module Hydra::AccessControlsEnforcement
 
       unless current_user.nil?
         # for roles
-        RoleMapper.roles(current_user.login).each do |role|
+        RoleMapper.roles(user_key).each do |role|
           permission_types.each do |type|
             field_queries << "_query_:\"#{type}_access_group_t:#{role}\""
           end
         end
         # for individual person access
         permission_types.each do |type|
-          field_queries << "_query_:\"#{type}_access_person_t:#{current_user.login}\""
+          field_queries << "_query_:\"#{type}_access_person_t:#{user_key}\""
         end
         if current_user.is_being_superuser?(session)
           permission_types.each do |type|
@@ -269,7 +270,7 @@ module Hydra::AccessControlsEnforcement
 
         # if it is the depositor and it is under embargo, that is ok
         # otherwise if it not the depositor and it is under embargo, don't show it
-        embargo_query = " OR  ((_query_:\"embargo_release_date_dt:[NOW TO *]\" AND  _query_:\"depositor_t:#{current_user.login}\") AND NOT (NOT _query_:\"depositor_t:#{current_user.login}\" AND _query_:\"embargo_release_date_dt:[NOW TO *]\"))"
+        embargo_query = " OR  ((_query_:\"embargo_release_date_dt:[NOW TO *]\" AND  _query_:\"depositor_t:#{user_key}\") AND NOT (NOT _query_:\"depositor_t:#{user_key}\" AND _query_:\"embargo_release_date_dt:[NOW TO *]\"))"
       end
       
       # remove anything with an embargo release date in the future  
@@ -281,4 +282,5 @@ module Hydra::AccessControlsEnforcement
     return q
   end
 
+
 end

data/lib/hydra/access_controls_evaluation.rb

@@ -25,7 +25,7 @@ module Hydra::AccessControlsEvaluation
         user = "public"
         logger.debug("current_user is nil, assigning public")
       else
-        user = current_user.login
+        user = user_key
       end
       
       user_groups = RoleMapper.roles(user)

data/lib/hydra/assets_controller_helper.rb

@@ -4,12 +4,12 @@ module Hydra::AssetsControllerHelper
   # This makes sure that assets have the current user marked as their depositor/owner.  
   # Relies on the asset's model to define _what_ apply_depositor_metadata should do.  Most Hydra assets will rely on {Hydra::ModelMethods#apply_depositor_metadata}
   #
-  # Attempts to call apply_depositor_metadata on the +asset+, passing current_user.login as the depositor
-  # Does nothing if the asset doesn't respond to .apply_depositor_metadata or current_user doesn't respond to .login
+  # Attempts to call apply_depositor_metadata on the +asset+, passing user_key as the depositor
+  # Does nothing if the asset doesn't respond to .apply_depositor_metadata 
   # @param asset to call apply_depositor_metadata on
   def apply_depositor_metadata(asset)
-    if asset.respond_to?(:apply_depositor_metadata) && current_user.respond_to?(:login)
-      asset.apply_depositor_metadata(current_user.login)
+    if asset.respond_to?(:apply_depositor_metadata) && user_key
+      asset.apply_depositor_metadata(user_key)
     end
   end
 
@@ -147,4 +147,4 @@ module Hydra::AssetsControllerHelper
     h
   end
   
-end
+end

data/lib/hydra/controller.rb

@@ -31,4 +31,9 @@ module Hydra::Controller
     javascript_includes << ['jquery.form.js']
     javascript_includes << ['spin.min.js' ]
   end
-end
+
+  def user_key
+    current_user.send(Devise.authentication_keys.first)
+  end
+  
+end

data/lib/railties/hydra_jetty.rake

@@ -1,18 +1,4 @@
-require "hydra/testing_server"
-
-# if you would like to see solr startup messages on STDERR
-# when starting solr test server during functional tests use:
-# 
-#    rake SOLR_CONSOLE=true
-JETTY_PARAMS = {
-  :quiet => ENV['HYDRA_CONSOLE'] ? false : true,
-  :jetty_home => ENV['HYDRA_JETTY_HOME'],
-  :jetty_port => 8983,
-  :solr_home => ENV['HYDRA_SOLR_HOME'],
-  :fedora_home => ENV['HYDRA_SOLR_HOME']
-}
-
-#:jetty_port => ENV['HYDRA_JETTY_PORT'],
+require 'jettywrapper'
 
 namespace :jetty do
   desc "Apply all configs to Testing Server (relies on hydra:jetty:config tasks unless you override it)"
@@ -23,24 +9,6 @@ end
 
 namespace :hydra do
   namespace :jetty do
-    desc "Starts the bundled Hydra Testing Server"
-    task :start do
-      Hydra::TestingServer.configure(JETTY_PARAMS)
-      Hydra::TestingServer.instance.start
-    end
-    
-    desc "Stops the bundled Hydra Testing Server"
-    task :stop do
-      Hydra::TestingServer.instance.stop
-    end
-    
-    desc "Restarts the bundled Hydra Testing Server"
-    task :restart do
-      Hydra::TestingServer.instance.stop
-      Hydra::TestingServer.configure(JETTY_PARAMS)
-      Hydra::TestingServer.instance.start
-    end
-
     desc "Copies the default Solr & Fedora configs into the bundled Hydra Testing Server"
     task :config do
       Rake::Task["hydra:jetty:config_fedora"].invoke
@@ -50,8 +18,8 @@ namespace :hydra do
     desc "Copies the contents of solr_conf into the Solr development-core and test-core of Testing Server"
     task :config_solr do
       FileList['solr_conf/*'].each do |f|  
-        cp_r("#{f}", 'jetty/solr/development-core/', :verbose => true)
-        cp_r("#{f}", 'jetty/solr/test-core/', :verbose => true)
+        cp("#{f}", 'jetty/solr/development-core/', :verbose => true)
+        cp("#{f}", 'jetty/solr/test-core/', :verbose => true)
       end
     end
 
@@ -77,10 +45,5 @@ namespace :hydra do
     desc "Copies the default SOLR config files and starts up the fedora instance."
     task :load => [:config, :start]
 
-    desc "Returns the status of the Hydra::TestingServer."
-    task :status do
-      status = Hydra::TestingServer.instance.pid ? "Running: #{Hydra::TestingServer.instance.pid}" : "Not running"
-      puts status
-    end
   end
 end

data/spec/controllers/catalog_valid_html_spec.rb

@@ -52,7 +52,7 @@ describe CatalogController do
     it "Should have Valid HTML when I'm logged in" do
         
         mock_user = mock("User")
-        mock_user.stubs(:login).returns("archivist1@example.com")
+        mock_user.stubs(:email).returns("archivist1@example.com")
         mock_user.stubs(:can_be_superuser?).returns(true)
         mock_user.stubs(:is_being_superuser?).returns(true)
         mock_user.stubs(:last_search_url).returns(nil)
@@ -67,7 +67,7 @@ describe CatalogController do
     
     before(:each)  do
         mock_user = mock("User")
-        mock_user.stubs(:login).returns("archivist1@example.com")
+        mock_user.stubs(:email).returns("archivist1@example.com")
         mock_user.stubs(:can_be_superuser?).returns(true)
         mock_user.stubs(:is_being_superuser?).returns(true)
         mock_user.stubs(:last_search_url).returns(nil)
@@ -125,4 +125,4 @@ describe CatalogController do
     
   end #Document pages
   
-end
+end

data/tasks/hydra-head.rake

@@ -6,31 +6,19 @@ namespace :hyhead do
 
   desc "Execute Continuous Integration build (docs, tests with coverage)"
   task :ci do
-    if ( ENV['environment'] == 'test' )
-      Rake::Task["hyhead:doc"].invoke
-      Rake::Task["hydra:jetty:config"].invoke
-      
-      require 'jettywrapper'
-      jetty_params = {
-        :jetty_home => File.expand_path(File.dirname(__FILE__) + '/../jetty'),
-        :quiet => false,
-        :jetty_port => 8983,
-        :solr_home => File.expand_path(File.dirname(__FILE__) + '/../jetty/solr'),
-        :fedora_home => File.expand_path(File.dirname(__FILE__) + '/../jetty/fedora/default'),
-        :startup_wait => 30
-        }
-
-      # does this make jetty run in TEST environment???
-      error = Jettywrapper.wrap(jetty_params) do
-        Rake::Task['hyhead:setup_test_app'].invoke
-        puts %x[rake hyhead:fixtures:refresh RAILS_ENV=test] # calling hydra:fixtures:refresh from the root of the test app
+    # Docs are broken
+    #Rake::Task["hyhead:doc"].invoke
+    Rake::Task["hydra:jetty:config"].invoke
+    
+    require 'jettywrapper'
+    jetty_params = Jettywrapper.load_config.merge({:jetty_home => File.expand_path(File.dirname(__FILE__) + '/../jetty')})
+    
+    error = nil
+    error = Jettywrapper.wrap(jetty_params) do
         Rake::Task['hyhead:test'].invoke
-      end
-      raise "test failures: #{error}" if error
-    else
-      system("rake hyhead:ci environment=test")
-      fail unless $?.success?
+        Rake::Task['hyhead:cucumber'].invoke
     end
+    raise "test failures: #{error}" if error
   end
 
   
@@ -40,16 +28,19 @@ namespace :hyhead do
   namespace :rspec do
       
     desc "Run the hydra-head specs - need to have jetty running, test host set up and fixtures loaded."
-    task :run => :use_test_app do
-			puts "Running rspec tests"
-			puts  %x[rake hyhead:spec:run]
-      FileUtils.cd('../../')
+    ENV['RAILS_ROOT'] = File.join(File.expand_path(File.dirname(__FILE__)),'..','tmp','test_app')
+    RSpec::Core::RakeTask.new(:run) do |t|
+      t.rspec_opts = "--colour"
+      
+      # pattern directory name defaults to ./**/*_spec.rb, but has a more concise command line echo
+      t.pattern = File.join(File.expand_path(File.dirname(__FILE__)),'..','test_support','spec')
     end
     
+    
     desc "Sets up test host, loads fixtures, then runs specs - need to have jetty running."
     task :setup_and_run => ["hyhead:setup_test_app"] do
 			puts "Reloading fixtures"
-      puts %x[rake hyhead:fixtures:refresh RAILS_ENV=test] # calling hydra:fixtures:refresh from the root of the test app
+      puts %x[rake hyhead:fixtures:refresh RAILS_ENV=test]
       Rake::Task["hyhead:rspec:run"].invoke
     end
         
@@ -99,16 +90,21 @@ namespace :hyhead do
   
 
   namespace :cucumber do
+
+    require 'cucumber/rake/task'
+
+    ### Don't call this directly, use hyhead:cucumber:run
+    Cucumber::Rake::Task.new(:cmd) do |t|
+      t.cucumber_opts = "../../test_support/features --format pretty"
+    end
    
-   desc "Run cucumber tests for hyhead - need to have jetty running, test host set up and fixtures loaded."
-   task :run => :set_test_host_path do
-     Dir.chdir(TEST_HOST_PATH)
-     puts "Running cucumber features in test host app"
-     puts %x[rake hyhead:cucumber]
-     # puts %x[cucumber --color --tags ~@pending --tags ~@overwritten features]
-     raise "Cucumber tests failed" unless $?.success?
-     FileUtils.cd('../../')
-   end
+    desc "Run cucumber tests for hyhead - need to have jetty running, test host set up and fixtures loaded."
+    task :run => :set_test_host_path do
+      Dir.chdir(TEST_HOST_PATH)
+      puts "Running cucumber features in test host app"
+      Rake::Task["hyhead:cucumber:cmd"].invoke
+      FileUtils.cd('../../')
+    end
  
    # desc "Sets up test host, loads fixtures, then runs cucumber features - need to have jetty running."
    # task :setup_and_run => ["hyhead:setup_test_app", "hyhead:remove_features_from_host", "hyhead:copy_features_to_host"] do
@@ -218,26 +214,30 @@ namespace :hyhead do
   #
   # Test
   #
-
   desc "Run tests against test app"
-  task :test => [:use_test_app]  do
+  task :test => [:spec, :cucumber]  do
     
-    puts "Running rspec tests"
-    puts %x[rake hyhead:spec]
-    rspec_success = $?.success?
+  end
 
-    puts "Running cucumber tests"
-    puts %x[rake hyhead:cucumber]
-    cucumber_success = $?.success?
+  # desc "Run tests against test app"
+  # task :test => [:use_test_app]  do
+  #   
+  #   puts "Running rspec tests"
+  #   puts %x[rake hyhead:spec]
+  #   rspec_success = $?.success?
 
-    FileUtils.cd('../../')
-    if rspec_success && cucumber_success
-      puts "Completed test suite with no errors"
-    else
-      puts "Test suite encountered failures... check console output for details."
-      fail
-    end
-  end
+  #   puts "Running cucumber tests"
+  #   puts %x[rake hyhead:cucumber]
+  #   cucumber_success = $?.success?
+
+  #   FileUtils.cd('../../')
+  #   if rspec_success && cucumber_success
+  #     puts "Completed test suite with no errors"
+  #   else
+  #     puts "Test suite encountered failures... check console output for details."
+  #     fail
+  #   end
+  # end
   
   desc "Make sure the test app is installed, then run the tasks from its root directory"
   task :use_test_app => [:set_test_host_path] do

data/tasks/hydra_jetty.rake

@@ -1,38 +1,9 @@
-require "hydra/testing_server"
+##For jettywrapper set the app_ROOT
+APP_ROOT= File.expand_path(File.join(File.dirname(__FILE__),".."))
+require 'jettywrapper'
 
-# if you would like to see solr startup messages on STDERR
-# when starting solr test server during functional tests use:
-# 
-#    rake SOLR_CONSOLE=true
-JETTY_PARAMS = {
-  :quiet => ENV['HYDRA_CONSOLE'] ? false : true,
-  :jetty_home => ENV['HYDRA_JETTY_HOME'],
-  :jetty_port => 8983,
-  :solr_home => ENV['HYDRA_SOLR_HOME'],
-  :fedora_home => ENV['HYDRA_SOLR_HOME']
-}
-
-#:jetty_port => ENV['HYDRA_JETTY_PORT'],
 namespace :hydra do
   namespace :jetty do
-    desc "Starts the bundled Hydra Testing Server"
-    task :start do
-      Hydra::TestingServer.configure(JETTY_PARAMS)
-      Hydra::TestingServer.instance.start
-    end
-    
-    desc "Stops the bundled Hydra Testing Server"
-    task :stop do
-      Hydra::TestingServer.instance.stop
-    end
-    
-    desc "Restarts the bundled Hydra Testing Server"
-    task :restart do
-      Hydra::TestingServer.instance.stop
-      Hydra::TestingServer.configure(JETTY_PARAMS)
-      Hydra::TestingServer.instance.start
-    end
-
     desc "Copies the default Solr & Fedora configs into the bundled Hydra Testing Server"
     task :config do
       Rake::Task["hydra:jetty:config_fedora"].invoke
@@ -44,7 +15,7 @@ namespace :hydra do
       FileList['solr_conf/conf/*'].each do |f|  
         cp("#{f}", 'jetty/solr/development-core/conf/', :verbose => true)
         cp("#{f}", 'jetty/solr/test-core/conf/', :verbose => true)
-    end
+      end
 
     end
 
@@ -68,12 +39,7 @@ namespace :hydra do
     end
 
     desc "Copies the default SOLR config files and starts up the fedora instance."
-    task :load => [:config, :start]
+    task :load => [:config, 'jetty:start']
 
-    desc "Returns the status of the Hydra::TestingServer."
-    task :status do
-      status = Hydra::TestingServer.instance.pid ? "Running: #{Hydra::TestingServer.instance.pid}" : "Not running"
-      puts status
-    end
   end
 end

data/test_support/etc/Gemfile

@@ -12,6 +12,7 @@ gem 'sqlite3-ruby', '~>1.2.5', :require => 'sqlite3'
 gem 'blacklight', '3.0.0'
 gem 'hydra-head', :path => '../../'
 gem 'devise'
+gem 'jettywrapper'
 
 # For testing
 group :development, :test do 

data/test_support/features/html_validity.feature

@@ -22,6 +22,7 @@ Feature: HTML validity
     Given I am logged in as "archivist1@example.com" 
     When I am on the home page
     And I follow "Article"
+#This may fail if there are a lot of articles in fedora and the expected article is not on the first page
     Then I should see "TITLE OF HOST JOURNAL"
     And the page should be HTML5 valid
     

data/test_support/spec/controllers/catalog_controller_spec.rb

@@ -72,7 +72,7 @@ describe CatalogController do
         assigns(:document_list).count.should == @public_only_results.docs.count
       end
       it "should return all documents if role does have permissions" do
-	User.any_instance.stubs(:login).returns("BigWig")
+       	User.any_instance.stubs(:email).returns("BigWig@example.com")
         mock_user =  User.new
         # session[:superuser_mode] = true
         mock_user.stubs(:is_being_superuser?).returns(true)

data/test_support/spec/controllers/catalog_controller_viewing_context_spec.rb

@@ -44,7 +44,7 @@ describe CatalogController do
   describe "edit" do
     it "should enforce edit permissions, redirecting to show action and resetting session context if user does not have edit permissions" do
       mock_user = mock("User")
-      mock_user.stubs(:login).returns("patron1")
+      mock_user.stubs(:email).returns("patron1@example.com")
       mock_user.stubs(:is_being_superuser?).returns(false)
       controller.stubs(:current_user).returns(mock_user)
       

data/test_support/spec/controllers/file_assets_controller_spec.rb

@@ -64,11 +64,7 @@ describe FileAssetsController do
     end
   end
 
-  describe "index" do
-    it "should be refined further!"
-  end
   describe "new" do
-    it "should return the file uploader view"
     it "should set :container_id to value of :container_id if available" do
       xhr :get, :new, :asset_id=>"_PID_"
       @controller.params[:asset_id].should == "_PID_"
@@ -78,7 +74,7 @@ describe FileAssetsController do
   describe "show" do
     it "should redirect to index view if current_user does not have read or edit permissions" do
       mock_user = mock("User")
-      mock_user.stubs(:login).returns("fake_user")
+      mock_user.stubs(:email).returns("fake_user@example.com")
       mock_user.stubs(:is_being_superuser?).returns(false)
       controller.stubs(:current_user).returns(mock_user)
       get(:show, :id=>"hydrangea:fixture_file_asset1")
@@ -170,6 +166,7 @@ describe FileAssetsController do
     describe "create" do
       before :each do
         mock_user = mock("User")
+        mock_user.stubs(:email).returns('user@example.com')
         mock_warden = mock("Warden")
         mock_warden.stubs(:authenticate).returns(mock_user)
         request.env['warden'] = mock_warden

data/test_support/spec/helpers/access_controls_enforcement_spec.rb

@@ -7,8 +7,7 @@ describe Hydra::AccessControlsEnforcement do
     before(:each) do
       @stub_user = User.new :email=>'archivist1@example.com'
       @stub_user.stubs(:is_being_superuser?).returns false
-      @stub_user.stubs(:login).returns "fred"
-      RoleMapper.stubs(:roles).with(@stub_user.login).returns(["archivist","researcher"])
+      RoleMapper.stubs(:roles).with(@stub_user.email).returns(["archivist","researcher"])
       helper.stubs(:current_user).returns(@stub_user)
       @solr_parameters = {}
       @user_parameters = {}
@@ -16,7 +15,7 @@ describe Hydra::AccessControlsEnforcement do
     it "should set query fields for the user id checking against the discover, access, read fields" do
       helper.send(:apply_gated_discovery, @solr_parameters, @user_parameters)
       ["discover","edit","read"].each do |type|
-        @solr_parameters[:fq].first.should match(/#{type}_access_person_t\:#{@stub_user.login}/)      
+        @solr_parameters[:fq].first.should match(/#{type}_access_person_t\:#{@stub_user.email}/)      
       end
     end
     it "should set query fields for all roles the user is a member of checking against the discover, access, read fields" do
@@ -33,17 +32,16 @@ describe Hydra::AccessControlsEnforcement do
     it "should allow content owners access to their embargoed content" do
       pending
       helper.send(:apply_gated_discovery, @solr_parameters, @user_parameters)
-      @solr_parameters[:fq].should include("(NOT embargo_release_date_dt:[NOW TO *]) OR depositor_t:#{@stub_user.login}")
+      @solr_parameters[:fq].should include("(NOT embargo_release_date_dt:[NOW TO *]) OR depositor_t:#{@stub_user.email}")
       
-      # @solr_parameters[:fq].should include("embargo_release_date_dt:[NOW TO *] AND  depositor_t:#{current_user.login}) AND NOT (NOT depositor_t:#{current_user.login} AND embargo_release_date_dt:[NOW TO *]")
+      # @solr_parameters[:fq].should include("embargo_release_date_dt:[NOW TO *] AND  depositor_t:#{current_user.email}) AND NOT (NOT depositor_t:#{current_user.email} AND embargo_release_date_dt:[NOW TO *]")
     end
     
     describe "for superusers" do
       it "should return superuser access level" do
-        stub_user = User.new
-        stub_user.stubs(:login).returns "suzie"
+        stub_user = User.new(:email=>'suzie@example.com')
         stub_user.stubs(:is_being_superuser?).returns true
-        RoleMapper.stubs(:roles).with(stub_user.login).returns(["archivist","researcher"])
+        RoleMapper.stubs(:roles).with(stub_user.email).returns(["archivist","researcher"])
         helper.stubs(:current_user).returns(stub_user)
         helper.send(:apply_gated_discovery, @solr_parameters, @user_parameters)
         ["discover","edit","read"].each do |type|    
@@ -51,10 +49,9 @@ describe Hydra::AccessControlsEnforcement do
         end
       end
       it "should not return superuser access to non-superusers" do
-        stub_user = User.new
-        stub_user.stubs(:login).returns "suzie"
+        stub_user = User.new(:email=>'suzie@example.com')
         stub_user.stubs(:is_being_superuser?).returns false
-        RoleMapper.stubs(:roles).with(stub_user.login).returns(["archivist","researcher"])
+        RoleMapper.stubs(:roles).with(stub_user.email).returns(["archivist","researcher"])
         helper.stubs(:current_user).returns(stub_user)
         helper.send(:apply_gated_discovery, @solr_parameters, @user_parameters)
         ["discover","edit","read"].each do |type|
@@ -87,9 +84,9 @@ describe Hydra::AccessControlsEnforcement do
      helper.stubs(:current_user).returns(stub_user)
      # This example assumes that archivist1 is in the archivist and researcher groups.
      # Tried stubbing RoleMapper.roles instead, but that broke 26 other tests because mocha fails to release the expectation.
-     # RoleMapper.stubs(:roles).with(stub_user.login).returns(["archivist", "researcher"])
+     # RoleMapper.stubs(:roles).with(stub_user.email).returns(["archivist", "researcher"])
      query = helper.send(:build_lucene_query, "query_string")
-     # RoleMapper.stubs(:roles).with(stub_user.login).returns(["archivist", "researcher"])
+     # RoleMapper.stubs(:roles).with(stub_user.email).returns(["archivist", "researcher"])
      # query = helper.send(:build_lucene_query, "string")
      
      ["discover","edit","read"].each do |type|
@@ -112,7 +109,7 @@ describe Hydra::AccessControlsEnforcement do
      helper.stubs(:current_user).returns(stub_user)
      query = helper.send(:build_lucene_query, "string")
      ["discover","edit","read"].each do |type|
-       query.should match(/_query_\:\"#{type}_access_person_t\:#{stub_user.login}/)
+       query.should match(/_query_\:\"#{type}_access_person_t\:#{stub_user.email}/)
      end
    end
    describe "for superusers" do

data/test_support/spec/helpers/access_controls_evaluation_spec.rb

@@ -4,7 +4,7 @@ describe Hydra::AccessControlsEvaluation do
   
   describe "test_permission" do
     it "should automatically add logged-in users to 'registered' group" do
-      mock_user = mock("User", :login => "logged_in_person")
+      mock_user = mock("User", :email => "logged_in_person@example.com")
       helper.stubs(:read_groups).returns(["registered"])
       helper.stubs(:current_user).returns(nil)
       helper.test_permission(:read).should == false 
@@ -15,7 +15,7 @@ describe Hydra::AccessControlsEvaluation do
   
   describe "editor?" do
     it "should return true if current_user.is_being_superuser? is true" do
-      mock_user = mock("User", :login => "BigWig")
+      mock_user = mock("User", :email => "BigWig@example.com")
       mock_user.stubs(:is_being_superuser?).returns true
       helper.stubs(:current_user).returns mock_user
       helper.editor?.should be_true
@@ -25,7 +25,7 @@ describe Hydra::AccessControlsEvaluation do
       helper.editor?.should be_false
     end    
     it "should return false if the session[:user] does not have an editor role" do
-      mock_user = mock("User", :login=>"nobody_special")
+      mock_user = mock("User", :email=>"nobody_special@example.com")
       mock_user.stubs(:is_being_superuser?).returns(false)
       helper.stubs(:current_user).returns(mock_user)
       helper.editor?.should be_false

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: hydra-head
 version: !ruby/object:Gem::Version 
-  hash: 1923832029
+  hash: 1923832031
   prerelease: 6
   segments: 
   - 3
   - 1
   - 0
   - pre
-  - 2
-  version: 3.1.0.pre2
+  - 3
+  version: 3.1.0.pre3
 platform: ruby
 authors: 
 - Matt Zumwalt, Bess Sadler, Julie Meloni, Naomi Dushay, Jessie Keck, John Scofield, Justin Coyne & many more.  See https://github.com/projecthydra/hydra-head/contributors
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-10 00:00:00 -08:00
+date: 2011-11-11 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -540,12 +540,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 31
         segments: 
         - 1
         - 0
-        - 0
-        version: 1.0.0
+        - 4
+        version: 1.0.4
   type: :development
   version_requirements: *id036
 - !ruby/object:Gem::Dependency 
@@ -577,55 +577,25 @@ dependencies:
   type: :development
   version_requirements: *id038
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rspec-rails
   prerelease: false
   requirement: &id039 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 19
         segments: 
         - 2
+        - 7
         - 0
-        - 0
-        version: 2.0.0
+        version: 2.7.0
   type: :development
   version_requirements: *id039
-- !ruby/object:Gem::Dependency 
-  name: rspec-rails
-  prerelease: false
-  requirement: &id040 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
-        version: 2.0.0
-  type: :development
-  version_requirements: *id040
-- !ruby/object:Gem::Dependency 
-  name: rest-client
-  prerelease: false
-  requirement: &id041 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id041
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id042 !ruby/object:Gem::Requirement 
+  requirement: &id040 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -635,11 +605,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id042
+  version_requirements: *id040
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id043 !ruby/object:Gem::Requirement 
+  requirement: &id041 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -651,11 +621,11 @@ dependencies:
         - 5
         version: 0.8.5
   type: :development
-  version_requirements: *id043
+  version_requirements: *id041
 - !ruby/object:Gem::Dependency 
   name: cucumber-rails
   prerelease: false
-  requirement: &id044 !ruby/object:Gem::Requirement 
+  requirement: &id042 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -667,11 +637,11 @@ dependencies:
         - 0
         version: 1.0.0
   type: :development
-  version_requirements: *id044
+  version_requirements: *id042
 - !ruby/object:Gem::Dependency 
   name: gherkin
   prerelease: false
-  requirement: &id045 !ruby/object:Gem::Requirement 
+  requirement: &id043 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -681,11 +651,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id045
+  version_requirements: *id043
 - !ruby/object:Gem::Dependency 
   name: factory_girl
   prerelease: false
-  requirement: &id046 !ruby/object:Gem::Requirement 
+  requirement: &id044 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -695,11 +665,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id046
+  version_requirements: *id044
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id047 !ruby/object:Gem::Requirement 
+  requirement: &id045 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -709,7 +679,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id047
+  version_requirements: *id045
 description: "Hydra-Head is a Rails Engine containing the core code for a Hydra application. The full hydra stack includes: Blacklight, Fedora, Solr, active-fedora, solrizer, and om"
 email: 
 - hydra-tech@googlegroups.com
@@ -1198,7 +1168,7 @@ files:
 - vendor/cache/httparty-0.8.1.gem
 - vendor/cache/httpi-0.9.5.gem
 - vendor/cache/i18n-0.5.0.gem
-- vendor/cache/jettywrapper-1.0.2.gem
+- vendor/cache/jettywrapper-1.0.4.gem
 - vendor/cache/json-1.6.1.gem
 - vendor/cache/json_pure-1.6.1.gem
 - vendor/cache/kaminari-0.12.4.gem
@@ -1231,11 +1201,11 @@ files:
 - vendor/cache/rest-client-1.6.7.gem
 - vendor/cache/rsolr-1.0.2.gem
 - vendor/cache/rsolr-ext-1.0.3.gem
-- vendor/cache/rspec-2.6.0.gem
-- vendor/cache/rspec-core-2.6.4.gem
-- vendor/cache/rspec-expectations-2.6.0.gem
-- vendor/cache/rspec-mocks-2.6.0.gem
-- vendor/cache/rspec-rails-2.6.1.gem
+- vendor/cache/rspec-2.7.0.gem
+- vendor/cache/rspec-core-2.7.1.gem
+- vendor/cache/rspec-expectations-2.7.0.gem
+- vendor/cache/rspec-mocks-2.7.0.gem
+- vendor/cache/rspec-rails-2.7.0.gem
 - vendor/cache/ruby-debug-0.10.4.gem
 - vendor/cache/ruby-debug-base-0.10.4.gem
 - vendor/cache/rubydora-0.2.3.gem