hydra-head 3.1.1 → 3.1.2

data/HISTORY.textile

@@ -1,7 +1,11 @@
+h3. 3.1.2
+* Make asset controller easily overridden
+
+
 h3. 3.1.1
-* Fixed bug where selected facet was not html_safe
-* Fixed document_list, called when sorting by object_type_facet
-* Don't issue two notice messags when saving document.
+* Selected facet was not html_safe
+* document_list was attempting to call Mash#get, when sorting by object_type_facet
+* Don't issue two notice messages when saving document.
 
 
 h3. 3.1.0

data/app/controllers/assets_controller.rb

@@ -1,147 +1,3 @@
-require 'mediashelf/active_fedora_helper'
-
 class AssetsController < ApplicationController
-    include MediaShelf::ActiveFedoraHelper
-    include Blacklight::SolrHelper
-    include Hydra::RepositoryController
-    include Hydra::AssetsControllerHelper
-    include ReleaseProcessHelper
-    
-    
-    include Blacklight::Catalog
-    helper :hydra
-    
-    before_filter :search_session, :history_session
-    before_filter :load_document, :only => :update # allows other filters to operate on the document before the update method is called
-    before_filter :require_solr
-
-    # need to include this after the :require_solr/fedora before filters because of the before filter that the workflow provides.
-    include Hydra::SubmissionWorkflow
-    
-    
-    prepend_before_filter :sanitize_update_params, :only=>:update
-    before_filter :check_embargo_date_format, :only=>:update
-        
-    def show
-      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]
-          elsif result.kind_of?(Array)
-            result = result.first
-          end
-        end
-        respond_to do |format|
-          format.html     { render :text=>result }
-          format.textile  { render :text=> RedCloth.new(result, [:sanitize_html]).to_html  }
-        end
-      else
-        redirect_to :controller=>"catalog", :action=>"show"
-      end
-    end
-    
-    # Uses the update_indexed_attributes method provided by ActiveFedora::Base
-    # This should behave pretty much like the ActiveRecord update_indexed_attributes method
-    # For more information, see the ActiveFedora docs.
-    # 
-    # @example Appends a new "subject" value of "My Topic" to on the descMetadata datastream in in the _PID_ document.
-    #   put :update, :id=>"_PID_", "asset"=>{"descMetadata"=>{"subject"=>{"-1"=>"My Topic"}}
-    # @example Sets the 1st and 2nd "medium" values on the descMetadata datastream in the _PID_ document, overwriting any existing values.
-    #   put :update, :id=>"_PID_", "asset"=>{"descMetadata"=>{"medium"=>{"0"=>"Paper Document", "1"=>"Image"}}
-    def update
-      logger.debug("attributes submitted: #{@sanitized_params.inspect}")
-           
-      @response = update_document(@document, @sanitized_params)
-     
-      @document.save
-      flash[:notice] = "Your changes have been saved."
-      
-      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) )
-        }
-        want.js {
-          render :json=> tidy_response_from_update(@response)  
-        }
-        want.textile {
-          if @response.kind_of?(Hash)
-            textile_response = tidy_response_from_update(@response).values.first
-          end
-          render :text=> RedCloth.new(textile_response, [:sanitize_html]).to_html
-        }
-      end
-    end
-    
-    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
-      session[:scripts] = params[:combined] == "true"
-      redirect_to url_for(:action=>"edit", :controller=>"catalog", :id=>@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.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)
-    end
-
-    
-    # This is a method to simply remove the item from SOLR but keep the object in fedora. 
-    alias_method :withdraw, :destroy
-    
-    protected
-
-    def load_document
-      @document = load_document_from_params
-    end
-
-    
-    def mods_assets_update_validation
-      desc_metadata = params[:asset][:descMetadata]
-      rights_metadata = params[:asset][:rightsMetadata]
-      if !rights_metadata.nil? and rights_metadata.has_key?(:embargo_embargo_release_date)
-        unless rights_metadata[:embargo_embargo_release_date]["0"].blank?
-          begin
-            parsed_date = Date.parse(rights_metadata[:embargo_embargo_release_date]["0"]).to_s
-            params[:asset][:rightsMetadata][:embargo_embargo_release_date]["0"] = parsed_date
-          rescue
-            flash[:error] = "You must enter a valid release date."
-            return false
-          end
-        end
-      end
-      
-      if !desc_metadata.nil? and desc_metadata.has_key?(:title_info_main_title) and desc_metadata.has_key?(:journal_0_title_info_main_title)
-        if desc_metadata[:title_info_main_title]["0"].blank? or desc_metadata[:journal_0_title_info_main_title]["0"].blank?
-          flash[:error] = "The title fields are required."
-          return false
-        end
-      end
-      
-      return true
-    end
+    include Hydra::Assets
 end

data/app/views/catalog/_edit_partials/_default_details.html.erb

@@ -4,8 +4,6 @@
 <%= form_tag url_for(:action=>"update", :controller=>"assets"), :id=>"document_metadata"  "accept-charset"=>"utf-8" do %>
 
   <div id="multipleEdit">
-    <div id="loading" style="display:none;"><img src="/plugin_assets/hydra-head/images/ajax-loader.gif" width="32" height="32" alt="Saving"/> Saving...</div>
-    <div>
       <dl class="defList fl-theme-mist">
       <%= editable_metadata_field(@document_fedora, "descMetadata", :title, :label => "Title:") %>
       </dl>

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "3.1.1"
+  VERSION = "3.1.2"
 end
 

data/lib/hydra.rb

@@ -1,8 +1,10 @@
 require "blacklight"
 # Hydra libraries
 module Hydra
-  autoload :Configurable, 'blacklight/configurable'
   extend Blacklight::Configurable
+  extend ActiveSupport::Autoload
+  autoload :Configurable, 'blacklight/configurable'
+  autoload :Assets
 end
 
 

data/lib/hydra/assets.rb

@@ -0,0 +1,147 @@
+module Hydra::Assets
+  extend ActiveSupport::Concern
+  include MediaShelf::ActiveFedoraHelper
+  include Blacklight::SolrHelper
+  include Hydra::RepositoryController
+  include Hydra::AssetsControllerHelper
+  include ReleaseProcessHelper
+  include Blacklight::Catalog
+
+  included do
+    helper :hydra
+    
+    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/fedora before filters because of the before filter that the workflow provides.
+    include Hydra::SubmissionWorkflow
+    
+    
+    prepend_before_filter :sanitize_update_params, :only=>:update
+    before_filter :check_embargo_date_format, :only=>:update
+  end
+      
+  def show
+    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]
+        elsif result.kind_of?(Array)
+          result = result.first
+        end
+      end
+      respond_to do |format|
+        format.html     { render :text=>result }
+        format.textile  { render :text=> RedCloth.new(result, [:sanitize_html]).to_html  }
+      end
+    else
+      redirect_to :controller=>"catalog", :action=>"show"
+    end
+  end
+  
+  # Uses the update_indexed_attributes method provided by ActiveFedora::Base
+  # This should behave pretty much like the ActiveRecord update_indexed_attributes method
+  # For more information, see the ActiveFedora docs.
+  # 
+  # @example Appends a new "subject" value of "My Topic" to on the descMetadata datastream in in the _PID_ document.
+  #   put :update, :id=>"_PID_", "asset"=>{"descMetadata"=>{"subject"=>{"-1"=>"My Topic"}}
+  # @example Sets the 1st and 2nd "medium" values on the descMetadata datastream in the _PID_ document, overwriting any existing values.
+  #   put :update, :id=>"_PID_", "asset"=>{"descMetadata"=>{"medium"=>{"0"=>"Paper Document", "1"=>"Image"}}
+  def update
+    logger.debug("attributes submitted: #{@sanitized_params.inspect}")
+         
+    @response = update_document(@document, @sanitized_params)
+   
+    @document.save
+    flash[:notice] = "Your changes have been saved."
+    
+    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) )
+      }
+      want.js {
+        render :json=> tidy_response_from_update(@response)  
+      }
+      want.textile {
+        if @response.kind_of?(Hash)
+          textile_response = tidy_response_from_update(@response).values.first
+        end
+        render :text=> RedCloth.new(textile_response, [:sanitize_html]).to_html
+      }
+    end
+  end
+  
+  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
+    session[:scripts] = params[:combined] == "true"
+    redirect_to url_for(:action=>"edit", :controller=>"catalog", :id=>@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.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)
+  end
+
+  
+  # This is a method to simply remove the item from SOLR but keep the object in fedora. 
+  alias_method :withdraw, :destroy
+  
+  protected
+
+  def load_document
+    @document = load_document_from_params
+  end
+
+  
+  def mods_assets_update_validation
+    desc_metadata = params[:asset][:descMetadata]
+    rights_metadata = params[:asset][:rightsMetadata]
+    if !rights_metadata.nil? and rights_metadata.has_key?(:embargo_embargo_release_date)
+      unless rights_metadata[:embargo_embargo_release_date]["0"].blank?
+        begin
+          parsed_date = Date.parse(rights_metadata[:embargo_embargo_release_date]["0"]).to_s
+          params[:asset][:rightsMetadata][:embargo_embargo_release_date]["0"] = parsed_date
+        rescue
+          flash[:error] = "You must enter a valid release date."
+          return false
+        end
+      end
+    end
+    
+    if !desc_metadata.nil? and desc_metadata.has_key?(:title_info_main_title) and desc_metadata.has_key?(:journal_0_title_info_main_title)
+      if desc_metadata[:title_info_main_title]["0"].blank? or desc_metadata[:journal_0_title_info_main_title]["0"].blank?
+        flash[:error] = "The title fields are required."
+        return false
+      end
+    end
+    
+    return true
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hydra-head
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: 
   segments: 
   - 3
   - 1
-  - 1
-  version: 3.1.1
+  - 2
+  version: 3.1.2
 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
@@ -973,6 +973,7 @@ files:
 - lib/hydra.rb
 - lib/hydra/access_controls_enforcement.rb
 - lib/hydra/access_controls_evaluation.rb
+- lib/hydra/assets.rb
 - lib/hydra/assets_controller_helper.rb
 - lib/hydra/catalog.rb
 - lib/hydra/common_mods_index_methods.rb
@@ -1154,6 +1155,7 @@ files:
 - vendor/cache/crack-0.3.1.gem
 - vendor/cache/cucumber-1.1.0.gem
 - vendor/cache/cucumber-rails-1.1.1.gem
+- vendor/cache/curb-0.7.15.gem
 - vendor/cache/daemons-1.1.4.gem
 - vendor/cache/database_cleaner-0.6.7.gem
 - vendor/cache/diff-lcs-1.1.3.gem