fcrepo_admin 0.2.0 → 0.2.3

data/app/controllers/fcrepo_admin/datastreams_controller.rb

@@ -4,12 +4,12 @@ module FcrepoAdmin
   class DatastreamsController < ApplicationController
 
     include FcrepoAdmin::ControllerBehavior
-    # include CanCan::ControllerAdditions
 
     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
+    before_filter :load_and_authz_datastream, :except => [:index, :download]
+    before_filter :load_datastream, :only => :download
     before_filter :inline_filter, :only => [:show, :edit]
 
     def index
@@ -19,6 +19,7 @@ module FcrepoAdmin
     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
@@ -28,10 +29,7 @@ module FcrepoAdmin
 
     def update
       if params[:file]
-        File.open(params[:file], 'rb') do |f|
-          # FIXME read in chunks
-          @datastream.content = f.read
-        end
+        @datastream.content = params[:file].read
       else
         @datastream.content = params[:content]
       end

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

@@ -3,16 +3,16 @@
 <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")  %>
+    <%= 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 %>
-  <div>
-    <%= label_tag "file", t("fcrepo_admin.datastream.edit.file")  %>
-    <%= file_field_tag "file" %>
-  </div>
   <p>
 	<%= submit_tag t("fcrepo_admin.datastream.edit.submit"), :confirm => t("fcrepo_admin.datastream.edit.confirm"), :class => "btn btn-primary" %>
   </p>

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

@@ -0,0 +1,18 @@
+<table class="table table-bordered table-condensed">
+  <thead>
+	<tr>
+	  <th scope="col"><%= t("fcrepo_admin.object.permissions.type") %></th>
+	  <th scope="col"><%= t("fcrepo_admin.object.permissions.name") %></th>
+	  <th scope="col"><%= t("fcrepo_admin.object.permissions.access") %></th>
+	</tr>
+  </thead>
+  <tbody>
+	<% object.permissions.each do |p| %>
+    <tr>
+	  <td><%= p[:type] %></td>
+	  <td><%= p[:name] %></td>
+	  <td><%= p[:access] %></td>
+    </tr>
+	<% end %>
+  </tbody>
+</table>

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

@@ -2,16 +2,20 @@
 
 <div class="tabbable">
   <ul class="nav nav-tabs">
-    <li class="active"><a href="#tab1" data-toggle="tab"><%= t("fcrepo_admin.object.tabs.datastreams") %></a></li>
-    <li><a href="#tab2" data-toggle="tab"><%= t("fcrepo_admin.object.tabs.properties") %></a></li>
+    <li class="active"><a href="#tab-datastreams" data-toggle="tab"><%= t("fcrepo_admin.object.tabs.datastreams") %></a></li>
+    <li><a href="#tab-properties" data-toggle="tab"><%= t("fcrepo_admin.object.tabs.properties") %></a></li>
+    <li><a href="#tab-permissions" data-toggle="tab"><%= t("fcrepo_admin.object.tabs.permissions") %></a></li>
   </ul>
   <div class="tab-content">
-    <div class="tab-pane active" id="tab1">
+    <div class="tab-pane active" id="tab-datastreams">
 	  <%= render :partial => 'fcrepo_admin/datastreams/datastreams', :locals => {:datastreams => @object.datastreams} %>
     </div>
-    <div class="tab-pane" id="tab2">
+    <div class="tab-pane" id="tab-properties">
 	  <%= render :partial => 'properties', :locals => {:properties => @properties} %>
     </div>
+    <div class="tab-pane" id="tab-permissions">
+	  <%= render :partial => 'permissions', :locals => {:object => @object} %>
+    </div>
   </div>
 </div>
 

data/config/locales/fcrepo_admin.en.yml

@@ -5,6 +5,7 @@ en:
       tabs:
         datastreams: 'Datastreams'
         properties: 'Properties'
+        permissions: 'Permissions'
       properties:
         title: 'Properties'
         keys:
@@ -13,6 +14,10 @@ en:
           create_date: 'Create Date'
           modified_date: 'Modified Date'
           label: 'Label'
+      permissions:
+        type: 'Type'
+        name: 'Name'
+        access: 'Access'
     audit_trail: 
       title: 'Audit Trail'
       download: 'Download'

data/lib/fcrepo_admin/version.rb

@@ -1,3 +1,3 @@
 module FcrepoAdmin
-  VERSION = "0.2.0"
+  VERSION = "0.2.3"
 end

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

@@ -22,6 +22,7 @@ describe "objects/show.html.erb" 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))
     end
+    it "should display the object's permissions"
     context "object governed by an admin policy" do
       it "should link to the APO"
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fcrepo_admin
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -272,6 +272,7 @@ files:
 - 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/_permissions.html.erb
 - app/views/fcrepo_admin/objects/_properties.html.erb
 - app/views/fcrepo_admin/objects/show.html.erb
 - config/locales/fcrepo_admin.en.yml
@@ -288,7 +289,6 @@ files:
 - lib/fcrepo_admin/version.rb
 - lib/tasks/.gitkeep
 - lib/tasks/fcrepo_admin.rake
-- script/rails
 - spec/controllers/audit_trail_controller_spec.rb
 - spec/controllers/datastreams_controller_spec.rb
 - spec/factories/fcrepo_admin_factories.rb
@@ -369,7 +369,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3734139466657518267
+      hash: 3240411754357515048
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25

data/script/rails

@@ -1,6 +0,0 @@
-#!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
-
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
-require File.expand_path('../../config/boot',  __FILE__)
-require 'rails/commands'