hydra-head 3.0.0pre4 → 3.0.0.rc1

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    hydra-head (3.0.0pre3)
+    hydra-head (3.0.0.rc1)
       RedCloth (= 4.2.3)
-      active-fedora (>= 2.3.3)
+      active-fedora (~> 3.0.7)
       blacklight (= 3.0.0)
       block_helpers
       builder
@@ -57,15 +57,16 @@ GEM
       rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    active-fedora (2.3.3)
-      activeresource
+    active-fedora (3.0.7)
+      activeresource (~> 3.0.0)
+      activesupport (~> 3.0.0)
       equivalent-xml
       facets
       mediashelf-loggable
       mime-types (>= 1.16)
-      multipart-post
+      multipart-post (= 1.1.2)
       nokogiri
-      om (>= 1.0)
+      om (>= 1.4.3)
       solr-ruby (>= 0.0.6)
       solrizer (> 1.0.0)
       xml-simple (>= 1.0.12)
@@ -161,9 +162,9 @@ GEM
       metaclass (~> 0.0.1)
     multi_json (1.0.3)
     multi_xml (0.4.1)
-    multipart-post (1.1.3)
+    multipart-post (1.1.2)
     nokogiri (1.5.0)
-    om (1.4.2)
+    om (1.4.3)
       mediashelf-loggable
       nokogiri (>= 1.4.2)
     polyglot (0.3.2)
@@ -231,14 +232,12 @@ GEM
       om (>= 1.4.0)
       stomp
       xml-simple
-    solrizer-fedora (1.1.2)
+    solrizer-fedora (1.1.3)
       active-fedora (>= 2.3.0)
       fastercsv
       rsolr
       solr-ruby (>= 0.0.6)
       solrizer (>= 1.0.0)
-    sqlite3 (1.3.4)
-    sqlite3-ruby (1.2.5)
     stomp (1.1.9)
     term-ansicolor (1.0.7)
     thor (0.14.6)
@@ -252,7 +251,7 @@ GEM
     xml-simple (1.1.1)
     xpath (0.1.4)
       nokogiri (~> 1.3)
-    yard (0.7.2)
+    yard (0.7.3)
 
 PLATFORMS
   ruby
@@ -271,5 +270,3 @@ DEPENDENCIES
   rspec-rails (>= 2.0.0)
   ruby-debug
   ruby-debug-base
-  sqlite3
-  sqlite3-ruby (= 1.2.5)

data/app/controllers/assets_controller.rb

@@ -144,4 +144,4 @@ class AssetsController < ApplicationController
       
       return true
     end
-end
+end

data/app/controllers/file_assets_controller.rb

@@ -153,7 +153,7 @@ From file_assets/_new.html.haml
       @downloadable = false
       # A FileAsset is downloadable iff the user has read or higher access to a parent
       @id_array.each do |pid|
-        @response, @document = get_solr_response_for_doc_id(pid)
+        @response, @permissions_solr_document = get_solr_response_for_doc_id(pid)
         if reader?
           @downloadable = true
           break

data/app/helpers/generic_content_objects_helper.rb

@@ -10,7 +10,7 @@ module GenericContentObjectsHelper
   end
   
   def disseminator_link pid, datastream_name
-    "<a class=\"fbImage\" href=\"#{ datastream_disseminator_url(pid, datastream_name) }\">view</a>"
+    link_to 'view', datastream_disseminator_url(pid, datastream_name), :class=>"fbImage"
   end
   
-end
+end

data/app/views/catalog/_delete_partials/_default.html.erb

@@ -13,14 +13,14 @@
 			
 				
 				<div>
-	        <span>Permanently delete <%= @document_fedora.pid %> and its assets from the repository?</span><br/>
+	        <span>Permanently delete <%= @document['id'] %> and its assets from the repository?</span><br/>
 	        <div id="deletable_assets"></div>
 	      </div>
 				
 					<div>
-					<%= button_to("Delete", {:action => :destroy, :controller => :assets, :id => @document_fedora.pid}, :confirm => 'Are you sure?', :method => :delete )%>
-					 <%= button_to("Withdraw", :action=>"withdraw", :controller => :assets, :id => @document_fedora.pid) %>
-					 <%= button_to("Cancel", :action=>:edit, :controller => :catalog, :id => @document_fedora.pid) %>
+					<%= button_to("Delete", {:action => :destroy, :controller => :assets, :id => @document['id'] }, :confirm => 'Are you sure?', :method => :delete )%>
+					 <%= button_to("Withdraw", :action=>"withdraw", :controller => :assets, :id => @document['id'] ) %>
+					 <%= button_to("Cancel", :action=>:edit, :controller => :catalog, :id => @document['id'] ) %>
 					
 	      </div>
 	      		 

data/app/views/catalog/show.html.erb

@@ -37,4 +37,4 @@
   <div class="delete-asset">
     <%= button_to("Delete This Item", {:action => :destroy, :controller => :assets, :id => @document_fedora.pid}, :confirm => 'Are you sure?', :method => :delete )%>
   </div>
-<% end %>
+<% end %>

data/app/views/file_assets/_index.html.erb

@@ -12,7 +12,7 @@
   <fieldset id='uploader'>
     <legend>File Upload</legend>
     <!-- This form will be progressively enhanced by the Fluid Uploader component. -->
-    <%= form_tag(upload_url,:method=>"post",:enctype=>"multipart/form-data", :class=>"uploader-form") do -%>
+    <%= form_tag(upload_url,:method=>"post",:enctype=>"multipart/form-data", :class=>"uploader-form step") do -%>
       <input type="hidden" name="container_id" value="<%=h container_id %>"/>
       <%= hidden_field_tag("container_content_type", container_content_type, :id => "file_upload_content_type") if defined?(container_content_type) %>
       <%- params[:number_of_files].to_i.times do -%>

data/app/views/file_assets/_result.html.erb

@@ -10,7 +10,7 @@
     	<% else %>
     		<% file_asset_url = asset_file_asset_path(@container.pid, result["id"]) %>
     	<% end %>
-    	<%= link_to("Delete", "/file_assets/" + result["id"] + "?container_id=" + @document[:id], :method => :delete, :confirm => "Are you sure you want to delete this file?") %>
+    	<%= button_to("Delete", "/file_assets/" + result["id"] + "?container_id=" + @document[:id], :confirm => "Are you sure you want to delete this file?", :method => :delete, :class => "delete-button") %>
    <% end %>
   </td>
 </tr>

data/assets/javascripts/hydra/hydra-head.js

@@ -51,9 +51,9 @@ $(document).ready(function() {
   // Enable Ajax save functionality on edit pages
   HydraHead.enable_form_save = function() {
     HydraHead.target = null;
-    var all_forms = $('.document_edit form');
+    var all_forms = $('.document_edit form.step');
     
-    $('.document_edit input[type="submit"], .all-steps-actions button').click(function() {
+    $('.document_edit input[type="submit"], .all-steps-actions button').not('.delete-button').click(function() {
       HydraHead.target = $(this);
       all_forms.first().submit();
       return false;
@@ -90,7 +90,7 @@ $(document).ready(function() {
   // When an input changes (using blur for IE consistency), 
   // submit the containing form.
   HydraHead.auto_save = function() {
-    $('.document_edit input, .document_edit textarea, .document_edit select').blur(function() {
+    $('.document_edit input.edit, .document_edit textarea, .document_edit select').blur(function() {
       $(this).closest('form').ajaxSubmit();
     });
   };

data/assets/stylesheets/hydra/html_refactor.css

@@ -94,6 +94,7 @@ background-image: -moz-linear-gradient(center bottom, #DDD 0%, #EEE 100%); }
 -------------------------------------------------------------- */
 .document_edit .document {padding: 0.5em 0;}
 .document_edit form {padding-bottom: 2em;}
+.document_edit form.button_to {padding-bottom: 0;}
 #document.document_edit h1 {color: #333; font-size: 18px; font-weight: bold; padding: 0.33em 0 0.67em;}
 #document.document_edit label {border-bottom: 1px dotted #D4D4D4; color: #444; display: block; font-size: 15px; font-variant: small-caps; font-weight: normal; padding: 1em 0 0.2em; margin-bottom: 0.8em; width: 45%;}
 #document.document_edit fieldset label {border-bottom: none; font-size: 13px; font-variant: normal; margin-bottom: 0; padding: 0.2em 0 0.5em; width: 33%;}

data/hydra-head.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "rails", '~> 3.0.10'
   s.add_dependency "blacklight", '3.0.0'  
-  s.add_dependency "active-fedora", '>= 2.3.3'
+  s.add_dependency "active-fedora", '~>3.0.7'
   s.add_dependency 'builder'
   s.add_dependency 'columnize'
   s.add_dependency 'crack'
@@ -41,7 +41,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'mediashelf-loggable', '>=0.4.7' ##This can be removed once this dependency is declared in solrizer
   s.add_dependency 'solrizer', '>=1.1.0'
   s.add_dependency 'solrizer-fedora', '>=1.1.0'
-  #s.add_dependency 'sqlite3-ruby', '>=1.2.5'
   s.add_dependency 'term-ansicolor'
   s.add_dependency 'trollop'
   s.add_dependency 'will_paginate'
@@ -56,8 +55,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec', '>= 2.0.0'  
   s.add_development_dependency 'rspec-rails', '>= 2.0.0' # rspec-rails 2.0.0 requires Rails 3.
   s.add_development_dependency 'rest-client'
-  s.add_development_dependency 'sqlite3-ruby', '1.2.5'
-  s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'mocha'
   s.add_development_dependency 'cucumber', '>=0.8.5'
   s.add_development_dependency 'cucumber-rails', '>=1.0.0'

data/lib/hydra-head/version.rb

@@ -1,4 +1,4 @@
 module HydraHead
-  VERSION = "3.0.0pre4"
+  VERSION = "3.0.0.rc1"
 end
 

data/lib/hydra/access_controls_enforcement.rb

@@ -129,6 +129,11 @@ module Hydra::AccessControlsEnforcement
     enforce_edit_permissions(opts)
   end
 
+  ## proxies to enforce_edit_permssions.  This method is here for you to override
+  def enforce_delete_permissions(opts={})
+    enforce_edit_permissions(opts)
+  end
+
   # Controller "before" filter for enforcing access controls on index actions
   # Currently does nothing, instead relies on 
   # @param [Hash] opts (optional, not currently used)

data/test_support/features/mods_asset_edit.feature

@@ -16,7 +16,7 @@ Feature: Edit a ModsAsset object
      And I press "Continue"
 #     Then the "title_info_main_title" field should contain "The Smallest Victims of the "
 		 Then I should see "gibson.pdf" within "tr.file_asset"
-		 And I should see "Delete" in the file assets list
+		 And I should see a "Delete" button
 
   Scenario: Viewing browse/edit buttons
     Given I am logged in as "archivist1@example.com" 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: hydra-head
 version: !ruby/object:Gem::Version 
-  hash: 1923832001
-  prerelease: 5
+  hash: 15424119
+  prerelease: 6
   segments: 
   - 3
   - 0
   - 0
-  - pre
-  - 4
-  version: 3.0.0pre4
+  - rc
+  - 1
+  version: 3.0.0.rc1
 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
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-13 00:00:00 -05:00
+date: 2011-10-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,14 +58,14 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 9
         segments: 
-        - 2
-        - 3
         - 3
-        version: 2.3.3
+        - 0
+        - 7
+        version: 3.0.7
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -636,40 +636,10 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id042
-- !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
-  prerelease: false
-  requirement: &id043 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 2
-        - 5
-        version: 1.2.5
-  type: :development
-  version_requirements: *id043
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
-  prerelease: false
-  requirement: &id044 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id044
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id045 !ruby/object:Gem::Requirement 
+  requirement: &id043 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -679,11 +649,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id045
+  version_requirements: *id043
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id046 !ruby/object:Gem::Requirement 
+  requirement: &id044 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -695,11 +665,11 @@ dependencies:
         - 5
         version: 0.8.5
   type: :development
-  version_requirements: *id046
+  version_requirements: *id044
 - !ruby/object:Gem::Dependency 
   name: cucumber-rails
   prerelease: false
-  requirement: &id047 !ruby/object:Gem::Requirement 
+  requirement: &id045 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -711,11 +681,11 @@ dependencies:
         - 0
         version: 1.0.0
   type: :development
-  version_requirements: *id047
+  version_requirements: *id045
 - !ruby/object:Gem::Dependency 
   name: gherkin
   prerelease: false
-  requirement: &id048 !ruby/object:Gem::Requirement 
+  requirement: &id046 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -725,11 +695,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id048
+  version_requirements: *id046
 - !ruby/object:Gem::Dependency 
   name: factory_girl
   prerelease: false
-  requirement: &id049 !ruby/object:Gem::Requirement 
+  requirement: &id047 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -739,11 +709,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id049
+  version_requirements: *id047
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id050 !ruby/object:Gem::Requirement 
+  requirement: &id048 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -753,7 +723,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id050
+  version_requirements: *id048
 description: "Hydra-Head is a Rails Engine containing the core code for a Hydra application. The full hydra stack includes: Blacklight, Fedora, Solr, active-fedora, solrizer, and om"
 email: 
 - hydra-tech@googlegroups.com
@@ -1207,7 +1177,7 @@ files:
 - vendor/cache/abstract-1.0.0.gem
 - vendor/cache/actionmailer-3.0.10.gem
 - vendor/cache/actionpack-3.0.10.gem
-- vendor/cache/active-fedora-2.3.3.gem
+- vendor/cache/active-fedora-3.0.7.gem
 - vendor/cache/activemodel-3.0.10.gem
 - vendor/cache/activerecord-3.0.10.gem
 - vendor/cache/activeresource-3.0.10.gem
@@ -1252,9 +1222,9 @@ files:
 - vendor/cache/mocha-0.10.0.gem
 - vendor/cache/multi_json-1.0.3.gem
 - vendor/cache/multi_xml-0.4.1.gem
-- vendor/cache/multipart-post-1.1.3.gem
+- vendor/cache/multipart-post-1.1.2.gem
 - vendor/cache/nokogiri-1.5.0.gem
-- vendor/cache/om-1.4.2.gem
+- vendor/cache/om-1.4.3.gem
 - vendor/cache/polyglot-0.3.2.gem
 - vendor/cache/rack-1.2.4.gem
 - vendor/cache/rack-mount-0.6.14.gem
@@ -1280,9 +1250,7 @@ files:
 - vendor/cache/selenium-webdriver-2.8.0.gem
 - vendor/cache/solr-ruby-0.0.8.gem
 - vendor/cache/solrizer-1.1.2.gem
-- vendor/cache/solrizer-fedora-1.1.2.gem
-- vendor/cache/sqlite3-1.3.4.gem
-- vendor/cache/sqlite3-ruby-1.2.5.gem
+- vendor/cache/solrizer-fedora-1.1.3.gem
 - vendor/cache/stomp-1.1.9.gem
 - vendor/cache/term-ansicolor-1.0.7.gem
 - vendor/cache/thor-0.14.6.gem
@@ -1293,7 +1261,7 @@ files:
 - vendor/cache/will_paginate-3.0.2.gem
 - vendor/cache/xml-simple-1.1.1.gem
 - vendor/cache/xpath-0.1.4.gem
-- vendor/cache/yard-0.7.2.gem
+- vendor/cache/yard-0.7.3.gem
 has_rdoc: true
 homepage: http://projecthydra.org
 licenses: []