fcrepo_admin 0.4.1 → 0.5.0

data/lib/fcrepo_admin/version.rb

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

data/spec/controllers/datastreams_controller_spec.rb

@@ -1,67 +1,91 @@
 require 'spec_helper'
 
-# shared_examples "a datastream profile view" do
-#   it { should render_template(:show) }
-# end
-
 describe FcrepoAdmin::DatastreamsController do
-  before do
-    @object = FactoryGirl.create(:item)
-    @dsid = "descMetadata"
-  end
-  after { @object.delete }
+  let(:object) { FactoryGirl.create(:item) }
+  after { object.delete }
   context "#show" do
-    subject { get :show, :object_id => @object, :id => @dsid, :use_route => 'fcrepo_admin' }
-    it { should render_template(:show) }
+    it "should render the show template" do
+      get :show, :object_id => object, :id => object.descMetadata, :use_route => 'fcrepo_admin'
+      response.should be_successful
+      response.should render_template(:show)
+    end
   end
-  context "#show" do
-    subject { get :content, :object_id => @object, :id => @dsid, :use_route => 'fcrepo_admin' }
-    it { should render_template(:content) }
+  context "#content" do
+    it "should render the content template" do
+      get :content, :object_id => object, :id => object.descMetadata, :use_route => 'fcrepo_admin'
+      response.should be_successful
+      response.should render_template(:content)
+    end
   end
   context "#download" do
-    subject { get :download, :object_id => @object, :id => @dsid, :use_route => 'fcrepo_admin' }
+    subject { get :download, :object_id => object, :id => object.descMetadata, :use_route => 'fcrepo_admin' }
     it { should be_successful }
   end
   context "change methods" do
     let(:user) { FactoryGirl.create(:user) }
     before do
-      @object.permissions = [{type: 'user', name: user.email, access: 'edit'}]
-      @object.save
+      object.permissions = [{type: 'user', name: user.email, access: 'edit'}]
+      object.save
       sign_in user
     end
     after { user.delete }
     context "#edit" do
-      subject { get :edit, :object_id => @object, :id => @dsid, :use_route => 'fcrepo_admin' }
-      it { should render_template(:edit) }
+      context "content is editable" do
+        it "should render the edit tenplate" do
+          get :edit, :object_id => object, :id => object.descMetadata, :use_route => 'fcrepo_admin'
+          response.should be_successful
+          response.should render_template(:edit)
+        end
+      end
+      context "content is not editable" do
+        before do
+          object.content.content = File.read(File.join(Rails.root, "spec", "fixtures", "files", "hydra.jpg"), {mode: 'rb'})
+          object.save
+        end
+        subject { get :edit, :object_id => object, :id => object.content, :use_route => 'fcrepo_admin' }
+        its(:response_code) { should eq(403) }
+      end
+    end
+    context "#upload" do
+      context "content is uploadable" do
+        it "should render the upload template" do
+          get :upload, :object_id => object, :id => object.descMetadata, :use_route => 'fcrepo_admin'
+          response.should be_successful
+          response.should render_template(:upload)
+        end
+      end
+      context "content is not uploadable" do
+        subject { get :upload, :object_id => object, :id => object.externalMetadata, :use_route => 'fcrepo_admin' }
+        its(:response_code) { should eq(403) }
+      end
     end
     context "#update" do
       context "content" do
         before do
-          @content = <<EOS
+          content = <<EOS
 <dc xmlns:dcterms="http://purl.org/dc/terms/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <dcterms:title>Altered Test Component</dcterms:title>
 </dc>
 EOS
-          put :update, :object_id => @object, :id => @dsid, :content => @content, :use_route => 'fcrepo_admin'
-          @object.reload
+          put :update, :object_id => object, :id => object.descMetadata, :content => content, :use_route => 'fcrepo_admin'
+          object.reload
         end
         it "should update the datastream content and redirect to the show page" do
-          @object.title.should == "Altered Test Component"
+          object.title.should == "Altered Test Component"
           # TODO get this to work
-          # response.should redirect_to :action => :show, :object_id => @object, :id => @dsid, :use_route => 'fcrepo_admin'
+          # response.should redirect_to :action => :show, :object_id => object, :id => datastream, :use_route => 'fcrepo_admin'
           response.response_code.should == 302
         end
       end
       context "file" do
         before do
-          @file = fixture_file_upload('/files/descMetadata.xml', 'text/xml')
-          put :update, :object_id => @object, :id => @dsid, :file => @file, :use_route => 'fcrepo_admin'
-          @object.reload
+          put :update, :object_id => object, :id => object.descMetadata, :file => fixture_file_upload('/files/descMetadata.xml', 'text/xml'), :use_route => 'fcrepo_admin'
+          object.reload
         end
         it "should update the datastream content and redirect to the show page" do
-          @object.title.should == "Altered Test Component"
+          object.title.should == "Altered Test Component"
           # TODO get this to work
-          # response.should redirect_to :action => :show, :object_id => @object, :id => @dsid, :use_route => 'fcrepo_admin'
+          # response.should redirect_to :action => :show, :object_id => object, :id => datastream, :use_route => 'fcrepo_admin'
           response.response_code.should == 302
         end
       end

data/spec/controllers/objects_controller_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe FcrepoAdmin::ObjectsController do
-  let(:object) { FactoryGirl.create(:item) }
+  let!(:object) { FactoryGirl.create(:item) }
   after { object.delete }
   context "#show" do
     subject { get :show, :id => object, :use_route => 'fcrepo_admin' }

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

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe "datastreams/content.html.erb" do
+  let(:object) { FactoryGirl.create(:item) }
+  after { object.delete }
+  it "should display the datastream content"
+end

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

@@ -24,7 +24,7 @@ describe "datastreams/edit.html.erb" do
   <dcterms:title>Altered Test Component</dcterms:title>
 </dc>
 EOS
-    click_button I18n.t("fcrepo_admin.datastream.edit.submit")
+    click_button I18n.t("fcrepo_admin.datastream.edit.form.submit")
     object.reload
     object.title.should == "Altered Test Component"
   end

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

@@ -4,9 +4,9 @@ describe "datastreams/index.html.erb" do
   before { visit fcrepo_admin.object_datastreams_path(object) }
   after { object.delete }
   let(:object) { FactoryGirl.create(:item) }
-  it "should link to all persisted datastreams" do
-    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))
+  it "should link to all datastreams" do
+    object.datastreams.each do |dsid, ds|
+      page.should have_link(dsid, :href => fcrepo_admin.object_datastream_path(object, ds))
     end
   end  
 end

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

@@ -6,18 +6,41 @@ end
 
 describe "datastreams/show.html.erb" do
   let!(:object) { FactoryGirl.create(:item) }
-  let(:dsid) { "descMetadata" }
-  before { visit fcrepo_admin.object_datastream_path(object, dsid) }
   after { object.delete }
-  it "should display all attributes of the datastream profile" do
-    profile = object.datastreams[dsid].profile
-    profile.each do |key, value|
-      # TODO use paths
-      page.should have_content(I18n.t("fcrepo_admin.datastream.profile.#{key}"))
+  context "user can read" do
+    before { visit fcrepo_admin.object_datastream_path(object, datastream) }
+    context "content is text" do
+      let(:datastream) { object.descMetadata }
+      it "should display all attributes of the datastream profile" do
+        datastream.profile.each do |key, value|
+          page.should have_content(I18n.t("fcrepo_admin.datastream.profile.keys.#{key}"))
+        end
+      end
+      it "should have a link to download the datastream content" do
+        page.should have_link(I18n.t("fcrepo_admin.datastream.nav.items.content"), :href => fcrepo_admin.content_object_datastream_path(object, datastream))
+      end
+      it "should have a link to view the content" do
+        page.should have_link(I18n.t("fcrepo_admin.datastream.nav.items.content"), :href => fcrepo_admin.content_object_datastream_path(object, datastream))
+      end
+    end
+    context "content is not text" do
+      let(:datastream) { object.content }
+      before do
+        datastream.content = File.read(File.join(Rails.root, "spec", "fixtures", "files", "hydra.jpg"), {mode: 'rb'})
+        object.save
+      end
+      it "should not have a link to view the content" do
+        page.should_not have_link(I18n.t("fcrepo_admin.datastream.nav.items.content"), :href => fcrepo_admin.content_object_datastream_path(object, datastream))
+      end
     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))
+  context "user cannot edit" do
+    let(:datastream) { object.descMetadata }
+    before { visit fcrepo_admin.object_datastream_path(object, datastream) }
+    it "should not have links to edit or upload" do
+      page.should_not have_link(I18n.t("fcrepo_admin.datastream.nav.items.edit"), :href => fcrepo_admin.edit_object_datastream_path(object, datastream))
+      page.should_not have_link(I18n.t("fcrepo_admin.datastream.nav.items.upload"), :href => fcrepo_admin.upload_object_datastream_path(object, datastream))
+    end
   end
   context "user can edit" do
     let(:user) { FactoryGirl.create(:user) }
@@ -25,14 +48,23 @@ describe "datastreams/show.html.erb" do
       object.permissions = [{type: 'user', name: user.email, access: 'edit'}]
       object.save
       login_as(user, :scope => :user, :run_callbacks => false) 
-      visit fcrepo_admin.object_datastream_path(object, dsid)
+      visit fcrepo_admin.object_datastream_path(object, datastream)
     end
     after do
       user.delete
       Warden.test_reset!
     end
-    it "should have a link to the edit page" do
-      page.should have_link("", :href => fcrepo_admin.edit_object_datastream_path(object, dsid))
+    context "datastream content is editable" do
+      let(:datastream) { object.descMetadata }
+      it "should have an edit link" do
+        page.should have_link(I18n.t("fcrepo_admin.datastream.nav.items.edit"), :href => fcrepo_admin.edit_object_datastream_path(object, datastream))
+      end
+    end
+    context "datastream content is uploadable" do
+      let(:datastream) { object.descMetadata }
+      it "should have an upload link" do
+        page.should have_link(I18n.t("fcrepo_admin.datastream.nav.items.upload"), :href => fcrepo_admin.upload_object_datastream_path(object, datastream))
+      end
     end
   end
 end

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

@@ -20,7 +20,7 @@ describe "datastreams/upload.html.erb" do
   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")
+    click_button I18n.t("fcrepo_admin.datastream.upload.form.submit")
     object.reload
     object.title.should == "Altered Test Component"
   end

data/spec/internal/app/models/item.rb

@@ -2,6 +2,9 @@ class Item < ActiveFedora::Base
 
   has_metadata :name => "descMetadata", :type => ActiveFedora::QualifiedDublinCoreDatastream
   has_metadata :name => "rightsMetadata", :type => Hydra::Datastream::RightsMetadata
+  has_metadata :name => "externalMetadata", :type => ActiveFedora::Datastream, :control_group => 'E'
+  has_metadata :name => "redirectedMetadata", :type => ActiveFedora::Datastream, :control_group => 'R'
+  has_file_datastream :name => "content"
 
   delegate :title, :to => "descMetadata", :unique => true
 

data/spec/internal/app/models/solr_document.rb

@@ -3,8 +3,6 @@ class SolrDocument
 
   include Blacklight::Solr::Document
 
-  use_extension FcrepoAdmin::SolrDocumentExtension
-
   # self.unique_key = 'id'
   
   # The following shows how to setup this blacklight document to display marc documents

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fcrepo_admin
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - David Chandek-Stark
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-14 00:00:00.000000000 Z
+date: 2013-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -254,9 +254,8 @@ files:
 - 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/_alert.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
@@ -267,9 +266,6 @@ files:
 - 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
@@ -291,11 +287,12 @@ files:
 - lib/fcrepo_admin.rb
 - lib/fcrepo_admin/ability.rb
 - lib/fcrepo_admin/controller/controller_behavior.rb
+- lib/fcrepo_admin/decorators/active_fedora/base_decorator.rb
+- lib/fcrepo_admin/decorators/active_fedora/datastream_decorator.rb
 - lib/fcrepo_admin/engine.rb
 - lib/fcrepo_admin/helpers/associations_helper_behavior.rb
 - lib/fcrepo_admin/helpers/blacklight_helper_behavior.rb
 - lib/fcrepo_admin/helpers/datastreams_helper_behavior.rb
-- lib/fcrepo_admin/helpers/fcrepo_admin_helper_behavior.rb
 - lib/fcrepo_admin/helpers/objects_helper_behavior.rb
 - lib/fcrepo_admin/solr_document_extension.rb
 - lib/fcrepo_admin/version.rb
@@ -307,6 +304,7 @@ files:
 - spec/factories/fcrepo_admin_factories.rb
 - spec/factories/user_factories.rb
 - spec/features/associations/index.html.erb_spec.rb
+- spec/features/datastreams/content.html.erb_spec.rb
 - spec/features/datastreams/edit.html.erb_spec.rb
 - spec/features/datastreams/index.html.erb_spec.rb
 - spec/features/datastreams/show.html.erb_spec.rb
@@ -366,6 +364,7 @@ files:
 - spec/internal/public/favicon.ico
 - spec/internal/script/rails
 - spec/internal/spec/fixtures/files/descMetadata.xml
+- spec/internal/spec/fixtures/files/hydra.jpg
 - spec/spec_helper.rb
 homepage: http://projecthydra.org
 licenses:
@@ -398,6 +397,7 @@ test_files:
 - spec/factories/fcrepo_admin_factories.rb
 - spec/factories/user_factories.rb
 - spec/features/associations/index.html.erb_spec.rb
+- spec/features/datastreams/content.html.erb_spec.rb
 - spec/features/datastreams/edit.html.erb_spec.rb
 - spec/features/datastreams/index.html.erb_spec.rb
 - spec/features/datastreams/show.html.erb_spec.rb
@@ -457,4 +457,5 @@ test_files:
 - spec/internal/public/favicon.ico
 - spec/internal/script/rails
 - spec/internal/spec/fixtures/files/descMetadata.xml
+- spec/internal/spec/fixtures/files/hydra.jpg
 - spec/spec_helper.rb

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

@@ -1,9 +0,0 @@
-<div class="well">
-  <ul class="nav nav-list">
-	<li class="nav-header">
-      <%= datastream_context_nav_header %>
-	</li>
-	<%= datastream_context_nav_items %>
-  </ul>
-</div>
-

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

@@ -1,38 +0,0 @@
-<% unless ds_is_current_version? %>
-  <li>
-	<%= 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.summary"), fcrepo_admin.object_datastream_path(object, datastream.dsid, datastream_params) %>
-</li>
-<% 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 t("fcrepo_admin.datastream.nav.items.download"), fcrepo_admin.download_object_datastream_path(object, datastream.dsid, datastream_params) %>
-  </li>
-<% end %>
-<% 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.history"), fcrepo_admin.history_object_datastream_path(object, datastream.dsid) %>
-  </li>
-<% end %>

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

@@ -1,9 +0,0 @@
-<div class="well">
-  <ul class="nav nav-list">
-	<li class="nav-header">
-	  <%= object_context_nav_header %>
-	</li>
-	<%= object_context_nav_items %>
-  </ul>
-</div>
-

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

@@ -1,13 +0,0 @@
-<li class="dropdown">
-  <%= link_to fcrepo_admin.object_datastreams_path(object), :class => "dropdown-toggle", :id => "dLabel", :role => "button", :'data-toggle' => "dropdown", :'data-target' => "#" do %>
-	<%= t("fcrepo_admin.object.nav.items.datastreams") %>
-    <b class="caret"></b>
-  <% end %>
-  <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
-	<% object.datastreams.keys.each do |dsid| %>
-	<li>
-	  <%= link_to dsid, fcrepo_admin.object_datastream_path(object, dsid) %>
-	</li>
-	<% end %>
-  </ul>
-</li>

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

@@ -1,19 +0,0 @@
-<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.datastreams"), fcrepo_admin.object_datastreams_path(object) %>
-</li>
-<% if object_has_permissions? && can?(:permissions, object) %>
-  <li>
-    <%= link_to_unless_current t("fcrepo_admin.object.nav.items.permissions"), fcrepo_admin.permissions_object_path(object) %>
-  </li>
-<% end %>
-<li>
-  <%= link_to_unless_current t("fcrepo_admin.object.nav.items.associations"), fcrepo_admin.object_associations_path(object) %>
-</li>
-<% if object_is_auditable? && can?(:audit_trail, object) %>
-  <li>
-	<%= link_to_unless_current t("fcrepo_admin.object.nav.items.audit_trail"), fcrepo_admin.audit_trail_object_path(object) %>
-  </li>
-<% end %>