fcrepo_admin 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 037b085bbd970e56f0258962a525d716e7126de3
-  data.tar.gz: b5198489fc6a71de84f2ccd823d9f9b989aa4ea4
+  metadata.gz: 305ef9978b750b747db1086587bf2d1728a59db9
+  data.tar.gz: 6c1b3182517d5540696c72f69a8eb5eb8e360925
 SHA512:
-  metadata.gz: 58d1033182af3051b5115b6d812bcbf5f04a52ed082e2feb1f3deb47a1eaf9f14fd564bd0e4966aa2d0d6da40587d778cbe00341398edad8d596562a7fe5afe7
-  data.tar.gz: 0fa62de534dd7ce460a2dec042f3fd8e0c291443dc8a426d8c1c44fde9cc53195faea74c26cd2115a1e5db1d504d088c408d3d12adbe82e29458f5f36e9eaf80
+  metadata.gz: b2c10fdd7964b34923d6486be2fb8b1c05215e9430d0f8cf75e04007f80ab658660f83220502b9469a94f1467d49a364a80714b209ddad2efc726d0fed71e887
+  data.tar.gz: 277b2fc6f1dd3a411ace6984eec531d60cd2e5d4ac9b906e9774f9064d283c84d82e6abf8630dc0110328de7803cf95e79d460a641f704e4c1b80a149a6e5af1

data/HISTORY.rdoc

@@ -1,14 +1,18 @@
-=== 0.4.0
+==== 0.4.1 (2013-05-14)
+
+* Feature: Datastream history view
+
+=== 0.4.0 (2013-05-03)
 
 * Feature: Display object's associations.
 * Require inclusion of CanCan action aliases in application's Ability class.
 * Tabbed object show view ("summary") replaced with separate views.
 
-=== 0.3.5
+==== 0.3.5 (2013-04-30)
 
 * Requires active-fedora 6.1.
 
-=== 0.3.4
+==== 0.3.4 (2013-04-29)
 
 * Moved FcrepoAdmin::BlacklightHelperBehavior to FcrepoAdmin::Helpers::BlacklightHelperBehavior.
 * FcrepoAdmin::ObjectsHelper methods can now be easily overridden.
@@ -17,29 +21,29 @@
 * Objects and datastreams controller behaviors are now easily overrideable.
 * Refactored object and datastream context navs for greater reusability.
 
-=== 0.3.3
+==== 0.3.3 (2013-04-25)
 
 * Audit trail functionality fails gracefully (i.e., if object does not implement ActiveFedora::Auditable)
 
-=== 0.3.2
+==== 0.3.2 (2013-04-19)
 
 * Separated datastream and object context navigation menus.
 * Added object helpers.
 
-=== 0.3.1
+==== 0.3.1 (2013-04-18)
 
 * Object and datastream context nav menus added.
 * Audit trail moved into objects controller.
 
-== 0.3.0
+=== 0.3.0 (2013-04-16)
 
 * Feature: Permissions and inherited permissions added to object show view.
 
-== 0.2.0
+=== 0.2.0 (2013-04-12)
 
 * Feature: Datastream content editing.
 
-== 0.1.0
+=== 0.1.0 (2013-04-11)
 
 Initial release to RubyGems.
 

data/README.rdoc

@@ -1,18 +1,18 @@
-== Hydra Administrative Tool for a Fedora Repository
+= Hydra Administrative Tool for a Fedora Repository
 
 A Rails engine providing an administrative interface to a Fedora Commons repository built on the Hydra project framework.
 
-=== Status
+== Status
 
 This project should be considered *experimental* and not ready for production deployment.
 Versions earlier than 1.0 may change API and/or UI without notice or regard for backward compatibility.
 
-=== Requirements
+== Requirements
 
 fcrepo_admin is designed for installation on hydra-head 6.0 or higher (requires active-fedora 6.1 or higher).
 See https://github.com/projecthydra/hydra-head/wiki/Installation-Prerequisites.
 
-=== Installation
+== Installation
 
 (In the future, we hope to automate some of these tasks with a generator.)
 
@@ -75,57 +75,61 @@ See https://github.com/projecthydra/hydra-head/wiki/Installation-Prerequisites.
 
     include ActiveFedora::Auditable
 
-=== Overriding fcrepo_admin behaviors
+== Overriding fcrepo_admin behaviors
 
 The following are examples of possible customizations.  This list is not necessarily exhaustive.
 
-* Helpers
+=== Helpers
 
-  Override objects helpers by creating app/helpers/fcrepo_admin/objects_helper.rb with this content:
+Override objects helpers by creating app/helpers/fcrepo_admin/objects_helper.rb with this content:
 
     module FcrepoAdmin::ObjectsHelper
       include FcrepoAdmin::Helpers::ObjectsHelperBehavior
-      # override and/or add methods here
+      # override methods here
     end
 
-  In particular you may want to override #object_title.
+In particular you may want to override #object_title.
 
-  The contents of the object context navigation menu can be customized by overriding #object_context_nav_items, 
-  or by copying and modifying the partial fcrepo_admin/objects/context_nav_items.
-
-  Override datastreams helpers by creating app/helpers/fcrepo_admin/datastreams_helper.rb with this content:
+Override datastreams helpers by creating app/helpers/fcrepo_admin/datastreams_helper.rb with this content:
 
     module FcrepoAdmin::DatastreamsHelper
       include FcrepoAdmin::Helpers::DatastreamsHelperBehavior
-      # override and/or add methods here
+      # override methods here
     end    
 
-  The contents of the datastream context navigation menu can be customized by overriding #datastream_context_nav_items,
-  or by copying and modifying the partial fcrepo_admin/datastreams/context_nav_items.
+=== Context Navigation Menus
 
-* Controllers
+The contents of the object context navigation menu can be customized by overriding the #object_context_nav_items
+helper method, or by copying and modifying the partial fcrepo_admin/objects/context_nav_items.
 
-  To override/extend the objects controller, create app/controllers/fcrepo_admin/objects_controller.rb:
+The contents of the datastream context navigation menu can be customized by overriding the 
+#datastream_context_nav_items helper method, or by copying and modifying the partial fcrepo_admin/datastreams/context_nav_items.
 
-    module FcrepoAdmin
-      class ObjectsController < CatalogController
-        include FcrepoAdmin::Controller::ObjectsControllerBehavior
-        # add your customizations
-      end
-    end
+=== Controllers
 
-  NOTE: This controller subclasses CatalogController, not ApplicationController.
+To override or extend controller behaviors, please consult Rails engine documentation and guides, such as 
+http://edgeguides.rubyonrails.org/engines.html.
 
-  To override/extend the datastreams controller, create app/controllers/fcrepo_admin/datastreams_controller.rb:
+IMPORTANT: If you add a non-RESTful action to a controller, you will probably have to add a CanCan action alias
+to your Ability class.  For this, you can use Hydra's #custom_permissions callback:
+
+    class Ability
+      include Hydra::Ability
+      include Hydra::PolicyAwareAbility
+      include FcrepoAdmin::Ability
 
-    module FcrepoAdmin
-      class DatastreamsController < ApplicationController
-        include FcrepoAdmin::Controller::DatastreamsControllerBehavior
-        # add your customizations
+      def custom_permissions
+        alias_action :my_method, :to => :read
       end
-    end
 
-=== Contributing
+    end  
+
+== Internationalization (i18n)
+
+An effort has been made to support i18n on headings, menus, etc.  See https://github.com/projecthydra/fcrepo-admin/blob/master/config/locales/fcrepo_admin.en.yml
+for the keys and consult the Rails documentation on how to provide your own translations or alternate text values.
+
+== Contributing
 
 * Consider first posting to hydra-tech@googlegroups.com with a question or bug report, or submit an issue
   to the Github issue tracker at https://github.com/projecthydra/fcrepo-admin/issues.
@@ -134,7 +138,7 @@ The following are examples of possible customizations.  This list is not necessa
 
 Thanks!
 
-=== License
+== License
 
 See the LICENSE file in the root directory of the project for copyright and license information.
 

data/app/controllers/fcrepo_admin/associations_controller.rb

@@ -1,7 +1,54 @@
 module FcrepoAdmin
-  # NOTE: This controller subclasses CatalogController, not ApplicationController
-  class AssociationsController < CatalogController
-    include FcrepoAdmin::Controller::CatalogControllerBehavior
-    include FcrepoAdmin::Controller::AssociationsControllerBehavior
+  class AssociationsController < ApplicationController
+
+    layout 'fcrepo_admin/objects'
+
+    include Hydra::Controller::ControllerBehavior
+    include Hydra::PolicyAwareAccessControlsEnforcement
+    include FcrepoAdmin::Controller::ControllerBehavior
+
+    before_filter :load_and_authorize_object
+    before_filter :load_association, :only => :show
+
+    def index
+    end
+
+    def show
+      if @association.collection?
+        get_collection_from_solr
+      else
+        target = @object.send("#{@association.name}_id")
+        if target
+          redirect_to :controller => 'objects', :action => 'show', :id => target, :use_route => 'fcrepo_admin'
+        else
+          render :text => "Target not found", :status => 404
+        end
+      end
+    end
+
+    protected
+
+    def get_collection_from_solr
+      @response = solr_response_for_raw_result(get_collection_query_result)
+      @documents = solr_documents_for_response(@response)
+    end
+
+    def get_collection_query_result
+      args = {raw: true}
+      apply_gated_discovery(args, {}) # add args to enforce Hydra permissions and admin policies
+      ActiveFedora::SolrService.query(construct_collection_query, args)
+    end
+
+    def construct_collection_query
+      # Copied from ActiveFedora::Associations::AssociationCollection#construct_query
+      clauses = {@association.options[:property] => @object.internal_uri}
+      clauses[:has_model] = @association.class_name.constantize.to_class_uri if @association.class_name && @association.class_name != 'ActiveFedora::Base'
+      query = ActiveFedora::SolrService.construct_query_for_rel(clauses)
+    end
+
+    def load_association
+      @association = @object.reflections[params[:id].to_sym] # XXX raise exception if nil
+    end
+
   end
 end

data/app/controllers/fcrepo_admin/datastreams_controller.rb

@@ -1,6 +1,107 @@
+require 'mime/types'
+
 module FcrepoAdmin
   class DatastreamsController < ApplicationController
-    include FcrepoAdmin::Controller::DatastreamsControllerBehavior
+
+    layout 'fcrepo_admin/datastreams', :except => :index
+    layout 'fcrepo_admin/objects', :only => :index
+
+    include Hydra::Controller::ControllerBehavior
+    include Hydra::PolicyAwareAccessControlsEnforcement
+    include FcrepoAdmin::Controller::ControllerBehavior
+
+    before_filter :load_and_authorize_object
+    before_filter :load_datastream, :except => :index
+
+    helper_method :ds_is_current_version?
+    helper_method :ds_content_is_text?
+    helper_method :ds_content_is_editable?
+    helper_method :ds_content_is_uploadable?
+
+    # TODO Migrate to config initializer
+    EXTRA_TEXT_MIME_TYPES = ['application/xml', 'application/rdf+xml', 'application/json']
+    MAX_EDITABLE_SIZE = 1024 * 64
+
+    def index
+    end
+
+    def show
+    end
+
+    def content
+    end
+
+    def history
+    end
+
+    def download
+      # XXX Replace with Hydra download behavior?
+      mimetypes = MIME::Types[@datastream.mimeType]
+      send_data @datastream.content, :disposition => 'attachment', :type => @datastream.mimeType, :filename => "#{@datastream.pid.sub(/:/, '_')}_#{@datastream.dsid}.#{mimetypes.first.extensions.first}"                
+    end
+
+    def edit
+    end
+
+    def upload
+      unless ds_content_is_uploadable?
+        render :text => "This datstream does not support file content", :status => 403
+      end
+    end
+
+    def update
+      if params[:file] # file uploaded
+        @datastream.content = params[:file].read
+      else # content submitted
+        @datastream.content = params[:content]
+      end
+      @object.save
+      flash[:notice] = "Datastream content updated." # i18n
+      redirect_to fcrepo_admin.object_datastream_url(@object, @datastream.dsid)
+    end
+
+    private
+    
+    def load_datastream
+      @datastream = @object.datastreams[params[:id]]
+      @datastream = @datastream.asOfDateTime(params[:asOfDateTime]) if params[:asOfDateTime]
+    end
+
+    protected
+
+    # XXX Use Rubydora::Datastream#current_version? when it becomes available
+    # https://github.com/projecthydra/rubydora/pull/25
+    def ds_is_current_version?
+      @current_version ||= (@datastream.new? || @datastream.dsVersionID == @datastream.versions.first.dsVersionID)
+    end
+
+    def ds_content_is_url?
+      @datastream.external? || @datastream.redirect?
+    end
+
+    def ds_content_is_editable?
+      !ds_content_is_url? && ds_content_is_text? && ds_editable_content_size_ok?
+    end
+
+    def ds_editable_content_size_ok?
+      @datastream.dsSize <= MAX_EDITABLE_SIZE
+    end
+
+    def ds_content_is_uploadable?
+      @datastream.managed? || @datastream.inline?
+    end
+
+    private
+
+    def ds_content_is_text?
+      mimetype_is_text(@datastream.mimeType)
+    end
+
+    def mimetype_is_text(mimetype)
+      return false if mimetype.blank?
+      mimetype.start_with?('text/') || EXTRA_TEXT_MIME_TYPES.include?(mimetype)
+    end
+
   end
 end
 

data/app/controllers/fcrepo_admin/objects_controller.rb

@@ -1,6 +1,29 @@
 module FcrepoAdmin
-  class ObjectsController < CatalogController
-    include FcrepoAdmin::Controller::CatalogControllerBehavior
-    include FcrepoAdmin::Controller::ObjectsControllerBehavior
+  class ObjectsController < ApplicationController
+
+    layout 'fcrepo_admin/objects'
+
+    include Hydra::Controller::ControllerBehavior
+    include Hydra::PolicyAwareAccessControlsEnforcement
+    include FcrepoAdmin::Controller::ControllerBehavior
+
+    before_filter :load_and_authorize_object
+    
+    def show
+    end
+
+    def audit_trail
+      if object_is_auditable?
+        if params[:download] # TODO use format instead download param
+          send_data @object.audit_trail.to_xml, :disposition => 'inline', :type => 'text/xml'
+        end
+      else
+        render :text => I18n.t("fcrepo_admin.object.audit_trail.not_implemented"), :status => 404
+      end
+    end
+
+    def permissions
+    end
+
   end
 end

data/app/views/fcrepo_admin/associations/_associations.html.erb

@@ -5,7 +5,7 @@
 	  <th scope="col"><%= t("fcrepo_admin.object.associations.header.macro") %></th>
 	  <th scope="col"><%= t("fcrepo_admin.object.associations.header.name") %></th>
 	  <th scope="col"><%= t("fcrepo_admin.object.associations.header.target") %></th>
-	  <th scope="col"><%= t("fcrepo_admin.object.associations.header.class_name") %></th>
+	  <!-- <th scope="col"><%= t("fcrepo_admin.object.associations.header.class_name") %></th> -->
 	  <th scope="col"><%= t("fcrepo_admin.object.associations.header.property") %></th>
 	</tr>
   </thead>
@@ -14,8 +14,8 @@
 	<tr>
 	  <td><%= association.macro %></td>
 	  <td><%= association.name %></td>
-	  <td><%= link_to_target association %></td>
-	  <td><%= association.class_name %></td>
+	  <td><%= link_to_association_target association %></td>
+	  <!-- <td><%= association.class_name %></td> -->
 	  <td>
 		<%= association.options[:property] %><% if association.options[:inbound] %> (inbound)<% end %>
 	  </td>

data/app/views/fcrepo_admin/associations/show.html.erb

@@ -1,9 +1,13 @@
 <h3><%= t("fcrepo_admin.object.associations.title") %>: <%= @association.name %></h3>
 
-<!-- <pre><%= @response %></pre> -->
-
-<% unless @documents.blank? %>
-  <%= render_document_index @documents %>
+<% if @response.total > 0 %>
+  <%= content_tag :ol, :start => @response.params[:start].to_i + 1 do %>
+    <% @documents.each do |doc| %>
+	  <li>
+		<%= link_to doc.id, fcrepo_admin.object_path(doc.id) %>
+	  </li>
+	<% end %>
+  <% end %>
 <% else %>
   <div class="alert">
 	No associated objects found.

data/app/views/fcrepo_admin/datastreams/_active_fedora.html.erb

@@ -0,0 +1 @@
+<p class="muted"><%= datastream.class.to_s %></p>

data/app/views/fcrepo_admin/datastreams/_context_nav_items.html.erb

@@ -1,21 +1,38 @@
-<li>
-  <%= link_to_unless_current t("fcrepo_admin.datastream.nav.items.summary"), fcrepo_admin.object_datastream_path(object, datastream.dsid) %>
-</li>
-<% if ds_content_is_text? %>
+<% unless ds_is_current_version? %>
   <li>
-	<%= link_to_unless_current t("fcrepo_admin.datastream.nav.items.content"), fcrepo_admin.content_object_datastream_path(object, datastream.dsid) %>
+	<%= render :partial => 'version', :locals => {:datastream => datastream} %>
+  </li>
+  <li>
+	<%= link_to t("fcrepo_admin.nav.items.current_version"), fcrepo_admin.object_datastream_path(object, datastream.dsid) %>
   </li>
 <% end %>
 <li>
-  <%= link_to_unless_current t("fcrepo_admin.datastream.nav.items.download"), fcrepo_admin.download_object_datastream_path(object, datastream.dsid) %>
+  <%= link_to_unless_current t("fcrepo_admin.datastream.nav.items.summary"), fcrepo_admin.object_datastream_path(object, datastream.dsid, datastream_params) %>
 </li>
-<% if can_edit_datastream? && ds_content_is_editable? %>
+<% unless datastream.new? %>
+  <% if ds_content_is_text? %>
+    <li>
+	  <%= link_to_unless_current t("fcrepo_admin.datastream.nav.items.content"), fcrepo_admin.content_object_datastream_path(object, datastream.dsid, datastream_params) %>
+    </li>
+  <% end %>
   <li>
-    <%= link_to_unless_current t("fcrepo_admin.datastream.nav.items.edit"), fcrepo_admin.edit_object_datastream_path(object, datastream.dsid) %>
+    <%= link_to t("fcrepo_admin.datastream.nav.items.download"), fcrepo_admin.download_object_datastream_path(object, datastream.dsid, datastream_params) %>
   </li>
 <% end %>
-<% if can_upload_datastream? %>
+<% if ds_is_current_version? %>
+  <% if ds_content_is_editable? && can?(:edit, object) %>
+    <li>
+      <%= link_to_unless_current t("fcrepo_admin.datastream.nav.items.edit"), fcrepo_admin.edit_object_datastream_path(object, datastream.dsid) %>
+	</li>
+  <% end %>
+  <% if can?(:upload, object) %>
+    <li>
+	  <%= link_to_unless_current t("fcrepo_admin.datastream.nav.items.upload"), fcrepo_admin.upload_object_datastream_path(object, datastream.dsid) %>
+    </li>
+  <% end %>
+<% end %>
+<% unless datastream.new? %>
   <li>
-	<%= link_to_unless_current t("fcrepo_admin.datastream.nav.items.upload"), fcrepo_admin.upload_object_datastream_path(object, datastream.dsid) %>
+    <%= link_to_unless_current t("fcrepo_admin.datastream.nav.items.history"), fcrepo_admin.history_object_datastream_path(object, datastream.dsid) %>
   </li>
 <% end %>

data/app/views/fcrepo_admin/datastreams/_datastreams.html.erb

@@ -1,33 +1,3 @@
 <h3><%= t("fcrepo_admin.datastreams.title") %></h3>
-<table class="table table-bordered table-condensed">
-  <thead>
-    <tr>
-	  <th scope="col"><%= t("fcrepo_admin.datastreams.header.id") %></th>
-	  <th scope="col"><%= t("fcrepo_admin.datastreams.header.label") %></th>
-	  <th scope="col"><%= t("fcrepo_admin.datastreams.header.mimetype") %></th>
-	  <th scope="col"><%= t("fcrepo_admin.datastreams.header.create_date") %></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% object.datastreams.each do |dsid, ds| %>
-    <tr>
-	  <td>
-		<%= 
-		   link_to_unless ds.profile.empty?, dsid, fcrepo_admin.object_datastream_path(ds.pid, dsid) do |name|
-		     name
-		   end
-		 %>
-      </td>
-	  <td><%= ds.profile["dsLabel"] %></td>
-	  <td><%= ds.profile["dsMIME"] %></td>
-	  <td>
-		<% unless ds.profile.empty? %>
-		  <%= ds.profile["dsCreateDate"] %>
-		<% else %>
-		  [<%= t("fcrepo_admin.datastreams.not_persisted") %>]
-		<% end %>
-	  </td>
-    </tr>
-    <% end %>
-  </tbody>
-</table>
+
+<%= render :partial => 'datastreams_list', :locals => {:object => object, :columns => datastream_index_columns} %>

data/app/views/fcrepo_admin/datastreams/_datastreams_list.html.erb

@@ -0,0 +1,30 @@
+<table class="table table-bordered table-condensed table-striped">
+  <thead>
+    <tr>
+	  <th scope="col"><%= t("fcrepo_admin.datastreams.header.id") %></th>
+	  <% columns.each do |col| %>
+	  <th scope="col"><%= t("fcrepo_admin.datastream.profile.#{col}") %></th>
+	  <% end %>
+    </tr>
+  </thead>
+  <tbody>
+    <% object.datastreams.each do |dsid, ds| %>
+      <tr>
+	    <td>
+		  <%= link_to dsid, fcrepo_admin.object_datastream_path(object, dsid) %>
+		</td>
+	    <% unless ds.new? %>
+	      <% columns.each do |col| %>
+	        <td>
+			  <%= format_ds_profile_value ds, col %>
+			</td>
+	      <% end %>
+        <% else %>
+	      <%= content_tag :td, :colspan => columns.size do %>
+		    <em><%= t("fcrepo_admin.datastream.not_persisted") %></em>
+		  <% end %>
+	    <% end %>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

data/app/views/fcrepo_admin/datastreams/_profile.html.erb

@@ -1,9 +1,16 @@
-<h4>Profile</h4>
-<table class="table table-condensed table-striped" style="width: auto">
-  <% datastream.profile.each do |key, value| %>
-  <tr>
-	<th scope="row"><%= t("fcrepo_admin.datastream.profile.#{key}") %></th>
-	<td><%= value.blank? ? " " : value %></td>
-  </tr>
-  <% end %>
-</table>
+<% unless datastream.new? %>
+  <h4><%= t("fcrepo_admin.datastream.profile.title") %></h4>
+
+  <table class="table table-bordered table-condensed table-striped" style="width: auto">
+	<% datastream.profile.each_key do |key| %>
+	<tr>
+	  <th scope="row"><%= t("fcrepo_admin.datastream.profile.#{key}") %></th>
+	  <td><%= format_ds_profile_value datastream, key %></td>
+	</tr>
+	<% end %>
+  </table>  
+<% else %>
+  <div class="alert alert-info">
+	This datastream has not been persisted to Fedora.
+  </div>
+<% end %>

data/app/views/fcrepo_admin/datastreams/_version.html.erb

@@ -0,0 +1 @@
+<span class="label label-important"><%= t("fcrepo_admin.datastream.version") %> <%= datastream.profile["dsVersionID"] %></span>

data/app/views/fcrepo_admin/datastreams/history.html.erb

@@ -0,0 +1,25 @@
+<h4>History</h4>
+<table class="table table-condensed table-bordered" style="width: auto">
+  <thead>
+	<tr>
+	  <th scope="col"><%= t("fcrepo_admin.datastream.profile.dsVersionID") %></th>
+	  <% datastream_history_columns.each do |col| %>
+	  <th scope="col"><%= t("fcrepo_admin.datastream.profile.#{col}") %></th>
+	  <% end %>
+	</tr>
+  </thead>
+  <tbody>
+	<% @datastream.versions.each_with_index do |ds, i| %>
+	<tr>
+	  <td><%= 
+			 link_to_unless i == 0, ds.profile["dsVersionID"], "#{fcrepo_admin.object_datastream_path(@object, ds.dsid)}?asOfDateTime=#{ds.asOfDateTime}" do |name|
+			   "#{name} (current version)"
+			 end
+			 -%>
+	  </td>
+	  <% datastream_history_columns.each do |col| %>
+	  <td><%= ds.profile[col] %></td>
+	  <% end %>
+	<% end %>
+  </tbody>
+</table>

data/app/views/fcrepo_admin/datastreams/show.html.erb

@@ -1 +1,3 @@
+<%= render :partial => 'active_fedora', :locals => {:datastream => @datastream} %>
 <%= render :partial => 'profile', :locals => {:datastream => @datastream} %>
+

data/app/views/fcrepo_admin/objects/_datastreams.html.erb

@@ -0,0 +1,3 @@
+<h3><%= t("fcrepo_admin.datastreams.title") %></h3>
+
+<%= render :partial => 'fcrepo_admin/datastreams/datastreams_list', :locals => {:object => object, :columns => object_show_datastream_columns} %>

data/app/views/fcrepo_admin/objects/_inherited_permissions.html.erb

@@ -1,9 +1,5 @@
 <h4><%= t("fcrepo_admin.object.permissions.inherited") %></h4>
-<% unless admin_policy_enforcement_enabled? %>
-  <p class="alert">
-	<%= t("fcrepo_admin.object.apo.enforcement_disabled") %>.
-  </p>
-<% end %>
+
 <% if object_is_governable? %>
   <div class="alert alert-info">
 	<% if object_is_governed_by %>

data/app/views/fcrepo_admin/objects/_properties.html.erb

@@ -1,5 +1,6 @@
 <h3><%= t("fcrepo_admin.object.properties.title") %></h3>
-<table class="table" style="width: auto">
+
+<table class="table table-condensed table-bordered">
   <% object_properties.each do |key, value| %>
   <tr>
 	<th scope="row"><%= t("fcrepo_admin.object.properties.keys.#{key}") %>:</th>

data/app/views/fcrepo_admin/objects/show.html.erb

@@ -1,3 +1,9 @@
-<%= render_document_partial @document, :show %>
-<%= render 'properties' %>
+<div class="row">
+  <div class="span5">
+	<%= render :partial => 'datastreams', :locals => {:object => @object} %>
+  </div>
+  <div class="span4">
+	<%= render 'properties' %>
+  </div>
+</div>
 

data/app/views/layouts/fcrepo_admin/datastreams.html.erb

@@ -1,10 +1,17 @@
 <% content_for :main do %>
   <h1><%= object_title %></h1>
-  <h3><%= t("fcrepo_admin.datastream.title") %>: <%= @datastream.dsid %></h3>
+  <h3>
+	<%= t("fcrepo_admin.datastream.title") %>: <%= @datastream.dsid %>
+  </h3>
+  <% unless ds_is_current_version? %>
+    <p>
+      <%= render :partial => 'version', :locals => {:datastream => @datastream} %>
+	</p>
+  <% end %>
   <%= yield %>
 <% end %>
 <% content_for :sidebar do %>
   <%= render 'fcrepo_admin/objects/context_nav' %>
-  <%= render 'fcrepo_admin/datastreams/context_nav' %>
+  <%= render 'context_nav' %>
 <% end %>
 <%= render :template => 'layouts/fcrepo_admin/default' %>

data/config/locales/fcrepo_admin.en.yml

@@ -1,18 +1,12 @@
 en:
   fcrepo_admin:
     object:
-      tabs:
-        datastreams: 'Datastreams'
-        properties: 'Properties'
-        permissions: 'Permissions'
-        associations: 'Associations'
       nav:
         header: 'Object Admin'
         items:
-          summary: 'Basic View'
+          summary: 'Summary'
           audit_trail: 'Audit Trail'
           permissions: 'Permissions'
-          properties: 'Properties'
           datastreams: 'Datastreams'
           associations: 'Associations'
       properties:
@@ -70,21 +64,23 @@ en:
         create_date: 'Create Date'
     datastream:
       title: 'Datastream'
+      not_persisted: 'Not persisted to Fedora'
+      version: 'Version'
       nav:
         header: 'Datastream Admin'
         items:
+          current_version: 'Current Version'
           summary: 'Profile'
           content: 'View Content'
           edit: 'Edit Content'
           upload: 'Upload Content'
           download: 'Download Content'
           object: 'Object Admin'
-      tabs:
-        content: 'Content'
-        profile: 'Profile'
+          history: 'History'
       download: 'Download'
       content_not_text: 'The datastream content is not text'
       profile:
+        title: 'Profile'
         dsLabel: 'Label'
         dsMIME: 'MIME Type'
         dsVersionID: 'Version'

data/config/routes.rb

@@ -12,6 +12,7 @@ FcrepoAdmin::Engine.routes.draw do
           get 'content'
           get 'upload'
           get 'download'
+          get 'history'
         end
       end
     end

data/lib/fcrepo_admin.rb

@@ -14,9 +14,5 @@ module FcrepoAdmin
   end
   module Controller
     autoload :ControllerBehavior, 'fcrepo_admin/controller/controller_behavior'
-    autoload :ObjectsControllerBehavior, 'fcrepo_admin/controller/objects_controller_behavior'
-    autoload :DatastreamsControllerBehavior, 'fcrepo_admin/controller/datastreams_controller_behavior'
-    autoload :AssociationsControllerBehavior, 'fcrepo_admin/controller/associations_controller_behavior'
-    autoload :CatalogControllerBehavior, 'fcrepo_admin/controller/catalog_controller_behavior'
   end
 end

data/lib/fcrepo_admin/ability.rb

@@ -11,6 +11,7 @@ module FcrepoAdmin
       alias_action :audit_trail, :to => :read
       alias_action :permissions, :to => :read
       alias_action :content, :to => :read
+      alias_action :history, :to => :read
       alias_action :upload, :to => :update
     end
 

data/lib/fcrepo_admin/controller/controller_behavior.rb

@@ -6,7 +6,6 @@ module FcrepoAdmin::Controller
       helper_method :object_is_auditable?
       helper_method :object_is_governable?
       helper_method :object_is_governed_by
-      helper_method :admin_policy_enforcement_enabled?
     end
 
     protected
@@ -17,8 +16,12 @@ module FcrepoAdmin::Controller
     end
 
     def load_object
-      id = params[:object_id] || params[:id]
-      @object = ActiveFedora::Base.find(id, :cast => true)
+      pid = params[:object_id] || params[:id]
+      begin
+        @object = ActiveFedora::Base.find(pid, :cast => true)
+      rescue ActiveFedora::ObjectNotFoundError
+        render :text => "Object not found", :status => 404
+      end
     end
 
     def authorize_object
@@ -33,12 +36,6 @@ module FcrepoAdmin::Controller
       end
     end
 
-    def admin_policy_enforcement_enabled?
-      # Including Hydra::PolicyAwareAccessControlsEnforcement in ApplicationController 
-      # appears to be the only way that APO access control enforcement can be enabled.
-      self.class.ancestors.include?(Hydra::PolicyAwareAccessControlsEnforcement)
-    end
-
     def object_is_governed_by
       @object_is_governed_by ||= object_is_governable? && @object.send(is_governed_by_association_name)
     end
@@ -49,18 +46,21 @@ module FcrepoAdmin::Controller
 
     def is_governed_by_association_name
       @object.reflections.each do |name, reflection|
-        if reflection.macro == :belongs_to && reflection.options[:property] == :is_governed_by # && reflection.class_name == admin_policy_class.to_s
+        if reflection.macro == :belongs_to && reflection.options[:property] == :is_governed_by # TODO add policy class
           return reflection.name
         end
       end
     end
 
-    def admin_policy_class
-      # XXX Ideally we would use Hydra::PolicyAwareAccessControlsEnforcement#policy_class,
-      # but it's only available if it's been included in the application controller, i.e.,
-      # if APO access control enforcement is enabled.  We want to know the name of the
-      # relationship regardless of whether policy enforcement is enabled.
-      Hydra.config[:permissions].fetch(:policy_class, Hydra::AdminPolicy)
+    # #solr_response_for_raw_result and #solr_documents_for_response
+    # duplicate Blacklight functionality outside of a full Blacklight
+    # catalog controller context.
+    def solr_response_for_raw_result(solr_result)
+      Blacklight::SolrResponse.new(solr_result, {})
+    end
+
+    def solr_documents_for_response(solr_response)
+      solr_response.docs.collect { |doc| SolrDocument.new(doc, solr_response) }
     end
 
   end

data/lib/fcrepo_admin/helpers/associations_helper_behavior.rb

@@ -1,20 +1,17 @@
 module FcrepoAdmin::Helpers
   module AssociationsHelperBehavior
 
-    def link_to_target(association)
+    def link_to_association_target(association)
       target = @object.send(association.name)
       if association.collection?
-        text = "#{target.size} #{target.size == 1 ? 'object' : 'objects'}"
-        if target.size > 0
-          link_to text, fcrepo_admin.object_association_path(@object, association.name)
-        else
+        link_to_unless target.size == 0, "#{association.class_name} (#{target.size})", fcrepo_admin.object_association_path(@object, association.name) do |text|
           text
         end
       else # not a collection
         if target
-          link_to target.pid, fcrepo_admin.object_path(target)
+          link_to "#{association.class_name} #{target.pid}", fcrepo_admin.object_path(target)
         else
-          "[not assigned]"
+          "#{association.class_name} (not assigned)"
         end
       end
     end

data/lib/fcrepo_admin/helpers/datastreams_helper_behavior.rb

@@ -10,12 +10,18 @@ module FcrepoAdmin::Helpers
       render :partial => 'fcrepo_admin/datastreams/context_nav_items', :locals => {:object => @object, :datastream => @datastream}
     end
 
-    def can_edit_datastream?
-      can? :edit, @object
+    # List of ds profile keys for ds index view
+    def datastream_index_columns
+      ["dsLabel", "dsMIME", "dsSize", "dsCreateDate"]
     end
 
-    def can_upload_datastream?
-      can? :upload, @object
+    # List of ds profile keys for ds history view
+    def datastream_history_columns
+      ["dsCreateDate"]
+    end
+
+    def datastream_params
+      params.has_key?(:asOfDateTime) ? {:asOfDateTime => params[:asOfDateTime]} : {}
     end
 
   end

data/lib/fcrepo_admin/helpers/fcrepo_admin_helper_behavior.rb

@@ -13,5 +13,15 @@ module FcrepoAdmin::Helpers
       render :partial => 'fcrepo_admin/objects/context_nav_items', :locals => {:object => @object}
     end
 
+    def format_ds_profile_value(ds, key)
+      value = ds.profile[key]
+      case
+      when key == "dsSize" then number_to_human_size(value)
+      when key == "dsCreateDate" then value.strftime("%Y-%m-%dT%H:%M:%S.%LZ")
+      when key == "dsLocation" && (ds.external? || ds.redirect?) then link_to(value, value)
+      else value
+      end
+    end
+
   end
 end

data/lib/fcrepo_admin/helpers/objects_helper_behavior.rb

@@ -9,6 +9,19 @@ module FcrepoAdmin::Helpers
     def object_type
       @object.class.to_s
     end
+
+    def object_properties_keys
+      [:owner_id, :state, :create_date, :modified_date, :label]
+    end
+
+    def object_properties
+      object_properties_keys.inject(Hash.new) { |h, p| h[p] = @object.send(p); h }
+    end
+
+    # List of ds profile keys for for object show view
+    def object_show_datastream_columns
+      ["dsLabel"]
+    end
     
   end
 end

data/lib/fcrepo_admin/version.rb

@@ -1,3 +1,3 @@
 module FcrepoAdmin
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/features/associations/index.html.erb_spec.rb

@@ -12,7 +12,7 @@ describe "associations/index.html.erb" do
     end
     it "should link to the show view of the association" do
       visit fcrepo_admin.object_associations_path(object)
-      page.should have_link("1 object", :href => fcrepo_admin.object_association_path(object, "parts"))
+      page.should have_link("Part (1)", :href => fcrepo_admin.object_association_path(object, "parts"))
     end
   end
   context "association is not a collection" do
@@ -22,7 +22,7 @@ describe "associations/index.html.erb" do
     it "should link to the show view of the target object" do
       pending "Bug in Capybara?"
       visit fcrepo_admin.object_associations_path(object)
-      page.should have_link(collection.pid, :href => fcrepo_admin.object_path(collection))
+      page.should have_link("Collection #{collection.pid}", :href => fcrepo_admin.object_path(collection))
     end
   end
 end

data/spec/features/datastreams/show.html.erb_spec.rb

@@ -10,10 +10,10 @@ describe "datastreams/show.html.erb" do
   before { visit fcrepo_admin.object_datastream_path(object, dsid) }
   after { object.delete }
   it "should display all attributes of the datastream profile" do
-    object.datastreams[dsid].profile.each do |key, value|
+    profile = object.datastreams[dsid].profile
+    profile.each do |key, value|
       # TODO use paths
       page.should have_content(I18n.t("fcrepo_admin.datastream.profile.#{key}"))
-      page.should have_content(value)
     end
   end
   it "should have a link to download the datastream content" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fcrepo_admin
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - David Chandek-Stark
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-03 00:00:00.000000000 Z
+date: 2013-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -253,19 +253,24 @@ files:
 - app/views/fcrepo_admin/associations/index.html.erb
 - app/views/fcrepo_admin/associations/show.html.erb
 - app/views/fcrepo_admin/catalog/_document.html.erb
+- app/views/fcrepo_admin/datastreams/_active_fedora.html.erb
 - app/views/fcrepo_admin/datastreams/_content.html.erb
 - app/views/fcrepo_admin/datastreams/_context_nav.html.erb
 - app/views/fcrepo_admin/datastreams/_context_nav_items.html.erb
 - app/views/fcrepo_admin/datastreams/_datastreams.html.erb
+- app/views/fcrepo_admin/datastreams/_datastreams_list.html.erb
 - app/views/fcrepo_admin/datastreams/_profile.html.erb
+- app/views/fcrepo_admin/datastreams/_version.html.erb
 - app/views/fcrepo_admin/datastreams/content.html.erb
 - app/views/fcrepo_admin/datastreams/edit.html.erb
+- app/views/fcrepo_admin/datastreams/history.html.erb
 - app/views/fcrepo_admin/datastreams/index.html.erb
 - app/views/fcrepo_admin/datastreams/show.html.erb
 - app/views/fcrepo_admin/datastreams/upload.html.erb
 - app/views/fcrepo_admin/objects/_context_nav.html.erb
 - app/views/fcrepo_admin/objects/_context_nav_datastreams.html.erb
 - app/views/fcrepo_admin/objects/_context_nav_items.html.erb
+- app/views/fcrepo_admin/objects/_datastreams.html.erb
 - app/views/fcrepo_admin/objects/_direct_permissions.html.erb
 - app/views/fcrepo_admin/objects/_inherited_permissions.html.erb
 - app/views/fcrepo_admin/objects/_permissions_list.html.erb
@@ -285,11 +290,7 @@ files:
 - lib/assets/.gitkeep
 - lib/fcrepo_admin.rb
 - lib/fcrepo_admin/ability.rb
-- lib/fcrepo_admin/controller/associations_controller_behavior.rb
-- lib/fcrepo_admin/controller/catalog_controller_behavior.rb
 - lib/fcrepo_admin/controller/controller_behavior.rb
-- lib/fcrepo_admin/controller/datastreams_controller_behavior.rb
-- lib/fcrepo_admin/controller/objects_controller_behavior.rb
 - lib/fcrepo_admin/engine.rb
 - lib/fcrepo_admin/helpers/associations_helper_behavior.rb
 - lib/fcrepo_admin/helpers/blacklight_helper_behavior.rb

data/lib/fcrepo_admin/controller/associations_controller_behavior.rb

@@ -1,49 +0,0 @@
-module FcrepoAdmin::Controller
-  module AssociationsControllerBehavior
-    extend ActiveSupport::Concern
-    
-    included do
-      layout 'fcrepo_admin/objects'
-
-      include FcrepoAdmin::Controller::ControllerBehavior
-
-      before_filter :load_and_authorize_object
-      before_filter :load_association, :only => :show
-    end
-
-    def index
-    end
-
-    def show
-      if @association.collection?
-        self.solr_search_params_logic += [:association_filter]
-        @response, @documents = get_search_results({:qt => 'standard'})
-      else
-        target = @object.send("#{@association.name}_id")
-        if target
-          redirect_to :controller => 'objects', :action => 'show', :id => target, :use_route => 'fcrepo_admin'
-        else
-          render :text => "Target not found", :status => 404
-        end
-      end
-    end
-
-    def association_filter(solr_params, user_params)
-      solr_params[:q] = construct_query
-    end
-
-    protected
-
-    # Copied from ActiveFedora::Associations::AssociationCollection
-    def construct_query
-      clauses = {@association.options[:property] => @object.internal_uri}
-      clauses[:has_model] = @association.class_name.constantize.to_class_uri if @association.class_name && @association.class_name != 'ActiveFedora::Base'
-      ActiveFedora::SolrService.construct_query_for_rel(clauses)
-    end
-
-    def load_association
-      @association = @object.reflections[params[:id].to_sym] # XXX raise exception if nil
-    end
-
-  end
-end

data/lib/fcrepo_admin/controller/catalog_controller_behavior.rb

@@ -1,9 +0,0 @@
-module FcrepoAdmin::Controller
-  module CatalogControllerBehavior
-
-    def search_action_url
-      url_for(:controller => '/catalog', :action => 'index', :only_path => true)
-    end
-
-  end
-end

data/lib/fcrepo_admin/controller/datastreams_controller_behavior.rb

@@ -1,73 +0,0 @@
-require 'mime/types'
-
-module FcrepoAdmin::Controller
-  module DatastreamsControllerBehavior
-    extend ActiveSupport::Concern
-
-    included do
-      layout 'fcrepo_admin/datastreams', :except => :index
-      layout 'fcrepo_admin/objects', :only => :index
-
-      include FcrepoAdmin::Controller::ControllerBehavior
-
-      before_filter :load_and_authorize_object
-      before_filter :load_datastream, :except => :index
-
-      helper_method :ds_content_is_text?
-      helper_method :ds_content_is_editable?
-    end
-
-    # Additional types of content that should be displayed inline
-    TEXT_MIME_TYPES = ['application/xml', 'application/rdf+xml', 'application/json']
-    MAX_INLINE_SIZE = 1024 * 64
-
-    def index
-    end
-
-    def show
-    end
-
-    def content
-    end
-
-    def download
-      mimetypes = MIME::Types[@datastream.mimeType]
-      send_data @datastream.content, :disposition => 'attachment', :type => @datastream.mimeType, :filename => "#{@datastream.pid.sub(/:/, '_')}_#{@datastream.dsid}.#{mimetypes.first.extensions.first}"                
-    end
-
-    def edit
-    end
-
-    def upload
-    end
-
-    def update
-      if params[:file] # file uploaded
-        @datastream.content = params[:file].read
-      else # content submitted
-        @datastream.content = params[:content]
-      end
-      @object.save
-      flash[:notice] = "Datastream content updated." # i18n
-      redirect_to fcrepo_admin.object_datastream_url(@object, @datastream.dsid)
-    end
-
-    private
-    
-    def load_datastream
-      @datastream = @object.datastreams[params[:id]]
-    end
-
-    protected
-
-    def ds_content_is_text?
-      @datastream.mimeType.start_with?('text/') || TEXT_MIME_TYPES.include?(@datastream.mimeType)
-    end
-
-    def ds_content_is_editable?
-      ds_content_is_text? && (@datastream.dsSize <= MAX_INLINE_SIZE)
-    end
-
-  end
-end
-

data/lib/fcrepo_admin/controller/objects_controller_behavior.rb

@@ -1,42 +0,0 @@
-module FcrepoAdmin::Controller
-  module ObjectsControllerBehavior
-    extend ActiveSupport::Concern
-
-    included do
-      layout 'fcrepo_admin/objects'
-
-      include FcrepoAdmin::Controller::ControllerBehavior
-
-      helper_method :object_properties
-
-      before_filter :load_and_authorize_object, :except => :show
-    end
-    
-    PROPERTIES = [:owner_id, :state, :create_date, :modified_date, :label]
-
-    def show
-      @response, @document = get_solr_response_for_doc_id(params[:id])
-      @object = ActiveFedora::SolrService.reify_solr_results([@document], :load_from_solr => true).first
-    end
-
-    def audit_trail
-      if object_is_auditable?
-        if params[:download]
-          send_data @object.audit_trail.to_xml, :disposition => 'inline', :type => 'text/xml'
-        end
-      else
-        render :text => I18n.t("fcrepo_admin.object.audit_trail.not_implemented"), :status => 404
-      end
-    end
-
-    def permissions
-    end
-
-    protected
-
-    def object_properties
-      @object_properties ||= PROPERTIES.inject(Hash.new) { |h, p| h[p] = @object.send(p); h }
-    end
-
-  end
-end