hydra-head 4.0.1 → 4.0.2

data/lib/mediashelf/active_fedora_helper.rb

@@ -1,4 +1,4 @@
-# @deprecated.  Leftover from Hydrangea; will be removed in release 5.x
+# @deprecated  Leftover from Hydrangea; will be removed in release 5.x
 # 
 # Stanford SolrHelper is a controller layer mixin. It is in the controller scope: request params, session etc.
 # 

data/lib/prev_next_links.rb

@@ -1,11 +1,15 @@
 # @deprecated no longer used.  Will be removed no later than release 6.x
 # Custom pagination renderer
 # Call using will_paginate(@results, :renderer => 'PrevNextLinks')
+require 'deprecation'
 class PrevNextLinks < WillPaginate::LinkRenderer
+  extend Deprecation
   
-  def initialize
-    ActiveSupport::Deprecation.warn("PrevNextLinks is deprecated and will be removed in release 5 or 6; we are no longer doing custom pagination.")
-    super
+  self.deprecation_horizon = 'hydra-head 5.x'
+
+  def initialize(app)
+    Deprecation.warn("PrevNextLinks has been deprecated; it will be removed from HydraHead no later than release 6.")
+    @app = app
   end
 
   def to_html
@@ -24,5 +28,6 @@ class PrevNextLinks < WillPaginate::LinkRenderer
     html = links.join(@options[:separator])
     @options[:container] ? @template.content_tag(:div, html, html_attributes) : html
   end
+  deprecation_deprecate :to_html
   
 end

data/lib/user_attributes_loader.rb

@@ -1,19 +1,26 @@
-  # @deprecated   This code is unused / no longer useful.  It will be removed no later than release 6.x
-  # This middleware is for use in development mode, when User
-  # is removed/reloaded each request. This makes sure modules
-  # stay loaded.
-  class UserAttributesLoader
-    def initialize(app)
-      ActiveSupport::Deprecation.warn("UserAttributesLoader has been deprecated; it will be removed no later than release 6.")
-      @app = app
-    end
+# @deprecated   This code is unused / no longer useful.  It will be removed no later than release 6.x
+# This middleware is for use in development mode, when User
+# is removed/reloaded each request. This makes sure modules
+# stay loaded.
+require 'deprecation'
+class UserAttributesLoader
+  extend Deprecation
+  
+  self.deprecation_horizon = 'hydra-head 5.x'
+
+  def initialize(app)
+    Deprecation.warn("UserAttributesLoader has been deprecated; it will be removed from HydraHead no later than release 6.")
+    @app = app
+  end
 
-    def call(env)
-      User.class_eval do
-        unless ancestors.include?(Hydra::GenericUserAttributes)
-          include Hydra::GenericUserAttributes
-        end
+  def call(env)
+    User.class_eval do
+      unless ancestors.include?(Hydra::GenericUserAttributes)
+        include Hydra::GenericUserAttributes
       end
-      @app.call(env)
     end
+    @app.call(env)
   end
+  deprecation_deprecate :call
+  
+end

data/lib/uva/mods_index_methods.rb

@@ -1,4 +1,4 @@
-# @deprecated.  Leftover from Hydrangea; will be removed in release 5.x
+# @deprecated  Leftover from Hydrangea; will be removed in release 5.x
 module Uva
   module ModsIndexMethods
 

data/tasks/hydra-head.rake

@@ -98,7 +98,7 @@ namespace :hyhead do
 
     ### Don't call this directly, use hyhead:cucumber
     Cucumber::Rake::Task.new(:cmd) do |t|
-      t.cucumber_opts = "../../test_support/features --format pretty"
+      t.cucumber_opts = "../../test_support/features --format progress"
     end
   end
    
@@ -118,15 +118,11 @@ namespace :hyhead do
 
       FileUtils.mkdir_p(path)
       
-      puts "Copying over .rvmrc file"
-      FileUtils.cp("./test_support/etc/rvmrc",File.join(path,".rvmrc"))
-      FileUtils.cd("tmp")
-      system("source ./test_app/.rvmrc")
-      
       puts "Installing rails, bundler and devise"
-      %x[gem install --no-rdoc --no-ri 'rails' -v "<3.1"]
+      %x[gem install --no-rdoc --no-ri 'rails' -v "<4"]
       %x[gem install --no-rdoc --no-ri 'bundler']
       
+      FileUtils.cd('tmp')
       puts "Generating new rails app"
       %x[rails new test_app]
       errors << 'Error generating new rails test app' unless $?.success?
@@ -137,9 +133,6 @@ namespace :hyhead do
       puts "Copying Gemfile from test_support/etc"
       FileUtils.cp('../../test_support/etc/Gemfile','./Gemfile')
 
-      puts "Creating local vendor/cache dir and copying gems from hyhead-rails3 gemset"
-      FileUtils.cp_r(File.join('..','..','vendor','cache'), './vendor')
-      
       puts "Copying fixtures into test app spec/fixtures directory"
       FileUtils.mkdir_p( File.join('.','spec') )
       FileUtils.cp_r(File.join('..','..','test_support','fixtures'), File.join('.','spec','fixtures'))
@@ -158,7 +151,7 @@ namespace :hyhead do
       errors << 'Error generating default blacklight install' unless $?.success?
       
       puts "generating default hydra-head install"
-      puts %x[rails generate hydra:head -df]  # using -f to force overwriting of solr.yml
+      puts %x[rails generate hydra:head -f]  # using -f to force overwriting of solr.yml
       errors << 'Error generating default hydra-head install' unless $?.success?
 
       # set log_level to :warn in the test app's test environment. (:debug is too verbose)
@@ -168,12 +161,8 @@ namespace :hyhead do
       puts "Running rake db:migrate"
       %x[rake db:migrate]
       raise "Errors: #{errors.join("; ")}" unless errors.empty?
-
-
     
       FileUtils.cd('../../')
-    
-
   end
   
   task :set_test_host_path do

data/tasks/hydra_jetty.rake

@@ -6,7 +6,11 @@ namespace :hydra do
   namespace :jetty do
     desc "Copies the default Solr & Fedora configs into the bundled Hydra Testing Server"
     task :config do
+      Rake::Task["hydra:jetty:reset"].reenable
+      Rake::Task["hydra:jetty:reset"].invoke
+      Rake::Task["hydra:jetty:config_fedora"].reenable
       Rake::Task["hydra:jetty:config_fedora"].invoke
+      Rake::Task["hydra:jetty:config_solr"].reenable
       Rake::Task["hydra:jetty:config_solr"].invoke
     end
     
@@ -28,7 +32,7 @@ namespace :hydra do
         app_root = File.join(File.dirname(__FILE__),"..")
       end
        
-      fcfg = File.join(app_root,"fedora_conf","conf","fedora.fcfg")
+      fcfg = File.join(app_root,"fedora_conf","conf","test","fedora.fcfg")
       puts "PWD:: #{FileUtils.pwd}"
       if File.exists?(fcfg)
         puts "copying over fedora.fcfg"
@@ -41,5 +45,10 @@ namespace :hydra do
     desc "Copies the default SOLR config files and starts up the fedora instance."
     task :load => [:config, 'jetty:start']
 
+    desc "return development jetty to its pristine state, as pulled from git"
+    task :reset => ['jetty:stop'] do
+      system("cd jetty && git reset --hard HEAD && git clean -dfx & cd ..")
+      sleep 2
+    end
   end
 end

data/test_support/etc/Gemfile

@@ -5,11 +5,20 @@ source 'http://rubygems.org'
 
 gem "rails", '~> 3.2.2'
 
-gem 'sqlite3'
+gem 'blacklight', '~>3.4.1'
 
-gem 'blacklight', '~>3.3.0'
+platforms :jruby do
+  gem 'jruby-openssl'
+  gem 'activerecord-jdbcsqlite3-adapter'
+  gem 'jdbc-sqlite3'
+  gem 'therubyrhino'
+end
 
-gem 'therubyracer' # For compiling js - needed on the ci server
+platforms :ruby do
+ gem 'sqlite3'
+ gem 'execjs'
+ gem 'therubyracer'
+end
 
 gem 'hydra-head', :path => '../../'
 gem 'devise'
@@ -23,7 +32,7 @@ group :development, :test do
        gem 'capybara'
        gem 'factory_girl', '~> 2.6.0'
        gem 'rest-client'
-       gem 'solrizer-fedora', '>=1.2.5'
+       gem 'solrizer-fedora', '>=2.1.0'
 end
 
 # Gems used only for assets and not required

data/test_support/features/support/paths.rb

@@ -12,7 +12,7 @@ module NavigationHelpers
     when /the home\s?page/
       '/'
     when /the search page/
-      '/catalog'
+      '/'
     when /logout/
       destroy_user_session_path
     when /my account info/
@@ -20,9 +20,9 @@ module NavigationHelpers
     when /the base search page/
       '/catalog?q=&search_field=search&action=index&controller=catalog&commit=search'
     when /the document page for id (.+)/ 
-      catalog_path(CGI.escape($1))
+      catalog_path($1)
     when /the edit page for id (.+)/ 
-      edit_catalog_path(CGI.escape($1))
+      edit_catalog_path($1)
     when /the catalog index page/
       catalog_index_path
     # Add more mappings here.
@@ -32,9 +32,9 @@ module NavigationHelpers
     #     user_profile_path(User.find_by_login($1))
 
     when /the edit document page for (.*)$/i
-      edit_catalog_path(CGI.escape $1)
+      edit_catalog_path($1)
     when /the show document page for (.*)$/i
-      catalog_path(CGI.escape $1)
+      catalog_path($1)
     when /the delete confirmation page for (.*)$/i
       delete_catalog_path($1)
       

data/test_support/spec/helpers/blacklight_helper_spec.rb

@@ -1,15 +1,12 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe BlacklightHelper do
-  it "should include HydraHelper" do
-    BlacklightHelper.included_modules.should include(HydraHelper)
-  end
   
   describe "Overridden blacklight methods" do
     describe "document_partial_name" do
 
-      it "Should lop off everything before the first colin after the slash" do
-    @config = Blacklight::Configuration.new.configure do |config|
+    it "Should lop off everything before the first colin after the slash" do
+      @config = Blacklight::Configuration.new.configure do |config|
       config.show.display_type = 'has_model_s'
     end
         helper.stubs(:blacklight_config).returns(@config)
@@ -41,6 +38,13 @@ describe BlacklightHelper do
   
   describe "SALT methods" do
     describe "get_data_with_linked_label" do
+      before(:all) do
+        @orig_deprecation_behavior = Hydra::BlacklightHelperBehavior.deprecation_behavior
+        Hydra::BlacklightHelperBehavior.deprecation_behavior = :silence
+      end
+      after(:all) do
+        Hydra::BlacklightHelperBehavior.deprecation_behavior = @orig_deprecation_behavior
+      end
       before(:each) do
         @doc = {"field"=>["Item1","Item2","Item3"]}
       end

data/test_support/spec/helpers/generic_content_objects_helper_spec.rb

@@ -0,0 +1,8 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe GenericContentObjectsHelper do
+  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/
+  end
+
+end

data/test_support/spec/helpers/hydra_fedora_metadata_helper_spec.rb

@@ -106,6 +106,9 @@ describe HydraFedoraMetadataHelper do
       generated_html.should have_selector "textarea#subject_1.editable-edit.edit", :value => "topic2"
       generated_html.should have_selector "a.destructive.field"
     end
+    it "should make the text area required when the flag is set" do
+      helper.fedora_text_area(@resource, "simple_ds", "subject", :required => true).should have_selector "textarea#subject_0[required]"
+    end
     it "should render an empty control if the field has no values" do      
       helper.fedora_text_area(@resource,"empty_ds","something").should have_selector "textarea#something_0.editable-edit.edit", :value => ""
     end

data/test_support/spec/helpers/hydra_helper_spec.rb

@@ -1,5 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-#require 'RedCloth'
 include HydraHelper
 
 

data/test_support/spec/models/generic_image_spec.rb

@@ -3,61 +3,58 @@ require "active_fedora"
 
 describe GenericImage do
   
-  before(:each) do
-#    Fedora::Repository.stubs(:instance).returns(stub_everything())
-    @hydra_image = GenericImage.new
-
-  end
+  subject { GenericImage.new(:pid=>'test:pid')}
   
   it "Should be a kind of ActiveFedora::Base" do
-    @hydra_image.should be_kind_of(ActiveFedora::Base)
+    subject.should be_kind_of(ActiveFedora::Base)
   end
   
   it "should include Hydra Model Methods" do
-    @hydra_image.class.included_modules.should include(Hydra::ModelMethods)
-    @hydra_image.should respond_to(:apply_depositor_metadata)
+    subject.class.included_modules.should include(Hydra::ModelMethods)
+    subject.should respond_to(:apply_depositor_metadata)
   end
   
   it "should include Hydra Generic Image Methods" do
-    @hydra_image.class.included_modules.should include(Hydra::GenericImage)
-    @hydra_image.should respond_to(:derivation_options)
+    subject.class.included_modules.should include(Hydra::GenericImage)
+    subject.should respond_to(:derivation_options)
   end
   
   it "should have accessors for its default datastreams of content and original" do
-    @hydra_image.should respond_to(:has_content?)
-    @hydra_image.should respond_to(:content)
-    @hydra_image.should respond_to(:content=)
-    @hydra_image.should respond_to(:has_original?)
-    @hydra_image.should respond_to(:original)
-    @hydra_image.should respond_to(:original=)
+    subject.should respond_to(:has_content?)
+    subject.should respond_to(:content)
+    subject.should respond_to(:content=)
+    subject.should respond_to(:has_original?)
+    subject.should respond_to(:original)
+    subject.should respond_to(:original=)
   end
   
   it "should have accessors for its default datastreams of max, screen and thumbnail" do
-    @hydra_image.should respond_to(:has_max?)
-    @hydra_image.should respond_to(:max)
-    @hydra_image.should respond_to(:max=)
-    @hydra_image.should respond_to(:has_screen?)
-    @hydra_image.should respond_to(:screen)
-    @hydra_image.should respond_to(:screen=)
-    @hydra_image.should respond_to(:has_thumbnail?)
-    @hydra_image.should respond_to(:thumbnail)
-    @hydra_image.should respond_to(:thumbnail=)
+    subject.should respond_to(:has_max?)
+    subject.should respond_to(:max)
+    subject.should respond_to(:max=)
+    subject.should respond_to(:has_screen?)
+    subject.should respond_to(:screen)
+    subject.should respond_to(:screen=)
+    subject.should respond_to(:has_thumbnail?)
+    subject.should respond_to(:thumbnail)
+    subject.should respond_to(:thumbnail=)
   end
 
   it "should create a max datastream when setting max value to image file" do
     f = File.new(File.join( File.dirname(__FILE__), "../../fixtures/image.jp2" ))
-    @hydra_image.max = f
+    subject.max = f
   end
   
   describe '#content=' do
-    it "should create a content datastream when given an image file" do
-    end
+    it "should create a content datastream when given an image file" 
   end
 
   describe '#derive_all' do
-    it "should create a max, screen and thumbnail file" do 
-    end
+    it "should create a max, screen and thumbnail file"
   end
 
+  its(:datastream_url) { should match /http:\/\/127.0.0.1:\d{2,5}\/fedora-test\/objects\/test:pid\/datastreams\/content\/content$/ }
+  its(:admin_site) { match /http:\/\/127.0.0.1:\d{2,5}\// }
+
   
 end

data/test_support/spec/models/user_spec.rb

@@ -2,8 +2,16 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 require "active_fedora"
 
 describe User do
-  
+
   describe "superuser" do
+    before(:all) do
+      @orig_deprecation_behavior = Hydra::SuperuserAttributes.deprecation_behavior
+      Hydra::SuperuserAttributes.deprecation_behavior = :silence
+    end
+    after(:all) do
+      Hydra::SuperuserAttributes.deprecation_behavior = @orig_deprecation_behavior
+    end
+
     before(:each) do
       @user = User.create(:email=> "testuser@example.com", :password=> "password", :password_confirmation => "password")
     end

data/test_support/spec/unit/rights_metadata_spec.rb

@@ -0,0 +1,80 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Hydra::ModelMixins::RightsMetadata do
+  subject { ModsAsset.new }
+  it "should have a set of permissions" do
+    subject.discover_groups=['group1', 'group2']
+    subject.edit_users=['user1']
+    subject.read_users=['user2', 'user3']
+    subject.permissions.should include({:type=>"group", :access=>"discover", :name=>"group1"},
+        {:type=>"group", :access=>"discover", :name=>"group2"},
+        {:type=>"user", :access=>"read", :name=>"user2"},
+        {:type=>"user", :access=>"read", :name=>"user3"},
+        {:type=>"user", :access=>"edit", :name=>"user1"})
+  end
+
+  describe "updating permissions" do
+    it "should create new group permissions" do
+      subject.permissions = [{:name=>'group1', :access=>'discover', :type=>'group'}]
+      subject.permissions.should == [{:type=>'group', :access=>'discover', :name=>'group1'}]
+    end
+    it "should create new user permissions" do
+      subject.permissions = [{:name=>'user1', :access=>'discover', :type=>'user'}]
+      subject.permissions.should == [{:type=>'user', :access=>'discover', :name=>'user1'}]
+    end
+    it "should not replace existing groups" do
+      subject.permissions = [{:name=>'group1', :access=>'discover', :type=>'group'}]
+      subject.permissions = [{:name=>'group2', :access=>'discover', :type=>'group'}]
+      subject.permissions.should == [{:type=>'group', :access=>'discover', :name=>'group1'},
+                                   {:type=>'group', :access=>'discover', :name=>'group2'}]
+    end
+    it "should not replace existing users" do
+      subject.permissions = [{:name=>'user1', :access=>'discover', :type=>'user'}]
+      subject.permissions = [{:name=>'user2', :access=>'discover', :type=>'user'}]
+      subject.permissions.should == [{:type=>'user', :access=>'discover', :name=>'user1'},
+                                   {:type=>'user', :access=>'discover', :name=>'user2'}]
+    end
+    it "should update permissions on existing users" do
+      subject.permissions = [{:name=>'user1', :access=>'discover', :type=>'user'}]
+      subject.permissions = [{:name=>'user1', :access=>'edit', :type=>'user'}]
+      subject.permissions.should == [{:type=>'user', :access=>'edit', :name=>'user1'}]
+    end
+    it "should update permissions on existing groups" do
+      subject.permissions = [{:name=>'group1', :access=>'discover', :type=>'group'}]
+      subject.permissions = [{:name=>'group1', :access=>'edit', :type=>'group'}]
+      subject.permissions.should == [{:type=>'group', :access=>'edit', :name=>'group1'}]
+    end
+
+  end
+
+  context "with rightsMetadata" do
+    before do
+      subject.rightsMetadata.update_permissions("person"=>{"person1"=>"read","person2"=>"discover"}, "group"=>{'group-6' => 'read', "group-7"=>'read', 'group-8'=>'edit'})
+      subject.save
+    end
+    it "should have read groups accessor" do
+      subject.read_groups.should == ['group-6', 'group-7']
+    end
+    it "should have read groups string accessor" do
+      subject.read_groups_string.should == 'group-6, group-7'
+    end
+    it "should have read groups writer" do
+      subject.read_groups = ['group-2', 'group-3']
+      subject.rightsMetadata.groups.should == {'group-2' => 'read', 'group-3'=>'read', 'group-8' => 'edit'}
+      subject.rightsMetadata.individuals.should == {"person1"=>"read","person2"=>"discover"}
+    end
+
+    it "should have read groups string writer" do
+      subject.read_groups_string = 'umg/up.dlt.staff, group-3'
+      subject.rightsMetadata.groups.should == {'umg/up.dlt.staff' => 'read', 'group-3'=>'read', 'group-8' => 'edit'}
+      subject.rightsMetadata.individuals.should == {"person1"=>"read","person2"=>"discover"}
+    end
+    it "should only revoke eligible groups" do
+      subject.set_read_groups(['group-2', 'group-3'], ['group-6'])
+      # 'group-7' is not eligible to be revoked
+      subject.rightsMetadata.groups.should == {'group-2' => 'read', 'group-3'=>'read', 'group-7' => 'read', 'group-8' => 'edit'}
+      subject.rightsMetadata.individuals.should == {"person1"=>"read","person2"=>"discover"}
+    end
+  end
+
+end