hydra-head 3.3.0 → 4.0.0.rc2

data/lib/hydra/image.rb

@@ -23,8 +23,8 @@
 # hi.send(:generate_derivatives)
 #
 
-require "hydra"
-require "httparty"
+# require "hydra"
+# require "httparty"
 
 module Hydra
 class Image < ActiveFedora::Base

data/lib/hydra/repository_controller.rb

@@ -1,4 +1,3 @@
-require "mediashelf/active_fedora_helper"
 # Hydra-repository Contoller is a controller layer mixin. It is in the controller scope: request params, session etc.
 # 
 # NOTE: Be careful when creating variables here as they may be overriding something that already exists.
@@ -18,11 +17,6 @@ require "mediashelf/active_fedora_helper"
 #
 module Hydra::RepositoryController
   
-  include MediaShelf::ActiveFedoraHelper
-      
-      
-  
-  
   def self.included(c)
     if c.respond_to?(:helper_method)
       c.helper_method :solr_name
@@ -86,6 +80,28 @@ module Hydra::RepositoryController
     # puts "downloadables result: #{result}"
     return result    
   end
+
+  protected 
+  
+  def retrieve_af_model(class_name, opts={})
+    if !class_name.nil?
+      klass = Module.const_get(class_name.camelcase)
+    else
+      klass = nil
+    end
+    if klass.is_a?(Class) && klass.superclass == ActiveFedora::Base
+      return klass
+    else
+      return opts.fetch(:default, false)
+    end
+    rescue NameError
+      return false
+  end
+
+  def load_af_instance_from_solr(doc)
+    pid = doc[:id] ? doc[:id] : doc[:id.to_s]
+    pid ? ActiveFedora::Base.load_instance_from_solr(pid,doc) : nil
+  end
   
   private
   

data/lib/hydra/rights_metadata.rb

@@ -155,7 +155,7 @@ class RightsMetadata < ActiveFedora::NokogiriDatastream
   end
   def embargo_release_date(opts={})
     embargo_release_date = self.find_by_terms(*[:embargo,:machine,:date]).first ? self.find_by_terms(*[:embargo,:machine,:date]).first.text : nil
-    if opts[:format] && opts[:format] == :solr_date
+    if embargo_release_date.present? && opts[:format] && opts[:format] == :solr_date
       embargo_release_date << "T23:59:59Z"
     end
     embargo_release_date

data/lib/hydra/submission_workflow.rb

@@ -42,7 +42,7 @@ module Hydra::SubmissionWorkflow
     model_config.last[:name] unless model_config.nil?
   end
   
-  def params_for_next_step_in_wokflow
+  def next_step(id)
     return_params = {:wf_step=>next_step_in_workflow(params[:wf_step])}
     if params[:new_asset]
       return_params[:new_asset] = true
@@ -50,9 +50,10 @@ module Hydra::SubmissionWorkflow
     if params[:wf_step] == last_step_in_workflow or params.has_key?(:finish)
       return_params[:viewing_context] = "browse"
       return_params[:action] = "show" 
-      return_params[:wf_step] = nil
+      return_params.delete(:wf_step)
+      return catalog_path(id, return_params)
     end
-    return return_params
+    return edit_catalog_path(id,return_params)
   end
   
   # Convenience method to return the partial for any given step by name.

data/lib/railties/hydra-fixtures.rake

@@ -1,105 +1,8 @@
 require "active-fedora"
 require "solrizer-fedora"
 require "active_support" # This is just to load ActiveSupport::CoreExtensions::String::Inflections
-
-Rake::TaskManager.class_eval do
-  def alias_task(fq_name)
-    new_name = "#{fq_name}:original"
-    @tasks[new_name] = @tasks.delete(fq_name)
-  end
-end
-
-def alias_task(fq_name)
-  Rake.application.alias_task(fq_name)
-end
-
-# Rake does chaining by default, not overriding
-def override_task(*args, &block)
-  name, params, deps = Rake.application.resolve_args(args.dup)
-  fq_name = Rake.application.instance_variable_get(:@scope).dup.push(name).join(':')
-  alias_task(fq_name)
-  Rake::Task.define_task(*args, &block)
-end
-
-namespace :repo do
-  desc "Load the object located at the provided path or identified by pid."
-  override_task :load => :environment do
-    ### override the AF provided task to use the correct fixture directory
-    if ENV["pid"].nil? 
-      raise "You must specify a valid pid.  Example: rake repo:load pid=demo:12"
-    end
-puts "loading #{ENV['pid']}" 
-      
-    begin
-      ActiveFedora::FixtureLoader.new('test_support/fixtures').reload(ENV["pid"])
-    rescue Errno::ECONNREFUSED => e
-      puts "Can't connect to Fedora! Are you sure jetty is running?"
-    rescue Exception => e
-      logger.error("Received a Fedora error while loading #{pid}\n#{e}")
-    end
-  end
-end
 namespace :hydra do
   
-  desc "[DEPRECATED] Delete and re-import the fixture identified by pid" 
-  task :refresh_fixture do
-    STDERR.puts "DEPRECATED: hydra:refresh_fixture is deprecated.  Use/override repo:refresh instead."
-    Rake::Task["repo:refresh"].invoke
-  end
-  
-  desc "[DEPRECATED] Delete the object identified by pid. Example: rake hydra:delete pid=demo:12"
-  task :delete do
-    STDERR.puts "DEPRECATED: hydra:delete is deprecated.  Use/override repo:delete instead."
-    Rake::Task["repo:delete"].invoke
-  end
-  
-  desc "[DEPRECATED] Delete a range of objects in a given namespace.  ie 'rake hydra:purge_range[demo, 22, 50]' will delete demo:22 through demo:50"
-  task :purge_range do |t, args|
-    STDERR.puts "DEPRECATED: hydra:purge_range is deprecated.  Use/override repo:delete_range instead."
-    Rake::Task["repo:delete_range"].invoke
-  end
-
-  desc "[DEPRECATED] Export the object identified by pid into test_support/fixtures. Example:rake hydra:harvest_fixture pid=druid:sb733gr4073 source=http://fedoraAdmin:fedoraAdmin@127.0.0.1:8080/fedora"
-  task :harvest_fixture do
-    STDERR.puts "DEPRECATED: hydra:harvest_fixture is deprecated.  Use/override repo:export instead."
-    if ENV["path"].nil?
-      ENV["path"] = File.join("test_support","fixtures")
-    end
-    Rake::Task["repo:export"].invoke
-  end
-  
-  desc "[DEPRECATED] Import the fixture located at the provided path. Example: rake hydra:import_fixture fixture=test_support/fixtures/demo_12.foxml.xml"
-  task :import_fixture do
-    STDERR.puts "DEPRECATED: hydra:import_fixture is deprecated.  Use/override repo:load instead."
-    if !ENV["pid"].nil?
-      pid = ENV["pid"]
-      ENV["pid"] = nil
-      ENV["path"] = File.join("test_support","fixtures","#{pid.gsub(":","_")}.foxml.xml")
-     end
-     Rake::Task["repo:load"].invoke
-  end
-
-  namespace :default_fixtures do
-    desc "[DEPRECATED] Load default Hydra fixtures"
-    task :load do
-      STDERR.puts "DEPRECATED: hydra:default_fixtures:load is deprecated.  Use/override hydra:fixtures:load instead."
-      Rake::Task["hydra:fixtures:load"].invoke	
-    end
-
-    desc "[DEPRECATED] Remove default Hydra fixtures"
-    task :delete do
-      STDERR.puts "DEPRECATED: hydra:default_fixtures:delete is deprecated.  Use/override hydra:fixtures:delete instead."
-      Rake::Task["hydra:fixtures:delete"].invoke	
-    end
-
-    desc "[DEPRECATED] Refresh default Hydra fixtures"
-    task :refresh do
-      STDERR.puts "DEPRECATED: hydra:default_fixtures:refresh is deprecated.  Use/override hydra:fixtures:refresh instead."
-      Rake::Task["hydra:fixtures:refresh"].invoke	
-    end
-  end
-
-  
   desc "Init Hydra configuration" 
   task :init => [:environment] do
     # We need to just start rails so that all the models are loaded
@@ -131,6 +34,7 @@ namespace :hydra do
     ]
     desc "Load default Hydra fixtures"
     task :load do
+      ENV["dir"] = File.join("test_support", "fixtures")
       FIXTURES.each do |fixture|
         ENV["pid"] = fixture
         Rake::Task["repo:load"].reenable
@@ -140,6 +44,7 @@ namespace :hydra do
 
     desc "Remove default Hydra fixtures"
     task :delete do
+      ENV["dir"] = File.join("test_support", "fixtures")
       FIXTURES.each do |fixture|
         ENV["pid"] = fixture
         Rake::Task["repo:delete"].reenable

data/tasks/hydra-head-fixtures.rake

@@ -33,33 +33,6 @@ namespace :hyhead do
       FileUtils.cd('../../')
     end
 
-  namespace :fixture do
-    desc "[DEPRECATED] Call hydra:delete"
-    task :delete do
-      STDERR.puts "DEPRECATED: hyhead:fixture:delete is deprecated.  Use/override hyhead:delete instead."
-      Rake::Task["hyhead:delete"].invoke
-    end
-    
-    desc "[DEPRECATED] Call hydra:harvest_fixture"
-    task :harvest => ["hyhead:use_test_app"] do
-      STDERR.puts "DEPRECATED: hyhead:fixture:harvest is deprecated.  Use/override hyhead:export instead."
-      Rake::Task["hyhead:export"].invoke
-    end
-    
-    desc "[DEPRECATED] Call hydra:import_fixture from within the test app"
-    task :import => ["hyhead:use_test_app"] do
-      STDERR.puts "DEPRECATED: hyhead:fixture:import is deprecated.  Use/override hyhead:load instead."
-      Rake::Task["hyhead:load"].invoke
-    end
-    
-    
-    desc "[DEPRECATED] Call hydra:refresh_fixture from within the test app"
-    task :refresh => ["hyhead:use_test_app"] do
-      STDERR.puts "DEPRECATED: hyhead:fixture:refresh is deprecated.  Use/override hyhead:refresh instead."
-      Rake::Task["hyhead:refresh"].invoke
-    end
-  end
-  
   namespace :fixtures do
     
     desc "Call hydra:fixtures:refresh from within the test app"
@@ -77,12 +50,5 @@ namespace :hyhead do
       puts %x[rake hydra:fixtures:delete]
       FileUtils.cd('../../')
     end
-    
-    
-    desc "[DEPRECATED] Call hydra:purge_range"
-    task :purge_range => ["hyhead:use_test_app"] do
-      STDERR.puts "DEPRECATED: hyhead:fixtures:purge_range is deprecated.  Use/override hyhead:delete_range instead."
-      Rake::Task["hyhead:delete_range"].invoke
-    end
   end
 end

data/tasks/hydra-head.rake

@@ -6,7 +6,6 @@ namespace :hyhead do
 
   desc "Execute Continuous Integration build (docs, tests with coverage)"
   task :ci do
-    Rake::Task["hyhead:doc"].invoke
     Rake::Task["hydra:jetty:config"].invoke
     
     require 'jettywrapper'
@@ -18,6 +17,7 @@ namespace :hyhead do
         Rake::Task['hyhead:cucumber'].invoke
     end
     raise "test failures: #{error}" if error
+    Rake::Task["hyhead:doc"].invoke
   end
 
   
@@ -56,7 +56,7 @@ namespace :hyhead do
     end
 
     YARD::Rake::YardocTask.new(:doc) do |yt|
-      yt.files   = ['lib/**/*', project_root+"*", 'app/**/*']
+      yt.files   = ['lib/**/*.rb', project_root+"*", 'app/**/*.rb']
 
       yt.options << "-m" << "textile"
       yt.options << "--protected"
@@ -147,7 +147,8 @@ namespace :hyhead do
       FileUtils.cp_r(File.join('..','..','test_support','fixtures'), File.join('.','test_support','fixtures'))
       
       puts "Executing bundle install --local in the test app"
-      puts %x[bundle install --local]
+      #puts %x[bundle install --local]
+      puts %x[bundle install]
       errors << 'Error running bundle install in test app' unless $?.success?
 
       puts "Installing cucumber in test app"

data/test_support/etc/Gemfile

@@ -3,29 +3,34 @@
 
 source 'http://rubygems.org'
 
-gem "rails", '< 3.1'
+gem "rails", '~> 3.2.2'
 
-gem 'sqlite3-ruby', '~>1.2.5', :require => 'sqlite3'
-#gem 'sqlite3-ruby', :require => 'sqlite3'
+#gem 'sqlite3-ruby', '~>1.2.5', :require => 'sqlite3'
+gem 'sqlite3-ruby', :require => 'sqlite3'
 #gem 'sqlite3'
 
-gem 'blacklight', '~>3.1.2'
+gem 'blacklight', :git=>'git://github.com/projectblacklight/blacklight.git'
+
+
 gem 'hydra-head', :path => '../../'
 gem 'devise'
 gem 'jettywrapper'
 
 # For testing
 group :development, :test do 
-       gem 'solrizer-fedora', '>=1.2.0'
-       gem 'ruby-debug'
-       gem 'rspec'
-       gem 'rspec-rails', '>=2.5.0'
+       gem 'rspec-rails', '>=2.8.0'
        gem 'mocha'
        gem 'cucumber-rails'
-       gem 'database_cleaner'
        gem 'capybara'
        gem 'factory_girl'
-       gem 'bcrypt-ruby'
        gem 'rest-client'
 end
 
+# Gems used only for assets and not required
+# in production environments by default.
+group :assets do
+  gem 'sass-rails',   '~> 3.2.4'
+  gem 'coffee-rails', '~> 3.2.2'
+  gem 'uglifier', '>= 1.2.3'
+end
+

data/test_support/etc/rvmrc

@@ -3,7 +3,7 @@
 # This is an RVM Project .rvmrc file, used to automatically load the ruby
 # development environment upon cd'ing into the directory
 
-ruby_string="ree-1.8.7"
+ruby_string="1.9.3"
 gemset_name="hyhead-testapp"
 
 # Install rubies when used instead of only displaying a warning and exiting

data/test_support/features/mods_asset_edit.feature

@@ -33,7 +33,7 @@ Feature: Edit a ModsAsset object
   Scenario: Entering different date formats for embargo
     Given I am logged in as "archivist1@example.com" 
     When I am on the edit additional_info page for hydrangea:fixture_mods_article1
-    And I fill in "embargo_embargo_release_date" with "11/1/2010"
+    And I fill in "embargo_embargo_release_date" with "2010-11-01"
     When I press "Continue"
     And I am on the edit additional_info page for hydrangea:fixture_mods_article1
     Then the "embargo_embargo_release_date" field within "#release_date_field" should contain "2010-11-01"

data/test_support/features/step_definitions/create_asset_steps.rb

@@ -1,7 +1,3 @@
 When /^I create a new ([^"]*)$/ do |asset_type|
   visit path_to("new #{asset_type} page")
 end
-
-# Given /^I create a new "([^\"]*)"$/ do |asset_type|
-#   visit path_to("new #{asset_type} page")
-# end

data/test_support/features/support/env.rb

@@ -46,7 +46,7 @@ ActionController::Base.allow_rescue = false
 
 # Remove this line if your app doesn't have a database.
 # For some databases (like MongoDB and CouchDB) you may need to use :truncation instead.
-DatabaseCleaner.strategy = :transaction
+#DatabaseCleaner.strategy = :transaction
 
 # Stop endless errors like
 # ~/.rvm/gems/ruby-1.9.2-p0@global/gems/rack-1.2.1/lib/rack/utils.rb:16: 

data/test_support/features/support/paths.rb

@@ -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($1)
+      catalog_path(CGI.escape($1))
     when /the edit page for id (.+)/ 
-      edit_catalog_path($1)
+      edit_catalog_path(CGI.escape($1))
     when /the catalog index page/
       catalog_index_path
     # Add more mappings here.
@@ -32,36 +32,36 @@ module NavigationHelpers
     #     user_profile_path(User.find_by_login($1))
 
     when /the edit document page for (.*)$/i
-      edit_catalog_path($1)
+      edit_catalog_path(CGI.escape $1)
     when /the show document page for (.*)$/i
-      catalog_path($1)
+      catalog_path(CGI.escape $1)
     when /the delete confirmation page for (.*)$/i
       delete_catalog_path($1)
       
     when /the file (?:asset )?list page for (.*)$/i
-      asset_file_assets_path($1)
+      hydra_asset_file_assets_path($1)
     when /the file asset creation page for (.*)$/i
-      asset_file_assets_path($1)
+      hydra_asset_file_assets_path($1)
     when /the deletable file list page for (.*)/i
-      asset_file_assets_path($1, :deletable=>"true",:layout=>"false")
+      hydra_asset_file_assets_path($1, :deletable=>"true",:layout=>"false")
     when /the file asset (.*) with (.*) as its container$/i
-      asset_file_asset_path($2, $1)
+      hydra_asset_file_asset_path($2, $1)
     when /the file asset (.*)$/i
       file_asset_path($1)
     when /the permissions page for (.*)$/i
-      asset_permissions_path($1)
+      hydra_asset_permissions_path($1)
     
     when /new (.*) page$/i
-      new_asset_path(:content_type => $1)
+      new_hydra_asset_path(:content_type => $1)
     when /the asset (.*)$/i
-      asset_path($1)
+      hydra_asset_path($1)
     when /show asset page for (.*)$/i
-      asset_path($1)
+      hydra_asset_path($1)
 
       
     when /the (\d+)(?:st|nd|rd|th) (person|organization|conference) entry in (.*)$/i
       # contributor_id = "#{$2}_#{$1.to_i-1}"
-      asset_contributor_path($3, $2, $1.to_i-1, :content_type=>"mods_asset")
+      hydra_asset_contributor_path($3, $2, $1.to_i-1, :content_type=>"mods_asset")
     
     when /the edit (.*) page for (.*)$/i
       edit_catalog_path($2,:wf_step=>$1)

data/test_support/spec/controllers/contributors_controller_spec.rb

@@ -8,7 +8,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 # or
 # rake cucumber
 
-describe ContributorsController do
+describe Hydra::ContributorsController do
   
   describe "create" do
     it "should support adding new person / contributor / organization nodes" do
@@ -18,7 +18,7 @@ describe ContributorsController do
         mock_document.expects(:save)
         ModsAsset.expects(:find).with("_PID_").returns(mock_document)
         post :create, :asset_id=>"_PID_", :controller => "contributors", :content_type => "mods_asset", :contributor_type=>type
-        response.should redirect_to "http://test.host/catalog/_PID_/edit##{type}_989"
+        response.should redirect_to edit_catalog_path('_PID_', :anchor=>"#{type}_989")
       end
     end
     it "should return inline html if format is inline" do