hydra-head 3.1.4 → 3.1.5

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    hydra-head (3.1.0)
+    hydra-head (3.1.5)
       RedCloth (= 4.2.3)
-      active-fedora (~> 3.1.1)
+      active-fedora (~> 3.1.4)
       blacklight (= 3.0.0)
       block_helpers
-      builder
+      builder (= 2.1.2)
       columnize
       crack
       curb (= 0.7.15)
@@ -28,10 +28,11 @@ PATH
       rack-test
       rails (~> 3.0.10)
       rake
+      rsolr (= 1.0.2)
       sanitize
       solr-ruby
       solrizer (>= 1.1.0)
-      solrizer-fedora (>= 1.1.3)
+      solrizer-fedora (>= 1.2.0)
       term-ansicolor
       trollop
       will_paginate
@@ -42,12 +43,12 @@ GEM
   specs:
     RedCloth (4.2.3)
     abstract (1.0.0)
-    actionmailer (3.0.10)
-      actionpack (= 3.0.10)
+    actionmailer (3.0.11)
+      actionpack (= 3.0.11)
       mail (~> 2.2.19)
-    actionpack (3.0.10)
-      activemodel (= 3.0.10)
-      activesupport (= 3.0.10)
+    actionpack (3.0.11)
+      activemodel (= 3.0.11)
+      activesupport (= 3.0.11)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.5.0)
@@ -55,7 +56,7 @@ GEM
       rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    active-fedora (3.1.1)
+    active-fedora (3.1.4)
       activeresource (~> 3.0.0)
       activesupport (~> 3.0.0)
       equivalent-xml
@@ -67,23 +68,23 @@ GEM
       om (>= 1.4.3)
       rdf
       rdf-rdfxml
-      rubydora (= 0.2.3)
+      rubydora (~> 0.2.6)
       solr-ruby (>= 0.0.6)
       solrizer (> 1.0.0)
       xml-simple (>= 1.0.12)
-    activemodel (3.0.10)
-      activesupport (= 3.0.10)
+    activemodel (3.0.11)
+      activesupport (= 3.0.11)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activerecord (3.0.10)
-      activemodel (= 3.0.10)
-      activesupport (= 3.0.10)
+    activerecord (3.0.11)
+      activemodel (= 3.0.11)
+      activesupport (= 3.0.11)
       arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.10)
-      activemodel (= 3.0.10)
-      activesupport (= 3.0.10)
-    activesupport (3.0.10)
+    activeresource (3.0.11)
+      activemodel (= 3.0.11)
+      activesupport (= 3.0.11)
+    activesupport (3.0.11)
     addressable (2.2.6)
     akami (1.0.0)
       gyoku (>= 0.4.0)
@@ -99,41 +100,41 @@ GEM
     block_helpers (0.3.3)
       activesupport (>= 2.0)
     builder (2.1.2)
-    capybara (1.1.1)
+    capybara (1.1.2)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    childprocess (0.2.2)
+    childprocess (0.2.3)
       ffi (~> 1.0.6)
-    columnize (0.3.4)
+    columnize (0.3.5)
     crack (0.3.1)
-    cucumber (1.1.0)
+    cucumber (1.1.3)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (~> 2.5.0)
+      gherkin (~> 2.6.7)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.6)
-    cucumber-rails (1.1.1)
+    cucumber-rails (1.2.0)
       capybara (>= 1.1.1)
-      cucumber (>= 1.1.0)
+      cucumber (>= 1.1.1)
       nokogiri (>= 1.5.0)
     curb (0.7.15)
     daemons (1.1.4)
-    database_cleaner (0.6.7)
+    database_cleaner (0.7.0)
     diff-lcs (1.1.3)
     equivalent-xml (0.2.8)
       nokogiri (>= 1.4.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     facets (2.8.4)
-    factory_girl (2.1.2)
+    factory_girl (2.3.2)
       activesupport
     fastercsv (1.5.4)
-    ffi (1.0.9)
-    gherkin (2.5.2)
+    ffi (1.0.11)
+    gherkin (2.6.8)
       json (>= 1.4.6)
     gyoku (0.4.4)
       builder (>= 2.1.2)
@@ -144,14 +145,14 @@ GEM
     httpi (0.9.5)
       rack
     i18n (0.5.0)
-    jettywrapper (1.0.4)
+    jettywrapper (1.1.0)
       activesupport (>= 3.0.0)
       childprocess
       i18n
       logger
       mediashelf-loggable
-    json (1.6.1)
-    json_pure (1.6.1)
+    json (1.6.2)
+    json_pure (1.6.2)
     kaminari (0.12.4)
       rails (>= 3.0.0)
     launchy (2.0.5)
@@ -167,10 +168,10 @@ GEM
     marc (0.4.3)
     mediashelf-loggable (0.4.7)
     metaclass (0.0.1)
-    mime-types (1.16)
+    mime-types (1.17.2)
     mocha (0.10.0)
       metaclass (~> 0.0.1)
-    multi_json (1.0.3)
+    multi_json (1.0.4)
     multi_xml (0.4.1)
     multipart-post (1.1.2)
     nokogiri (1.5.0)
@@ -184,28 +185,28 @@ GEM
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.10)
-      actionmailer (= 3.0.10)
-      actionpack (= 3.0.10)
-      activerecord (= 3.0.10)
-      activeresource (= 3.0.10)
-      activesupport (= 3.0.10)
+    rails (3.0.11)
+      actionmailer (= 3.0.11)
+      actionpack (= 3.0.11)
+      activerecord (= 3.0.11)
+      activeresource (= 3.0.11)
+      activesupport (= 3.0.11)
       bundler (~> 1.0)
-      railties (= 3.0.10)
-    railties (3.0.10)
-      actionpack (= 3.0.10)
-      activesupport (= 3.0.10)
+      railties (= 3.0.11)
+    railties (3.0.11)
+      actionpack (= 3.0.11)
+      activesupport (= 3.0.11)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.4)
-    rake (0.9.2)
+    rake (0.9.2.2)
     rbx-require-relative (0.0.5)
     rdf (0.3.4.1)
       addressable (>= 2.2.6)
     rdf-rdfxml (0.3.5)
       nokogiri (>= 1.4.4)
       rdf (>= 0.3.4)
-    rdoc (3.10)
+    rdoc (3.11)
       json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
@@ -231,7 +232,7 @@ GEM
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    rubydora (0.2.3)
+    rubydora (0.2.6)
       activemodel
       activesupport
       fastercsv
@@ -239,7 +240,7 @@ GEM
       nokogiri
       rest-client
       savon
-    rubyzip (0.9.4)
+    rubyzip (0.9.5)
     sanitize (2.0.3)
       nokogiri (>= 1.4.4, < 1.6)
     savon (0.9.7)
@@ -250,9 +251,9 @@ GEM
       nokogiri (>= 1.4.0)
       nori (~> 1.0)
       wasabi (~> 2.0)
-    selenium-webdriver (2.8.0)
+    selenium-webdriver (2.13.0)
       childprocess (>= 0.2.1)
-      ffi (>= 1.0.7)
+      ffi (~> 1.0.9)
       json_pure
       rubyzip
     solr-ruby (0.0.8)
@@ -263,9 +264,11 @@ GEM
       om (>= 1.4.0)
       stomp
       xml-simple
-    solrizer-fedora (1.1.3)
-      active-fedora (>= 2.3.0)
+    solrizer-fedora (1.2.0)
+      active-fedora (~> 3.1.0)
+      activesupport
       fastercsv
+      jettywrapper (~> 1.1.0)
       rsolr
       solr-ruby (>= 0.0.6)
       solrizer (>= 1.0.0)
@@ -276,7 +279,7 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     trollop (1.16.2)
-    tzinfo (0.3.30)
+    tzinfo (0.3.31)
     unicode (0.4.0)
     wasabi (2.0.0)
       nokogiri (>= 1.4.0)

data/HISTORY.textile

@@ -1,3 +1,7 @@
+h3. 3.1.5
+* Update to ActiveFedora 3.1.4
+
+
 h3. 3.1.4
 * Removed unnecessary require of jettywrapper
 

data/README.textile

@@ -74,7 +74,7 @@ First, add them to the "Gemfile":http://gembundler.com/gemfile.html of your appl
   gem 'rails', '~>3.0.10'
 
   gem 'blacklight', '~> 3.0.0'
-  gem 'hydra-head', '3.0.0.rc2'
+  gem 'hydra-head', '~> 3.1.0'
 
   # 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
@@ -96,7 +96,7 @@ First, add them to the "Gemfile":http://gembundler.com/gemfile.html of your appl
          gem 'capybara'
          gem 'bcrypt-ruby'
          gem "jettywrapper"
-  end
+  end # (leave this comment here to catch a stray line inserted by blacklight!)
 </pre>
 
 To install all of the dependencies, run:
@@ -111,7 +111,7 @@ Even if all of the dependencies are satisfied, this will take a _very_ long time
 
 <pre>
   gem install blacklight
-  gem install hydra-head -v 3.0.0.rc2
+  gem install hydra-head -v 3.1.4
 </pre>
 
 Then re-run bundle install and it will run slightly faster.

data/app/controllers/downloads_controller.rb

@@ -2,6 +2,7 @@ require 'mediashelf/active_fedora_helper'
 class DownloadsController < ApplicationController
     include MediaShelf::ActiveFedoraHelper
     include Hydra::RepositoryController
+    include Hydra::AssetsControllerHelper
     helper :downloads
     
     # Note: Actual downloads are handled by the index method insead of the show method
@@ -11,7 +12,7 @@ class DownloadsController < ApplicationController
       fedora_object = ActiveFedora::Base.load_instance(params[:asset_id])
       if params[:download_id]
         @datastream = fedora_object.datastreams[params[:download_id]]
-        send_data @datastream.content, :filename=>@datastream.label, :type=>@datastream.attributes["mimeType"]
+        send_datastream @datastream
         #send_data( Fedora::Repository.instance.fetch_custom(params[:document_id], "datastreams/#{datastream_id}/content") )
       else
         @datastreams = downloadables( fedora_object )

data/app/controllers/get_controller.rb

@@ -2,6 +2,7 @@ require 'mediashelf/active_fedora_helper'
 class GetController < ApplicationController
     include MediaShelf::ActiveFedoraHelper
     include Hydra::RepositoryController
+    include Hydra::AssetsControllerHelper
     helper :downloads
     
     def show
@@ -19,9 +20,4 @@ class GetController < ApplicationController
       
     end
     
-    private
-    def send_datastream(datastream)
-      send_data datastream.content, :filename=>datastream.label, :type=>datastream.attributes["mimeType"]
-    end
-    
 end

data/app/helpers/hydra/downloads_helper_behavior.rb

@@ -7,9 +7,6 @@ module Hydra
       datastreams.each_value do |ds|
         result << "<li>"
         result << link_to(ds.label, asset_downloads_path(ds.pid, :download_id=>ds.dsid))
-        # if editor?
-        #   result << " <span>#{ds.attributes["mimeType"]}</span>"
-        # end
         result << "</li>"     
       end
           

data/app/helpers/hydra/hydra_fedora_metadata_helper_behavior.rb

@@ -18,14 +18,14 @@ module Hydra::HydraFedoraMetadataHelperBehavior
     field_values.each_with_index do |current_value, z|
       base_id = generate_base_id(field_name, current_value, field_values, opts)
       name = "asset[#{datastream_name}][#{field_name}][#{z}]"
-        body << "<input class=\"editable-edit edit\" id=\"#{base_id}\" data-datastream-name=\"#{datastream_name}\" name=\"#{name}\" value=\"#{h(current_value.strip)}\" #{required} type=\"text\" />"
-        body << "<a href=\"\" title=\"Delete '#{h(current_value)}'\" class=\"destructive field\">Delete</a>" if opts.fetch(:multiple, true) && !current_value.empty?
+        body << "<input class=\"editable-edit edit\" id=\"#{base_id}\" data-datastream-name=\"#{datastream_name}\" name=\"#{name}\" value=\"#{sanitize(current_value.strip)}\" #{required} type=\"text\" />"
+        body << "<a href=\"\" title=\"Delete '#{sanitize(current_value)}'\" class=\"destructive field\">Delete</a>" if opts.fetch(:multiple, true) && !current_value.empty?
     end
     
     result = field_selectors_for(datastream_name, field_key)
-    result << body
+    result << body.html_safe
     
-    return result.html_safe
+    result
   end
   
   def fedora_text_area(resource, datastream_name, field_key, opts={})
@@ -56,10 +56,8 @@ module Hydra::HydraFedoraMetadataHelperBehavior
     end
     
     result = field_selectors_for(datastream_name, field_key)
-    result << body
-
-    return result.html_safe
-    
+    result << body.html_safe
+    result
   end
   
   # Expects :choices option.  Option tags for the select are generated from the :choices option using Rails "options_for_select":http://apidock.com/rails/ActionView/Helpers/FormOptionsHelper/options_for_select helper
@@ -82,9 +80,9 @@ module Hydra::HydraFedoraMetadataHelperBehavior
       body << "</select>"
       
       result = field_selectors_for(datastream_name, field_key)
-      result << body
+      result << body.html_safe
     end
-    return result.html_safe
+    result
   end
   
   def fedora_date_select(resource, datastream_name, field_key, opts={})
@@ -135,8 +133,8 @@ module Hydra::HydraFedoraMetadataHelperBehavior
     EOF
     
     result = field_selectors_for(datastream_name, field_key)
-    result << body
-    return result.html_safe
+    result << body.html_safe
+    result
   end
 
   def fedora_submit(resource, datastream_name, field_key, opts={})
@@ -258,7 +256,7 @@ module Hydra::HydraFedoraMetadataHelperBehavior
         end
       end
     end
-    return result
+    result.html_safe
   end
   
   # hydra_form_for block helper 

data/app/models/common_metadata_asset.rb

@@ -0,0 +1,13 @@
+# A Basic Model for Assets that conform to Hydra commonMetadata cModel and have basic MODS metadata (currently "Article" is the MODS exemplar)
+class CommonMetadataAsset < ActiveFedora::Base
+  
+  # declares a rightsMetadata datastream with type Hydra::RightsMetadata
+  #  basically, it is another expression of
+  #  has_metadata :name => "rightsMetadata", :type => Hydra::RightsMetadata
+  include Hydra::ModelMixins::CommonMetadata
+  
+  # adds helpful methods for basic hydra objects
+  include Hydra::ModelMethods
+  
+end
+

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

@@ -56,9 +56,3 @@
 
 </div>
 
-
-<% sidebar_items << capture do %>
-  <%#= render :partial=>"catalog/_show_partials/facets", :locals=>{:document=>document, :facets_display_heading => "This document refers to:"} %>
-  <%#= render :partial=>'facets' %>
-<% end %>
-

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

@@ -0,0 +1,2 @@
+The file <%=file_asset.label%> has been saved in <%= link_to(file_asset.pid, asset_url(file_asset.pid)) %>.
+

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

@@ -11,7 +11,6 @@
   <%- container_content_type_param = defined?(container_content_type) ? "?container_content_type=#{container_content_type}" : "" %>
   <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 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) %>

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

@@ -5,12 +5,8 @@
   <td>
 	
    <% if editor? %>
-    	<% if @container.nil? %>
-    		<% file_asset_url = file_asset_path(result["id"]) %>
-    	<% else %>
-    		<% file_asset_url = asset_file_asset_path(@container.pid, result["id"]) %>
-    	<% end %>
     	<%= 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>