fcrepo_admin 0.3.0 → 0.3.1

data/Gemfile

@@ -3,4 +3,5 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'active-fedora', github: 'projecthydra/active_fedora'
+gem 'hydra-head', github: 'projecthydra/hydra-head'
 gem 'devise'

data/README.rdoc

@@ -4,7 +4,8 @@ A Rails engine providing an administrative interface to a Fedora Commons reposit
 
 === Status
 
-This project is at an early stage of development.  It should be considered experimental and not ready for production deployment.
+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
 
@@ -37,42 +38,21 @@ See https://github.com/projecthydra/hydra-head/wiki/Installation-Prerequisites.
   You may replace <code>'/admin'</code> with any mount point (except perhaps <code>'/catalog'</code>), 
   including <code>'/'</code>. All routes include <code>objects</code> as a subpath.
 
-* Add abilities to your Ability class
-
-  In app/models/ability.rb add this line after the Hydra abilities:
-
-    include FcrepoAdmin::DatastreamAbility
-
-* Extend the SolrDocument model
-  
-  In app/models/solr_document.rb add this line:
-
-    use_extension FcrepoAdmin::SolrDocumentExtension
-
-  (This may only be necessary if customizing the catalog show page as indicated below.)
-
 * Add Javascript
   
   In app/assets/javascripts/application.js add this line: 
 
     //= require bootstrap-tab
 
-* Add CSS
-
-  In app/assets/stylesheets/application.css add this line:
-
-    //= require fcrepo_admin/fcrepo_admin
-
-* Customize catalog show page (optional)
-
-  If you would like to add Fedora object information to the catalog show page, 
-  copy the partial <code>app/views/catalog/_show_default.html.erb</code> from the Blacklight 
-  gem to your application, then add to the bottom of the file:
+* Customize catalog search results (optional)
 
-    <%= render :partial => 'fcrepo_admin/catalog/show', :locals => {:document => document} %>
+  If you would like items from the catalog search results list to the object admin view
+  instead of the catalog show view, create app/helpers/blacklight_helper.rb with this content:
 
-  Use Blacklight's config options in CatalogController to control the basic content on the show page 
-  (HTML title, page title, and list of the fields/values at the top of the page).
+    module BlacklightHelper
+      include Blacklight::BlacklightHelperBehavior  # Default Blacklight behaviors
+      include FcrepoAdmin::BlacklightHelperBehavior # fcrepo_admin overrides
+    end
 
 === License
 

data/app/controllers/fcrepo_admin/datastreams_controller.rb

@@ -3,26 +3,32 @@ require 'mime/types'
 module FcrepoAdmin
   class DatastreamsController < ApplicationController
 
-    include FcrepoAdmin::ControllerBehavior
+    # include FcrepoAdmin::ControllerBehavior
 
+    layout 'fcrepo_admin/datastreams'
+
+    # Additional types of content that should be displayed inline
     TEXT_MIME_TYPES = ['application/xml', 'application/rdf+xml', 'application/json']
 
-    before_filter :load_and_authz_object, :only => :index
-    before_filter :load_and_authz_datastream, :except => [:index, :download]
-    before_filter :load_datastream, :only => :download
+    # before_filter :load_and_authorize_object, :only => :index
+    before_filter :load_and_authorize_datastream # , :except => :index
+    # before_filter :load_datastream, :only => :download
     before_filter :inline_filter, :only => [:show, :edit]
 
-    def index
-    end
+    # def index
+    # end
   
     def show
+      if params[: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
     end
 
-    def download
-      authorize! :read, @datastream
-      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 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
@@ -38,6 +44,23 @@ module FcrepoAdmin
       redirect_to fcrepo_admin.object_datastream_url(@object, @datastream.dsid)
     end
 
+    private
+
+    def load_and_authorize_datastream
+      load_datastream
+      authorize_datastream
+    end
+
+    def load_datastream
+      @object = ActiveFedora::Base.find(params[:object_id], :cast => true)
+      @datastream = @object.datastreams[params[:id]]
+    end
+
+    def authorize_datastream
+      # Datastream permissions are solely based on object permissions
+      authorize! params[:action].to_sym, @object
+    end
+
     protected
 
     def inline_filter

data/app/controllers/fcrepo_admin/objects_controller.rb

@@ -1,19 +1,46 @@
 module FcrepoAdmin
   class ObjectsController < ApplicationController
 
-    include FcrepoAdmin::ControllerBehavior
+    layout 'fcrepo_admin/objects'
     
     PROPERTIES = [:owner_id, :state, :create_date, :modified_date, :label]
 
     helper_method :apo_enforcement_enabled?
     helper_method :object_properties
+    helper_method :admin_policy_object?
+    helper_method :object_type
+    helper_method :has_permissions?
 
-    before_filter { |c| c.load_and_authz_object :id }
-    before_filter :load_apo_info   # depends on load_and_authz_object
+    before_filter :load_and_authorize_object
+    before_filter :load_apo_info, :only => :show  # depends on load_and_authz_object
 
     def show
     end
 
+    def audit_trail
+      # XXX Update when new version of ActiveFedora released
+      @audit_trail = @object.respond_to?(:audit_trail) ? @object.audit_trail : @object.inner_object.audit_trail
+      if params[:download]
+        send_data @audit_trail.to_xml, :disposition => 'inline', :type => 'text/xml'
+      end
+    end
+
+    private
+
+    def load_and_authorize_object
+      load_object
+      authorize_object
+    end
+
+    def load_object
+      @object = ActiveFedora::Base.find(params[:id], :cast => true)
+    end
+
+    def authorize_object
+      action = params[:action] == 'audit_trail' ? :read : params[:action].to_sym
+      authorize! action, @object
+    end
+
     protected
 
     def apo_enforcement_enabled?
@@ -28,23 +55,37 @@ module FcrepoAdmin
       properties
     end
 
+    def object_type
+      @object.class.to_s
+    end
+
     def load_apo_info
       @apo_relationship_name = nil
       @apo = nil
-      # 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.
-      apo_class = Hydra.config[:permissions].fetch(:policy_class, Hydra::AdminPolicy)
       @object.reflections.each_value do |reflection|
         if reflection.options[:property] == :is_governed_by \
-          && reflection.macro == :belongs_to #&& reflection.class_name == apo_class.to_s
+          && reflection.macro == :belongs_to
           @apo_relationship_name = reflection.name
           @apo = @object.send(@apo_relationship_name)
           break
         end
       end
-      
+    end
+
+    def has_permissions?
+      @object.is_a?(Hydra::ModelMixins::RightsMetadata)
+    end
+
+    def admin_policy_object?
+      @object.is_a?(apo_class)
+    end
+
+    def apo_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)
     end
 
   end

data/app/helpers/fcrepo_admin/objects_helper.rb

@@ -0,0 +1,9 @@
+module FcrepoAdmin
+  module ObjectsHelper
+
+    def object_title
+      "#{@object.class.to_s} #{@object.pid}"
+    end
+
+  end
+end

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

@@ -1,4 +1,3 @@
-<div id="fcrepo-admin-dscontent">
 <% if inline %>
   <pre class="prettyprint pre-scrollable"><%= datastream.content %></pre>
 <% else %>
@@ -6,7 +5,7 @@
     <%= t("fcrepo_admin.datastream.content_not_text") %>.
   </p>
 <% end %>
-  <p>
-    <%= link_to t("fcrepo_admin.datastream.download"), fcrepo_admin.download_object_datastream_path(datastream.pid, datastream.dsid), :class => "btn btn-primary" %>
-  </p>
-</div>
+<p>
+  <%= link_to t("fcrepo_admin.datastream.download"), "#{fcrepo_admin.object_datastream_path(datastream.pid, datastream.dsid)}?download=true", :class => "btn btn-primary" %>
+</p>
+

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

@@ -0,0 +1,18 @@
+<div class="well">
+  <ul class="nav nav-list">
+	<li class="nav-header">
+	  <%= t("fcrepo_admin.datastream.nav.header") %>
+	</li>
+	<li>
+	  <%= link_to_unless_current t("fcrepo_admin.datastream.nav.items.summary"), fcrepo_admin.object_datastream_path(datastream.pid, datastream.dsid) %>
+	</li>
+	<li>
+	  <%= link_to_unless_current t("fcrepo_admin.datastream.nav.items.edit"), fcrepo_admin.edit_object_datastream_path(datastream.pid, datastream.dsid) %>
+	</li>
+	<li>
+	  <%= link_to t("fcrepo_admin.datastream.nav.items.download"), "#{fcrepo_admin.object_datastream_path(datastream.pid, datastream.dsid)}?download=true" %>
+	</li>
+	<li class="divider"></li>
+	<%= render :partial => 'fcrepo_admin/objects/object_nav_items', :locals => {:object => object} %>
+  </ul>
+</div>

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

@@ -4,6 +4,7 @@
 	  <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>
@@ -12,6 +13,7 @@
 	  <td><%= link_to dsid, fcrepo_admin.object_datastream_path(ds.pid, dsid) %></td>
 	  <td><%= ds.profile["dsLabel"] %></td>
 	  <td><%= ds.profile["dsMIME"] %></td>
+	  <td><%= ds.profile["dsCreateDate"] %></td>
     </tr>
     <% end %>
   </tbody>

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

@@ -1,7 +1,3 @@
-<h1><%= @datastream.pid %></h1>
-
-<h3><%= t("fcrepo_admin.datastream.title") %>: <%= @datastream.dsid %></h3>
-
 <%= form_tag fcrepo_admin.object_datastream_path(@datastream.pid, @datastream.dsid), :method => :put, :multipart => true do %>
   <div>
     <%= label_tag "file", t("fcrepo_admin.datastream.edit.file")  %>

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

@@ -1,15 +1,3 @@
-<h1><%= @datastream.pid %></h1>
-
-<ul class="pull-right nav nav-pills">
-  <% if can? :edit, @datastream %>
-    <li>
-	  <%= link_to content_tag(:i, "", :class => "icon-pencil"), fcrepo_admin.edit_object_datastream_path(@datastream.pid, @datastream.dsid) %>
-	</li>
-  <% end %>
-</ul>
-
-<h3><%= t("fcrepo_admin.datastream.title") %>: <%= @datastream.dsid %></h3>
-
 <div class="tabbable">
   <ul class="nav nav-tabs">
     <li class="active"><a href="#tab1" data-toggle="tab"><%= t("fcrepo_admin.datastream.tabs.content") %></a></li>
@@ -24,4 +12,3 @@
     </div>
   </div>
 </div>
-

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

@@ -0,0 +1,5 @@
+<div class="well">
+  <ul class="nav nav-list">
+	<%= render :partial => 'fcrepo_admin/objects/object_nav_items', :locals => {:object => object} %>
+  </ul>
+</div>

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

@@ -0,0 +1,9 @@
+	<li class="nav-header">
+	  <%= t("fcrepo_admin.object.nav.header") %>
+	</li>
+	<li>
+	  <%= link_to_unless_current t("fcrepo_admin.object.nav.items.summary"), fcrepo_admin.object_path(object) %>
+	</li>
+	<li>
+	  <%= link_to_unless_current t("fcrepo_admin.object.nav.items.audit_trail"), fcrepo_admin.audit_trail_object_path(object) %>
+	</li>

data/app/views/fcrepo_admin/{audit_trail/index.html.erb → objects/audit_trail.html.erb}

@@ -1,9 +1,7 @@
-<h1><%= @object.pid %></h1>
-
 <h3><%= t("fcrepo_admin.audit_trail.title") %></h3>
 
 <p>
-	<%= link_to t("fcrepo_admin.audit_trail.download"), "#{fcrepo_admin.object_audit_trail_index_path(@object)}?download=true", :class => "btn btn-primary" %>
+	<%= link_to t("fcrepo_admin.audit_trail.download"), "#{fcrepo_admin.audit_trail_object_path(@object)}?download=true", :class => "btn btn-primary" %>
 </p>
 
 <table class="table table-bordered table-condensed table-striped">

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

@@ -1,9 +1,3 @@
-<h1><%= @object.pid %></h1>
-
-<p>
-  Object Type: <%= @object.class.to_s %>
-</p>
-
 <div class="tabbable">
   <ul class="nav nav-tabs">
     <li class="active"><a href="#tab-datastreams" data-toggle="tab"><%= t("fcrepo_admin.object.tabs.datastreams") %></a></li>
@@ -18,12 +12,13 @@
 	  <%= render :partial => 'properties', :locals => {:properties => object_properties} %>
     </div>
     <div class="tab-pane" id="tab-permissions">
+	<% if has_permissions? %>
       <h4>Direct Permissions</h4>
 	  <%= render :partial => 'permissions', :locals => {:permissions => @object.permissions} %>
 	  <h4>Inherited Permissions</h4>
 	  <% unless apo_enforcement_enabled? %>
 	    <p class="alert">
-		  <%= t("fcrepo_admin.object.apo.enforcement_disabled") %>
+		  <%= t("fcrepo_admin.object.apo.enforcement_disabled") %>.
 	    </p>
 	  <% end %>
 	  <% if @apo_relationship_name %>
@@ -40,11 +35,12 @@
 		<% end %>
 	  <% else %>
 	    <p class="alert alert-info">
-		  <%= t("fcrepo_admin.object.apo.relationship_undefined") %>
+		  <%= t("fcrepo_admin.object.apo.relationship_undefined") %>: <%= object_type %>.
 	    </p>
 	  <% end %>
-    </div>
+    <% else %>
+	  <%= t("fcrepo_admin.object.permissions.not_supported") %>: <%= object_type %>.
+	<% end %>
+    </div> <!-- /tab-permissions -->
   </div>
 </div>
-
-<%= render :partial => 'more_info', :locals => {:pid => @object.pid} %>

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

@@ -0,0 +1,9 @@
+<% content_for :main do %>
+  <h1><%= object_title %></h1>
+  <h3><%= t("fcrepo_admin.datastream.title") %>: <%= @datastream.dsid %></h3>
+  <%= yield %>
+<% end %>
+<% content_for :sidebar do %>
+  <%= render :partial => 'fcrepo_admin/datastreams/datastream_nav', :locals => {:datastream => @datastream, :object => @object} %>
+<% end %>
+<%= render :template => 'layouts/fcrepo_admin/default' %>

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

@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<html lang="en" class="no-js">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+
+    <!-- Mobile viewport optimization h5bp.com/ad -->
+    <meta name="HandheldFriendly" content="True">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+
+    <!-- Mobile IE allows us to activate ClearType technology for smoothing fonts for easy reading -->
+    <!--[if IEMobile]>
+      <meta http-equiv="cleartype" content="on">
+    <![endif]-->
+
+    <title><%= h(@page_title || application_name) %></title>
+    <link href="<%= opensearch_catalog_path(:format => 'xml', :only_path => false) %>" title="<%= application_name%>" type="application/opensearchdescription+xml" rel="search"/>
+    <%= favicon_link_tag asset_path('favicon.ico') %>
+    <%= stylesheet_link_tag    "application" %>
+    <%= javascript_include_tag "application" %>
+    <%= csrf_meta_tags %>
+    <%= raw(render_head_content) %> 
+
+    <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
+    <!--[if lt IE 9]>
+      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+
+  </head>
+  <% onload_text = "$('input#q').focus();" if params[:q].to_s.empty? and params[:f].to_s.empty? and params[:id].nil? %>
+  <body onload="<%= onload_text %>" class="<%= render_body_class %>">
+	<%= render :partial => 'shared/header_navbar' %>
+
+	<div id="ajax-modal" class="modal hide fade" tabindex="-1"></div>
+
+	<div id="main-container" class="container">
+      <!-- Top bar -->
+      <div id="search-found" class="row hidden-phone">
+        <%= topbar_items.join('').html_safe %>
+      </div>
+      <!-- /Top bar -->
+      <div class="row">
+        <div class="span12">
+          <div id="main-flashes">
+            <%= render :partial=>'/flash_msg' %>
+          </div>
+        </div>    
+      </div>              
+	  
+      <div class="row">
+		<div class="span9">
+          <%= yield :main %>
+		</div>
+		<div class="span3">
+		  <%= yield :sidebar %>
+		</div>
+      </div>   
+	</div>
+	<!-- /container -->
+
+	<%= render :partial => 'shared/footer' %>
+  </body>
+</html>

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

@@ -0,0 +1,8 @@
+<% content_for :main do %>
+  <h1><%= object_title %></h1>
+  <%= yield %>
+<% end %>
+<% content_for :sidebar do %>
+  <%= render :partial => 'fcrepo_admin/objects/object_nav', :locals => {:object => @object} %>
+<% end %>
+<%= render :template => 'layouts/fcrepo_admin/default' %>

data/config/locales/fcrepo_admin.en.yml

@@ -1,11 +1,15 @@
 en:
   fcrepo_admin:
     object:
-      more_info: 'More Information'
       tabs:
         datastreams: 'Datastreams'
         properties: 'Properties'
         permissions: 'Permissions'
+      nav:
+        header: 'Object Admin'
+        items:
+          summary: 'Object Summary'
+          audit_trail: 'Audit Trail'
       properties:
         title: 'Properties'
         keys:
@@ -16,6 +20,7 @@ en:
           label: 'Label'
       permissions:
         no_permissions: 'No permissions.'
+        not_supported: 'This object type does not support Hydra permissions'
         header:
           type: 'Type'
           name: 'Name'
@@ -23,8 +28,8 @@ en:
       apo:
         governed_by: 'Governed By'
         not_assigned: 'Not Assigned'
-        enforcement_disabled: 'Admin policy access control enforcement is disabled.'
-        relationship_undefined: 'This object type does not define an admin policy relationship.'
+        enforcement_disabled: 'Admin policy access control enforcement is disabled'
+        relationship_undefined: 'This object type does not define an admin policy relationship'
     audit_trail: 
       title: 'Audit Trail'
       download: 'Download'
@@ -42,8 +47,16 @@ en:
         id: 'Datastream ID'
         label: 'Label'
         mimetype: 'MIME Type'
+        create_date: 'Create Date'
     datastream:
       title: 'Datastream'
+      nav:
+        header: 'Datastream Admin'
+        items:
+          summary: 'Datastream Summary'
+          edit: 'Edit Content'
+          download: 'Download Content'
+          object: 'Object Admin'
       tabs:
         content: 'Content'
         profile: 'Profile'

data/config/routes.rb

@@ -2,12 +2,8 @@ FcrepoAdmin::Engine.routes.draw do
 
   scope :module => "fcrepo_admin" do
     resources :objects, :only => :show do
-      resources :datastreams, :only => [:index, :show, :edit, :update] do
-        member do
-          get 'download'
-        end
-      end
-      resources :audit_trail, :only => :index
+      get 'audit_trail', :on => :member
+      resources :datastreams, :only => [:show, :edit, :update]
     end
   end
     

data/lib/fcrepo_admin.rb

@@ -6,4 +6,5 @@ module FcrepoAdmin
   autoload :SolrDocumentExtension, 'fcrepo_admin/solr_document_extension'
   autoload :ControllerBehavior, 'fcrepo_admin/controller_behavior'
   autoload :DatastreamAbility, 'fcrepo_admin/datastream_ability'
+  autoload :BlacklightHelperBehavior, 'fcrepo_admin/blacklight_helper_behavior'
 end

data/lib/fcrepo_admin/blacklight_helper_behavior.rb

@@ -0,0 +1,11 @@
+module FcrepoAdmin
+  module BlacklightHelperBehavior
+
+    def link_to_document(doc, opts={:label=>nil, :counter => nil, :results_view => true})
+      opts[:label] ||= blacklight_config.index.show_link.to_sym
+      label = render_document_index_label doc, opts
+      link_to label, fcrepo_admin.object_path(doc.id), { :'data-counter' => opts[:counter] }.merge(opts.reject { |k,v| [:label, :counter, :results_view].include? k  })
+    end
+
+  end
+end

data/lib/fcrepo_admin/controller_behavior.rb

@@ -1,13 +1,13 @@
 module FcrepoAdmin
   module ControllerBehavior
 
-    def load_and_authz_object(param = :object_id)
-      load_object param
+    def load_and_authz_object
+      load_object
       authorize_object
     end
 
-    def load_object(param = :object_id)
-      @object = ActiveFedora::Base.find(params[param], :cast => true)
+    def load_object
+      @object = ActiveFedora::Base.find(params[:id], :cast => true)
     end
 
     def authorize_object
@@ -20,7 +20,7 @@ module FcrepoAdmin
     end
 
     def load_datastream
-      load_object unless @object
+      @object ||= ActiveFedora::Base.find(params[:object_id], :cast => true)
       @datastream = @object.datastreams[params[:id]]
     end
 

data/lib/fcrepo_admin/version.rb

@@ -1,3 +1,3 @@
 module FcrepoAdmin
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/controllers/objects_controller_spec.rb

@@ -7,4 +7,16 @@ describe FcrepoAdmin::ObjectsController do
     after { object.delete }
     it { should render_template(:show) }
   end
+  context "#audit_trail" do
+    let(:object) { FactoryGirl.create(:content_model) }
+    after { object.delete }
+    subject { get :audit_trail, :id => object, :use_route => 'fcrepo_admin' }
+    it { should render_template(:audit_trail) }
+  end
+  context "#audit_trail?download=true" do
+    subject { get :audit_trail, :id => object, :download => 'true', :use_route => 'fcrepo_admin' }
+    let(:object) { FactoryGirl.create(:content_model) }
+    after { object.delete }
+    its(:response_code) { should eq(200) }
+  end
 end

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

@@ -17,7 +17,7 @@ describe "datastreams/show.html.erb" do
     end
   end
   it "should have a link to download the datastream content" do
-    page.should have_link(I18n.t("fcrepo_admin.datastream.download"), :href => fcrepo_admin.download_object_datastream_path(object, dsid))
+    page.should have_link(I18n.t("fcrepo_admin.datastream.download"), :href => "#{fcrepo_admin.object_datastream_path(object, dsid)}?download=true")
   end
   context "user can edit" do
     let(:user) { FactoryGirl.create(:user) }

data/spec/features/{audit_trail/index.html.erb_spec.rb → objects/audit_trail.html.erb_spec.rb}

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
-describe "audit_trail/index.html.erb" do
+describe "audit_trail.html.erb" do
   let(:object) { FactoryGirl.create(:content_model) }
   after { object.delete }
   it "should display the audit trail" do
-    visit fcrepo_admin.object_audit_trail_index_path(object)
+    visit fcrepo_admin.audit_trail_object_path(object)
     page.should have_content(object.pid)
-    page.should have_link(I18n.t("fcrepo_admin.audit_trail.download"), :href => "#{fcrepo_admin.object_audit_trail_index_path(object)}?download=true")
+    page.should have_link(I18n.t("fcrepo_admin.audit_trail.download"), :href => "#{fcrepo_admin.audit_trail_object_path(object)}?download=true")
   end
 end

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

@@ -20,7 +20,7 @@ describe "objects/show.html.erb" do
     end
     it "should link to its audit trail" do
       visit fcrepo_admin.object_path(object)
-      page.should have_link(I18n.t("fcrepo_admin.audit_trail.title"), :href => fcrepo_admin.object_audit_trail_index_path(object))
+      page.should have_link(I18n.t("fcrepo_admin.audit_trail.title"), :href => fcrepo_admin.audit_trail_object_path(object))
     end
     it "should display the object's permissions"
   end

data/spec/internal/app/helpers/blacklight_helper.rb

@@ -0,0 +1,4 @@
+module BlacklightHelper
+  include Blacklight::BlacklightHelperBehavior
+  include FcrepoAdmin::BlacklightHelperBehavior
+end

data/spec/internal/public/403.html

@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>The action you wanted to perform was forbidden (403)</title>
+  <style type="text/css">
+    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
+    div.dialog {
+      width: 25em;
+      padding: 0 4em;
+      margin: 4em auto 0 auto;
+      border: 1px solid #ccc;
+      border-right-color: #999;
+      border-bottom-color: #999;
+    }
+    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+  </style>
+</head>
+
+<body>
+  <!-- This file lives in public/403.html -->
+  <div class="dialog">
+    <h1>The action you wanted to perform was forbidden.</h1>
+    <p>Maybe you tried to perform an action you didn't have permissions for.</p>
+  </div>
+</body>
+</html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fcrepo_admin
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-16 00:00:00.000000000 Z
+date: 2013-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -256,33 +256,37 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
-- app/controllers/fcrepo_admin/audit_trail_controller.rb
 - app/controllers/fcrepo_admin/datastreams_controller.rb
 - app/controllers/fcrepo_admin/objects_controller.rb
+- app/helpers/fcrepo_admin/objects_helper.rb
 - app/mailers/.gitkeep
 - app/models/.gitkeep
-- app/views/fcrepo_admin/audit_trail/index.html.erb
-- app/views/fcrepo_admin/catalog/_datastreams.html.erb
-- app/views/fcrepo_admin/catalog/_show.html.erb
 - app/views/fcrepo_admin/datastreams/_content.html.erb
+- app/views/fcrepo_admin/datastreams/_datastream_nav.html.erb
 - app/views/fcrepo_admin/datastreams/_datastreams.html
 - app/views/fcrepo_admin/datastreams/_profile.html.erb
 - app/views/fcrepo_admin/datastreams/edit.html.erb
 - app/views/fcrepo_admin/datastreams/index.html.erb
 - app/views/fcrepo_admin/datastreams/show.html.erb
 - app/views/fcrepo_admin/objects/_more_info.html.erb
+- app/views/fcrepo_admin/objects/_object_nav.html.erb
+- app/views/fcrepo_admin/objects/_object_nav_items.html.erb
 - app/views/fcrepo_admin/objects/_permissions.html.erb
 - app/views/fcrepo_admin/objects/_permissions_header.html.erb
 - app/views/fcrepo_admin/objects/_permissions_row.html.erb
 - app/views/fcrepo_admin/objects/_properties.html.erb
+- app/views/fcrepo_admin/objects/audit_trail.html.erb
 - app/views/fcrepo_admin/objects/show.html.erb
+- app/views/layouts/fcrepo_admin/datastreams.html.erb
+- app/views/layouts/fcrepo_admin/default.html.erb
+- app/views/layouts/fcrepo_admin/objects.html.erb
 - config/locales/fcrepo_admin.en.yml
 - config/routes.rb
 - doc/README_FOR_APP
 - fcrepo_admin.gemspec
 - lib/assets/.gitkeep
-- lib/assets/stylesheets/fcrepo_admin/fcrepo_admin.css
 - lib/fcrepo_admin.rb
+- lib/fcrepo_admin/blacklight_helper_behavior.rb
 - lib/fcrepo_admin/controller_behavior.rb
 - lib/fcrepo_admin/datastream_ability.rb
 - lib/fcrepo_admin/engine.rb
@@ -290,15 +294,13 @@ files:
 - lib/fcrepo_admin/version.rb
 - lib/tasks/.gitkeep
 - lib/tasks/fcrepo_admin.rake
-- spec/controllers/audit_trail_controller_spec.rb
 - spec/controllers/datastreams_controller_spec.rb
 - spec/controllers/objects_controller_spec.rb
 - spec/factories/fcrepo_admin_factories.rb
 - spec/factories/user_factories.rb
-- spec/features/audit_trail/index.html.erb_spec.rb
-- spec/features/catalog/show.html.erb_spec.rb
 - spec/features/datastreams/edit.html.erb_spec.rb
 - spec/features/datastreams/show.html.erb_spec.rb
+- spec/features/objects/audit_trail.html.erb_spec.rb
 - spec/features/objects/show.html.erb_spec.rb
 - spec/fixtures/auditable.foxml.xml
 - spec/internal/README.rdoc
@@ -309,6 +311,7 @@ files:
 - spec/internal/app/controllers/application_controller.rb
 - spec/internal/app/controllers/catalog_controller.rb
 - spec/internal/app/helpers/application_helper.rb
+- spec/internal/app/helpers/blacklight_helper.rb
 - spec/internal/app/mailers/.gitkeep
 - spec/internal/app/models/.gitkeep
 - spec/internal/app/models/ability.rb
@@ -316,7 +319,6 @@ files:
 - spec/internal/app/models/content_model.rb
 - spec/internal/app/models/solr_document.rb
 - spec/internal/app/models/user.rb
-- spec/internal/app/views/catalog/_show_default.html.erb
 - spec/internal/app/views/layouts/application.html.erb
 - spec/internal/config.ru
 - spec/internal/config/application.rb
@@ -344,6 +346,7 @@ files:
 - spec/internal/db/schema.rb
 - spec/internal/lib/assets/.gitkeep
 - spec/internal/log/.gitkeep
+- spec/internal/public/403.html
 - spec/internal/public/404.html
 - spec/internal/public/422.html
 - spec/internal/public/500.html
@@ -372,7 +375,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4159393718138306915
+      hash: 1033224864064252852
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -380,15 +383,13 @@ signing_key:
 specification_version: 3
 summary: Hydra-based Fedora Commons repository admin tool.
 test_files:
-- spec/controllers/audit_trail_controller_spec.rb
 - spec/controllers/datastreams_controller_spec.rb
 - spec/controllers/objects_controller_spec.rb
 - spec/factories/fcrepo_admin_factories.rb
 - spec/factories/user_factories.rb
-- spec/features/audit_trail/index.html.erb_spec.rb
-- spec/features/catalog/show.html.erb_spec.rb
 - spec/features/datastreams/edit.html.erb_spec.rb
 - spec/features/datastreams/show.html.erb_spec.rb
+- spec/features/objects/audit_trail.html.erb_spec.rb
 - spec/features/objects/show.html.erb_spec.rb
 - spec/fixtures/auditable.foxml.xml
 - spec/internal/README.rdoc
@@ -399,6 +400,7 @@ test_files:
 - spec/internal/app/controllers/application_controller.rb
 - spec/internal/app/controllers/catalog_controller.rb
 - spec/internal/app/helpers/application_helper.rb
+- spec/internal/app/helpers/blacklight_helper.rb
 - spec/internal/app/mailers/.gitkeep
 - spec/internal/app/models/.gitkeep
 - spec/internal/app/models/ability.rb
@@ -406,7 +408,6 @@ test_files:
 - spec/internal/app/models/content_model.rb
 - spec/internal/app/models/solr_document.rb
 - spec/internal/app/models/user.rb
-- spec/internal/app/views/catalog/_show_default.html.erb
 - spec/internal/app/views/layouts/application.html.erb
 - spec/internal/config.ru
 - spec/internal/config/application.rb
@@ -434,6 +435,7 @@ test_files:
 - spec/internal/db/schema.rb
 - spec/internal/lib/assets/.gitkeep
 - spec/internal/log/.gitkeep
+- spec/internal/public/403.html
 - spec/internal/public/404.html
 - spec/internal/public/422.html
 - spec/internal/public/500.html

data/app/controllers/fcrepo_admin/audit_trail_controller.rb

@@ -1,17 +0,0 @@
-module FcrepoAdmin
-  class AuditTrailController < ApplicationController
-
-    include FcrepoAdmin::ControllerBehavior
-
-    before_filter :load_and_authz_object
-  
-    def index
-      # XXX Update when new version of ActiveFedora released
-      @audit_trail = @object.respond_to?(:audit_trail) ? @object.audit_trail : @object.inner_object.audit_trail
-      if params[:download]
-        send_data @audit_trail.to_xml, :disposition => 'inline', :type => 'text/xml'
-      end
-    end
-  
-  end
-end

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

@@ -1,19 +0,0 @@
-<h3><%= t("fcrepo_admin.datastream.title").pluralize %></h3>
-<table class="table table-bordered table-condensed">
-  <thead>
-    <tr>
-	  <th scope="col"><%= t("fcrepo_admin.datastream.id") %></th>
-	  <th scope="col"><%= t("fcrepo_admin.datastream.label") %></th>
-	  <th scope="col"><%= t("fcrepo_admin.datastream.mimetype") %></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% datastreams.reject { |dsid, dsProfile| dsProfile.empty? }.each do |dsid, dsProfile| %>
-    <tr>
-	  <td><%= link_to dsid, fcrepo_admin.object_datastream_path(pid, dsid) %></td>
-	  <td><%= dsProfile["dsLabel"] %></td>
-	  <td><%= dsProfile["dsMIME"] %></td>
-    </tr>
-    <% end %>
-  </tbody>
-</table>

data/app/views/fcrepo_admin/catalog/_show.html.erb

@@ -1,2 +0,0 @@
-<%= render :partial => 'fcrepo_admin/catalog/datastreams', :locals => {:datastreams => document.datastreams, :pid => document.id} %>
-<%= render :partial => 'fcrepo_admin/objects/more_info', :locals => {:pid => document.id} %>

data/lib/assets/stylesheets/fcrepo_admin/fcrepo_admin.css

@@ -1,4 +0,0 @@
-#fcrepo-admin-dsprofile { 
-	/* datastream profile table */
-	width: 40em;
-}

data/spec/controllers/audit_trail_controller_spec.rb

@@ -1,20 +0,0 @@
-require 'spec_helper'
-
-describe FcrepoAdmin::AuditTrailController do
-  context "#index" do
-    let(:object) { FactoryGirl.create(:content_model) }
-    after { object.delete }
-    it "should render the index template" do
-      get :index, :object_id => object, :use_route => 'fcrepo_admin'
-      response.should render_template(:index)
-    end
-  end
-  context "#index?download=true" do
-    context "object does not respond to audit_trail" do
-      subject { get :index, :object_id => object, :download => 'true', :use_route => 'fcrepo_admin' }
-      let(:object) { FactoryGirl.create(:content_model) }
-      after { object.delete }
-      its(:response_code) { should eq(200) }
-    end
-  end
-end

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

@@ -1,21 +0,0 @@
-require 'spec_helper'
-
-describe "catalog/show.html.erb" do
-  after { object.delete }
-  context "basic object" do
-    let(:object) { FactoryGirl.create(:content_model) }
-    it "should link to all datastreams" do
-      visit catalog_path(object)
-      object.datastreams.reject { |dsid, ds| ds.profile.empty? }.each_key do |dsid|
-        page.should have_link(dsid, :href => fcrepo_admin.object_datastream_path(object, dsid))
-      end
-    end
-    it "should link to its audit trail" do
-      visit catalog_path(object)
-      page.should have_link(I18n.t("fcrepo_admin.audit_trail.title"))
-    end
-  end
-  context "object has admin policy" do
-    it "should link to the APO"
-  end
-end

data/spec/internal/app/views/catalog/_show_default.html.erb

@@ -1,12 +0,0 @@
-<%# default partial to display solr document fields in catalog show view -%>
-<dl class="dl-horizontal  dl-invert">
-  <% document_show_fields.each do |solr_fname, field| -%>
-    <% if should_render_show_field? document, field %>
-    <dt class="blacklight-<%= solr_fname.parameterize %>"><%= render_document_show_field_label :field => solr_fname %></dt>
-    <dd class="blacklight-<%= solr_fname.parameterize %>"><%= render_document_show_field_value :document => document, :field => solr_fname %></dd>
-    <% end -%>
-  <% end -%>
-</dl>
-<%# end blacklight default -%>
-
-<%= render :partial => 'fcrepo_admin/catalog/show', :locals => {:document => document} %>