hydra-head 4.0.0.rc2 → 4.0.0.rc3

data/lib/mediashelf/active_fedora_helper.rb

@@ -0,0 +1,71 @@
+# Stanford SolrHelper 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.
+# The ActionController docs: http://api.rubyonrails.org/classes/ActionController/Base.html
+#
+# Override these methods in your own controller for customizations:
+# 
+# class HomeController < ActionController::Base
+#   
+#   include Stanford::SolrHelper
+#   
+#   def solr_search_params
+#     super.merge :per_page=>10
+#   end
+#   
+# end
+#
+require 'active_fedora/version'
+module MediaShelf
+  module ActiveFedoraHelper
+    def self.included(base)
+      ActiveSupport::Deprecation.warn("ActiveFedoraHelper is deprecated for removal")
+    end
+
+    def retrieve_af_model(class_name, opts={})
+      if !class_name.nil?
+        klass = Module.const_get(class_name.camelcase)
+      else
+        klass = nil
+      end
+      #klass.included_modules.include?(ActiveFedora::Model)  
+      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
+  
+    def require_solr
+      ActiveFedora::SolrService.register(ActiveFedora.solr_config[:url])
+    end
+    
+    #underscores are escaped w/ + signs, which are unescaped by rails to spaces
+    def unescape_keys(attrs)
+      h=Hash.new
+      attrs.each do |k,v|
+        h[k.gsub(/ /, '_')]=v
+
+      end
+      h
+    end
+    def escape_keys(attrs)
+      h=Hash.new
+      attrs.each do |k,v|
+        h[k.gsub(/_/, '+')]=v
+
+      end
+      h
+    end
+    
+  end
+end

data/lib/uva/mods_index_methods.rb

@@ -1,5 +1,10 @@
 module Uva
   module ModsIndexMethods
+
+  def self.included(base)
+    ActiveSupport::Deprecation.warn("Uva::ModsIndexMethods has been deprecated and its functionality has been encorporated into Hydra::Datastream::ModsArticle")
+  end
+
   # extracts the last_name##full_name##computing_id to be used by home view
   def extract_person_full_names_and_computing_ids
     names = {}

data/test_support/etc/Gemfile

@@ -9,16 +9,17 @@ gem "rails", '~> 3.2.2'
 gem 'sqlite3-ruby', :require => 'sqlite3'
 #gem 'sqlite3'
 
-gem 'blacklight', :git=>'git://github.com/projectblacklight/blacklight.git'
+gem 'blacklight', '~>3.3.0'
 
 
 gem 'hydra-head', :path => '../../'
 gem 'devise'
 gem 'jettywrapper'
+gem 'cancan'
 
 # For testing
 group :development, :test do 
-       gem 'rspec-rails', '>=2.8.0'
+       gem 'rspec-rails'
        gem 'mocha'
        gem 'cucumber-rails'
        gem 'capybara'

data/test_support/spec/controllers/catalog_controller_viewing_context_spec.rb

@@ -16,15 +16,13 @@ describe CatalogController do
 
   describe "show" do
     it "should redirect to edit view if session is in edit context and user has edit permission" do
-      controller.stubs(:reader?).returns(true)            
-      controller.expects(:editor?).returns(true)
-      
+      controller.stubs(:can?).returns(true)
       controller.session[:viewing_context] = "edit"
       get(:show, {:id=>"hydrangea:fixture_mods_article1"})
       response.should redirect_to(:action => 'edit')
     end
     it "should allow you to reset the session context to browse using :viewing_context param" do
-      controller.stubs(:reader?).returns(true)            
+      controller.stubs(:can?).returns(true)
       controller.session[:viewing_context] = "edit"
       get(:show, :id=>"hydrangea:fixture_mods_article1", :viewing_context=>"browse")
       session[:viewing_context].should == "browse"
@@ -32,8 +30,8 @@ describe CatalogController do
     end
     
     it "should quietly switch session state to browse if user does not have edit permissions" do
-      controller.expects(:reader?).returns(true)
-      controller.expects(:editor?).returns(false)
+      controller.stubs(:can?).with(:edit, anything()).returns(false)
+      controller.stubs(:can?).with(:read, anything()).returns(true)
       controller.session[:viewing_context] = "edit"
       get(:show, {:id=>"hydrangea:fixture_mods_article1"})
       session[:viewing_context].should == "browse"
@@ -53,7 +51,7 @@ describe CatalogController do
       flash[:notice].should == "You do not have sufficient privileges to edit this document. You have been redirected to the read-only view."
     end
     it "should render normally if user has edit permissions" do
-      controller.expects(:editor?).returns(true)
+      controller.expects(:can?).with(:edit, anything()).returns(true)
       get :edit, :id=>"hydrangea:fixture_mods_article1"
       response.should_not redirect_to(:action => 'show')
     end

data/test_support/spec/controllers/file_assets_controller_spec.rb

@@ -34,7 +34,7 @@ describe Hydra::FileAssetsController do
       controller.expects(:get_solr_response_for_doc_id).with('_PID_').returns(["container solr response","container solr doc"])
       controller.stubs(:load_permissions_from_solr)
       
-      ActiveFedora::Base.expects(:find).with("_PID_").returns(mock_container)
+      ActiveFedora::Base.expects(:find).with("_PID_", :cast=>true).returns(mock_container)
       xhr :get, :index, :asset_id=>"_PID_"
       assigns[:response].should == "assets solr response"
       assigns[:document_list].should == "assets solr list"
@@ -45,17 +45,6 @@ describe Hydra::FileAssetsController do
       assigns[:container].should == mock_container
     end
     
-    it "should find all file assets belonging to a given container object if container_id or container_id is provided" do
-      pending
-      # this was testing a hacked version
-      mock_solr_hash = {"has_collection_member_field"=>["info:fedora/foo:id"]}
-      mock_container = mock("container")
-      mock_container.expects(:collection_members).with(:response_format=>:solr).returns("solr result")
-      ActiveFedora::Base.expects(:find).with("_PID_").returns(mock_container)
-      xhr :get, :index, :asset_id=>"_PID_"
-      assigns[:solr_result].should == "solr result"
-      assigns[:container].should == mock_container
-    end
   end
 
   describe "new" do
@@ -113,7 +102,7 @@ describe Hydra::FileAssetsController do
   describe "destroy" do
     it "should delete the asset identified by pid" do
       mock_obj = mock("asset", :delete)
-      ActiveFedora::Base.expects(:find).with("__PID__").returns(mock_obj)
+      ActiveFedora::Base.expects(:find).with("__PID__", :cast=>true).returns(mock_obj)
       delete(:destroy, :id => "__PID__")
     end
     it "should remove container relationship and perform proper garbage collection" do
@@ -121,7 +110,7 @@ describe Hydra::FileAssetsController do
       mock_container = mock("asset")
       mock_container.expects(:file_objects_remove).with("_file_asset_pid_")
       FileAsset.expects(:garbage_collect).with("_file_asset_pid_")
-      ActiveFedora::Base.expects(:find).with("_container_pid_").returns(mock_container)
+      ActiveFedora::Base.expects(:find).with("_container_pid_", :cast=>true).returns(mock_container)
       delete(:destroy, :id => "_file_asset_pid_", :asset_id=>"_container_pid_")
     end
   end

data/test_support/spec/controllers/hydra-assets_controller_spec.rb

@@ -108,7 +108,7 @@ describe Hydra::AssetsController do
     it "should delete the asset identified by pid" do
       mock_obj = mock("asset", :delete)
       mock_obj.expects(:destroy_child_assets).returns([])
-      ActiveFedora::Base.expects(:find).with("__PID__").returns(mock_obj)
+      ActiveFedora::Base.expects(:find).with("__PID__", :cast=>true).returns(mock_obj)
       delete(:destroy, :id => "__PID__")
     end
   end
@@ -119,7 +119,7 @@ describe Hydra::AssetsController do
     it "should withdraw the asset identified by pid" do
       mock_obj = mock("asset", :delete)
       mock_obj.expects(:destroy_child_assets).returns([])
-      ActiveFedora::Base.expects(:find).with("__PID__").returns(mock_obj)
+      ActiveFedora::Base.expects(:find).with("__PID__", :cast=>true).returns(mock_obj)
       delete(:withdraw, :id => "__PID__")
     end
   end

data/test_support/spec/helpers/access_controls_enforcement_spec.rb

@@ -2,6 +2,20 @@
 require File.expand_path( File.join( File.dirname(__FILE__),'..','spec_helper') )
 
 describe Hydra::AccessControlsEnforcement do
+  describe "enforce_access_controls" do
+    describe "when the method exists" do
+      it "should call the method" do
+        params[:action] = :index
+        helper.enforce_access_controls.should be_true
+      end
+    end
+    describe "when the method doesn't exist" do
+      it "should not call the method, but should return true" do
+        params[:action] = :facet
+        helper.enforce_access_controls.should be_true
+      end
+    end
+  end
 
   describe "apply_gated_discovery" do
     before(:each) do

data/test_support/spec/helpers/access_controls_evaluation_spec.rb

@@ -2,32 +2,23 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Hydra::AccessControlsEvaluation do
   
-  describe "test_permission" do
-    it "should automatically add logged-in users to 'registered' group" do
-      mock_user = mock("User", :email => "logged_in_person@example.com")
-      helper.stubs(:read_groups).returns(["registered"])
-      helper.stubs(:current_user).returns(nil)
-      helper.test_permission(:read).should == false 
-      helper.stubs(:current_user).returns(mock_user)
-      helper.test_permission(:read).should == true 
-    end
-  end
-  
   describe "editor?" do
     it "should return true if current_user.is_being_superuser? is true" do
-      mock_user = mock("User", :email => "BigWig@example.com")
+      mock_user = mock("User")
+      mock_user.stubs(:email).returns "BigWig@example.com"
       mock_user.stubs(:is_being_superuser?).returns true
-      helper.stubs(:current_user).returns mock_user
+      controller.stubs(:current_user).returns mock_user
       helper.editor?.should be_true
     end
     it "should return false if the session[:user] is not logged in" do
-      helper.stubs(:current_user).returns(nil)
+      controller.stubs(:current_user).returns(nil)
       helper.editor?.should be_false
     end    
     it "should return false if the session[:user] does not have an editor role" do
-      mock_user = mock("User", :email=>"nobody_special@example.com")
+      mock_user = mock("User")
+      mock_user.stubs(:email).returns "nobody_special@example.com"
       mock_user.stubs(:is_being_superuser?).returns(false)
-      helper.stubs(:current_user).returns(mock_user)
+      controller.stubs(:current_user).returns(mock_user)
       helper.editor?.should be_false
     end
   end  

data/test_support/spec/helpers/hydra-repository_controller_spec.rb

@@ -51,18 +51,4 @@ describe Hydra::RepositoryController do
     
   end
 
-  describe "load_af_instance_from_solr" do
-    it "should return an ActiveFedora object given a valid solr doc same as loading from Fedora" do
-      pid = "hydrangea:fixture_mods_article1"
-      result = ActiveFedora::Base.find_by_solr(pid)
-      solr_doc = result.first 
-      solr_af_obj = helper.load_af_instance_from_solr(solr_doc)
-      fed_af_obj = ActiveFedora::Base.find(pid)
-      #check both inbound and outbound match
-      fed_af_obj.outbound_relationships.to_hash.should == solr_af_obj.outbound_relationships.to_hash
-      fed_af_obj.inbound_relationships.should == solr_af_obj.inbound_relationships
-    end
-  end
-  
-  
 end

data/test_support/spec/helpers/hydra_assets_helper_spec.rb

@@ -63,8 +63,8 @@ describe HydraAssetsHelper do
   describe "get_file_asset_count" do
     describe "with outbound has_part" do
       before do
-        @asset_object4 =ActiveFedora::Base.new
-        @file_object1 = ActiveFedora::Base.create
+        @asset_object4 =ModsAsset.new
+        @file_object1 = ModsAsset.create
         @asset_object4.add_relationship(:has_part,@file_object1)
         @asset_object4.save
       end
@@ -74,17 +74,17 @@ describe HydraAssetsHelper do
       end
       it "should find one" do
         #outbound has_part
-        doc = ActiveFedora::Base.find_by_solr(@asset_object4.pid).first
+        doc = ModsAsset.find_by_solr(@asset_object4.pid).first
         get_file_asset_count(doc).should == 1
       end
     end
 
     describe "with has_part and inbound is_part_of" do
       before do
-        @asset_object5 =ActiveFedora::Base.create
-        @file_object1 = ActiveFedora::Base.create
-        @file_object2 = ActiveFedora::Base.create
-        @file_object2.part_of_append(@asset_object5)
+        @asset_object5 =ModsAsset.create
+        @file_object1 = FileAsset.create
+        @file_object2 = FileAsset.create
+        @file_object2.container = @asset_object5
         @asset_object5.add_relationship(:has_part,@file_object1)
         @asset_object5.save
         @file_object2.save
@@ -102,9 +102,9 @@ describe HydraAssetsHelper do
 
     describe "with inbound is_part_of" do
       before do
-        @asset_object6 =ActiveFedora::Base.create
-        @file_object1 = ActiveFedora::Base.create
-        @file_object1.part_of_append(@asset_object6)
+        @asset_object6 =ModsAsset.create
+        @file_object1 = FileAsset.create
+        @file_object1.container = @asset_object6
         @asset_object6.save
         @file_object1.save
       end
@@ -120,7 +120,7 @@ describe HydraAssetsHelper do
 
     describe "with inbound is_part_of" do
       before do
-        @asset_object7 =ActiveFedora::Base.create
+        @asset_object7 =ModsAsset.create
       end
       after do
         @asset_object7.delete

data/test_support/spec/helpers/hydra_model_methods_spec.rb

@@ -37,7 +37,7 @@ describe Hydra::ModelMethods do
   describe "set_title" do
     it "should set the title if the descMetadata is a NokogiriDatastream that responds to :title term" do
       obj = ActiveFedora::Base.new
-      dm = Hydra::ModsArticle.new(obj.inner_object, nil)
+      dm = Hydra::Datastream::ModsArticle.new(obj.inner_object, nil)
       dm.stubs(:content).returns('')
       helper.stubs(:datastreams).returns("descMetadata"=>dm)
       helper.set_title("My title")
@@ -50,7 +50,7 @@ describe Hydra::ModelMethods do
       #dm = ActiveFedora::QualifiedDublinCoreDatastream.new  nil, nil 
       helper.stubs(:datastreams).returns("descMetadata"=>dm)
       helper.set_title("My title")
-      dm.title_values.should == ["My title"]
+      dm.title.should == ["My title"]
     end
   end
   

data/test_support/spec/integration/file_asset_spec.rb

@@ -1,5 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require "active_fedora"
 
 class DummyFileAsset < ActiveFedora::Base
   def initialize(attr={})

data/test_support/spec/lib/common_mods_index_methods_spec.rb

@@ -2,7 +2,7 @@
 require File.expand_path( File.join( File.dirname(__FILE__),'..','spec_helper') )
 
 
-describe Hydra::CommonModsIndexMethods do
+describe Hydra::Datastream::CommonModsIndexMethods do
   describe "extract_person_full_names" do
     it "should return an array of Solr::Field objects for :person_full_name_facet" do
       ma = ModsAsset.find("hydrangea:fixture_mods_article1")

data/test_support/spec/lib/hydra_submission_workflow_spec.rb

@@ -138,4 +138,4 @@ class SubmissionWorkflowObject
   def mods_assets_update_validation
     return true
   end
-end
+end

data/test_support/spec/models/ability_spec.rb

@@ -0,0 +1,16 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Ability do
+
+  describe "initialize" do
+    it "should automatically add logged-in users to 'registered' group" do
+      mock_user = mock("User")
+      mock_user.stubs(:email).returns "logged_in_person@example.com"
+      mock_user.stubs(:is_being_superuser?).returns false
+      ability = Ability.new(nil)
+      ability.user_groups.should_not include 'registered'
+      ability = Ability.new(mock_user)
+      ability.user_groups.should include 'registered'
+    end
+  end
+end

data/test_support/spec/models/file_asset_spec.rb

@@ -1,5 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require "active_fedora"
 
 describe FileAsset do
   

data/test_support/spec/models/hydra_rights_metadata_spec.rb

@@ -1,14 +1,13 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require "active_fedora"
 require "nokogiri"
 
-describe Hydra::RightsMetadata do
+describe Hydra::Datastream::RightsMetadata do
   
   before(:each) do
     # The way RubyDora loads objects prevents us from stubbing the fedora connection :(
     # ActiveFedora::RubydoraConnection.stubs(:instance).returns(stub_everything())
     obj = ActiveFedora::Base.new
-    @sample = Hydra::RightsMetadata.new(obj.inner_object, nil)
+    @sample = Hydra::Datastream::RightsMetadata.new(obj.inner_object, nil)
     @sample.stubs(:content).returns('')
   end
   
@@ -128,10 +127,10 @@ describe Hydra::RightsMetadata do
     it "should solrize fixture content correctly" do
       fixture_xml = Nokogiri::XML::Document.parse( File.new(File.join( File.dirname(__FILE__), "../../fixtures/hydrangea_fixture_mods_article1.foxml.xml") ))
       fixture_rights = fixture_xml.xpath("//foxml:datastream[@ID='rightsMetadata']/foxml:datastreamVersion[last()]/foxml:xmlContent", {'foxml'=>"info:fedora/fedora-system:def/foxml#"}).first.to_xml
-      lsample = Hydra::RightsMetadata.new(nil, nil)
+      lsample = Hydra::Datastream::RightsMetadata.new(nil, nil)
       lsample.content = fixture_rights
 #      lsample.expects(:content).returns('')
-      lsample = Hydra::RightsMetadata.from_xml(fixture_rights, lsample)
+      lsample = Hydra::Datastream::RightsMetadata.from_xml(fixture_rights, lsample)
       solr_doc = lsample.to_solr
       solr_doc["edit_access_person_t"].should == ["researcher1"]
       solr_doc["edit_access_group_t"].should == ["archivist"]

data/test_support/spec/models/mods_asset_spec.rb

@@ -3,10 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe ModsAsset do
   
   before(:each) do
-#    Fedora::Repository.stubs(:instance).returns(stub_everything())
     @asset = ModsAsset.new nil
-    # @asset.stubs(:create_date).returns("2008-07-02T05:09:42.015Z")
-    # @asset.stubs(:modified_date).returns("2008-09-29T21:21:52.892Z")
   end
   
   it "Should be a kind of ActiveFedora::Base" do
@@ -15,15 +12,9 @@ describe ModsAsset do
   
   it "should set up descMetadata and rightsMetadata datastreams" do
     @asset.datastreams.should have_key("descMetadata")
-    @asset.datastreams["descMetadata"].should be_instance_of(Hydra::ModsArticle)
+    @asset.datastreams["descMetadata"].should be_instance_of(Hydra::Datastream::ModsArticle)
     @asset.datastreams.should have_key("rightsMetadata")
-    @asset.datastreams["rightsMetadata"].should be_instance_of(Hydra::RightsMetadata)
-  end
-  
-  it "should have has_model relationships pointing to commonMetadata and modsObject cModels" do
-    pending "this is waiting for ActiveFedora::Base to support a self.relationships method"
-    @asset.relationships[:self][:has_model].should include("info:fedora/hydra-cModel:commonMetadata")
-    @asset.relationships[:self][:has_model].should include("info:fedora/hydra-cModel:modsObject")
+    @asset.datastreams["rightsMetadata"].should be_instance_of(Hydra::Datastream::RightsMetadata)
   end
   
 end