hydra-head 3.3.0 → 4.0.0.rc2

data/lib/generators/hydra/templates/config/fedora.yml

@@ -1,8 +1,14 @@
 development:
-  url: http://fedoraAdmin:fedoraAdmin@127.0.0.1:8983/fedora
+  user: fedoraAdmin
+  password: fedoraAdmin
+  url: http://127.0.0.1:8983/fedora
 test: &TEST  
-  url: http://fedoraAdmin:fedoraAdmin@127.0.0.1:8983/fedora
+  user: fedoraAdmin
+  password: fedoraAdmin
+  url: http://127.0.0.1:8983/fedora
 production:
-  url: http://fedoraAdmin:fedoraAdmin@your.production.server:8080/fedora
+  user: fedoraAdmin
+  password: fedoraAdmin
+  url: http://your.production.server:8080/fedora
 cucumber:
   <<: *TEST

data/lib/generators/hydra/templates/config/initializers/hydra_config.rb

@@ -29,13 +29,13 @@ if Hydra.respond_to?(:configure)
         :mods_assets =>      [{:name => "contributor",     :edit_partial => "mods_assets/contributor_form",     :show_partial => "mods_assets/show_contributors"},
                               {:name => "publication",     :edit_partial => "mods_assets/publication_form",     :show_partial => "mods_assets/show_publication"},
                               {:name => "additional_info", :edit_partial => "mods_assets/additional_info_form", :show_partial => "mods_assets/show_additional_info"},
-                              {:name => "files",           :edit_partial => "file_assets/file_assets_form",     :show_partial => "mods_assets/show_file_assets"},
-                              {:name => "permissions",     :edit_partial => "permissions/permissions_form",     :show_partial => "mods_assets/show_permissions"}
+                              {:name => "files",           :edit_partial => "hydra/file_assets/file_assets_form",     :show_partial => "mods_assets/show_file_assets"},
+                              {:name => "permissions",     :edit_partial => "hydra/permissions/permissions_form",     :show_partial => "mods_assets/show_permissions"}
                              ],
         # Not being used right now
         :generic_contents => [{:name => "description", :edit_partial => "generic_content_objects/description_form", :show_partial => "generic_contents/show_description"},
-                              {:name => "files",       :edit_partial => "file_assets/file_assets_form",             :show_partial => "file_assets/index"},
-                              {:name => "permissions", :edit_partial => "permissions/permissions_form",             :show_partial => "generic_contents/show_permissions"},
+                              {:name => "files",       :edit_partial => "hydra/file_assets/file_assets_form",             :show_partial => "file_assets/index"},
+                              {:name => "permissions", :edit_partial => "hydra/permissions/permissions_form",             :show_partial => "generic_contents/show_permissions"},
                               {:name => "contributor", :edit_partial => "generic_content_objects/contributor_form", :show_partial => "generic_contents/show_contributors"}
                              ]
       }

data/lib/hydra-head.rb

@@ -1,6 +1,5 @@
 module HydraHead 
   require 'hydra-head/engine' if defined?(Rails) && Rails::VERSION::MAJOR == 3
-  require 'hydra-head/railtie' if defined? Rails
   require 'hydra-head/controller'
 
   require 'hydra-head/version'

data/lib/hydra-head/controller.rb

@@ -8,23 +8,22 @@ module HydraHead
       before_filter :method_for_before_filtering
     end
 
-    module InstanceMethods
-      def method_for_before_filtering
-        #puts "Filtering before" 
-      end
+    def method_for_before_filtering
+      #puts "Filtering before" 
+    end
 
-      def method_not_a_filter
-        puts "not used as a filter"
-      end
+    def method_not_a_filter
+      puts "not used as a filter"
+    end
 
-      def layout_name
-        puts " ***** CALLING LAYOUT_NAME ****"
-        'application'
-      end
+    def layout_name
+      puts " ***** CALLING LAYOUT_NAME ****"
+      'application'
     end
   end
 end
 
+#TODO this seems bad.  
 ::ActionController::Base.send :include, HydraHead::Controller
 
 

data/lib/hydra-head/routes.rb

@@ -32,23 +32,25 @@ module HydraHead
 
       def assets_with_all_nested_routes
         add_routes do |options|
-          resources :file_assets
           match "withdraw", :to => "assets#withdraw", :as => "withdraw"   
-          resources :assets do 
-            # this is to remove documents from SOLR but not from Fedora.
-            resources :contributors, :only=>[:new,:create]
-            match '/contributors', :to => 'contributors#update', :as => 'update_contributors'
-            # We would need to include the rails JS files (or implement our own) if we want this to work w/ DELETE because we delete from a link not a button.
-            #match 'contributors/:contributor_type/:index', :to => 'contributors#destroy', :as => 'connect',  :via => 'delete'
-            match 'contributors/:contributor_type/:index', :to => 'contributors#destroy', :as => 'connect'
-            # There is no ContributorsController#show
-            match 'contributors/:contributor_type/:index', :to => 'contributors#show', :as => 'contributor', :via => 'get'
+          namespace :hydra do
             resources :file_assets
-            resources :downloads, :only=>[:index]
-            resources :grants, :only=>[:new,:create]
-            resources :permissions
-            # Allow updates to assets/:asset_id/permissions (no :id necessary)
-            match '/permissions', :to => 'permissions#update', :as => 'update_group_permissions'            
+            resources :assets do 
+              # this is to remove documents from SOLR but not from Fedora.
+              resources :contributors, :only=>[:new,:create]
+              match '/contributors', :to => 'contributors#update', :as => 'update_contributors'
+              # We would need to include the rails JS files (or implement our own) if we want this to work w/ DELETE because we delete from a link not a button.
+              #match 'contributors/:contributor_type/:index', :to => 'contributors#destroy', :as => 'connect',  :via => 'delete'
+              match 'contributors/:contributor_type/:index', :to => 'contributors#destroy', :as => 'connect'
+              # There is no ContributorsController#show
+              match 'contributors/:contributor_type/:index', :to => 'contributors#show', :as => 'contributor', :via => 'get'
+              resources :file_assets
+              resources :downloads, :only=>[:index]
+              resources :grants, :only=>[:new,:create]
+              resources :permissions
+              # Allow updates to assets/:asset_id/permissions (no :id necessary)
+              match '/permissions', :to => 'permissions#update', :as => 'update_group_permissions'            
+            end
           end
           match "generic_contents_object/content/:container_id", :to=>"generic_content_objects#create", :as=>'generic_content_object',  :via => 'post'            
         end
@@ -56,7 +58,9 @@ module HydraHead
       
       def permissions
         add_routes do |options|
-          resources :permissions
+          namespace :hydra do
+            resources :permissions
+          end
         end
       end
 
@@ -72,12 +76,6 @@ module HydraHead
           match 'catalog/:id/edit', :to => 'catalog#edit', :as => 'edit_catalog'
           # The delete method renders a confirmation page with a button to submit actual destroy request
           match 'catalog/:id/delete', :to => 'catalog#delete', :as => 'delete_catalog'
-	  ### The rest of these routes are defined in blacklight
-          #resources :catalog, :id=> /.+/
-         # resources :catalog, :only => [:index, :show], :controller => "hydra_head/catalog", :path_prefix => HydraHead::Engine.config.mount_at, :as => "hydra_head", :id=> /.+/
-          #match 'catalog/:id', :to => "hydra_head/catalog#show", :path_prefix => HydraHead::Engine.config.mount_at, :as => "catalog", :id => /.+/
-          #match 'catalog/:id', :to => "hydra_head/catalog#show", :id => /.+/
-          # match 'about', :to => 'catalog#about', :as => 'about'
         end
       end
 

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "3.3.0"
+  VERSION = "4.0.0.rc2"
 end
 

data/lib/hydra.rb

@@ -1,13 +1,12 @@
 require "blacklight"
 # Hydra libraries
 module Hydra
-  extend Blacklight::Configurable
+  extend Blacklight::GlobalConfigurable
   extend ActiveSupport::Autoload
   autoload :AccessControlsEvaluation
   autoload :AccessControlsEnforcement
   autoload :Assets
   autoload :Catalog
-  autoload :Configurable, 'blacklight/configurable'
   autoload :Controller
   autoload :FileAssets
   autoload :GenericContent
@@ -16,6 +15,7 @@ module Hydra
   autoload :ModelMixins
   autoload :ModsGenericContent
   autoload :ModsImage
+  autoload :RepositoryController
   autoload :SubmissionWorkflow
   autoload :SuperuserAttributes
   autoload :User
@@ -24,9 +24,7 @@ module Hydra
 end
 
 
-require 'mediashelf/active_fedora_helper'
 
-require 'hydra/repository_controller'
 require 'hydra/assets_controller_helper'
 require 'hydra/file_assets_helper'
 

data/lib/hydra/assets.rb

@@ -1,6 +1,5 @@
 module Hydra::Assets
   extend ActiveSupport::Concern
-  include MediaShelf::ActiveFedoraHelper
   include Blacklight::SolrHelper
   include Hydra::RepositoryController
   include Hydra::AssetsControllerHelper
@@ -11,10 +10,8 @@ module Hydra::Assets
     helper :hydra
     include Hydra::UI::Controller
     before_filter :search_session, :history_session
-    before_filter :require_solr
     before_filter :load_document, :only => :update # allows other filters to operate on the document before the update method is called
 
-    # need to include this after the :require_solr before filters because of the before filter that the workflow provides.
     include Hydra::SubmissionWorkflow
     
     
@@ -26,10 +23,7 @@ module Hydra::Assets
     if params.has_key?("field")
       
       @response, @document = get_solr_response_for_doc_id
-      # @document = SolrDocument.new(@response.docs.first)
       result = @document["#{params["field"]}_t"]
-      # document_fedora = SaltDocument.load_instance(params[:id])
-      # result = document_fedora.datastreams_in_memory[params["datastream"]].send("#{params[:field]}_values")
       unless result.nil?
         if params.has_key?("field_index")
           result = result[params["field_index"].to_i-1]
@@ -42,7 +36,7 @@ module Hydra::Assets
         format.textile  { render :text=> RedCloth.new(result, [:sanitize_html]).to_html  }
       end
     else
-      redirect_to :controller=>"catalog", :action=>"show"
+      redirect_to catalog_path(params[:id])
     end
   end
   
@@ -62,11 +56,11 @@ module Hydra::Assets
     @document.save
     flash[:notice] = "Your changes have been saved."
     
-    logger.debug("returning #{@response.inspect}")
+    #logger.debug("returning #{@response.inspect}")
     
     respond_to do |want| 
       want.html {
-        redirect_to( {:controller => "catalog", :action => "edit", :id => params[:id]}.merge(params_for_next_step_in_wokflow) )
+        redirect_to next_step(params[:id])
       }
       want.js {
         render :json=> tidy_response_from_update(@response)  
@@ -82,31 +76,27 @@ module Hydra::Assets
   
   def new
     af_model = retrieve_af_model(params[:content_type])
-    if af_model
-      @asset = af_model.new
-      apply_depositor_metadata(@asset)
-      set_collection_type(@asset, params[:content_type])
-      @asset.save
-      model_display_name = af_model.to_s.camelize.scan(/[A-Z][^A-Z]*/).join(" ")
-      msg = "Created a #{model_display_name} with pid #{@asset.pid}. Now it's ready to be edited."
-      flash[:notice]= msg
-    end
+    raise "Can't find a model for #{params[:content_type]}" unless af_model
+    @asset = af_model.new
+    apply_depositor_metadata(@asset)
+    set_collection_type(@asset, params[:content_type])
+    @asset.save
+    model_display_name = af_model.to_s.camelize.scan(/[A-Z][^A-Z]*/).join(" ")
+    msg = "Created a #{model_display_name} with pid #{@asset.pid}. Now it's ready to be edited."
+    flash[:notice]= msg
     session[:scripts] = params[:combined] == "true"
-    redirect_to url_for(:action=>"edit", :controller=>"catalog", :id=>@asset.pid, :new_asset=>true)
+
+    redirect_to edit_catalog_path(@asset.pid, :new_asset=>true)
   end
   
   def destroy
-    af = ActiveFedora::Base.load_instance_from_solr(params[:id])
-    the_model = ActiveFedora::ContentModel.known_models_for( af ).first
-    unless the_model.nil?
-      af = the_model.load_instance_from_solr(params[:id])
-      assets = af.destroy_child_assets
-    end
+    af = ActiveFedora::Base.find(params[:id])
+    assets = af.destroy_child_assets
     af.delete
     msg = "Deleted #{params[:id]}"
     msg.concat(" and associated file_asset(s): #{assets.join(", ")}") unless assets.empty?
     flash[:notice]= msg
-    redirect_to url_for(:action => 'index', :controller => "catalog", :q => nil , :f => nil)
+    redirect_to catalog_index_path()
   end
 
   

data/lib/hydra/controller.rb

@@ -13,15 +13,8 @@ module Hydra::Controller
   def self.included(klass)
     # Other modules to auto-include
     klass.send(:include, Hydra::AccessControlsEnforcement)
-    klass.send(:include, MediaShelf::ActiveFedoraHelper)
     klass.send(:include, Hydra::RepositoryController)
   
-  
-    # Controller filters
-    # Also see the generator (or generated CatalogController) to see more before_filters in action
-    klass.before_filter :require_solr
-    # klass.before_filter :load_fedora_document, :only=>[:show,:edit]
-  
     # View Helpers
     klass.helper :hydra
     klass.helper :hydra_assets
@@ -31,16 +24,14 @@ module Hydra::Controller
   # Sets @document_fedora with the loaded object
   # Sets @file_assets with file objects that are children of the loaded object
   def load_fedora_document
-    af_base = ActiveFedora::Base.load_instance(params[:id])
-    the_model = ActiveFedora::ContentModel.known_models_for( af_base ).first
-    unless the_model.include?(ActiveFedora::Relationships)
-      the_model.send :include, ActiveFedora::Relationships
+    @document_fedora = ActiveFedora::Base.find(params[:id])
+    unless @document_fedora.class.include?(ActiveFedora::Relationships)
+      @document_fedora.class.send :include, ActiveFedora::Relationships
     end
-    unless the_model.include?(ActiveFedora::FileManagement)
-      the_model.send :include, ActiveFedora::FileManagement
+    unless @document_fedora.class.include?(ActiveFedora::FileManagement)
+      @document_fedora.class.send :include, ActiveFedora::FileManagement
     end
     
-    @document_fedora = af_base.adapt_to(the_model)
     @file_assets = @document_fedora.file_objects(:response_format=>:solr)
   end
   

data/lib/hydra/file_assets.rb

@@ -7,12 +7,11 @@ module Hydra::FileAssets
     include Hydra::AssetsControllerHelper
     include Hydra::FileAssetsHelper  
     include Hydra::RepositoryController  
-    include MediaShelf::ActiveFedoraHelper
     include Hydra::UI::Controller
     include Blacklight::SolrHelper
-    before_filter :require_solr, :only=>[:index, :create, :show, :destroy]
-    # need to include this after the :require_solr/fedora before filters because of the before filter that the workflow provides.
     include Hydra::SubmissionWorkflow
+    include Blacklight::Configurable
+    copy_blacklight_config_from(CatalogController)
     prepend_before_filter :sanitize_update_params
     helper :hydra_uploader
   end
@@ -34,7 +33,7 @@ module Hydra::FileAssets
       @container_response, @document = get_solr_response_for_doc_id(params[:asset_id])
       
       # Including these lines for backwards compatibility (until we can use Rails3 callbacks)
-      @container =  ActiveFedora::Base.load_instance(params[:asset_id])
+      @container =  ActiveFedora::Base.find(params[:asset_id])
       @solr_result = @container.file_objects(:response_format=>:solr)
     end
     
@@ -54,9 +53,9 @@ module Hydra::FileAssets
   # * the method will redirect to the container object's edit view after saving
   def create
     if params.has_key?(:number_of_files) and params[:number_of_files] != "0"
-      return redirect_to({:controller => "catalog", :action => "edit", :id => params[:id], :wf_step => :files, :number_of_files => params[:number_of_files]})
+      return redirect_to edit_catalog_path(params[:id], :wf_step => :files, :number_of_files => params[:number_of_files])
     elsif params.has_key?(:number_of_files) and params[:number_of_files] == "0"
-      return redirect_to( {:controller => "catalog", :action => "edit", :id => params[:id]}.merge(params_for_next_step_in_wokflow) )
+      return redirect_to next_step(params[:id])
     end
     
     if params.has_key?(:Filedata)
@@ -66,12 +65,12 @@ module Hydra::FileAssets
       flash[:notice] = "You must specify a file to upload."
     end
     
-    unless params[:container_id].nil?
-      redirect_params = {:controller => "catalog", :action => "edit", :id => params[:container_id]}.merge(params_for_next_step_in_wokflow)
+    if params[:container_id]
+      redirect_to next_step(params[:container_id])
+    else
+      redirect_to catalog_index_path
     end
-    redirect_params ||= {:controller => "catalog", :action => "index"}
-    
-    redirect_to redirect_params
+
   end
 
   def process_files
@@ -80,7 +79,7 @@ module Hydra::FileAssets
     @file_assets.each do |file_asset|
       apply_depositor_metadata(file_asset)
 
-      notice << render_to_string(:partial=>'file_assets/asset_saved_flash', :locals => { :file_asset => file_asset })
+      notice << render_to_string(:partial=>'hydra/file_assets/asset_saved_flash', :locals => { :file_asset => file_asset })
         
       if !params[:container_id].nil?
         associate_file_asset_with_container(file_asset,'info:fedora/' + params[:container_id])
@@ -99,7 +98,7 @@ module Hydra::FileAssets
   
   # Common destroy method for all AssetsControllers 
   def destroy
-    ActiveFedora::Base.load_instance(params[:id]).delete 
+    ActiveFedora::Base.find(params[:id]).delete 
 
     flash[:notice] = "Deleted #{params[:id]} from #{params[:container_id]}."
     
@@ -114,32 +113,36 @@ module Hydra::FileAssets
   
   
   def show
-    @file_asset = FileAsset.find(params[:id])
-    if (@file_asset.nil?)
+    begin
+      @file_asset = FileAsset.find(params[:id])
+    rescue ActiveFedora::ObjectNotFoundError
       logger.warn("No such file asset: " + params[:id])
       flash[:notice]= "No such file asset."
       redirect_to(:action => 'index', :q => nil , :f => nil)
-    else
-      # get containing object for this FileAsset
-      pid = @file_asset.container_id
-      @downloadable = false
-      # A FileAsset is downloadable iff the user has read or higher access to a parent
+      return
+    end
+    # get containing object for this FileAsset
+    pid = @file_asset.container_id
+    @downloadable = false
+    # A FileAsset is downloadable iff the user has read or higher access to a parent
+    begin
       @response, @permissions_solr_document = get_solr_response_for_doc_id(pid)
-      if reader?
-        @downloadable = true
-     end
+    rescue Blacklight::Exceptions::InvalidSolrID
+    end
+    if reader?
+      @downloadable = true
+    end
 
-      if @downloadable
-        # First try to use datastream_id value (set in FileAssetsHelper)
-        if @file_asset.datastreams.include?(datastream_id)
-          send_datastream @file_asset.datastreams[datastream_id]
-        elsif @file_asset.datastreams.include?("DS1")
-          send_datastream @file_asset.datastreams["DS1"]
-        end
-      else
-        flash[:notice]= "You do not have sufficient access privileges to download this file."
-        redirect_to(:action => 'index', :q => nil , :f => nil)
+    if @downloadable
+      # First try to use datastream_id value (set in FileAssetsHelper)
+      if @file_asset.datastreams.include?(datastream_id)
+        send_datastream @file_asset.datastreams[datastream_id]
+      elsif @file_asset.datastreams.include?("DS1")
+        send_datastream @file_asset.datastreams["DS1"]
       end
+    else
+      flash[:notice]= "You do not have sufficient access privileges to download this file."
+      redirect_to(:action => 'index', :q => nil , :f => nil)
     end
   end
 end

data/lib/hydra/generic_content.rb

@@ -1,6 +1,6 @@
-require "hydra"
-require "httparty"
-require "mime/types"
+# require "hydra"
+# require "httparty"
+# require "mime/types"
 
 module Hydra::GenericContent