hydra-head 3.1.5 → 3.2.0.pre1

data/lib/hydra/file_assets.rb

@@ -98,14 +98,6 @@ module Hydra::FileAssets
   
   # 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]}."
@@ -127,17 +119,14 @@ module Hydra::FileAssets
       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)
+      # 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
-      @id_array.each do |pid|
-        @response, @permissions_solr_document = get_solr_response_for_doc_id(pid)
-        if reader?
-          @downloadable = true
-          break
-        end
-      end
+      @response, @permissions_solr_document = get_solr_response_for_doc_id(pid)
+      if reader?
+        @downloadable = true
+     end
 
       if @downloadable
         # First try to use datastream_id value (set in FileAssetsHelper)

data/lib/hydra/image.rb

@@ -28,6 +28,8 @@ require "httparty"
 
 module Hydra
 class Image < ActiveFedora::Base
+=begin
+  TODO This doesn't seem to be used anywhere. Commenting out until I hear back. Justin 2011-12-21
   include Hydra::ModelMethods
   include HTTParty
 
@@ -173,5 +175,6 @@ class Image < ActiveFedora::Base
     "#{admin_site}fedora/objects/#{pid}/datastreams/#{ds_name}/content"
   end
 
+=end
 end
 end

data/lib/hydra/model_methods.rb

@@ -1,4 +1,10 @@
 module Hydra::ModelMethods
+  extend ActiveSupport::Concern
+
+  included do
+    extend ActiveFedora::Relationships
+    extend ActiveFedora::FileManagement
+  end
   
   #
   # Adds metadata about the depositor to the asset

data/lib/hydra/models/file_asset.rb

@@ -0,0 +1,74 @@
+module Hydra
+  module Models
+    module FileAsset
+      extend ActiveSupport::Concern
+      included do
+        include Hydra::ModelMethods
+        
+        #has_relationship "is_member_of_collection", :has_collection_member, :inbound => true
+        #has_bidirectional_relationship "part_of", :is_part_of, :has_part
+        belongs_to :container, :class_name=>'ActiveFedora::Base', :property=>:is_part_of
+        has_metadata :name => "descMetadata", :type => ActiveFedora::QualifiedDublinCoreDatastream do |m|
+        end
+      end
+
+
+      # Returns a human readable filesize appropriate for the given number of bytes (ie. automatically chooses 'bytes','KB','MB','GB','TB')
+      # Based on a bit of python code posted here: http://blogmag.net/blog/read/38/Print_human_readable_file_size
+      # @param [Numeric] file size in bits
+      def bits_to_human_readable(num)
+          ['bytes','KB','MB','GB','TB'].each do |x|
+            if num < 1024.0
+              return "#{num.to_i} #{x}"
+            else
+              num = num/1024.0
+            end
+          end
+      end
+      
+
+      def label
+        descMetadata.title_values.first
+      end
+          
+      def label=(label)
+        super
+        descMetadata.title_values = label
+      end    
+      
+      # augments add_file_datastream to also put file size (in bytes/KB/MB/GB/TB) in dc:extent 
+      def add_file_datastream(file, opts={})
+        super
+        if file.respond_to?(:size)
+          size = bits_to_human_readable(file.size)
+        elsif file.kind_of?(File)
+          size = bits_to_human_readable(File.size(file))
+        else
+          size = ""
+        end
+        datastreams["descMetadata"].extent_values = size
+      end
+
+       # Override ActiveFedora::Base.to_solr to...
+      # Check if we are dealing with a child of FileAsset and if so when calling to_solr from Solrizer indexer we want to skip loading parent metadata again 
+      #
+      # if known models greater than one (without ActiveFedora::Base) and
+      #   known models contains a child of FileAsset and
+      #   opts[:model_only] == true and
+      #   current object class is FileAsset
+      # that means that the child already has had to_solr called which included metadata from FileAsset
+      # if any of the above is false then call to_solr as normal
+      def to_solr(solr_doc=Hash.new, opts={})
+
+        active_fedora_model_s = solr_doc["active_fedora_model_s"] if solr_doc["active_fedora_model_s"]
+        actual_class = active_fedora_model_s.constantize if active_fedora_model_s
+        if actual_class && actual_class != self.class && actual_class.superclass == ::FileAsset
+          solr_doc
+        else
+          super(solr_doc,opts)
+        end
+      end
+
+    end
+  end
+end

data/lib/railties/hydra-fixtures.rake

@@ -1,4 +1,3 @@
-# require File.expand_path(File.dirname(__FILE__) + '/hydra_jetty.rb')
 require "active-fedora"
 require "solrizer-fedora"
 require "active_support" # This is just to load ActiveSupport::CoreExtensions::String::Inflections
@@ -34,7 +33,6 @@ namespace :hydra do
       raise "You must specify a valid pid.  Example: rake hydra:delete pid=demo:12"
     else
       pid = ENV["pid"]
-      puts "Deleting '#{pid}' from #{ActiveFedora::RubydoraConnection.instance.options[:url]}"
       begin
         ActiveFedora::FixtureLoader.delete(pid)
       rescue Errno::ECONNREFUSED => e
@@ -42,7 +40,7 @@ namespace :hydra do
       rescue Exception => e
         logger.error("Received a Fedora error while deleting #{pid}\n#{e}")
       end
-      logger.info "Deleted '#{pid}' from #{ActiveFedora::RubydoraConnection.instance.options[:url]}"
+      #logger.info "Deleted '#{pid}' from #{ActiveFedora::RubydoraConnection.instance.options[:url]}"
     end
   end
   

data/lib/railties/hydra_jetty.rake

@@ -47,7 +47,7 @@ namespace :hydra do
     end
 
     desc "Copies the default SOLR config files and starts up the fedora instance."
-    task :load => [:config, :start]
+    task :load => [:config, 'jetty:start']
 
   end
 end

data/tasks/hydra-head-fixtures.rake

@@ -1,4 +1,3 @@
-#require 'rake/testtask'
 require 'rspec/core'
 require 'rspec/core/rake_task'
 
@@ -51,4 +50,4 @@ namespace :hyhead do
       FileUtils.cd('../../')
     end
   end
-end
+end

data/test_support/features/step_definitions/edit_metadata_steps.rb

@@ -3,11 +3,11 @@ Then /^the following (should contain|contain|should not contain|do not contain):
   # table is a Cucumber::Ast::Table
   if bool == "should contain" || bool == "contain"
     table.rows_hash.each do |name, value|
-      Then %{the "#{name}" field should contain "#{value}"}
+      step %{the "#{name}" field should contain "#{value}"}
     end
   elsif bool == "should not contain" || bool == "do not contain"
     table.rows_hash.each do |name, value|
-      Then %{the "#{name}" field should not contain "#{value}"}
+      step %{the "#{name}" field should not contain "#{value}"}
     end
   else
     pending
@@ -17,14 +17,14 @@ end
 When /^I select the following(?: within "([^"]*)")?$/ do |scope_selector, table|
   # table is a Cucumber::Ast::Table
   table.rows_hash.each do |field_selector, value|
-    Given %{I select "#{value}" from "#{field_selector}" within "#{scope_selector}"}
+    step %{I select "#{value}" from "#{field_selector}" within "#{scope_selector}"}
   end
 end
 
 Then /^the following should be selected(?: within "([^"]*)")?$/ do |scope_selector, table|
   # table is a Cucumber::Ast::Table
   table.rows_hash.each do |field_selector, value|
-    Then %{"#{value}" should be selected from "#{field_selector}" within "#{scope_selector}"}
+    step %{"#{value}" should be selected from "#{field_selector}" within "#{scope_selector}"}
     # Then %{the "#{field_selector}" field within "#{scope_selector}" should contain "#{value}"}
   end
 end

data/test_support/features/step_definitions/file_list_steps.rb

@@ -2,9 +2,9 @@
 Then /^I (should|should not) see "([^"]*)" in the file assets list$/ do |bool, arg|
   with_scope("#file_assets") do
     if bool == "should"
-      Then %{I should see "#{arg}"}
+      step %{I should see "#{arg}"}
     else
-      Then %{I should not see "#{arg}"}
+      step %{I should not see "#{arg}"}
     end
   end
 end
@@ -12,7 +12,7 @@ end
 
 Then /^I should see a link to "([^"]*)" in the file assets list$/ do |link_name|
   with_scope("#file_assets") do
-    Then %{I should see a link called "#{link_name}"}
+    step %{I should see a link called "#{link_name}"}
   end
 end
 
@@ -20,9 +20,9 @@ end
 Then /^I (should|should not) see a link to "([^"]*)" with label "([^"]*)" in the file assets list$/ do |bool, link_name, label_name|
   with_scope("#file_assets") do
     if bool == "should"
-      Then %{I should see a link to "#{link_name}" with label "#{label_name}"}
+      step %{I should see a link to "#{link_name}" with label "#{label_name}"}
     else
-      Then %{I should not see a link to "#{link_name}" with label "#{label_name}"} 
+      step %{I should not see a link to "#{link_name}" with label "#{label_name}"} 
     end
   end
 end

data/test_support/features/step_definitions/user_steps.rb

@@ -11,8 +11,8 @@ Given /^I (?:am )?log(?:ged)? in as "([^\"]*)"$/ do |email|
   fill_in "Email", :with => email 
   fill_in "Password", :with => "password"
   click_button "Sign in"
-  Then %{I should see a link to "my account info" with label "#{email}"} 
-  And %{I should see a link to "logout"} 
+  step %{I should see a link to "my account info" with label "#{email}"} 
+  step %{I should see a link to "logout"} 
 end
 
 Given /^I am logged in as "([^\"]*)" with "([^\"]*)" permissions$/ do |login,permission_group|
@@ -21,14 +21,14 @@ Given /^I am logged in as "([^\"]*)" with "([^\"]*)" permissions$/ do |login,per
 end
 
 Given /^I am a superuser$/ do
-  Given %{I am logged in as "bigwig@example.com"}
+  step %{I am logged in as "bigwig@example.com"}
   bigwig_id = User.find_by_email("bigwig@example.com").id
   superuser = Superuser.create(:id => 20, :user_id => bigwig_id)
   visit superuser_path
 end
 
 Given /^I am not logged in$/ do
-  Given %{I log out}
+  step %{I log out}
 end
 
 Given /^I log out$/ do

data/test_support/spec/helpers/hydra_assets_helper_spec.rb

@@ -64,68 +64,35 @@ describe HydraAssetsHelper do
     before(:each) do
       #setup objects for following cases
       #
-      #outbound has_collection_member
-      #outbound has_collection_member + inbound is_part_of
-      #outbound has_collection_member + outbound has_part + inbound is_part_of
       #outbound has_part
       #outbound has_part + inbound is_part_of
       #inbound is_part_of
       #none      
-      @asset_object1 = ActiveFedora::Base.new
-      @asset_object2 = ActiveFedora::Base.new
-      @asset_object3 = ActiveFedora::Base.new
       @asset_object4 = ActiveFedora::Base.new
       @asset_object5 = ActiveFedora::Base.new
       @asset_object6 = ActiveFedora::Base.new
       @asset_object7 = ActiveFedora::Base.new
       @file_object1 = ActiveFedora::Base.new
       @file_object2 = ActiveFedora::Base.new
-      @file_object3 = ActiveFedora::Base.new
-      @file_object4 = ActiveFedora::Base.new
 
-      @asset_object1.collection_members_append(@file_object1)
-      @asset_object1.collection_members_append(@file_object2)
 
-      @asset_object2.collection_members_append(@file_object1)
-      @asset_object2.collection_members_append(@file_object2)
-      @asset_object2.add_relationship(:has_part,@file_object3)
-
-      @asset_object3.collection_members_append(@file_object1)
-      @asset_object3.collection_members_append(@file_object2)
-      @asset_object3.add_relationship(:has_part,@file_object3)
-      @file_object4.part_of_append(@asset_object3)
 
       @asset_object4.add_relationship(:has_part,@file_object1)
+      @asset_object5.save
       @asset_object5.add_relationship(:has_part,@file_object1)
       @file_object2.part_of_append(@asset_object5)
+      @asset_object6.save
       @file_object1.part_of_append(@asset_object6)
      
-      @asset_object1.save
-      @asset_object2.save
-      @asset_object3.save
+      @file_object1.save
+      @file_object2.save
       @asset_object4.save
       @asset_object5.save
       @asset_object6.save
       @asset_object7.save
-      @file_object1.save
-      @file_object2.save
-      @file_object3.save 
-      @file_object4.save
     end
 
     after(:each) do
-      begin
-        @asset_object1.delete
-      rescue
-      end
-      begin
-        @asset_object2.delete
-      rescue
-      end
-      begin
-        @asset_object3.delete
-      rescue
-      end
       begin
         @asset_object4.delete
       rescue
@@ -150,36 +117,17 @@ describe HydraAssetsHelper do
         @file_object2.delete
       rescue
       end
-      begin
-        @file_object3.delete
-      rescue
-      end
-      begin
-        @file_object4.delete
-      rescue
-      end
     end
 
     it "should return the correct number of assets with either has_collection_member file assets or parts" do
       
       #cases are
-      #outbound has_collection_member
-      #outbound has_collection_member + inbound is_part_of
-      #outbound has_collection_member + outbound has_part + inbound is_part_of
       #outbound has_part
       #outbound has_part + inbound is_part_of
       #inbound is_part_of
       #none      
 
-      result = ActiveFedora::Base.find_by_solr(@asset_object1.pid)
-      doc = result.hits.first
-      get_file_asset_count(doc).should == 2
-      result = ActiveFedora::Base.find_by_solr(@asset_object2.pid)
-      doc = result.hits.first
-      get_file_asset_count(doc).should == 3
-      result = ActiveFedora::Base.find_by_solr(@asset_object3.pid)
-      doc = result.hits.first
-      get_file_asset_count(doc).should == 4
+
       result = ActiveFedora::Base.find_by_solr(@asset_object4.pid)
       doc = result.hits.first
       get_file_asset_count(doc).should == 1

data/test_support/spec/integration/file_asset_spec.rb

@@ -21,71 +21,20 @@ describe FileAsset do
   describe "with parts" do
     before(:each) do
       @asset1 = ActiveFedora::Base.new
-      @asset2 = ActiveFedora::Base.new
-      @asset3 = ActiveFedora::Base.new
       @asset1.save
-      @asset2.save
-      @asset3.save
     end
 
     after(:each) do
-      begin
       @asset1.delete
-      rescue
-      end
-      begin
-      @asset2.delete
-      rescue
-      end
-      begin
-      @asset3.delete
-      rescue
-      end
-    end
-
-    describe ".containers" do    
-      it "should return asset container objects via either inbound has_collection_member, inbound has_part, or outbound is_part_of relationships" do
-        #test all possible combinations...
-        #none
-        @file_asset.containers(:response_format=>:id_array).should == []
-        #is_part_of
-        @file_asset.part_of_append(@asset1)
-        @file_asset.containers(:response_format=>:id_array).should == [@asset1.pid]
-        #has_part + is_part_of
-        @asset2.parts_append(@file_asset)
-        @asset2.save
-        @file_asset.containers(:response_format=>:id_array).should == [@asset2.pid,@asset1.pid]
-        #has_part
-        @file_asset.part_of_remove(@asset1)
-        @file_asset.containers(:response_format=>:id_array).should == [@asset2.pid]      
-        #has_collection_member
-        @asset2.parts_remove(@file_asset)
-        @asset2.save
-        @asset3.collection_members_append(@file_asset)
-        @asset3.save
-        @file_asset.containers(:response_format=>:id_array).should == [@asset3.pid]
-        #is_part_of + has_collection_member
-        @file_asset.part_of_append(@asset1)
-        @file_asset.containers(:response_format=>:id_array).should == [@asset3.pid,@asset1.pid]
-        #has_part + has_collection_member      
-        @file_asset.part_of_remove(@asset1)
-        @asset2.parts_append(@file_asset)
-        @asset2.save
-        @file_asset.containers(:response_format=>:id_array).should == [@asset3.pid,@asset2.pid]
-        #has_collection_member + has_part + is_part_of
-        @file_asset.part_of_append(@asset1)
-        @file_asset.containers(:response_format=>:id_array).should == [@asset3.pid,@asset2.pid,@asset1.pid]
-      end
     end
 
-    describe ".containers_ids" do
-      it "should return an array of container ids instead of objects" do
-         #test all possible combinations...
+    describe ".container_id" do    
+      it "should return asset container objects via is_part_of relationships" do
         #none
-        @file_asset.containers_ids.should == []
+        @file_asset.container_id.should be_nil
         #is_part_of
-        @file_asset.part_of_append(@asset1)
-        @file_asset.containers_ids.should == [@asset1.pid]
+        @file_asset.container = @asset1
+        @file_asset.container_id.should == @asset1.pid
       end
     end
   end