RubyGems - hydra-head - Versions diffs - 4.0.0.rc5 → 4.0.0.rc6 - Mend

hydra-head 4.0.0.rc5 → 4.0.0.rc6

Files changed (44) hide show

data/HISTORY.textile +1 -1
data/HOW_TO_GET_STARTED.textile +2 -2
data/INSTALL_PREREQ.textile +1 -20
data/README.textile +12 -16
data/app/assets/stylesheets/hydra/html_refactor.css +1 -5
data/app/assets/stylesheets/hydra/hydrangea.css +0 -4
data/app/assets/stylesheets/hydra/styles.css +12 -595
data/app/controllers/downloads_controller.rb +2 -1
data/app/controllers/hydra/permissions_controller.rb +2 -6
data/app/models/ability.rb +1 -98
data/app/models/hydra/ability.rb +128 -0
data/app/views/_flash_msg.html.erb +1 -1
data/app/views/catalog/_home.html.erb +2 -2
data/app/views/catalog/_home_text.html.erb +2 -8
data/app/views/catalog/_show_partials/_default.html.erb +0 -4
data/app/views/generic_images/_edit.html.erb +0 -2
data/app/views/layouts/hydra-head.html.erb +22 -35
data/lib/hydra-head/version.rb +1 -1
data/lib/hydra/mods_article.rb +22 -2
data/lib/railties/hydra-fixtures.rake +17 -24
data/tasks/hydra-head-fixtures.rake +32 -28
data/tasks/hydra-head.rake +39 -57
data/{lib/railties → tasks}/hyhead_rspec.rake +7 -26
data/test_support/features/file_upload.feature +3 -3
data/test_support/features/step_definitions/edit_metadata_steps.rb +1 -1
data/test_support/features/step_definitions/user_steps.rb +7 -4
data/test_support/spec/models/ability_spec.rb +3 -9
metadata +36 -51
data/DEVELOP_PLUGIN.textile +0 -90
data/GIT_WORKFLOW.textile +0 -106
data/HOW_TO_DEFINE_A_HYDRA_CONTROLLER.textile +0 -21
data/HOW_TO_DEFINE_A_HYDRA_MODEL.textile +0 -64
data/HYDRA_ACCESS_CONTROLS.textile +0 -27
data/INITIAL_APP_MODS.textile +0 -223
data/README_RAILS3_CHANGES.textile +0 -67
data/README_RAKE_TASKS.textile +0 -107
data/README_SUBTREE.textile +0 -87
data/README_TERSE.textile +0 -92
data/RELEASE_NOTES.textile +0 -8
data/TESTING.textile +0 -85
data/TESTING_PLUGIN.textile +0 -133
data/app/views/layouts/application.html.erb +0 -49
data/lib/railties/all_tests.rake +0 -23
data/lib/railties/hyhead_cucumber.rake +0 -126

data/TESTING_PLUGIN.textile DELETED Viewed

@@ -1,133 +0,0 @@
-h1. Testing the hydra-head Plugin
-h2. I. Install the Testing Rails Application
-In order to run the tests, you need to have a properly configured rails app installed in the hydra-plugin_test_host directory.  See "DEVELOP_PLUGIN":https://github.com/projecthydra/hydra-head/blob/master/DEVELOP_PLUGIN.textile for instructions on setting this up.
-h2. II. Running the full Continuous Integration build
-_Stop any copies of jetty (or anything else using port 8983) before running this command._
-This will spin up jetty pre-configured with Fedora and Solr on port 8983, import your fixtures into it, run the tests, and stop jetty.
-<pre>
-  rake hyhead:ci RAILS_ENV=test
-</pre>
-h2. III. Running the Tests Manually
-h4. (1) Start Jetty, preloaded with Fedora and Solr applications
-See below to reset jetty when re-running tests, or when running a simultaneous development instance.
-_Stop any copies of jetty (or anything else using port 8983) before running this command._
-You must do this at the root of the <b><i>hydra-head plugin</i> directory</b>, not within the tmp/test_app_ directory.
-Note that java 1.6 must be invoked by the "java" command or Fedora won't work.
-<pre>
-  rake hydra:jetty:load RAILS_ENV=test
-</pre>
-This will start up jetty on port 8983.
-h4. (2) Load test fixtures into Fedora/Solr.
-You must do this at the root of the <b><i>hydra-head plugin</i> directory</b>, not within the tmp/test_app directory.
-NOTE: to ensure that the tests do not rely on non-test data, do this first:
-<pre>
-  rake hydra:default_fixtures:delete
-</pre>
-<pre>
-  rake hydra:default_fixtures:refresh environment=test
-</pre>
-(TO DO: get rid of irrelevant fixtures; get rid of non-generic fixtures.)
-h4. (3) Run specs.
-<pre>
-  rake hyhead:spec
-</pre>
-OR
-<pre>
-  rake hyhead:setup_test_app
-  rake hyhead:spec
-</pre>
-h2. If you need to Re-run the tests:
-h4. Clean out and reload the databases:
-<pre>
-  cd hydra-plugin_test_host
-  rake db:drop RAILS_ENV=test
-    or
-  rake db:drop:all   (to ensure that the tests do not rely on non-test data)
-  rake db:migrate RAILS_ENV=test
-  cd ..
-</pre>
-h2. Don't forget to stop Jetty!
-It's easy to forget a running jetty, start another jetty process,
-and then get confusing behavior because you have two jetty instances on the
-same port.
-To stop jetty:
-From the rails application directory  (my-hydra-head-test-app)
-<pre>
-  rake jetty:stop
-</pre>
-Use ps to ensure the java process has stopped.  If not, kill it manually.
-h4. Clean out and reload the fixtures:
-1. Stop jetty
-<pre>
-  rake jetty:stop
-</pre>
-Use ps to ensure the java process has stopped.  If not, kill it manually.
-2. Clean out Solr and Fedora on Jetty
-(Note:  this will also wipe out the development data until we use the single solr instance of hydra-jetty)
-TODO: can this be a single rake task?
-<pre>
-  cd jetty
-  git clean -df
-  git checkout .
-  git status     should show nothing to commit
-  cd ..   (back to root of the _plugin_)
-</pre>
-3. Re-initialize and start Jetty:
-<pre>
-  rake hydra:jetty:load RAILS_ENV=test
-</pre>
-4. Reload the pristine fixtures.
-NOTE: to ensure that the tests do not rely on non-test data, do this first:
-<pre>
-  rake hydra:default_fixtures:delete
-</pre>
-<pre>
-  rake hydra:default_fixtures:refresh environment=test
-</pre>

data/app/views/layouts/application.html.erb DELETED Viewed

@@ -1,49 +0,0 @@
-<!DOCTYPE html>
-<!--[if lt IE 7 ]> <html class="ie6"> <![endif]-->
-<!--[if IE 7 ]>    <html class="ie7"> <![endif]-->
-<!--[if IE 8 ]>    <html class="ie8"> <![endif]-->
-<!--[if IE 9 ]>    <html class="ie9"> <![endif]-->
-<!--[if gt IE 9]>  <html> <![endif]-->
-<!--[if !IE]><!--> <html> <!--<![endif]-->
-<head>
-  <meta charset="utf-8" />
-  <title><%= h(@page_title || application_name) %></title>
-  <link href="<%= url_for :controller=>'catalog',:action => 'opensearch', :format => 'xml', :only_path => false %>" title="<%= application_name%>" type="application/opensearchdescription+xml" rel="search"/>
-  <%= render_head_content %>
-	<!--[if IE]>
-  	<%= stylesheet_link_tag('hydra/ie-styles', {:plugin=>"hydra-head", :media=>'all'}) %>
-  	<%= stylesheet_link_tag('progressBox-ie6.css', {:plugin=>"hydra-head", :media=>'all'}) %>
-	<![endif]-->
-</head>
-<body class="<%= render_body_class %>">
-  <div id="doc4" class="yui-t2">
-  	<div id="hd">
-  		<%= render :partial => '/user_util_links' %>
-  		<%= (params[:controller] == "catalog" and !params[:id]) ? "<span id='results_text'>Search Results</span>".html_safe : "" %>
-  	</div>
-    <div id="bd">
-  		<div id="yui-main">
-        <%= render :partial=>'/flash_msg' %>
-        <%= yield %>
-      </div>
-      <div class="yui-b sidebar"><%= sidebar_items.join('') %></div>
-    </div>
-  	<div id="footer">
-  	  <div id="hydra_logo"><%= image_tag('hydra/powered_by_hydra.png', :plugin=>"hydra-head", :width => 80, :height => 50, :alt => "Hydra logo") %></div>
-  	</div>
-  </div>
-</body>
-</html>

data/lib/railties/all_tests.rake DELETED Viewed

@@ -1,23 +0,0 @@
-namespace :hyhead do
-  begin
-    require 'cucumber/rake/task'
-    require 'rspec/core'
-    require 'rspec/core/rake_task'
-    desc "Run HydraHead cucumber and rspec, with test solr"
-    task :all_tests => ['hyhead:spec:with_solr', 'hyhead:cucumber:with_solr']
-    namespace :all_tests do
-      desc "Run HydraHead rspec and cucumber tests with rcov"
-      rm "hyhead-coverage.data" if File.exist?("hyhead-coverage.data")
-      task :rcov => ['hyhead:spec:rcov', 'hyhead:cucumber:rcov']
-    end
-  rescue LoadError
-    desc "Not available! (cucumber and rspec not avail)"
-    task :all_tests do
-      abort 'Not available. Both cucumber and rspec need to be installed to run hyhead:all_tests'
-    end
-  end
-end

data/lib/railties/hyhead_cucumber.rake DELETED Viewed

@@ -1,126 +0,0 @@
-# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
-# It is recommended to regenerate this file in the future when you upgrade to a
-# newer version of cucumber-rails. Consider adding your own code to a new file
-# instead of editing this one. Cucumber will automatically load all features/**/*.rb
-# files.
-# Blacklight customization, trick Cucumber into looking in our current
-# location for Rails.root, even though we're going to give it features
-# from elsewhere.
-ENV['RAILS_ROOT'] = Rails.root.to_s
-# hyhead_features, where to find features inside hyhead source?
-hyhead_features = File.expand_path("./test_support/features",HydraHead.root)
-unless ARGV.any? {|a| a =~ /^gems/} # Don't load anything when running the gems:* tasks
-vendored_cucumber_bin = Dir["#{Rails.root}/vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
-$LOAD_PATH.unshift(File.dirname(vendored_cucumber_bin) + '/../lib') unless vendored_cucumber_bin.nil?
-begin
-  require 'cucumber/rake/task'
-  namespace :hyhead do
-    desc 'Alias for hyhead:cucumber:ok'
-    task :cucumber => 'hyhead:cucumber:ok'
-    namespace :cucumber do
-      Cucumber::Rake::Task.new({:ok => 'db:test:prepare'}, 'Run features that should pass') do |t|
-        # Blacklight customization, call features from external location, pass
-        # in feature location wtih cucumber_opts, yeah it's weird but that's how.
-        t.cucumber_opts = hyhead_features
-        t.binary = vendored_cucumber_bin # If nil, the gem's binary is used.
-        t.fork = true # You may get faster startup if you set this to false
-        t.profile = 'default'
-      end
-      Cucumber::Rake::Task.new({:wip => 'db:test:prepare'}, 'Run features that are being worked on') do |t|
-        # Blacklight customization, call features from external location, pass
-        # in feature location wtih cucumber_opts, yeah it's weird but that's how.
-        t.cucumber_opts = hyhead_features
-        t.binary = vendored_cucumber_bin
-        t.fork = true # You may get faster startup if you set this to false
-        t.profile = 'wip'
-      end
-      Cucumber::Rake::Task.new({:rerun => 'db:test:prepare'}, 'Record failing features and run only them if any exist') do |t|
-        # Blacklight customization, call features from external location, pass
-        # in feature location wtih cucumber_opts, yeah it's weird but that's how.
-        t.cucumber_opts = hyhead_features
-        t.binary = vendored_cucumber_bin
-        t.fork = true # You may get faster startup if you set this to false
-        t.profile = 'rerun'
-      end
-      if (RUBY_VERSION.to_f < 1.9)  then
-      Cucumber::Rake::Task.new({:rcov => 'db:test:prepare'}, 'Run features with rcov') do |t|
-        # Blacklight customization, call features from external location, pass
-        # in feature location wtih cucumber_opts, yeah it's weird but that's how.
-        t.cucumber_opts = hyhead_features
-        t.binary = vendored_cucumber_bin # If nil, the gem's binary is used.
-        t.fork = true # You may get faster startup if you set this to false
-        t.profile = 'default'
-        t.rcov = true
-        t.rcov_opts = %w{--rails --exclude osx\/objc,gems\/,spec\/,features\/ --aggregate hyhead-coverage.data}
-        t.rcov_opts << %[-o "#{HydraHead.root}/coverage"]
-      end
-      end
-      desc 'Run all features'
-      task :all => [:ok, :wip]
-      # Solr wrapper. for now just for hyhead:cucumber, plan to
-      # provide it for all variants eventually.
-      # if you would like to see solr startup messages on STDERR
-      # when starting solr test server during functional tests use:
-      #
-      #    rake SOLR_CONSOLE=true
-      require File.expand_path('../jetty_solr_server.rb', __FILE__)
-      desc "hyhead:cucumber with jetty/solr launch"
-      task :with_solr do
-        # wrap tests with a test-specific Solr server
-        # Need to look  up where the test jetty is located
-        # from solr.yml, we don't hardcode it anymore.
-        solr_yml_path = locate_path("config", "solr.yml")
-        jetty_path = if ( File.exists?( solr_yml_path ))
-            solr_config = YAML::load(File.open(solr_yml_path))
-            solr_config["test"]["jetty_path"] if solr_config["test"]
-        end
-        raise Exception.new("Can't find jetty path to start test jetty. Expect a jetty_path key in config/solr.yml for test environment.") unless jetty_path
-        JettySolrServer.new(
-          :jetty_home => File.expand_path(jetty_path, Rails.root),
-          :sleep_after_start => 2).wrap do
-            Rake::Task["hyhead:cucumber"].invoke
-        end
-      end
-    end
-  end
-  task :features => :cucumber do
-    STDERR.puts "*** The 'features' task is deprecated. See rake -T cucumber ***"
-  end
-  # In case we don't have ActiveRecord, append a no-op task that we can depend upon.
-  task 'db:test:prepare' do
-  end
-rescue LoadError
-  desc 'cucumber rake task not available (cucumber not installed)'
-  task :cucumber do
-    abort 'Cucumber rake task is not available. Be sure to install cucumber as a gem or plugin'
-  end
-end
-end