fcrepo_admin 0.3.1 → 0.3.2

data/HISTORY.rdoc

@@ -1,12 +1,17 @@
-=== 0.3.0
+=== 0.3.1
+
+* Object and datastream context nav menus added.
+* Audit trail moved into objects controller
+
+== 0.3.0
 
 * Feature: Permissions and inherited permissions added to object show view.
 
-=== 0.2.0
+== 0.2.0
 
 * Feature: Datastream content editing.
 
-=== 0.1.0
+== 0.1.0
 
 Initial release to RubyGems.
 

data/app/controllers/fcrepo_admin/datastreams_controller.rb

@@ -3,68 +3,74 @@ require 'mime/types'
 module FcrepoAdmin
   class DatastreamsController < ApplicationController
 
-    # 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']
+    MAX_INLINE_SIZE = 1024 * 64
 
-    # before_filter :load_and_authorize_object, :only => :index
-    before_filter :load_and_authorize_datastream # , :except => :index
-    # before_filter :load_datastream, :only => :download
+    before_filter :load_and_authorize_datastream
     before_filter :inline_filter, :only => [:show, :edit]
 
-    # 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
-    #   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
 
+    def upload
+    end
+
     def update
-      if params[:file]
+      if params[:file] # file uploaded
         @datastream.content = params[:file].read
-      else
+      else # content submitted
         @datastream.content = params[:content]
       end
       @object.save
-      flash[:notice] = "Datastream content updated."
+      flash[:notice] = "Datastream content updated." # i18n
       redirect_to fcrepo_admin.object_datastream_url(@object, @datastream.dsid)
     end
 
     private
 
     def load_and_authorize_datastream
+      load_object
       load_datastream
       authorize_datastream
     end
+    
+    def load_object
+      @object = ActiveFedora::Base.find(params[:object_id], :cast => true)
+    end
 
     def load_datastream
-      @object = ActiveFedora::Base.find(params[:object_id], :cast => true)
       @datastream = @object.datastreams[params[:id]]
     end
 
     def authorize_datastream
+      action = case params[:action]
+               when 'upload'
+                 :edit
+               when 'download'
+                 :read
+               else
+                 params[:action].to_sym
+               end
       # Datastream permissions are solely based on object permissions
-      authorize! params[:action].to_sym, @object
+      authorize! action, @object
     end
 
     protected
 
     def inline_filter
       @inline = @datastream.mimeType.start_with?('text/') || TEXT_MIME_TYPES.include?(@datastream.mimeType)
+      # @inline &&= @datastream.dsSize <= MAX_INLINE_SIZE
     end
 
   end

data/app/controllers/fcrepo_admin/objects_controller.rb

@@ -5,14 +5,10 @@ module FcrepoAdmin
     
     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 :load_and_authorize_object
-    before_filter :load_apo_info, :only => :show  # depends on load_and_authz_object
+    before_filter :load_apo_info, :only => :show
 
     def show
     end
@@ -43,49 +39,28 @@ module FcrepoAdmin
 
     protected
 
-    def apo_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_properties
-      properties = {}
-      PROPERTIES.each { |p| properties[p] = @object.send(p) }
-      properties
-    end
-
-    def object_type
-      @object.class.to_s
+      unless @object_properties
+        @object_properties = {}
+        PROPERTIES.each { |p| @object_properties[p] = @object.send(p) }
+      end
+      @object_properties
     end
 
-    def load_apo_info
-      @apo_relationship_name = nil
-      @apo = nil
+    def apo_relationship_name
       @object.reflections.each_value do |reflection|
-        if reflection.options[:property] == :is_governed_by \
-          && reflection.macro == :belongs_to
-          @apo_relationship_name = reflection.name
-          @apo = @object.send(@apo_relationship_name)
-          break
-        end
+        # XXX This test should also check that reflection class is identical to admin policy class
+        return reflection.name if reflection.options[:property] == :is_governed_by && reflection.macro == :belongs_to
       end
+      nil
     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)
+    def load_apo_info
+      @apo_relationship_name ||= apo_relationship_name
+      @object_admin_policy ||= @apo_relationship_name ? @object.send(@apo_relationship_name) : nil
+      # Including Hydra::PolicyAwareAccessControlsEnforcement in ApplicationController 
+      # appears to be the only way that APO access control enforcement can be enabled.
+      @apo_enforcement_enabled ||= self.class.ancestors.include?(Hydra::PolicyAwareAccessControlsEnforcement)
     end
 
   end

data/app/helpers/fcrepo_admin/objects_helper.rb

@@ -2,7 +2,47 @@ module FcrepoAdmin
   module ObjectsHelper
 
     def object_title
-      "#{@object.class.to_s} #{@object.pid}"
+      "#{object_type} #{@object.pid}"
+    end
+
+    def object_type
+      @object.class.to_s
+    end
+
+    def object_has_permissions?
+      @object.is_a?(Hydra::ModelMixins::RightsMetadata)
+    end
+
+    def object_model_belongs_to_apo?
+      !@apo_relationship_name.nil?
+    end
+
+    def object_admin_policy
+      @object_admin_policy
+    end
+
+    def object_has_admin_policy?
+      !object_admin_policy.nil?
+    end
+
+    def object_has_inherited_permissions?
+      object_has_admin_policy?
+    end
+
+    def object_inherited_permissions
+      object_admin_policy && object_admin_policy.default_permissions
+    end
+
+    def admin_policy_enforcement_enabled?
+      @apo_enforcement_enabled
+    end
+
+    def admin_policy_object?
+      # 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.
+      @object.is_a?(Hydra.config[:permissions].fetch(:policy_class, Hydra::AdminPolicy))
     end
 
   end

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

@@ -5,7 +5,3 @@
     <%= t("fcrepo_admin.datastream.content_not_text") %>.
   </p>
 <% end %>
-<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/_context_nav_items.html.erb

@@ -0,0 +1,17 @@
+<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(object, datastream.dsid) %>
+</li>
+<% if 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>
+<li>
+  <%= link_to_unless_current t("fcrepo_admin.datastream.nav.items.upload"), fcrepo_admin.upload_object_datastream_path(object, datastream.dsid) %>
+</li>
+<% end %>
+<li>
+  <%= link_to t("fcrepo_admin.datastream.nav.items.download"), fcrepo_admin.download_object_datastream_path(object, datastream.dsid) %>
+</li>

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

@@ -1,15 +1,9 @@
-<%= 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")  %>
-    <%= file_field_tag "file" %>
-  </div>
-  <% if @inline %>
-    <div>
-      <%= label_tag "content", t("fcrepo_admin.datastream.edit.content") %>
-      <%= text_area_tag "content", @datastream.content, :size => "50x20", :class => "field span9" %>
-	</div>
-  <% end %>
-  <p>
-	<%= submit_tag t("fcrepo_admin.datastream.edit.submit"), :confirm => t("fcrepo_admin.datastream.edit.confirm"), :class => "btn btn-primary" %>
-  </p>
+<h4><%= t("fcrepo_admin.datastream.edit.header") %></h4>
+<%= form_tag fcrepo_admin.object_datastream_path(@datastream.pid, @datastream.dsid), :method => :put do %>
+<div>
+  <%= text_area_tag "content", @datastream.content, :size => "50x20", :class => "field", :style => "width: 100%" %>
+</div>
+<p>
+  <%= submit_tag t("fcrepo_admin.datastream.edit.submit"), :confirm => t("fcrepo_admin.datastream.edit.confirm"), :class => "btn btn-primary" %>
+</p>
 <% end %>

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

@@ -0,0 +1,10 @@
+<h4><%= t("fcrepo_admin.datastream.upload.header") %></h4>
+<%= form_tag fcrepo_admin.object_datastream_path(@datastream.pid, @datastream.dsid), :method => :put, :multipart => true do %>
+<div>
+  <%= file_field_tag "file" %>
+</div>
+<p>
+  <%= submit_tag t("fcrepo_admin.datastream.upload.submit"), :confirm => t("fcrepo_admin.datastream.upload.confirm"), :class => "btn btn-primary" %>
+</p>
+<% end %>
+

data/app/views/fcrepo_admin/objects/_context_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/objects/_properties.html.erb

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

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

@@ -1,19 +1,19 @@
-<h3><%= t("fcrepo_admin.audit_trail.title") %></h3>
+<h3><%= t("fcrepo_admin.object.audit_trail.title") %></h3>
 
 <p>
-	<%= link_to t("fcrepo_admin.audit_trail.download"), "#{fcrepo_admin.audit_trail_object_path(@object)}?download=true", :class => "btn btn-primary" %>
+	<%= link_to t("fcrepo_admin.object.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">
 	<thead>
 		<tr>
-			<th scope="col"><%= t("fcrepo_admin.audit_trail.record.id") %></th>
-			<th scope="col"><%= t("fcrepo_admin.audit_trail.record.process_type") %></th>
-			<th scope="col"><%= t("fcrepo_admin.audit_trail.record.action") %></th>
-			<th scope="col"><%= t("fcrepo_admin.audit_trail.record.component_id") %></th>
-			<th scope="col"><%= t("fcrepo_admin.audit_trail.record.responsibility") %></th>
-			<th scope="col"><%= t("fcrepo_admin.audit_trail.record.date") %></th>
-			<th scope="col"><%= t("fcrepo_admin.audit_trail.record.justification") %></th>
+			<th scope="col"><%= t("fcrepo_admin.object.audit_trail.record.id") %></th>
+			<th scope="col"><%= t("fcrepo_admin.object.audit_trail.record.process_type") %></th>
+			<th scope="col"><%= t("fcrepo_admin.object.audit_trail.record.action") %></th>
+			<th scope="col"><%= t("fcrepo_admin.object.audit_trail.record.component_id") %></th>
+			<th scope="col"><%= t("fcrepo_admin.object.audit_trail.record.responsibility") %></th>
+			<th scope="col"><%= t("fcrepo_admin.object.audit_trail.record.date") %></th>
+			<th scope="col"><%= t("fcrepo_admin.object.audit_trail.record.justification") %></th>
 		</tr>
 	</thead>
 	<tbody>

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

@@ -9,29 +9,29 @@
 	  <%= render :partial => 'fcrepo_admin/datastreams/datastreams', :locals => {:datastreams => @object.datastreams} %>
     </div>
     <div class="tab-pane" id="tab-properties">
-	  <%= render :partial => 'properties', :locals => {:properties => object_properties} %>
+	  <%= render 'properties' %>
     </div>
     <div class="tab-pane" id="tab-permissions">
-	<% if has_permissions? %>
+	<% if object_has_permissions? %>
       <h4>Direct Permissions</h4>
 	  <%= render :partial => 'permissions', :locals => {:permissions => @object.permissions} %>
 	  <h4>Inherited Permissions</h4>
-	  <% unless apo_enforcement_enabled? %>
+	  <% unless admin_policy_enforcement_enabled? %>
 	    <p class="alert">
 		  <%= t("fcrepo_admin.object.apo.enforcement_disabled") %>.
 	    </p>
 	  <% end %>
-	  <% if @apo_relationship_name %>
+	  <% if object_model_belongs_to_apo? %>
 	    <p>
 		  <%= t("fcrepo_admin.object.apo.governed_by") %>: 
-		  <% if @apo %>
-		    <%= link_to @apo.pid, fcrepo_admin.object_path(@apo.pid) %>
+		  <% if object_has_admin_policy? %>
+		    <%= link_to object_admin_policy.pid, fcrepo_admin.object_path(object_admin_policy) %>
 	      <% else %>
 		    <span class="label"><%= t("fcrepo_admin.object.apo.not_assigned") %></span>
 		  <% end %>
 	    </p>
-		<% if @apo %>
-	      <%= render :partial => 'permissions', :locals => {:permissions => @apo.default_permissions} %>
+		<% if object_has_inherited_permissions? %>
+	      <%= render :partial => 'permissions', :locals => {:permissions => object_inherited_permissions} %>
 		<% end %>
 	  <% else %>
 	    <p class="alert alert-info">

data/app/views/fcrepo_admin/shared/_context_nav_list.html.erb

@@ -0,0 +1,5 @@
+<div class="well">
+  <ul class="nav nav-list">
+	<%= yield %>
+  </ul>
+</div>

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

@@ -4,6 +4,7 @@
   <%= yield %>
 <% end %>
 <% content_for :sidebar do %>
-  <%= render :partial => 'fcrepo_admin/datastreams/datastream_nav', :locals => {:datastream => @datastream, :object => @object} %>
+  <%= render :partial => 'fcrepo_admin/objects/context_nav_items', :locals => {:object => @object}, :layout => 'fcrepo_admin/shared/context_nav_list' %>
+  <%= render :partial => 'fcrepo_admin/datastreams/context_nav_items', :locals => {:datastream => @datastream, :object => @object}, :layout => 'fcrepo_admin/shared/context_nav_list' %>
 <% end %>
 <%= render :template => 'layouts/fcrepo_admin/default' %>

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

@@ -3,6 +3,6 @@
   <%= yield %>
 <% end %>
 <% content_for :sidebar do %>
-  <%= render :partial => 'fcrepo_admin/objects/object_nav', :locals => {:object => @object} %>
+  <%= render :partial => 'fcrepo_admin/objects/context_nav_items', :locals => {:object => @object}, :layout => 'fcrepo_admin/shared/context_nav_list' %>
 <% end %>
 <%= render :template => 'layouts/fcrepo_admin/default' %>

data/config/locales/fcrepo_admin.en.yml

@@ -30,17 +30,17 @@ en:
         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'
-    audit_trail: 
-      title: 'Audit Trail'
-      download: 'Download'
-      record:
-        id: 'Record ID'
-        process_type: 'Process Type'
-        action: 'Action'
-        component_id: 'Component ID'
-        responsibility: 'Responsibility'
-        date: 'Date'
-        justification: 'Justification'
+      audit_trail: 
+        title: 'Audit Trail'
+        download: 'Download'
+        record:
+          id: 'Record ID'
+          process_type: 'Process Type'
+          action: 'Action'
+          component_id: 'Component ID'
+          responsibility: 'Responsibility'
+          date: 'Date'
+          justification: 'Justification'
     datastreams:
       title: 'Datastreams'
       header:
@@ -55,6 +55,7 @@ en:
         items:
           summary: 'Datastream Summary'
           edit: 'Edit Content'
+          upload: 'Upload Content'
           download: 'Download Content'
           object: 'Object Admin'
       tabs:
@@ -78,8 +79,12 @@ en:
         dsChecksumType: 'Checksum Type'
         dsChecksum: 'Checksum'
       edit:
-        file: 'Upload File'
-        content: 'Replace Content'
+        header: 'Edit Content'
+        confirm: "These changes are not validated and cannot be undone!"
+        submit: 'Update'
+      upload:
+        header: 'Upload Content'
         confirm: "These changes are not validated and cannot be undone!"
-        submit: 'Update Content'
+        submit: 'Upload'
+
 

data/config/routes.rb

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

data/lib/fcrepo_admin/version.rb

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

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

@@ -17,9 +17,6 @@ describe "datastreams/edit.html.erb" do
     user.delete
     object.delete
     Warden.test_reset!
-  end
-  it "should provide an upload form to replace content" do
-    
   end
   it "should provide a text field to edit/replace text content" do
     fill_in "content", :with => <<EOS

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.object_datastream_path(object, dsid)}?download=true")
+    page.should have_link(I18n.t("fcrepo_admin.datastream.download"), :href => fcrepo_admin.download_object_datastream_path(object, dsid))
   end
   context "user can edit" do
     let(:user) { FactoryGirl.create(:user) }

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

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+RSpec.configure do |c|
+  Warden.test_mode!
+end
+
+describe "datastreams/upload.html.erb" do
+  let(:object) { FactoryGirl.create(:content_model) }
+  let(:user) { FactoryGirl.create(:user) }
+  before { 
+    object.permissions = [{type: 'user', name: user.email, access: 'edit'}]
+    object.save
+    login_as(user, :scope => :user, :run_callbacks => false) 
+    visit fcrepo_admin.upload_object_datastream_path(object, "descMetadata")
+  }
+  after do
+    user.delete
+    object.delete
+    Warden.test_reset!
+  end
+  it "should provide an upload form" do
+    attach_file "file", File.join(Rails.root, "spec", "fixtures", "files", "descMetadata.xml")
+    click_button I18n.t("fcrepo_admin.datastream.upload.submit")
+    object.reload
+    object.title.should == "Altered Test Component"
+  end
+end

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

@@ -6,6 +6,6 @@ describe "audit_trail.html.erb" do
   it "should display the audit trail" do
     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.audit_trail_object_path(object)}?download=true")
+    page.should have_link(I18n.t("fcrepo_admin.object.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.audit_trail_object_path(object))
+      page.should have_link(I18n.t("fcrepo_admin.object.audit_trail.title"), :href => fcrepo_admin.audit_trail_object_path(object))
     end
     it "should display the object's permissions"
   end
@@ -29,7 +29,7 @@ describe "objects/show.html.erb" do
     after { object.admin_policy.delete }
     it "should link to the APO" do
       visit fcrepo_admin.object_path(object)
-      page.should have_link(object.admin_policy.pid, :href => fcrepo_admin.object_path(object.admin_policy.pid))
+      page.should have_link(object.admin_policy.pid, :href => fcrepo_admin.object_path(object.admin_policy))
     end
     it "should display the inherited permissions"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fcrepo_admin
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2013-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -262,21 +262,23 @@ files:
 - app/mailers/.gitkeep
 - app/models/.gitkeep
 - app/views/fcrepo_admin/datastreams/_content.html.erb
+- app/views/fcrepo_admin/datastreams/_context_nav_items.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/datastreams/upload.html.erb
+- app/views/fcrepo_admin/objects/_context_nav_items.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/fcrepo_admin/shared/_context_nav_list.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
@@ -287,7 +289,6 @@ files:
 - lib/assets/.gitkeep
 - 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
 - lib/fcrepo_admin/solr_document_extension.rb
@@ -300,9 +301,9 @@ files:
 - spec/factories/user_factories.rb
 - spec/features/datastreams/edit.html.erb_spec.rb
 - spec/features/datastreams/show.html.erb_spec.rb
+- spec/features/datastreams/upload.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
 - spec/internal/Rakefile
 - spec/internal/app/assets/javascripts/application.js
@@ -375,7 +376,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1033224864064252852
+      hash: 1491170108417626237
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -389,9 +390,9 @@ test_files:
 - spec/factories/user_factories.rb
 - spec/features/datastreams/edit.html.erb_spec.rb
 - spec/features/datastreams/show.html.erb_spec.rb
+- spec/features/datastreams/upload.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
 - spec/internal/Rakefile
 - spec/internal/app/assets/javascripts/application.js

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

@@ -1,5 +0,0 @@
-<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

@@ -1,9 +0,0 @@
-	<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/lib/fcrepo_admin/controller_behavior.rb

@@ -1,32 +0,0 @@
-module FcrepoAdmin
-  module ControllerBehavior
-
-    def load_and_authz_object
-      load_object
-      authorize_object
-    end
-
-    def load_object
-      @object = ActiveFedora::Base.find(params[:id], :cast => true)
-    end
-
-    def authorize_object
-      authorize! params[:action].to_sym, @object
-    end
-
-    def load_and_authz_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
-      authorize! params[:action].to_sym, @datastream
-    end
-
-  end
-end

data/spec/fixtures/auditable.foxml.xml

@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<foxml:digitalObject VERSION="1.1" PID="changeme:242"
-xmlns:foxml="info:fedora/fedora-system:def/foxml#"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/definitions/1/0/foxml1-1.xsd">
-<foxml:objectProperties>
-<foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
-<foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE=""/>
-<foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
-<foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2013-02-25T16:43:05.802Z"/>
-<foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2013-02-25T16:43:06.379Z"/>
-</foxml:objectProperties>
-<foxml:datastream ID="AUDIT" STATE="A" CONTROL_GROUP="X" VERSIONABLE="false">
-<foxml:datastreamVersion ID="AUDIT.0" LABEL="Audit Trail for this object" CREATED="2013-02-25T16:43:05.802Z" MIMETYPE="text/xml" FORMAT_URI="info:fedora/fedora-system:format/xml.fedora.audit">
-<foxml:xmlContent>
-<audit:auditTrail xmlns:audit="info:fedora/fedora-system:def/audit#">
-<audit:record ID="AUDREC1">
-<audit:process type="Fedora API-M"/>
-<audit:action>addDatastream</audit:action>
-<audit:componentID>RELS-EXT</audit:componentID>
-<audit:responsibility>fedoraAdmin</audit:responsibility>
-<audit:date>2013-02-25T16:43:06.219Z</audit:date>
-<audit:justification></audit:justification>
-</audit:record>
-<audit:record ID="AUDREC2">
-<audit:process type="Fedora API-M"/>
-<audit:action>addDatastream</audit:action>
-<audit:componentID>descMetadata</audit:componentID>
-<audit:responsibility>fedoraAdmin</audit:responsibility>
-<audit:date>2013-02-25T16:43:06.315Z</audit:date>
-<audit:justification></audit:justification>
-</audit:record>
-<audit:record ID="AUDREC3">
-<audit:process type="Fedora API-M"/>
-<audit:action>addDatastream</audit:action>
-<audit:componentID>rightsMetadata</audit:componentID>
-<audit:responsibility>fedoraAdmin</audit:responsibility>
-<audit:date>2013-02-25T16:43:06.379Z</audit:date>
-<audit:justification></audit:justification>
-</audit:record>
-</audit:auditTrail>
-</foxml:xmlContent>
-</foxml:datastreamVersion>
-</foxml:datastream>
-<foxml:datastream ID="DC" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
-<foxml:datastreamVersion ID="DC1.0" LABEL="Dublin Core Record for this object" CREATED="2013-02-25T16:43:05.802Z" MIMETYPE="text/xml" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/" SIZE="341">
-<foxml:contentDigest TYPE="SHA-256" DIGEST="eb075bf6da5903e54464631dc998f66f95bffde9f4137132796457d31de5cd44"/>
-<foxml:xmlContent>
-<oai_dc:dc xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
-  <dc:identifier>changeme:242</dc:identifier>
-</oai_dc:dc>
-</foxml:xmlContent>
-</foxml:datastreamVersion>
-</foxml:datastream>
-<foxml:datastream ID="RELS-EXT" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
-<foxml:datastreamVersion ID="RELS-EXT.0" LABEL="Fedora Object-to-Object Relationship Metadata" CREATED="2013-02-25T16:43:06.219Z" MIMETYPE="application/rdf+xml" SIZE="284">
-<foxml:contentDigest TYPE="SHA-256" DIGEST="013d2229de7bd91c61256563eff1b475cd1e8f7e45a2f15de5a36f2d20ec2852"/>
-<foxml:xmlContent>
-<rdf:RDF xmlns:ns0="info:fedora/fedora-system:def/model#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-  <rdf:Description rdf:about="info:fedora/changeme:242">
-    <ns0:hasModel rdf:resource="info:fedora/afmodel:TestModel"></ns0:hasModel>
-  </rdf:Description>
-</rdf:RDF>
-</foxml:xmlContent>
-</foxml:datastreamVersion>
-</foxml:datastream>
-<foxml:datastream ID="descMetadata" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
-<foxml:datastreamVersion ID="descMetadata.0" LABEL="" CREATED="2013-02-25T16:43:06.315Z" MIMETYPE="text/xml" SIZE="215">
-<foxml:contentDigest TYPE="SHA-256" DIGEST="3f588eca58dea77b31c9ed0b90e4560288a419856c4bb744fab9c7fe8749ad19"/>
-<foxml:xmlContent>
-<dc xmlns:dcterms="http://purl.org/dc/terms/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <dcterms:title>Fcrepo Test Object</dcterms:title>
-  <dcterms:identifier>test00001</dcterms:identifier>
-</dc>
-</foxml:xmlContent>
-</foxml:datastreamVersion>
-</foxml:datastream>
-<foxml:datastream ID="rightsMetadata" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
-<foxml:datastreamVersion ID="rightsMetadata.0" LABEL="" CREATED="2013-02-25T16:43:06.379Z" MIMETYPE="text/xml" SIZE="596">
-<foxml:contentDigest TYPE="SHA-256" DIGEST="472f8634b31bd425dadd9206531ab02a70c08c22e4250bb2b0d3dd0314cfb240"/>
-<foxml:xmlContent>
-<rightsMetadata xmlns="http://hydra-collab.stanford.edu/schemas/rightsMetadata/v1" version="0.1">
-  <copyright>
-    <human type="title"></human>
-    <human type="description"></human>
-    <machine type="uri"></machine>
-  </copyright>
-  <access type="discover">
-    <human></human>
-    <machine></machine>
-  </access>
-  <access type="read">
-    <human></human>
-    <machine>
-      <group>public</group>
-    </machine>
-  </access>
-  <access type="edit">
-    <human></human>
-    <machine></machine>
-  </access>
-  <embargo>
-    <human></human>
-    <machine></machine>
-  </embargo>
-</rightsMetadata>
-</foxml:xmlContent>
-</foxml:datastreamVersion>
-</foxml:datastream>
-</foxml:digitalObject>