fcrepo_admin 0.3.5 → 0.4.0

data/lib/fcrepo_admin/helpers/associations_helper_behavior.rb

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

data/lib/fcrepo_admin/helpers/datastreams_helper_behavior.rb

@@ -7,18 +7,15 @@ module FcrepoAdmin::Helpers
     end
 
     def datastream_context_nav_items
-      items = []
-      items << [t("fcrepo_admin.datastream.nav.items.summary"), fcrepo_admin.object_datastream_path(@object, @datastream.dsid)]
-      if can? :edit, @object
-        items << [t("fcrepo_admin.datastream.nav.items.edit"), fcrepo_admin.edit_object_datastream_path(@object, @datastream.dsid)]
-      end
-      items << [t("fcrepo_admin.datastream.nav.items.upload"), fcrepo_admin.upload_object_datastream_path(@object, @datastream.dsid)]
-      items << [t("fcrepo_admin.datastream.nav.items.download"), fcrepo_admin.download_object_datastream_path(@object, @datastream.dsid)]
-      items
+      render :partial => 'fcrepo_admin/datastreams/context_nav_items', :locals => {:object => @object, :datastream => @datastream}
     end
 
-    def render_datastream_context_nav
-      render :partial => 'fcrepo_admin/shared/context_nav', :locals => {:header => datastream_context_nav_header, :items => datastream_context_nav_items}
+    def can_edit_datastream?
+      can? :edit, @object
+    end
+
+    def can_upload_datastream?
+      can? :upload, @object
     end
 
   end

data/lib/fcrepo_admin/helpers/fcrepo_admin_helper_behavior.rb

@@ -1,21 +1,16 @@
 module FcrepoAdmin::Helpers
   module FcrepoAdminHelperBehavior
 
-    def object_context_nav_items
-      items = []
-      items << [t("fcrepo_admin.object.nav.items.summary"), fcrepo_admin.object_path(@object)]
-      if object_is_auditable?
-        items << [t("fcrepo_admin.object.nav.items.audit_trail"), fcrepo_admin.audit_trail_object_path(@object)]
-      end
-      items
+    def object_has_permissions?
+      @object.is_a?(Hydra::ModelMixins::RightsMetadata)
     end
 
     def object_context_nav_header
-      t("fcrepo_admin.object.nav.header")
+	  t("fcrepo_admin.object.nav.header")
     end
 
-    def render_object_context_nav
-      render :partial => 'fcrepo_admin/shared/context_nav', :locals => {:header => object_context_nav_header, :items => object_context_nav_items}
+    def object_context_nav_items
+      render :partial => 'fcrepo_admin/objects/context_nav_items', :locals => {:object => @object}
     end
 
   end

data/lib/fcrepo_admin/helpers/objects_helper_behavior.rb

@@ -9,42 +9,6 @@ module FcrepoAdmin::Helpers
     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
 end

data/lib/fcrepo_admin/version.rb

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

data/spec/controllers/associations_controller_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe FcrepoAdmin::AssociationsController do
+  let(:object) { FactoryGirl.create(:item) }
+  after { object.delete }
+  context "#index" do
+    subject { get :index, :object_id => object, :use_route => 'fcrepo_admin' }
+    it { should render_template(:index) }
+  end
+  context "#show" do
+    context "association is a collection" do
+      let(:part) { FactoryGirl.create(:part) }
+      before { object.parts << part }
+      after do
+        part.delete
+        object.reload
+      end
+      subject { get :show, :object_id => object, :id => "parts", :use_route => 'fcrepo_admin' }
+      it { should render_template(:show) }
+    end
+    context "association is not a collection" do
+      subject { get :show, :object_id => object, :id => "collection", :use_route => 'fcrepo_admin' }
+      context "has target" do
+        let(:collection) { FactoryGirl.create(:collection) }
+        before { collection.members << object }
+        after { collection.delete }
+        its(:response_code) { should eq(302) }
+      end
+      context "target is nil" do
+        its(:response_code) { should eq(404) }
+      end
+    end
+  end
+end

data/spec/controllers/datastreams_controller_spec.rb

@@ -1,24 +1,26 @@
 require 'spec_helper'
 
-shared_examples "a datastream profile view" do
-  it { should render_template(:show) }
-end
+# shared_examples "a datastream profile view" do
+#   it { should render_template(:show) }
+# end
 
 describe FcrepoAdmin::DatastreamsController do
   before do
-    @object = FactoryGirl.create(:content_model)
+    @object = FactoryGirl.create(:item)
     @dsid = "descMetadata"
   end
   after { @object.delete }
   context "#show" do
-    context "browser view" do
-      subject { get :show, :object_id => @object, :id => @dsid, :use_route => 'fcrepo_admin' }
-      it { should render_template(:show) }
-    end
-    context "download" do
-      subject { get :show, :object_id => @object, :id => @dsid, :download => 'true', :use_route => 'fcrepo_admin' }
-      it { should be_successful }
-    end
+    subject { get :show, :object_id => @object, :id => @dsid, :use_route => 'fcrepo_admin' }
+    it { should render_template(:show) }
+  end
+  context "#show" do
+    subject { get :content, :object_id => @object, :id => @dsid, :use_route => 'fcrepo_admin' }
+    it { should render_template(:content) }
+  end
+  context "#download" do
+    subject { get :download, :object_id => @object, :id => @dsid, :use_route => 'fcrepo_admin' }
+    it { should be_successful }
   end
   context "change methods" do
     let(:user) { FactoryGirl.create(:user) }

data/spec/controllers/objects_controller_spec.rb

@@ -1,22 +1,22 @@
 require 'spec_helper'
 
 describe FcrepoAdmin::ObjectsController do
+  let(:object) { FactoryGirl.create(:item) }
+  after { object.delete }
   context "#show" do
     subject { get :show, :id => object, :use_route => 'fcrepo_admin' }
-    let(:object) { FactoryGirl.create(:content_model) }
-    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
+  context "#permissions" do
+    subject { get :permissions, :id => object, :use_route => 'fcrepo_admin' }
+    it { should render_template(:permissions) }
+  end
 end

data/spec/factories/fcrepo_admin_factories.rb

@@ -6,15 +6,19 @@ FactoryGirl.define do
     default_permissions [{type: 'group', name: 'public', access: 'read'}]
   end
 
-  factory :content_model do
-    title "Test Object"
+  factory :collection do
+    title "Test Collection"
     permissions [{type: 'group', name: 'public', access: 'read'}]
+  end
 
-    trait :has_apo do
-      admin_policy { create(:admin_policy) }
-    end
+  factory :item do
+    sequence(:title) { |n| "Test Item [#{n}]" }
+    permissions [{type: 'group', name: 'public', access: 'read'}]
+  end
 
-    factory :content_model_has_apo, :traits => [:has_apo]
+  factory :part do
+    sequence(:title) { |n| "Test Part [#{n}]" }
+    permissions [{type: 'group', name: 'public', access: 'read'}]
   end
 
 end

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

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe "associations/index.html.erb" do
+  let(:object) { FactoryGirl.create(:item) }
+  after { object.delete }
+  context "association is a collection" do
+    let(:part) { FactoryGirl.create(:part) }
+    before { object.parts << part }
+    after do
+      part.delete
+      object.reload
+    end
+    it "should link to the show view of the association" do
+      visit fcrepo_admin.object_associations_path(object)
+      page.should have_link("1 object", :href => fcrepo_admin.object_association_path(object, "parts"))
+    end
+  end
+  context "association is not a collection" do
+    let(:collection) { FactoryGirl.create(:collection) }
+    before { collection.members << object }
+    after { collection.delete }
+    it "should link to the show view of the target object" do
+      pending "Bug in Capybara?"
+      visit fcrepo_admin.object_associations_path(object)
+      page.should have_link(collection.pid, :href => fcrepo_admin.object_path(collection))
+    end
+  end
+end

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

@@ -5,7 +5,7 @@ RSpec.configure do |c|
 end
 
 describe "datastreams/edit.html.erb" do
-  let(:object) { FactoryGirl.create(:content_model) }
+  let(:object) { FactoryGirl.create(:item) }
   let(:user) { FactoryGirl.create(:user) }
   before { 
     object.permissions = [{type: 'user', name: user.email, access: 'edit'}]

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

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+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))
+    end
+  end  
+end

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

@@ -5,7 +5,7 @@ RSpec.configure do |c|
 end
 
 describe "datastreams/show.html.erb" do
-  let!(:object) { FactoryGirl.create(:content_model) }
+  let!(:object) { FactoryGirl.create(:item) }
   let(:dsid) { "descMetadata" }
   before { visit fcrepo_admin.object_datastream_path(object, dsid) }
   after { object.delete }

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

@@ -5,7 +5,7 @@ RSpec.configure do |c|
 end
 
 describe "datastreams/upload.html.erb" do
-  let(:object) { FactoryGirl.create(:content_model) }
+  let(:object) { FactoryGirl.create(:item) }
   let(:user) { FactoryGirl.create(:user) }
   before { 
     object.permissions = [{type: 'user', name: user.email, access: 'edit'}]

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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe "audit_trail.html.erb" do
-  let(:object) { FactoryGirl.create(:content_model) }
+  let(:object) { FactoryGirl.create(:item) }
   after { object.delete }
   it "should display the audit trail" do
     visit fcrepo_admin.audit_trail_object_path(object)

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

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe "objects/permissions.html.erb" do
+  after { object.delete }
+  context "object governed by an admin policy" do
+    let(:object) { FactoryGirl.create(:item) }
+    let(:apo) { FactoryGirl.create(:admin_policy) }
+    before do
+      object.admin_policy = apo
+      object.save
+    end
+    after { apo.delete }
+    it "should link to the APO" do
+      visit fcrepo_admin.permissions_object_path(object)
+      page.should have_link(object.admin_policy.pid, :href => fcrepo_admin.object_path(object.admin_policy))
+    end
+    it "should display the inherited permissions"
+  end
+end

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

@@ -1,36 +1,13 @@
 require 'spec_helper'
 
 describe "objects/show.html.erb" do
+  before { visit fcrepo_admin.object_path(object) }
   after { object.delete }
-  context "basic object" do
-    let(:object) { FactoryGirl.create(:content_model) }
-    it "should display the object's properties" do
-      visit fcrepo_admin.object_path(object)
-      page.should have_content(I18n.t("fcrepo_admin.object.properties.keys.state"))
-      page.should have_content(I18n.t("fcrepo_admin.object.properties.keys.create_date"))
-      page.should have_content(I18n.t("fcrepo_admin.object.properties.keys.modified_date"))
-      page.should have_content(I18n.t("fcrepo_admin.object.properties.keys.owner_id"))
-      page.should have_content(I18n.t("fcrepo_admin.object.properties.keys.label"))
-    end
-    it "should link to all datastreams" do
-      visit fcrepo_admin.object_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 fcrepo_admin.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
-  context "object governed by an admin policy" do
-    let(:object) { FactoryGirl.create(:content_model_has_apo) }
-    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))
-    end
-    it "should display the inherited permissions"
+  let(:object) { FactoryGirl.create(:item) }
+  it "should link to other views" do
+    page.should have_link(I18n.t("fcrepo_admin.object.nav.items.audit_trail"), :href => fcrepo_admin.audit_trail_object_path(object))
+    page.should have_link(I18n.t("fcrepo_admin.object.nav.items.permissions"), :href => fcrepo_admin.permissions_object_path(object))
+    page.should have_link(I18n.t("fcrepo_admin.object.nav.items.associations"), :href => fcrepo_admin.object_associations_path(object))
+    page.should have_link(I18n.t("fcrepo_admin.object.nav.items.datastreams"), :href => fcrepo_admin.object_datastreams_path(object))
   end
 end

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

@@ -1,5 +1,5 @@
 class Ability
   include Hydra::Ability
   include Hydra::PolicyAwareAbility
-  include FcrepoAdmin::DatastreamAbility
+  include FcrepoAdmin::Ability
 end

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

@@ -1,2 +1,5 @@
 class AdminPolicy < Hydra::AdminPolicy
+  
+  has_many :governs, :property => :is_governed_by, :inbound => true, :class_name => 'ActiveFedora::Base'
+
 end

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

@@ -0,0 +1,14 @@
+class Collection < ActiveFedora::Base
+
+  has_metadata :name => "descMetadata", :type => ActiveFedora::QualifiedDublinCoreDatastream
+  has_metadata :name => "rightsMetadata", :type => Hydra::Datastream::RightsMetadata
+
+  delegate :title, :to => "descMetadata", :unique => true
+
+  belongs_to :admin_policy, :property => :is_governed_by
+  has_many :members, :property => :is_member_of_collection, :inbound => true, :class_name => 'Item'
+
+  include Hydra::ModelMixins::RightsMetadata
+  include ActiveFedora::Auditable
+
+end

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

@@ -0,0 +1,15 @@
+class Item < ActiveFedora::Base
+
+  has_metadata :name => "descMetadata", :type => ActiveFedora::QualifiedDublinCoreDatastream
+  has_metadata :name => "rightsMetadata", :type => Hydra::Datastream::RightsMetadata
+
+  delegate :title, :to => "descMetadata", :unique => true
+
+  belongs_to :admin_policy, :property => :is_governed_by
+  belongs_to :collection, :property => :is_member_of_collection, :class_name => 'Collection'
+  has_many :parts, :property => :is_part_of, :inbound => true, :class_name => 'Part'
+
+  include Hydra::ModelMixins::RightsMetadata
+  include ActiveFedora::Auditable
+
+end