hydra-head 3.1.2 → 3.1.3

data/lib/hydra-head/version.rb

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

data/lib/hydra.rb

@@ -5,6 +5,7 @@ module Hydra
   extend ActiveSupport::Autoload
   autoload :Configurable, 'blacklight/configurable'
   autoload :Assets
+  autoload :FileAssets
 end
 
 

data/lib/hydra/file_assets.rb

@@ -0,0 +1,148 @@
+module Hydra::FileAssets
+  extend ActiveSupport::Concern
+  
+  include Hydra::AccessControlsEnforcement
+  include Hydra::AssetsControllerHelper
+  include Hydra::FileAssetsHelper  
+  include Hydra::RepositoryController  
+  include MediaShelf::ActiveFedoraHelper
+  include Blacklight::SolrHelper
+  
+  included do
+    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
+    prepend_before_filter :sanitize_update_params
+    helper :hydra_uploader
+  end
+  
+  def index
+    if params[:layout] == "false"
+      layout = false
+    end
+
+    if params[:asset_id].nil?
+      @solr_result = FileAsset.find_by_solr(:all)
+    else
+      container_uri = "info:fedora/#{params[:asset_id]}"
+      escaped_uri = container_uri.gsub(/(:)/, '\\:')
+      extra_controller_params =  {:q=>"is_part_of_s:#{escaped_uri}"}
+      @response, @document_list = get_search_results( extra_controller_params )
+      
+      # Including this line so permissions tests can be run against the container
+      @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])
+      @solr_result = @container.file_objects(:response_format=>:solr)
+    end
+    
+    # Load permissions_solr_doc based on params[:asset_id]
+    load_permissions_from_solr(params[:asset_id])
+    
+    render :action=>params[:action], :layout=>layout
+  end
+  
+  def new
+    render :partial=>"new", :layout=>false
+  end
+  
+  # Creates and Saves a File Asset to contain the the Uploaded file 
+  # If container_id is provided:
+  # * the File Asset will use RELS-EXT to assert that it's a part of the specified container
+  # * 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]})
+    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) )
+    end
+    
+    if params.has_key?(:Filedata)
+      @file_assets = create_and_save_file_assets_from_params
+      notice = []
+      @file_assets.each do |file_asset|
+        apply_depositor_metadata(file_asset)
+
+        notice << "The file #{file_asset.label} has been saved in <a href=\"#{asset_url(file_asset.pid)}\">#{file_asset.pid}</a>."
+          
+        if !params[:container_id].nil?
+          associate_file_asset_with_container(file_asset,'info:fedora/' + params[:container_id])
+        end
+  
+        ## Apply any posted file metadata
+        unless params[:asset].nil?
+          logger.debug("applying submitted file metadata: #{@sanitized_params.inspect}")
+          apply_file_metadata
+        end
+        # If redirect_params has not been set, use {:action=>:index}
+        logger.debug "Created #{file_asset.pid}."
+      end
+      flash[:notice] = notice.join("<br/>") unless notice.blank?
+    else
+      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)
+    end
+    redirect_params ||= {:controller => "catalog", :action => "index"}
+    
+    redirect_to redirect_params
+  end
+  
+  # Common destroy method for all AssetsControllers 
+  def destroy
+    # The correct implementation, with garbage collection:
+    # if params.has_key?(:container_id)
+    #   container = ActiveFedora::Base.load_instance(params[:container_id]) 
+    #   container.file_objects_remove(params[:id])
+    #   FileAsset.garbage_collect(params[:id])
+    # else
+    
+    # The dirty implementation (leaves relationship in container object, deletes regardless of whether the file object has other containers)
+    ActiveFedora::Base.load_instance(params[:id]).delete 
+
+    flash[:notice] = "Deleted #{params[:id]} from #{params[:container_id]}."
+    
+    if !params[:container_id].nil?
+      redirect_params = {:controller => "catalog", :action => "edit", :id => params[:container_id], :anchor => "file_assets"}
+    end
+    redirect_params ||= {:action => 'index', :q => nil , :f => nil}
+    
+    redirect_to redirect_params
+    
+  end
+  
+  
+  def show
+    @file_asset = FileAsset.find(params[:id])
+    if (@file_asset.nil?)
+      logger.warn("No such file asset: " + params[:id])
+      flash[:notice]= "No such file asset."
+      redirect_to(:action => 'index', :q => nil , :f => nil)
+    else
+      # get array of parent (container) objects for this FileAsset
+      @id_array = @file_asset.containers(:response_format => :id_array)
+      @downloadable = false
+      # A FileAsset is downloadable iff the user has read or higher access to a parent
+      @id_array.each do |pid|
+        @response, @permissions_solr_document = get_solr_response_for_doc_id(pid)
+        if reader?
+          @downloadable = true
+          break
+        end
+      end
+
+      if @downloadable
+        if @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 document, which has been marked private."
+        redirect_to(:action => 'index', :q => nil , :f => nil)
+      end
+    end
+  end
+end
+

data/lib/railties/hydra_jetty.rake

@@ -32,14 +32,20 @@ namespace :hydra do
         app_root = File.join(File.dirname(__FILE__),"..")
       end
        
-      fcfg = File.join(app_root,"fedora_conf","conf","fedora.fcfg")
-      puts "PWD:: #{FileUtils.pwd}"
+      fcfg = File.join(app_root,"fedora_conf","conf","development","fedora.fcfg")
       if File.exists?(fcfg)
-        puts "copying over fedora.fcfg"
+        puts "copying over development/fedora.fcfg"
         cp("#{fcfg}", 'jetty/fedora/default/server/config/', :verbose => true)
       else
         puts "#{fcfg} file not found -- skipping fedora config"
       end
+      fcfg = File.join(app_root,"fedora_conf","conf","test","fedora.fcfg")
+      if File.exists?(fcfg)
+        puts "copying over test/fedora.fcfg"
+        cp("#{fcfg}", 'jetty/fedora/test/server/config/', :verbose => true)
+      else
+        puts "#{fcfg} file not found -- skipping fedora config"
+      end
     end
 
     desc "Copies the default SOLR config files and starts up the fedora instance."

data/test_support/spec/controllers/permissions_controller_spec.rb

@@ -9,22 +9,6 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 # rake cucumber
 
 describe PermissionsController do
-  describe "index" do
-    it "should retrieve the object's rightsMetadata datastream as a Hydra::RightsMetadata object and render the _index partial" do
-    end
-  end
-  describe "show" do
-    it"should render different partial based on the permission type" do
-      pending
-      renders "permissions/edit_individual"
-      renders "permissions/edit_group"
-    end
-  end
-  describe "edit" do
-  end
-  describe "new" do
-    it "should render the _new partial"
-  end
   describe "create" do
     it "should create a new permissions entry" do
       stub_solrizer = stub("solrizer", :solrize)
@@ -33,7 +17,6 @@ describe PermissionsController do
       Hydra::RightsMetadata.stubs(:from_xml)
       Hydra::RightsMetadata.stubs(:new).returns(mock_ds)
       mock_ds.expects(:permissions).with({"person" => "_person_id_"}, "read")
-      # mock_ds.expects(:update_permissions).with({"person"=>{"_person_id_"=>"read"}})
       mock_ds.stubs(:content)
       mock_ds.stubs(:pid=)
       mock_ds.stubs(:dsid=)
@@ -47,9 +30,7 @@ describe PermissionsController do
       ActiveFedora::Base.expects(:load_instance).with("_pid_").returns(mock_object)
 
       post :create, :asset_id=>"_pid_", :permission => {"actor_id"=>"_person_id_","actor_type"=>"person","access_level"=>"read"}      
-      # post :create, :asset_id=>"_pid_", :permission => {"person"=>"_person_id_","level"=>"read"}
     end
-    it "should rely on .update method"
   end
   describe "update" do
     it "should call Hydra::RightsMetadata properties setter" do
@@ -79,10 +60,5 @@ describe PermissionsController do
       
       post :update, :asset_id=>"_pid_", :permission => {"group"=>{"_group_id_"=>"discover"}}
     end
-    it "should add a rightsMetadata datastream if it doesn't exist"
-    it "should not cause the metadata to be indexed twice" do
-      # should load the object as ActiveFedora::Base, initialize the rightsMetadata datastream as Hydra::RightsMetadata, update the datastream, save the datastream, and tell Solrizer to re-index the object from pid
-      # re-indexing from pid rather than passing in the current object prevents double-indexing of the edited metadatata datastream
-    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hydra-head
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 3
   - 1
-  - 2
-  version: 3.1.2
+  - 3
+  version: 3.1.3
 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
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-16 00:00:00 -06:00
+date: 2011-11-17 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -935,7 +935,8 @@ files:
 - db/migrate/20101105214243_add_user_attributes_table.rb
 - db/migrate/20101108192527_create_superusers.rb
 - fedora/conf/fedora.fcfg
-- fedora_conf/conf/fedora.fcfg
+- fedora_conf/conf/development/fedora.fcfg
+- fedora_conf/conf/test/fedora.fcfg
 - hydra-head.gemspec
 - init.rb
 - install.rb
@@ -978,6 +979,7 @@ files:
 - lib/hydra/catalog.rb
 - lib/hydra/common_mods_index_methods.rb
 - lib/hydra/controller.rb
+- lib/hydra/file_assets.rb
 - lib/hydra/file_assets_helper.rb
 - lib/hydra/generic_content.rb
 - lib/hydra/generic_image.rb
@@ -1096,7 +1098,6 @@ files:
 - test_support/spec/controllers/hydra_controller_spec.rb
 - test_support/spec/controllers/permissions_controller_spec.rb
 - test_support/spec/controllers/user_sessions_controller_spec.rb
-- test_support/spec/generators/hydra-head_generator_spec.rb
 - test_support/spec/helpers/access_controls_enforcement_spec.rb
 - test_support/spec/helpers/access_controls_evaluation_spec.rb
 - test_support/spec/helpers/assets_controller_helper_spec.rb

data/test_support/spec/generators/hydra-head_generator_spec.rb

@@ -1,14 +0,0 @@
-# -*- encoding : utf-8 -*-
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require "generators/hydra/head_generator"
-require "generators/blacklight/blacklight_generator"
-
-describe Hydra::HeadGenerator do
-
-  it "should be tested, but it's not clear how..."
-  it "should inject Hydra behaviors into User model by adding include Hydra::User" do
-    pending "Not sure how to test this..."
-  end
-
-end
-