ddr-models 2.4.10 → 2.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdb63bca20c6403cb271efc0fbef7a69e9639bd0
-  data.tar.gz: a2ed58e92914138708aee15495f447396fbc1242
+  metadata.gz: 9f6ac7dc1bb1835e59f99ca9b246644a70fc4d24
+  data.tar.gz: 0cd424492af393a1855e072a89badf9a5d7c3147
 SHA512:
-  metadata.gz: 1d6f7995169176b2705b96e2503af57a18e16c4490d6a3940b20b35881b5e1fdfa0d4655be1cbddd56217c42b4a3e2341f946cb3081651a9a395385dca757bdf
-  data.tar.gz: 44ec9729ef02ac1bba6dd9a3390fded3583ea656c58936138498e03f8ca3695cb252120b41a5290102d8c8faded0bb1ad0222217ed309e3519949cd8956ea2f5
+  metadata.gz: 4c05eac1799eb32e833cb9e627f219a8d62dab865818c8b8845bc435f00883b528654e570f5f3d73a2669e945ce32f5f5e26e6315dac688b2363ac5d92e039fa
+  data.tar.gz: 5514e0c5c3946b10f23c57ef2af02ed8014e2989e1930e205d4944ddcc0e6cb7423a7c03ab18b64a301c0ff4e68809415c131193bc0f88cc676abf557a5a116b

data/app/models/attachment.rb

@@ -9,4 +9,8 @@ class Attachment < Ddr::Models::Base
 
   belongs_to :attached_to, property: :is_attached_to, class_name: 'ActiveFedora::Base'
 
+  def publishable?
+    false
+  end
+
 end

data/app/models/collection.rb

@@ -49,6 +49,10 @@ class Collection < Ddr::Models::Base
     roles.grant type: Ddr::Auth::Roles::CURATOR, agent: creator.agent, scope: Ddr::Auth::Roles::POLICY_SCOPE
   end
 
+  def publishable?
+    true
+  end
+
   private
 
   def set_admin_policy

data/app/models/component.rb

@@ -25,6 +25,10 @@ class Component < Ddr::Models::Base
     self.collection.internal_uri rescue nil
   end
 
+  def publishable?
+    parent.present? && parent.published?
+  end
+
   def index_parent
     Resque.enqueue(Ddr::Jobs::UpdateIndex, parent_id)
   end

data/app/models/item.rb

@@ -21,6 +21,10 @@ class Item < Ddr::Models::Base
   alias_method :collection_id, :parent_id
   alias_method :collection=, :parent=
 
+  def publishable?
+    parent.present? && parent.published?
+  end
+
   def children_having_extracted_text
     item = self
     Ddr::Index::Query.new do

data/app/models/target.rb

@@ -12,4 +12,8 @@ class Target < Ddr::Models::Base
   has_many :components, property: :has_external_target, class_name: 'Component'
   belongs_to :collection, property: :is_external_target_for, class_name: 'Collection'
 
+  def publishable?
+    false
+  end
+
 end

data/lib/ddr/auth.rb

@@ -39,6 +39,7 @@ module Ddr
       autoload :DatastreamAbilityDefinitions
       autoload :EventAbilityDefinitions
       autoload :ItemAbilityDefinitions
+      autoload :PublicationAbilityDefinitions
       autoload :LockAbilityDefinitions
       autoload :RoleBasedAbilityDefinitions
       autoload :SuperuserAbilityDefinitions

data/lib/ddr/auth/ability.rb

@@ -10,6 +10,7 @@ module Ddr
                                    RoleBasedAbilityDefinitions,
                                    DatastreamAbilityDefinitions,
                                    EventAbilityDefinitions,
+                                   PublicationAbilityDefinitions,
                                    LockAbilityDefinitions ]
 
     end

data/lib/ddr/auth/ability_definitions/publication_ability_definitions.rb

@@ -0,0 +1,16 @@
+module Ddr
+  module Auth
+    class PublicationAbilityDefinitions < AbilityDefinitions
+
+      def call
+        cannot :publish, Ddr::Models::Base do |obj|
+          obj.published? || !obj.publishable?
+        end
+        cannot :unpublish, Ddr::Models::Base do |obj|
+          !obj.published?
+        end
+      end
+
+    end
+  end
+end

data/lib/ddr/auth/permissions.rb

@@ -8,10 +8,12 @@ module Ddr::Auth
     UPDATE       = :update
     REPLACE      = :replace
     ARRANGE      = :arrange
+    PUBLISH      = :publish
+    UNPUBLISH    = :unpublish
     AUDIT        = :audit
     GRANT        = :grant
 
-    ALL = [ READ, DOWNLOAD, ADD_CHILDREN, UPDATE, REPLACE, ARRANGE, AUDIT, GRANT ]
+    ALL = [ READ, DOWNLOAD, ADD_CHILDREN, UPDATE, REPLACE, ARRANGE, PUBLISH, UNPUBLISH, AUDIT, GRANT ]
 
     def self.const_missing(name)
       if name == :EDIT

data/lib/ddr/models/base.rb

@@ -102,6 +102,10 @@ module Ddr
         moved
       end
 
+      def publishable?
+        raise NotImplementedError, "Must be implemented by subclasses"
+      end
+
     end
   end
 end

data/lib/ddr/models/has_admin_metadata.rb

@@ -25,7 +25,7 @@ module Ddr::Models
                      datastream: "adminMetadata",
                      multiple: false
 
-      delegate :publish, :publish!, :unpublish, :unpublish!, :published?, to: :workflow
+      delegate :publish!, :unpublish!, :published?, to: :workflow
 
       after_create :assign_permanent_id!, if: "Ddr::Models.auto_assign_permanent_ids"
       around_destroy :update_permanent_id_on_destroy, if: "permanent_id.present?"

data/lib/ddr/models/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Models
-    VERSION = "2.4.10"
+    VERSION = "2.4.11"
   end
 end

data/spec/auth/ability_spec.rb

@@ -144,6 +144,55 @@ module Ddr::Auth
       end
     end
 
+    describe "publication abilities" do
+      let(:obj) { Ddr::Models::Base.new }
+
+      describe "publish" do
+        describe "when role-based permissions permit publish" do
+          before do
+            allow(obj).to receive(:effective_permissions) { [ Permissions::PUBLISH ] }
+          end
+          describe "when the object is published" do
+            before { allow(obj).to receive(:published?) { true } }
+            it { should_not be_able_to(:publish, obj) }
+          end
+          describe "when the object is not published" do
+            describe "when the object is publishable" do
+              before { allow(obj).to receive(:publishable?) { true } }
+              it { should be_able_to(:publish, obj) }
+            end
+            describe "when the object is not publishable" do
+              before { allow(obj).to receive(:publishable?) { false } }
+              it { should_not be_able_to(:publish, obj) }
+            end
+          end
+        end
+        describe "when role-based permissions do not permit publish" do
+          before { allow(obj).to receive(:publishable?) { true } }
+          it { should_not be_able_to(:publish, obj) }
+        end
+      end
+
+      describe "unpublish" do
+        describe "when role-based permissions permit unpublish" do
+          before do
+            allow(obj).to receive(:effective_permissions) { [ Permissions::UNPUBLISH ] }
+          end
+          describe "when the object is published" do
+            before { allow(obj).to receive(:published?) { true } }
+            it { should be_able_to(:unpublish, obj) }
+          end
+          describe "when the object is not published" do
+            it { should_not be_able_to(:unpublish, obj) }
+          end
+        end
+        describe "when role-based permissions do not permit unpublish" do
+          it { should_not be_able_to(:unpublish, obj) }
+        end
+      end
+
+    end
+
     describe "locks" do
       let(:obj) { Ddr::Models::Base.new }
 

data/spec/models/attachment_spec.rb

@@ -6,5 +6,6 @@ RSpec.describe Attachment, type: :model, attachments: true do
   it_behaves_like "an object that can have content"
   it_behaves_like "it has an association", :belongs_to, :attached_to, :is_attached_to, "ActiveFedora::Base"
   it_behaves_like "a non-collection model"
+  it_behaves_like "an unpublishable object"
 
 end

data/spec/models/collection_spec.rb

@@ -5,6 +5,7 @@ RSpec.describe Collection, type: :model do
   it_behaves_like "a DDR model"
   it_behaves_like "it has an association", :has_many, :children, :is_member_of_collection, "Item"
   it_behaves_like "it has an association", :has_many, :targets, :is_external_target_for, "Target"
+  it_behaves_like "a publishable object"
 
   describe "legacy license information" do
     before do

data/spec/models/component_spec.rb

@@ -7,6 +7,7 @@ RSpec.describe Component, type: :model, components: true do
   it_behaves_like "it has an association", :belongs_to, :parent, :is_part_of, "Item"
   it_behaves_like "it has an association", :belongs_to, :target, :has_external_target, "Target"
   it_behaves_like "a non-collection model"
+  it_behaves_like "a potentially publishable object"
 
   describe "indexing" do
     subject { FactoryGirl.build(:component) }

data/spec/models/has_admin_metadata_spec.rb

@@ -121,13 +121,6 @@ module Ddr::Models
         end
       end
 
-      describe "#publish" do
-        it "should publish the object" do
-          subject.publish
-          expect(subject).to be_published
-        end
-      end
-
       describe "#publish!" do
         it "should publish and persist the object" do
           subject.publish!
@@ -135,14 +128,6 @@ module Ddr::Models
         end
       end
 
-      describe "#unpublish" do
-        before { subject.publish }
-        it "should unpublish the object" do
-          subject.unpublish
-          expect(subject).not_to be_published
-        end
-      end
-
       describe "#unpublish!" do
         before { subject.publish! }
         it "should unpublish and persist the object" do

data/spec/models/item_spec.rb

@@ -6,6 +6,7 @@ RSpec.describe Item, type: :model do
   it_behaves_like "it has an association", :belongs_to, :parent, :is_member_of_collection, "Collection"
   it_behaves_like "it has an association", :has_many, :children, :is_part_of, "Component"
   it_behaves_like "a non-collection model"
+  it_behaves_like "a potentially publishable object"
 
   describe "indexing text" do
     let(:children) { FactoryGirl.build_list(:component, 5) }

data/spec/models/target_spec.rb

@@ -7,5 +7,6 @@ RSpec.describe Target, type: :model, targets: true do
   it_behaves_like "it has an association", :has_many, :components, :has_external_target, "Component"
   it_behaves_like "it has an association", :belongs_to, :collection, :is_external_target_for, "Collection"
   it_behaves_like "a non-collection model"
+  it_behaves_like "an unpublishable object"
 
 end

data/spec/support/shared_examples_for_publication.rb

@@ -0,0 +1,43 @@
+RSpec.shared_examples 'a publishable object' do
+  describe '#publishable?' do
+    let(:object) { described_class.new }
+    it 'should be publishable' do
+      expect(object.publishable?).to be true
+    end
+  end
+end
+
+RSpec.shared_examples 'an unpublishable object' do
+  describe '#publishable?' do
+    let(:object) { described_class.new }
+    it 'should not be publishable' do
+      expect(object.publishable?).to be false
+    end
+  end
+end
+
+RSpec.shared_examples 'a potentially publishable object' do
+  describe "#publishable?" do
+    let(:object) { described_class.new }
+    context "has parent" do
+      before { allow(object).to receive(:parent) { parent } }
+      context "parent is published" do
+        let(:parent) { double(published?: true) }
+        it "should be publishable" do
+          expect(object.publishable?).to be true
+        end
+      end
+      context "parent is not published" do
+        let(:parent) { double(published?: false) }
+        it "should not be publishable" do
+          expect(object.publishable?).to be false
+        end
+      end
+    end
+    context "does not have parent" do
+      it "should not be publishable" do
+        expect(object.publishable?).to be false
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 2.4.10
+  version: 2.4.11
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -406,6 +406,7 @@ files:
 - lib/ddr/auth/ability_definitions/event_ability_definitions.rb
 - lib/ddr/auth/ability_definitions/item_ability_definitions.rb
 - lib/ddr/auth/ability_definitions/lock_ability_definitions.rb
+- lib/ddr/auth/ability_definitions/publication_ability_definitions.rb
 - lib/ddr/auth/ability_definitions/role_based_ability_definitions.rb
 - lib/ddr/auth/ability_definitions/superuser_ability_definitions.rb
 - lib/ddr/auth/ability_factory.rb
@@ -695,6 +696,7 @@ files:
 - spec/support/shared_examples_for_has_content.rb
 - spec/support/shared_examples_for_indexing.rb
 - spec/support/shared_examples_for_non_collection_models.rb
+- spec/support/shared_examples_for_publication.rb
 - spec/support/shared_examples_for_role_sets.rb
 - spec/support/structural_metadata_helper.rb
 - spec/utils_spec.rb
@@ -870,6 +872,7 @@ test_files:
 - spec/support/shared_examples_for_has_content.rb
 - spec/support/shared_examples_for_indexing.rb
 - spec/support/shared_examples_for_non_collection_models.rb
+- spec/support/shared_examples_for_publication.rb
 - spec/support/shared_examples_for_role_sets.rb
 - spec/support/structural_metadata_helper.rb
 - spec/utils_spec.rb