hydra-head 3.2.2 → 3.3.0

data/Gemfile.lock

@@ -3,7 +3,7 @@ PATH
   specs:
     hydra-head (3.2.2)
       RedCloth (= 4.2.3)
-      active-fedora (>= 3.2.2)
+      active-fedora (>= 3.3.0)
       blacklight (~> 3.1.2)
       block_helpers
       builder (= 2.1.2)
@@ -57,7 +57,7 @@ GEM
       rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    active-fedora (3.2.2)
+    active-fedora (3.3.0)
       activeresource (>= 3.0.0)
       activesupport (>= 3.0.0)
       equivalent-xml
@@ -66,12 +66,12 @@ GEM
       mime-types (>= 1.16)
       multipart-post (= 1.1.2)
       nokogiri
-      om (>= 1.4.4)
+      om (>= 1.5.1)
       rdf
       rdf-rdfxml
-      rubydora (~> 0.4.1)
+      rubydora (~> 0.5.1)
       solr-ruby (>= 0.0.6)
-      solrizer (> 1.0.0)
+      solrizer (~> 1.2.0)
       xml-simple (>= 1.0.12)
     activemodel (3.0.11)
       activesupport (= 3.0.11)
@@ -109,7 +109,7 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    childprocess (0.2.3)
+    childprocess (0.3.0)
       ffi (~> 1.0.6)
     columnize (0.3.6)
     crack (0.3.1)
@@ -131,16 +131,16 @@ GEM
       orm_adapter (~> 0.0.3)
       warden (~> 1.1)
     diff-lcs (1.1.3)
-    equivalent-xml (0.2.8)
+    equivalent-xml (0.2.9)
       nokogiri (>= 1.4.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     facets (2.8.4)
-    factory_girl (2.3.2)
+    factory_girl (2.5.0)
       activesupport
     fastercsv (1.5.4)
     ffi (1.0.11)
-    gherkin (2.7.4)
+    gherkin (2.7.6)
       json (>= 1.4.6)
     gyoku (0.4.4)
       builder (>= 2.1.2)
@@ -151,7 +151,7 @@ GEM
     httpi (0.9.5)
       rack
     i18n (0.5.0)
-    jettywrapper (1.2.0)
+    jettywrapper (1.2.1)
       activesupport (>= 3.0.0)
       childprocess
       i18n
@@ -177,19 +177,19 @@ GEM
     mediashelf-loggable (0.4.7)
     metaclass (0.0.1)
     mime-types (1.17.2)
-    mocha (0.10.0)
+    mocha (0.10.3)
       metaclass (~> 0.0.1)
     multi_json (1.0.4)
     multi_xml (0.4.1)
     multipart-post (1.1.2)
     nokogiri (1.5.0)
     nori (1.0.2)
-    om (1.4.4)
+    om (1.5.1)
       mediashelf-loggable
       nokogiri (>= 1.4.2)
     orm_adapter (0.0.6)
     polyglot (0.3.3)
-    rack (1.2.4)
+    rack (1.2.5)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
@@ -223,25 +223,25 @@ GEM
       builder (>= 2.1.2)
     rsolr-ext (1.0.3)
       rsolr (>= 1.0.2)
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
-    rspec-rails (2.7.0)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      railties (~> 3.0)
-      rspec (~> 2.7.0)
+    rspec-mocks (2.8.0)
+    rspec-rails (2.8.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec (~> 2.8.0)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    rubydora (0.4.1)
+    rubydora (0.5.1)
       activemodel
       activesupport
       fastercsv
@@ -260,20 +260,20 @@ GEM
       nokogiri (>= 1.4.0)
       nori (~> 1.0)
       wasabi (~> 2.0)
-    selenium-webdriver (2.15.0)
-      childprocess (>= 0.2.1)
+    selenium-webdriver (2.18.0)
+      childprocess (>= 0.2.5)
       ffi (~> 1.0.9)
       multi_json (~> 1.0.4)
       rubyzip
     solr-ruby (0.0.8)
-    solrizer (1.1.2)
+    solrizer (1.2.0)
       daemons
-      mediashelf-loggable
+      mediashelf-loggable (~> 0.4.7)
       nokogiri
-      om (>= 1.4.0)
+      om (>= 1.5.0)
       stomp
       xml-simple
-    solrizer-fedora (1.2.2)
+    solrizer-fedora (1.2.3)
       active-fedora (>= 3.1.0)
       activesupport
       fastercsv

data/HISTORY.textile

@@ -1,3 +1,11 @@
+h3. 3.3.0
+* HYDRA-737: fixes to work with Ruby Enterprise Edition 2011.12 and ruby-1.8.7-p357.
+* Update ActiveFedora to 3.3.0
+* Separating Hydra::Controller from Hydra::UI::Controller
+
+h3. 3.2.3
+* HYDRA-736: hydra-head should not define a rake task called 'spec'
+
 h3. 3.2.2
 * Update to ActiveFedora 3.2.2 to fix severe error
 * HYDRA-661: deprecated tasks and made them call AF repo tasks

data/config/fedora.yml

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

data/hydra-head.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.add_dependency "blacklight", '~>3.1.2'  
   s.add_dependency "devise"
   s.add_dependency 'sqlite3-ruby', '~>1.2.5'  #Locked here because centos 5.2 (Hudson) won't support a modern version
-  s.add_dependency "active-fedora", '>=3.2.2'
+  s.add_dependency "active-fedora", '>=3.3.0'
   s.add_dependency 'builder', '2.1.2'
   s.add_dependency 'columnize'
   s.add_dependency 'crack'

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

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

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "3.2.2"
+  VERSION = "3.3.0"
 end
 

data/lib/hydra.rb

@@ -19,6 +19,8 @@ module Hydra
   autoload :SubmissionWorkflow
   autoload :SuperuserAttributes
   autoload :User
+  autoload :UI
+  autoload :Workflow
 end
 
 
@@ -34,3 +36,4 @@ require 'hydra/mods_article'
 require 'hydra/model_methods'
 require 'hydra/models/file_asset'
 
+

data/lib/hydra/assets.rb

@@ -9,12 +9,12 @@ module Hydra::Assets
 
   included do
     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/fedora before filters because of the before filter that the workflow provides.
+    # need to include this after the :require_solr before filters because of the before filter that the workflow provides.
     include Hydra::SubmissionWorkflow
     
     

data/lib/hydra/assets_controller_helper.rb

@@ -19,40 +19,6 @@ module Hydra::AssetsControllerHelper
     end
   end
   
-  # 
-  # parses your params hash, massaging them into an appropriate set of params and opts to pass into ActiveFedora::Base.update_indexed_attributes
-  #
-  def prep_updater_method_args
-    logger.warn "DEPRECATED: Hydra::AssetsControllerHelper.prep_updater_method_args is deprecated.  Use/override sanitize_update_params instead."
-    args = {:params=>{}, :opts=>{}}
-    
-    params["asset"].each_pair do |datastream_name,fields|
-      
-      args[:opts][:datastreams] = datastream_name
-      
-      # TEMPORARY HACK: special case for supporting textile 
-      if params["field_id"]=="abstract_0" 
-        params[:field_selectors] = {"descMetadata" => {"abstract" => [:abstract]}}
-      end
-      
-      if params.fetch("field_selectors",false) && params["field_selectors"].fetch(datastream_name, false)
-        # If there is an entry in field_selectors for the datastream (implying a nokogiri datastream), retrieve the field_selector for this field.
-        # if no field selector, exists, use the field name
-        fields.each_pair do |field_name,field_values|
-          parent_select = OM.destringify( params["field_selectors"][datastream_name].fetch(field_name, field_name) )
-          args[:params][parent_select] = field_values       
-        end        
-      else
-        args[:params] = unescape_keys(params[:asset][datastream_name])
-      end
-    end
-    
-    @sanitized_params = args
-    return args
-     
-  end
-
-  
   # Builds a Hash that you can feed into ActiveFedora::Base.update_datstream_attributes
   # If params[:asset] is empty, returns an empty Hash
   # @return [Hash] a Hash that you can feed into ActiveFedora::Base.update_datstream_attributes

data/lib/hydra/catalog.rb

@@ -1,37 +1,26 @@
-#require "hydra/access_controls_enforcement"
-# Include this module into any of your Blacklight Catalog classes (ie. CatalogController) to add Hydra functionality
+# *Using this Module is not necessary if you're writing Controllers in Rails3.*  
+# In a Rails3 app, simply define regular Rails Controllers to expose the Resources & Actions you need and use Hydra::Controller to add Hydra support.
+# For search & discovery in those apps, use Blacklight and customize the "index" partials for each type of content to include links to the show/edit actions of the corresponding Controllers.
 #
-# The primary function of this module is to mix in a number of other Hydra Modules, including 
-#   Hydra::AccessControlsEnforcement
+# This Module extends Blacklight Catalog behaviors to give you a "Hydra" Catalog with edit and show behaviors on top of the Blacklight search behaviors.
+# Include this module into any of your Blacklight Catalog classes (ie. CatalogController) to add Hydra functionality.
 #
-# This module will only work if you also include Blacklight::Catalog in the Controller you're extending.
-# The hydra head rails generator will create the CatalogController for you in app/controllers/catalog_controller.rb
-# @example 
-#  require 'blacklight/catalog'
-#  require 'hydra/catalog'
-#  class CustomCatalogController < ApplicationController  
-#    include Blacklight::Catalog
-#    include Hydra::Catalog
-#  end
 module Hydra::Catalog
+  extend ActiveSupport::Concern
   
-  def self.included(klass)
+  
+  included do
     # Other modules to auto-include
-    klass.send(:include, Hydra::AccessControlsEnforcement)
-    klass.send(:include, MediaShelf::ActiveFedoraHelper)
-    klass.send(:include, Hydra::RepositoryController)
-    
+    include Hydra::Controller
+    include Hydra::UI::Controller
     
     # Controller filters
     # Also see the generator (or generated CatalogController) to see more before_filters in action
-    klass.before_filter :require_solr, :check_scripts
-    klass.before_filter :load_fedora_document, :only=>[:show,:edit]
+    before_filter :load_fedora_document, :only=>[:show,:edit]
     
     # View Helpers
-    klass.helper :hydra
-    klass.helper :hydra_assets
-    klass.helper :hydra_uploader
-    klass.helper :article_metadata
+    helper :hydra_uploader
+    helper :article_metadata
   end
   
   def edit
@@ -44,23 +33,5 @@ module Hydra::Catalog
     show
     render "show"
   end
-  
-  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
-    end
-    unless the_model.include?(ActiveFedora::FileManagement)
-      the_model.send :include, ActiveFedora::FileManagement
-    end
-    
-    @document_fedora = af_base.adapt_to(the_model)
-    @file_assets = @document_fedora.file_objects(:response_format=>:solr)
-  end
-  
-  
-  def check_scripts
-    session[:scripts] ||= (params[:combined] and params[:combined] == "true")
-  end
+
 end

data/lib/hydra/common_mods_index_methods.rb

@@ -20,7 +20,7 @@ module Hydra::CommonModsIndexMethods
         hash[child.get_attribute(:type)] = child.text if ["family","given"].include? child.get_attribute(:type)
         hash
       end
-      ::Solrizer::Extractor.insert_solr_field_value(names,  "person_full_name_facet", [name_parts["family"], name_parts["given"]].join(", ") ) if name_parts.keys == ["family","given"]
+      ::Solrizer::Extractor.insert_solr_field_value(names,  "person_full_name_facet", [name_parts["family"], name_parts["given"]].join(", ") ) if name_parts.keys.sort == ["family","given"]
       names
     end
     return names

data/lib/hydra/controller.rb

@@ -1,37 +1,52 @@
-# Adds behaviors that Hydra needs all controllers to have. (mostly view helpers)
+# Include this module into any of your Controller classes to add Hydra functionality
+#
+# The primary function of this module is to mix in a number of other Hydra Modules, including 
+#   Hydra::AccessControlsEnforcement
+#
+# @example 
+#  class CustomHydraController < ApplicationController  
+#    include Hydra::Controller
+#  end
+#
 module Hydra::Controller
-  def self.included(base)
-    base.helper :hydra_assets
-    base.helper :hydra_fedora_metadata
-    base.helper :generic_content_objects
-    base.before_filter :store_bounce
-    base.before_filter :set_x_ua_compat
-    base.before_filter :load_css
-    base.before_filter :load_js
-  end
-  
-  protected
-  def store_bounce 
-    session[:bounce]=params[:bounce]
-  end
 
-  def set_x_ua_compat
-    # Always force latest IE rendering engine & Chrome Frame through header information.
-    response.headers["X-UA-Compatible"] = "IE=edge,chrome=1"
-  end
+  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]
   
-  def load_css
-    stylesheet_links << ["hydra/html_refactor", {:media=>"all"}]
+    # View Helpers
+    klass.helper :hydra
+    klass.helper :hydra_assets
   end
-
-  def load_js
-    # This JS file implementes Blacklight's JavaScript framework and simply assigns all of the Blacklight provided JS functionality to empty functions.
-    # We can use this file in the future, however we will want to implement a jQuery plugin architecture as we actually add in JS functionality.
-    javascript_includes << ["hydra/hydra-head"]
-    javascript_includes << ['jquery.form.js']
-    javascript_includes << ['spin.min.js' ]
+  
+  # Use params[:id] to load an object from Fedora.  Inspects the object for known models and mixes in any of those models' behaviors.
+  # 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
+    end
+    unless the_model.include?(ActiveFedora::FileManagement)
+      the_model.send :include, ActiveFedora::FileManagement
+    end
+    
+    @document_fedora = af_base.adapt_to(the_model)
+    @file_assets = @document_fedora.file_objects(:response_format=>:solr)
   end
-
+  
+  
+  # get the currently configured user identifier.  Can be overridden to return whatever (ie. login, email, etc)
+  # defaults to using whatever you have set as the Devise authentication_key
   def user_key
     current_user.send(Devise.authentication_keys.first)
   end

data/lib/hydra/file_assets.rb

@@ -8,6 +8,7 @@ module Hydra::FileAssets
     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.

data/lib/hydra/ui.rb

@@ -0,0 +1,6 @@
+# Modules, etc. to support Hydra default UI.
+module Hydra::UI
+  extend ActiveSupport::Autoload
+  autoload :Controller
+end
+

data/lib/hydra/ui/controller.rb

@@ -0,0 +1,47 @@
+# Basic view helpers & before_filters to support the default Hydra UI
+# This mixin is *not required* in order for a Hydra Controller to function.  It is required if you want to use the default UI and javascript.
+module Hydra::UI::Controller
+  
+  def self.included(base)
+    base.helper :hydra_fedora_metadata
+    base.helper :generic_content_objects
+    base.helper :hydra_uploader
+    base.helper :article_metadata
+    base.before_filter :store_bounce
+    base.before_filter :set_x_ua_compat
+    base.before_filter :load_css
+    base.before_filter :load_js
+    base.before_filter :check_scripts
+  end
+
+  protected
+  def store_bounce 
+    session[:bounce]=params[:bounce]
+  end
+  
+  def check_scripts
+    session[:scripts] ||= (params[:combined] and params[:combined] == "true")
+  end
+
+  #
+  # These are all setting view stuff in the style of Rails2 Blacklight.  
+  # Current versions of Blacklight have pushed this stuff back out of the controllers and into views.
+  #
+  def set_x_ua_compat
+    # Always force latest IE rendering engine & Chrome Frame through header information.
+    response.headers["X-UA-Compatible"] = "IE=edge,chrome=1"
+  end
+
+  def load_css
+    stylesheet_links << ["hydra/html_refactor", {:media=>"all"}]
+  end
+
+  def load_js
+    # This JS file implementes Blacklight's JavaScript framework and simply assigns all of the Blacklight provided JS functionality to empty functions.
+    # We can use this file in the future, however we will want to implement a jQuery plugin architecture as we actually add in JS functionality.
+    javascript_includes << ["hydra/hydra-head"]
+    javascript_includes << ['jquery.form.js']
+    javascript_includes << ['spin.min.js' ]
+  end
+
+end

data/lib/hydra/workflow.rb

@@ -0,0 +1,5 @@
+# Container for Hydra Workflow implementations & mixins
+module Workflow
+  extend ActiveSupport::Autoload
+  autoload :Controller
+end

data/lib/hydra/workflow/controller.rb

@@ -0,0 +1,3 @@
+module Hydra::Workflow::Controller
+  
+end

data/lib/railties/hyhead_rspec.rake

@@ -14,7 +14,6 @@ begin
   
   spec_prereq = Rails.configuration.generators.options[:rails][:orm] == :active_record ?  "db:test:prepare" : :noop
   task :noop do; end
-  #task :default => :spec
   
   hyhead_spec = File.expand_path("./test_support/spec", HydraHead.root)
   
@@ -62,56 +61,6 @@ begin
         t.rspec_opts = "--colour"
 			end
 			
-      # Blacklight. Solr wrapper. for now just for blacklight:spec, plan to
-      # provide it for all variants eventually.
-      # if you would like to see solr startup messages on STDERR
-      # when starting solr test server during functional tests use:
-      # 
-      #    rake SOLR_CONSOLE=true      
-      require File.expand_path('../jetty_solr_server.rb', __FILE__)
-      desc "hyhead:solr with jetty/solr launch"
-      task :with_solr do    
-        # wrap tests with a test-specific Solr server
-        # Need to look  up where the test jetty is located
-        # from solr.yml, we don't hardcode it anymore. 
-
-        solr_yml_path = locate_path("config", "solr.yml")
-        jetty_path = if ( File.exists?( solr_yml_path ))
-            solr_config = YAML::load(File.open(solr_yml_path))
-            solr_config["test"]["jetty_path"] if solr_config["test"]
-        end   
-        raise Exception.new("Can't find jetty path to start test jetty. Expect a jetty_path key in config/solr.yml for test environment.") unless jetty_path 
-
-        
-        # wrap tests with a test-specific Solr server
-        JettySolrServer.new(
-          :jetty_home => File.expand_path(jetty_path, Rails.root), 
-          :sleep_after_start => 2).wrap do          
-            Rake::Task["hyhead:spec"].invoke 
-        end             
-      end
-      
-    
-      # Don't understand what this does or how to make it use our remote stats_directory.
-      # task :statsetup do
-        # require 'rails/code_statistics'
-        # ::STATS_DIRECTORIES << %w(Model\ specs spec/models) if File.exist?('spec/models')
-        # ::STATS_DIRECTORIES << %w(View\ specs spec/views) if File.exist?('spec/views')
-        # ::STATS_DIRECTORIES << %w(Controller\ specs spec/controllers) if File.exist?('spec/controllers')
-        # ::STATS_DIRECTORIES << %w(Helper\ specs spec/helpers) if File.exist?('spec/helpers')
-        # ::STATS_DIRECTORIES << %w(Library\ specs spec/lib) if File.exist?('spec/lib')
-        # ::STATS_DIRECTORIES << %w(Mailer\ specs spec/mailers) if File.exist?('spec/mailers')
-        # ::STATS_DIRECTORIES << %w(Routing\ specs spec/routing) if File.exist?('spec/routing')
-        # ::STATS_DIRECTORIES << %w(Request\ specs spec/requests) if File.exist?('spec/requests')
-        # ::CodeStatistics::TEST_TYPES << "Model specs" if File.exist?('spec/models')
-        # ::CodeStatistics::TEST_TYPES << "View specs" if File.exist?('spec/views')
-        # ::CodeStatistics::TEST_TYPES << "Controller specs" if File.exist?('spec/controllers')
-        # ::CodeStatistics::TEST_TYPES << "Helper specs" if File.exist?('spec/helpers')
-        # ::CodeStatistics::TEST_TYPES << "Library specs" if File.exist?('spec/lib')
-        # ::CodeStatistics::TEST_TYPES << "Mailer specs" if File.exist?('spec/mailers')
-        # ::CodeStatistics::TEST_TYPES << "Routing specs" if File.exist?('spec/routing')
-        # ::CodeStatistics::TEST_TYPES << "Request specs" if File.exist?('spec/requests')
-      # end
     end
   end  
 rescue LoadError

data/test_support/spec/controllers/catalog_controller_spec.rb

@@ -82,35 +82,6 @@ describe CatalogController do
       end
     end
   end
-
-
-  describe "load_fedora_document" do
-
-    it "should load @document_fedora and @file_assets" do
-      # controller.stubs(:params).returns({:id=>"foo:id"})
-      # stub_base_object = stub("Base Object")
-      # ActiveFedora::ContentModel.expects(:known_models_for).with( stub_base_object ).returns( [ModsAsset] )
-      # stub_mods_asset = stub("MODS Asset")
-      # stub_mods_asset.expects(:file_objects).with(:response_format=>:solr).returns("file assets response")
-      
-      # Note: Had to stub Fedora::Repository.instance.find_model rather than stubbing ActiveFedora::Base.load_instance and ModsAsset.load_instance because 
-      # Mocha was not unstubbing the ModsAsset class
-      #
-      # ActiveFedora::Base.stubs(:load_instance).with("foo:id").returns( stub_base_object )
-      # ModsAsset.stubs(:load_instance).with("foo:id").returns( stub_mods_asset )
-      # Fedora::Repository.instance.expects(:find_model).with("foo:id", ActiveFedora::Base).returns( stub_base_object )
-      # Fedora::Repository.instance.expects(:find_model).with("foo:id", ModsAsset).returns( stub_mods_asset )
-      
-      controller.params[:id]='hydrangea:fixture_mods_article1'
-      controller.load_fedora_document
-      
-      assigns[:document_fedora].class.should == ModsAsset 
-      assigns[:document_fedora].pid.should == 'hydrangea:fixture_mods_article1' 
-      assigns[:file_assets].class.should == Solr::Response::Standard
-      assigns[:file_assets].hits.size.should == 1
-      assigns[:file_assets].hits.first["id"].should == "hydrangea:fixture_uploaded_svg1"
-    end
-  end
   
   describe "edit" do
 

data/test_support/spec/controllers/hydra_controller_spec.rb

@@ -1,17 +1,33 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
+class HydraControllerTest < ApplicationController
+  include Hydra::Controller
+end
 
-describe Hydra::Controller do
-  before(:all) do
-    class HydraControllerTest
-    end
+describe HydraControllerTest do
+  
+  after :all do
+    Object.send(:remove_const, :HydraControllerTest)
   end
   
   it "should add the necessary helpers to classes that include it" do
+    HydraControllerTest.expects(:helper).with(:hydra)
     HydraControllerTest.expects(:helper).with(:hydra_assets)
-    HydraControllerTest.expects(:helper).with(:hydra_fedora_metadata)
-    HydraControllerTest.expects(:helper).with(:generic_content_objects)
     HydraControllerTest.stubs(:before_filter)
     HydraControllerTest.send(:include, Hydra::Controller)
   end
-end
+  
+  describe "load_fedora_document" do
+
+    it "should load @document_fedora and @file_assets" do
+      controller.params[:id] = 'hydrangea:fixture_mods_article1'
+      controller.load_fedora_document
+      
+      assigns[:document_fedora].class.should == ModsAsset 
+      assigns[:document_fedora].pid.should == 'hydrangea:fixture_mods_article1' 
+      assigns[:file_assets].class.should == Solr::Response::Standard
+      assigns[:file_assets].hits.size.should == 1
+      assigns[:file_assets].hits.first["id"].should == "hydrangea:fixture_uploaded_svg1"
+    end
+  end
+end

data/test_support/spec/controllers/hydra_ui_controller_spec.rb

@@ -0,0 +1,21 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+
+describe Hydra::Controller do
+  before(:all) do
+    class HydraUiControllerTest
+    end
+  end
+  after :all do
+    Object.send(:remove_const, :HydraUiControllerTest)
+  end
+
+  it "should add the necessary helpers to classes that include it" do
+    HydraUiControllerTest.expects(:helper).with(:hydra_fedora_metadata)
+    HydraUiControllerTest.expects(:helper).with(:generic_content_objects)
+    HydraUiControllerTest.expects(:helper).with(:hydra_uploader)
+    HydraUiControllerTest.expects(:helper).with(:article_metadata)
+    HydraUiControllerTest.stubs(:before_filter)
+    HydraUiControllerTest.send(:include, Hydra::UI::Controller)
+  end
+end

data/test_support/spec/helpers/assets_controller_helper_spec.rb

@@ -1,22 +1,6 @@
 require File.expand_path( File.join( File.dirname(__FILE__),'..','spec_helper') )
 
 describe Hydra::AssetsControllerHelper do
-  
-  describe "prep_updater_method_args" do
-    it "should parse the input params" do
-      sample_params = {"content_type"=>"mods_asset", 
-        "action"=>"update", 
-        "_method"=>"put", 
-        "field_selectors"=>{"descMetadata"=>{"person_0_computing_id"=>[{"person"=>"0"}, "computing_id"], "journal_0_issue_start_page"=>[{"journal"=>"0"}, "issue", "start_page"], "person_1_description"=>[{"person"=>"1"}, "description"], "person_1_institution"=>[{"person"=>"1"}, "institution"], "journal_0_origin_info_publisher"=>[{"journal"=>"0"}, "origin_info", "publisher"], "abstract"=>["abstract"], "person_0_last_name"=>[{"person"=>"0"}, "last_name"], "person_0_description"=>[{"person"=>"0"}, "description"], "journal_0_issue_volume"=>[{"journal"=>"0"}, "issue", "volume"], "title_info_main_title"=>["title_info", "main_title"], "location_url"=>["location", "url"], "note"=>["note"], "person_1_last_name"=>[{"person"=>"1"}, "last_name"], "subject_topic"=>["subject", "topic"], "person_0_institution"=>[{"person"=>"0"}, "institution"], "person_1_first_name"=>[{"person"=>"1"}, "first_name"], "person_1"=>[{"person"=>"1"}], "journal_0_title_info_main_title"=>[{"journal"=>"0"}, "title_info", "main_title"], "journal_0_issue_level"=>[{"journal"=>"0"}, "issue", "level"], "journal_0_issue_end_page"=>[{"journal"=>"0"}, "issue", "end_page"], "peer_reviewed"=>["peer_reviewed"], "person_0_first_name"=>[{"person"=>"0"}, "first_name"], "person_1_computing_id"=>[{"person"=>"1"}, "computing_id"], "journal_0_issn"=>[{"journal"=>"0"}, "issn"], "journal_0_issue_publication_date"=>[{"journal"=>"0"}, "issue", "publication_date"]}, "rightsMetadata"=>{"embargo_embargo_release_date"=>["embargo", "embargo_release_date"]}, "properties"=>{"release_to"=>["release_to"]}}, 
-        "id"=>"hydrangea:fixture_mods_article3", 
-        "controller"=>"assets", 
-        "asset"=>{"descMetadata"=>{"person_0_computing_id"=>{"0"=>""}, "journal_0_issue_start_page"=>{"0"=>"195"}, "person_1_description"=>{"0"=>""}, "person_1_institution"=>{"0"=>"Baltimore"}, "journal_0_origin_info_publisher"=>{"0"=>"PUBLISHER"}, "abstract"=>{"0"=>"ABSTRACT"}, "person_0_last_name"=>{"0"=>"Smith"}, "person_0_description"=>{"0"=>""}, "journal_0_issue_volume"=>{"0"=>"2               "}, "title_info_main_title"=>{"0"=>"Test Article"}, "location_url"=>{"0"=>"http://example.com/foo"}, "note"=>{"0"=>""}, "person_1_last_name"=>{"0"=>"Lacks"}, "subject_topic"=>{"0"=>"TOPIC 1", "1"=>"TOPIC 2", "2"=>"CONTROLLED TERM"}, "person_0_institution"=>{"0"=>"FACULTY, UNIVERSITY"}, "person_1_first_name"=>{"0"=>"Henrietta"}, "journal_0_title_info_main_title"=>{"0"=>"The Journal of Mock Object"}, "journal_0_issue_level"=>{"0"=>""}, "journal_0_issue_end_page"=>{"0"=>"230"}, "person_0_first_name"=>{"0"=>"John"}, "person_1_computing_id"=>{"0"=>""}, "journal_0_issn"=>{"0"=>"1234-5678"}, "journal_0_issue_publication_date"=>{"0"=>"FEB. 2007"}}, "rightsMetadata"=>{"embargo_embargo_release_date"=>{"0"=>""}}, "properties"=>{"released"=>{"0"=>"true"}, "release_to"=>{"0"=>"public"}}}}
-      helper.stubs(:params).returns(sample_params)
-      helper.prep_updater_method_args[:params].should == {[{:journal=>0}, :issn]=>{"0"=>"1234-5678"}, [{:person=>0}, :description]=>{"0"=>""}, [:abstract]=>{"0"=>"ABSTRACT"}, [{:person=>0}, :last_name]=>{"0"=>"Smith"}, [{:journal=>0}, :issue, :level]=>{"0"=>""}, [:release_to]=>{"0"=>"public"}, [{:person=>1}, :computing_id]=>{"0"=>""}, [{:journal=>0}, :title_info, :main_title]=>{"0"=>"The Journal of Mock Object"}, [:subject, :topic]=>{"0"=>"TOPIC 1", "1"=>"TOPIC 2", "2"=>"CONTROLLED TERM"}, [{:person=>1}, :first_name]=>{"0"=>"Henrietta"}, [{:journal=>0}, :issue, :volume]=>{"0"=>"2               "}, [{:person=>1}, :institution]=>{"0"=>"Baltimore"}, [{:journal=>0}, :origin_info, :publisher]=>{"0"=>"PUBLISHER"}, [{:person=>0}, :computing_id]=>{"0"=>""}, [{:person=>0}, :first_name]=>{"0"=>"John"}, [:title_info, :main_title]=>{"0"=>"Test Article"}, [{:person=>0}, :institution]=>{"0"=>"FACULTY, UNIVERSITY"}, [{:journal=>0}, :issue, :end_page]=>{"0"=>"230"}, [:location, :url]=>{"0"=>"http://example.com/foo"}, [{:person=>1}, :description]=>{"0"=>""}, [{:person=>1}, :last_name]=>{"0"=>"Lacks"}, :released=>{"0"=>"true"}, [:embargo, :embargo_release_date]=>{"0"=>""}, [{:journal=>0}, :issue, :publication_date]=>{"0"=>"FEB. 2007"}, [:note]=>{"0"=>""}, [{:journal=>0}, :issue, :start_page]=>{"0"=>"195"}}
-      helper.prep_updater_method_args[:opts].should == {:datastreams=>"properties"}
-    end
-  end
-  
   describe "sanitize_update_params" do
     it "should create a hash appropriate for passing into ActiveFedora::Base.update_datastream_attributes" do
       sample_params = {
@@ -76,4 +60,4 @@ describe Hydra::AssetsControllerHelper do
     end
   end
   
-end
+end

data/test_support/spec/lib/common_mods_index_methods_spec.rb

@@ -5,12 +5,10 @@ require File.expand_path( File.join( File.dirname(__FILE__),'..','spec_helper')
 describe Hydra::CommonModsIndexMethods do
   describe "extract_person_full_names" do
     it "should return an array of Solr::Field objects for :person_full_name_facet" do
-      full_names = ModsAsset.find("hydrangea:fixture_mods_article1").datastreams["descMetadata"].extract_person_full_names
+      ma = ModsAsset.find("hydrangea:fixture_mods_article1")
+      full_names = ma.datastreams["descMetadata"].extract_person_full_names
       full_names.should be_kind_of Hash
-      full_names["person_full_name_facet"].should be_kind_of Array
-      full_names["person_full_name_facet"].length.should == 2
-      full_names["person_full_name_facet"].first.should == "FAMILY NAME, GIVEN NAMES"
-      full_names["person_full_name_facet"].last.should == "Lacks, Henrietta"
+      full_names["person_full_name_facet"].should == ["FAMILY NAME, GIVEN NAMES", "Lacks, Henrietta"]
     end
   end
   describe "extract_person_organizations" do 

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 3
-  - 2
-  - 2
-  version: 3.2.2
+  - 3
+  - 0
+  version: 3.3.0
 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: 2012-01-25 00:00:00 Z
+date: 2012-01-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -90,9 +90,9 @@ dependencies:
         hash: 11
         segments: 
         - 3
-        - 2
-        - 2
-        version: 3.2.2
+        - 3
+        - 0
+        version: 3.3.0
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -1025,7 +1025,11 @@ files:
 - lib/hydra/rights_metadata.rb
 - lib/hydra/submission_workflow.rb
 - lib/hydra/superuser_attributes.rb
+- lib/hydra/ui.rb
+- lib/hydra/ui/controller.rb
 - lib/hydra/user.rb
+- lib/hydra/workflow.rb
+- lib/hydra/workflow/controller.rb
 - lib/marc_mapper.rb
 - lib/marc_record_ext.rb
 - lib/mediashelf/active_fedora_helper.rb
@@ -1125,6 +1129,7 @@ files:
 - test_support/spec/controllers/contributors_controller_spec.rb
 - test_support/spec/controllers/file_assets_controller_spec.rb
 - test_support/spec/controllers/hydra_controller_spec.rb
+- test_support/spec/controllers/hydra_ui_controller_spec.rb
 - test_support/spec/controllers/permissions_controller_spec.rb
 - test_support/spec/controllers/user_sessions_controller_spec.rb
 - test_support/spec/helpers/access_controls_enforcement_spec.rb
@@ -1167,7 +1172,7 @@ files:
 - vendor/cache/abstract-1.0.0.gem
 - vendor/cache/actionmailer-3.0.11.gem
 - vendor/cache/actionpack-3.0.11.gem
-- vendor/cache/active-fedora-3.2.2.gem
+- vendor/cache/active-fedora-3.3.0.gem
 - vendor/cache/activemodel-3.0.11.gem
 - vendor/cache/activerecord-3.0.11.gem
 - vendor/cache/activeresource-3.0.11.gem
@@ -1180,7 +1185,7 @@ files:
 - vendor/cache/block_helpers-0.3.3.gem
 - vendor/cache/builder-2.1.2.gem
 - vendor/cache/capybara-1.1.2.gem
-- vendor/cache/childprocess-0.2.3.gem
+- vendor/cache/childprocess-0.3.0.gem
 - vendor/cache/columnize-0.3.6.gem
 - vendor/cache/crack-0.3.1.gem
 - vendor/cache/cucumber-1.1.4.gem
@@ -1190,19 +1195,19 @@ files:
 - vendor/cache/database_cleaner-0.7.1.gem
 - vendor/cache/devise-1.5.3.gem
 - vendor/cache/diff-lcs-1.1.3.gem
-- vendor/cache/equivalent-xml-0.2.8.gem
+- vendor/cache/equivalent-xml-0.2.9.gem
 - vendor/cache/erubis-2.6.6.gem
 - vendor/cache/facets-2.8.4.gem
-- vendor/cache/factory_girl-2.3.2.gem
+- vendor/cache/factory_girl-2.5.0.gem
 - vendor/cache/fastercsv-1.5.4.gem
 - vendor/cache/ffi-1.0.11.gem
-- vendor/cache/gherkin-2.7.4.gem
+- vendor/cache/gherkin-2.7.6.gem
 - vendor/cache/gyoku-0.4.4.gem
 - vendor/cache/haml-3.1.4.gem
 - vendor/cache/httparty-0.8.1.gem
 - vendor/cache/httpi-0.9.5.gem
 - vendor/cache/i18n-0.5.0.gem
-- vendor/cache/jettywrapper-1.2.0.gem
+- vendor/cache/jettywrapper-1.2.1.gem
 - vendor/cache/json-1.6.5.gem
 - vendor/cache/json_pure-1.6.5.gem
 - vendor/cache/kaminari-0.13.0.gem
@@ -1214,16 +1219,16 @@ files:
 - vendor/cache/mediashelf-loggable-0.4.7.gem
 - vendor/cache/metaclass-0.0.1.gem
 - vendor/cache/mime-types-1.17.2.gem
-- vendor/cache/mocha-0.10.0.gem
+- vendor/cache/mocha-0.10.3.gem
 - vendor/cache/multi_json-1.0.4.gem
 - vendor/cache/multi_xml-0.4.1.gem
 - vendor/cache/multipart-post-1.1.2.gem
 - vendor/cache/nokogiri-1.5.0.gem
 - vendor/cache/nori-1.0.2.gem
-- vendor/cache/om-1.4.4.gem
+- vendor/cache/om-1.5.1.gem
 - vendor/cache/orm_adapter-0.0.6.gem
 - vendor/cache/polyglot-0.3.3.gem
-- vendor/cache/rack-1.2.4.gem
+- vendor/cache/rack-1.2.5.gem
 - vendor/cache/rack-mount-0.6.14.gem
 - vendor/cache/rack-test-0.5.7.gem
 - vendor/cache/rails-3.0.11.gem
@@ -1236,21 +1241,21 @@ files:
 - vendor/cache/rest-client-1.6.7.gem
 - vendor/cache/rsolr-1.0.2.gem
 - vendor/cache/rsolr-ext-1.0.3.gem
-- vendor/cache/rspec-2.7.0.gem
-- vendor/cache/rspec-core-2.7.1.gem
-- vendor/cache/rspec-expectations-2.7.0.gem
-- vendor/cache/rspec-mocks-2.7.0.gem
-- vendor/cache/rspec-rails-2.7.0.gem
+- vendor/cache/rspec-2.8.0.gem
+- vendor/cache/rspec-core-2.8.0.gem
+- vendor/cache/rspec-expectations-2.8.0.gem
+- vendor/cache/rspec-mocks-2.8.0.gem
+- vendor/cache/rspec-rails-2.8.1.gem
 - vendor/cache/ruby-debug-0.10.4.gem
 - vendor/cache/ruby-debug-base-0.10.4.gem
-- vendor/cache/rubydora-0.4.1.gem
+- vendor/cache/rubydora-0.5.1.gem
 - vendor/cache/rubyzip-0.9.5.gem
 - vendor/cache/sanitize-2.0.3.gem
 - vendor/cache/savon-0.9.7.gem
-- vendor/cache/selenium-webdriver-2.15.0.gem
+- vendor/cache/selenium-webdriver-2.18.0.gem
 - vendor/cache/solr-ruby-0.0.8.gem
-- vendor/cache/solrizer-1.1.2.gem
-- vendor/cache/solrizer-fedora-1.2.2.gem
+- vendor/cache/solrizer-1.2.0.gem
+- vendor/cache/solrizer-fedora-1.2.3.gem
 - vendor/cache/sqlite3-ruby-1.2.5.gem
 - vendor/cache/stomp-1.2.0.gem
 - vendor/cache/term-ansicolor-1.0.7.gem
@@ -1294,7 +1299,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Hydra-Head Rails Engine (requires Rails3)