hydra-head 3.3.0 → 4.0.0.rc2

data/HISTORY.textile

@@ -1,3 +1,8 @@
+h3. 4.0.0
+* Upgrade to active fedora 4.0.0
+* Removed railtie to configure active-fedora
+* Register solr happens automatically
+
 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

data/INSTALL_PREREQ.textile

@@ -1,17 +1,20 @@
 h1. Hydra Installation Prerequisites
 
-* "ruby":http://www.ruby-lang.org/en/    NOTE: version 1.8.7 or higher
+* "ruby":http://www.ruby-lang.org/en/  NOTE: version 1.8.7
 * "rubygems":http://rubygems.org/pages/download
 * these ruby gems:
 ** "bundler":http://gembundler.com/
-** "rails":http://rubyonrails.org/    NOTE: version < 3.
+** "rails":http://rubyonrails.org/    NOTE: version 3.0.x.
 * "git":http://git-scm.com/
-* "java":http://www.java.com/en/    NOTE:  version 1.6 or higher
+* "java":http://www.java.com/en/    NOTE: version 1.6 or higher
 * "sqlite3":http://www.sqlite.org/
 
 * "RVM":http://rvm.beginrescueend.com/  (Ruby Version Manager)
 ** We strongly suggest using RVM as a means of keeping your different ruby applications with their specific gem requirements from having version clashes. 
 ** If you don't have the desired ruby version in RVM, e.g. ree-1.8.7, then install it. The following instructions assume the use of RVM.
+** See "https://rvm.beginrescueend.com/rvm/install/":https://rvm.beginrescueend.com/rvm/install/ for instructions on installing and running RVM.  
+** After installing RVM, set it up to use "rvmrc":http://beginrescueend.com/workflow/rvmrc/ files when they're available.  This will cause RVM to automatically switch Ruby versions and gemsets when you cd into different code bases.  Currently all Hydra software uses Ruby Enterprise Edition 1.8.7 (ree-1.8.7) and each component or Hydra Head uses its own gemsets (ie. hydra-head uses a gemset called hyhead,  hypatia uses a gemset called hypatia so that you can install a different set of dependencies for each. ) 
+** For information about using and setting up RVM to use .rvmrc files, see "http://beginrescueend.com/workflow/rvmrc/":http://beginrescueend.com/workflow/rvmrc/
 
 <pre>
   rvm install ree-1.8.7

data/README.textile

@@ -8,17 +8,21 @@ Hydra-Head is a Rails Engines plugin containing the core code for a Hydra applic
 - "OM (Opinionated Metadata)":https://github.com/mediashelf/om (a ruby gem) to streamline the metadata configuration
 - "Solrizer":https://github.com/projecthydra/solrizer (a ruby gem) to write content to the Solr index
 - "SolrizerFedora":https://github.com/projecthydra/solrizer-fedora (a ruby gem) to write Fedora content to the Solr index.
-- HydraHead (a rails engines plugin) to glue it all together 
+- Hydra-Head (a rails engines plugin) to glue it all together 
 
-For a more thorough overview of the Hydra framework, see "HYDRA_OVERVIEW.textile":https://github.com/projecthydra/hydrangea/blob/master/HYDRA_OVERVIEW.textile.
+For a more thorough overview of the Hydra framework, see "HYDRA_OVERVIEW.textile":https://github.com/projecthydra/hydrangea/blob/master/HYDRA_OVERVIEW.textile.  If you're looking to develop an application based on Hydra-Head, you might also be interested in "install prerequisites":https://github.com/projecthydra/hydra-head/blob/master/INSTALL_PREREQ.textile
 
 This is a Ruby on Rails 3 gem.
 
 h2. Installation/Setup
 
+h3. Ruby
+
+Currently all Hydra software uses Ruby 1.8.7 (and not 1.9). 
+
 h3. Install Rails, Bundler and Devise
 
-Currently hydra-head is compatible with Rails 3.0.x and incompatible with Rails 3.1
+Currently hydra-head is compatible with Rails 3.0.x and incompatible with Rails 3.1.
 
 <pre>
 gem install 'rails' --version '~>3.0.11'
@@ -43,6 +47,7 @@ First, add them to the "Gemfile":http://gembundler.com/gemfile.html of your appl
 
   gem 'blacklight', '~> 3.1.2'
   gem 'hydra-head', '~> 3.2.0'
+  gem 'solrizer-fedora', '>=1.0.1'
 
   # We will assume that you're using sqlite3 for testing/demo, 
   # but in a production setup you probably want to use a real sql database like mysql or postgres
@@ -54,7 +59,6 @@ First, add them to the "Gemfile":http://gembundler.com/gemfile.html of your appl
 
   # For testing.  You will probably want to use all of these to run the tests you write for your hydra head
   group :development, :test do 
-         gem 'solrizer-fedora', '>=1.0.1'
          gem 'ruby-debug'
          gem 'rspec'
          gem 'rspec-rails', '>=2.5.0'

data/{assets → app/assets}/stylesheets/hydra/html_refactor.css

@@ -29,7 +29,7 @@
 
 #doc4 #hd {font-size: 12px; text-align: right;}
 
-#select-item-box {background: url('/images/hydra/search-button.png') no-repeat scroll 95% 5px #f5f5f5; border: 1px solid #BBB; float: left; line-height: 20px; margin-top: -3px; padding: 2px 6px; position: relative; text-align: left; width: 170px; z-index: 300; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; }
+#select-item-box {background: url('/assets/hydra/search-button.png') no-repeat scroll 95% 5px #f5f5f5; border: 1px solid #BBB; float: left; line-height: 20px; margin-top: -3px; padding: 2px 6px; position: relative; text-align: left; width: 170px; z-index: 300; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; }
 #select-item-box > a {border-bottom: none; vertical-align: text-bottom;}
 #select-item-list {background: #f2f2f2; border-bottom: 1px solid #BBB; border-left: 1px solid #BBB; border-right: 1px solid #BBB; border-top: 1px solid #DDD; display: none; list-style: none; margin: 0; position: absolute; top: 24px; left: 0; width: 180px; z-index: 999; -webkit-box-shadow: 1px 1px 4px rgba(80, 80, 80, 0.2); -moz-box-shadow: 1px 1px 4px rgba(80, 80, 80, 0.2); box-shadow: 1px 1px 4px rgba(80, 80, 80, 0.2); -webkit-border-radius: 0 0 4px 4px; -moz-border-radius:    0 0 4px 4px; border-radius:         0 0 4px 4px; }
 #select-item-list li {list-style: none; margin: 0; }
@@ -113,4 +113,4 @@ input.invalid-input {border: 3px solid #C55;}
 #saving-notice {background: #EEE; color: #000; height: 100%; width: 100%; opacity: 0.8; position: fixed; top: 0; left: 0; z-index: 999;}
 #saving-notice h1 {font-size: 32px !important;  margin-top: 4em; text-align: center;}
 .all-steps-actions {margin: 2em 0 1em;}
-.all-steps-actions button {font-size: 16px; margin-right: 20px;}
+.all-steps-actions button {font-size: 16px; margin-right: 20px;}

data/app/controllers/downloads_controller.rb

@@ -1,6 +1,4 @@
-require 'mediashelf/active_fedora_helper'
 class DownloadsController < ApplicationController
-    include MediaShelf::ActiveFedoraHelper
     include Hydra::RepositoryController
     include Hydra::AssetsControllerHelper
     helper :downloads
@@ -13,23 +11,9 @@ class DownloadsController < ApplicationController
       if params[:download_id]
         @datastream = fedora_object.datastreams[params[:download_id]]
         send_datastream @datastream
-        #send_data( Fedora::Repository.instance.fetch_custom(params[:document_id], "datastreams/#{datastream_id}/content") )
       else
         @datastreams = downloadables( fedora_object )
       end
     end
     
-    # def show
-    #   puts "params: #{params.inspect}"
-    #   puts "Request: #{request.inspect}"
-    #   puts "Path: #{request.path}"
-    #   
-    #   datastream_id = File.basename(request.path)
-    #   respond_to do |format|
-    #     format.html { send_data( Fedora::Repository.instance.fetch_custom(params[:document_id], "datastreams/#{datastream_id}/content") ) }
-    #     format.pdf { send_data( Fedora::Repository.instance.fetch_custom(params[:document_id], "datastreams/#{datastream_id}/content") ) }
-    #   end
-    #   
-    # end        
-    
 end

data/app/controllers/hydra/assets_controller.rb

@@ -0,0 +1,3 @@
+class Hydra::AssetsController < ApplicationController
+    include Hydra::Assets
+end

data/app/controllers/{contributors_controller.rb → hydra/contributors_controller.rb}

@@ -1,13 +1,6 @@
-require 'mediashelf/active_fedora_helper'
-
-class ContributorsController < ApplicationController
-  
-  include MediaShelf::ActiveFedoraHelper
+class Hydra::ContributorsController < ApplicationController
   include Hydra::RepositoryController
   include Hydra::AssetsControllerHelper
-  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
   
   # Display form for adding a new Contributor
@@ -23,8 +16,8 @@ class ContributorsController < ApplicationController
     end
     
     respond_to do |format|
-      format.html { render :file=>"contributors/new.html" , :layout=>true}
-      format.inline { render :partial=>"contributors/new.html", :layout=>false }
+      format.html { render :file=>"contributors/new" , :layout=>true}
+      format.inline { render :partial=>"contributors/new", :layout=>false }
     end
   end
   
@@ -34,10 +27,12 @@ class ContributorsController < ApplicationController
     ct = params[:contributor_type]
     inserted_node, new_node_index = @document_fedora.insert_contributor(ct)
     @document_fedora.save
-    partial_name = "contributors/edit_#{ct}.html"
+    partial_name = "contributors/edit_#{ct}"
     respond_to do |format|
-      format.html { redirect_to( url_for(:controller=>"catalog", :action=>"edit", :id=>params[:asset_id] )+"##{params[:contributor_type]}_#{new_node_index}" ) }
-      format.inline { render :partial=>partial_name, :locals=>{"edit_#{ct}".to_sym =>inserted_node, "edit_#{ct}_counter".to_sym =>new_node_index}, :layout=>false }
+      format.html { 
+        redirect_to edit_catalog_path(params[:asset_id], :anchor=>"#{params[:contributor_type]}_#{new_node_index}")
+      }
+      format.inline { render :partial=>partial_name, :formats=>[:html], :locals=>{"edit_#{ct}".to_sym =>inserted_node, "edit_#{ct}_counter".to_sym =>new_node_index}, :layout=>false }
     end
     
   end
@@ -54,9 +49,9 @@ class ContributorsController < ApplicationController
     @document.save
     flash[:notice] = "Your changes have been saved."
     if params.has_key? :add_another_author
-      redirect_to({:controller => "catalog", :action => "edit", :id => params[:asset_id], :wf_step => :contributor, :add_contributor => true}) 
+      redirect_to edit_catalog_path(params[:asset_id], :wf_step => :contributor, :add_contributor => true)
     else
-      redirect_to( {:controller => "catalog", :action => "edit", :id => params[:asset_id]}.merge(params_for_next_step_in_wokflow) )
+      redirect_to next_step(params[:asset_id])
     end
   end
   
@@ -68,7 +63,7 @@ class ContributorsController < ApplicationController
     if request.xhr?
       render :text=>result.inspect
     else
-      redirect_to({:controller => "catalog", :action => "edit", :id => params[:asset_id], :wf_step => :contributor})
+      redirect_to edit_catalog_path(params[:asset_id], :wf_step => :contributor)
     end
   end
   

data/app/controllers/hydra/file_assets_controller.rb

@@ -0,0 +1,3 @@
+class Hydra::FileAssetsController < ApplicationController
+  include Hydra::FileAssets
+end

data/app/controllers/hydra/permissions_controller.rb

@@ -0,0 +1,104 @@
+class Hydra::PermissionsController < ApplicationController
+  include Hydra::AssetsControllerHelper
+  include Hydra::SubmissionWorkflow
+  
+  def index
+    af_base=ActiveFedora::Base.load_instance(params[:asset_id])
+    the_model = ActiveFedora::ContentModel.known_models_for( af_base ).first
+    @document_fedora = af_base.adapt_to(the_model)
+    
+    respond_to do |format|
+      format.html 
+      format.inline { render :partial=>"hydra/permissions/index", :format=>"html" }
+    end
+  end
+  
+  def new
+    respond_to do |format|
+      format.html 
+      format.inline { render :partial=>"hydra/permissions/new" }
+    end
+  end
+  
+  def edit
+    af_base=ActiveFedora::Base.load_instance(params[:asset_id])
+    the_model = ActiveFedora::ContentModel.known_models_for( af_base ).first
+    @document_fedora = af_base.adapt_to(the_model)
+    
+    respond_to do |format|
+      format.html 
+      format.inline {render :action=>"edit", :layout=>false}
+    end
+  end
+  
+  # Create a new permissions entry
+  # expects permission["actor_id"], permission["actor_type"] and permission["access_level"] as params. ie.   :permission=>{"actor_id"=>"_person_id_","actor_type"=>"person","access_level"=>"read"}
+  def create
+    @document_fedora=ActiveFedora::Base.find(params[:asset_id])
+
+    access_actor_type = params["permission"]["actor_type"]
+    actor_id = params["permission"]["actor_id"]
+    access_level = params["permission"]["access_level"]
+  
+    # update the datastream's values
+    result = @document_fedora.rightsMetadata.permissions({access_actor_type => actor_id}, access_level)
+    @document_fedora.save
+    
+    flash[:notice] = "#{actor_id} has been granted #{access_level} permissions for #{params[:asset_id]}"
+    
+    respond_to do |format|
+      format.html do 
+        if params.has_key?(:add_permission)
+          redirect_to :back
+        else
+          redirect_to next_step(params[:asset_id])
+        end
+        
+      end
+      format.inline { render :partial=>"hydra/permissions/edit_person_permissions", :locals=>{:person_id=>actor_id}}
+    end
+
+  end
+  
+  # Updates the permissions for all actors in a hash.  Can specify as many groups and persons as you want
+  # ie. :permission => {"group"=>{"group1"=>"discover","group2"=>"edit"}, {"person"=>{"person1"=>"read"}}}
+  def update
+    if params[:id].nil?  
+      pid = params[:asset_id]
+    else
+      pid = params[:id]
+    end
+    
+    @document_fedora=ActiveFedora::Base.find(pid)
+
+    # update the datastream's values
+    result = @document_fedora.rightsMetadata.update_permissions(params[:permission])
+    
+    @document_fedora.save
+    
+    
+    flash[:notice] = "The permissions have been updated."
+    
+    respond_to do |format|
+      format.html do
+        if params.has_key?(:add_permission)
+          redirect_to edit_catalog_path(pid, :wf_step => :permissions, :add_permission => true)
+        else
+          redirect_to next_step(pid)
+        end
+      end
+      format.inline do
+        # This should be replaced ...
+        if params[:permission].has_key?(:group)
+          access_actor_type = "group"
+        else
+          access_actor_type = "person"
+        end
+        actor_id = params["permission"][access_actor_type].first[0]
+        render :partial=>"hydra/permissions/edit_person_permissions", :locals=>{:person_id=>actor_id} 
+      end
+    end
+    
+  end
+    
+end