ddr-models 3.0.0.beta.13 → 3.0.0.beta.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd624d042a8843b603251a3e2335de11250c7cc7
-  data.tar.gz: 475629a158b74fcf445d2e75bc6a02df8df0eaab
+  metadata.gz: fa7faeec493c42d29c2ac9af03f8db073c700678
+  data.tar.gz: 9688fa99bde0eaffc03946d490e0f0413fa58ce0
 SHA512:
-  metadata.gz: b9b86d95736d6d52758b5c9102fba56ec686a2e6c7d2e03904d52917009b002b4e6e533c51df410d6ef6ed2922fb38c36ffe7bcdacbeb607c6f6140e26818e10
-  data.tar.gz: 9bc4aab3edea2950ae8115ba3948eb976cb368b2dccb513eace66fb59bc8798e4963e0aea3560a0ec093354485c7a91c9688fefc3f6d9262ded9be1874f71e70
+  metadata.gz: 383c3cfc797bdf3a6665fb5cf1c275eb4447e85b51cda3c9ff89f2405dfc079cc4a06f679500a1ec68abade1d0908393adc599e46a62e40976c7d580cd46aa0e
+  data.tar.gz: 1763c37c4f8e28444ebe303de40e0a85c87411943c28694205e3957e8b0a12c10822f3224669ba52139b4ca39909c3b4ca085eacf030724c6e5b11594b5b5ae9

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

@@ -3,11 +3,11 @@ module Ddr
     class PublicationAbilityDefinitions < AbilityDefinitions
 
       def call
-        can :publish, Ddr::Models::Base do |obj|
-          !obj.published? && obj.publishable?
+        cannot :publish, Ddr::Models::Base do |obj|
+          obj.published? || !obj.publishable?
         end
-        can :unpublish, Ddr::Models::Base do |obj|
-          obj.published?
+        cannot :unpublish, Ddr::Models::Base do |obj|
+          !obj.published?
         end
       end
 

data/lib/ddr/index/fields.rb

@@ -76,6 +76,7 @@ module Ddr::Index
     TECHMD_WELL_FORMED          = Field.new :techmd_well_formed, :symbol
     TITLE                       = Field.new :title, :stored_sortable
     TYPE_FACET                  = Field.new :type_facet, :facetable
+    UNIQUE_ID                   = Field.new :unique_id, :searchable, type: :symbol
     WORKFLOW_STATE              = Field.new :workflow_state, :stored_sortable
     YEAR_FACET                  = Field.new :year_facet, solr_name: "year_facet_iim"
 

data/lib/ddr/models/base.rb

@@ -22,10 +22,32 @@ module Ddr::Models
       end
     end
 
+    def self.find_by_unique_id(unique_id)
+      if result = where(Ddr::Index::Fields::UNIQUE_ID => unique_id).first
+        result
+      else
+        raise ActiveFedora::ObjectNotFoundError,
+              "#{self} not found having unique id #{unique_id.inspect}."
+      end
+    end
+
+    def unique_ids
+      [id, permanent_id, permanent_id_suffix].compact
+    end
+
     def inspect
       "#<#{model_and_id}, uri: \"#{uri}\">"
     end
 
+    def permanent_id_suffix
+      permanent_id && permanent_id.sub(/\Aark:\/\d+\//, "")
+    end
+
+    # @see ActiveModel::Conversion
+    def to_key
+      (key = permanent_id_suffix) ? [key] : super
+    end
+
     def model_and_id
       "#{self.class} id: #{id.inspect || '[NEW]'}"
     end
@@ -116,10 +138,6 @@ module Ddr::Models
       false
     end
 
-    def adminMetadata
-      self
-    end
-
     def datastreams_to_validate
       Deprecation.warn(FixityCheckable, "`datastreams_to_validate` is deprecated." \
                                         " Use `attached_files_having_content` instead.")

data/lib/ddr/models/indexing.rb

@@ -45,6 +45,7 @@ module Ddr
           SUBJECT_FACET         => desc_metadata.values('subject'),
           TITLE                 => title_display,
           TYPE_FACET            => desc_metadata.type,
+          UNIQUE_ID             => unique_ids,
           WORKFLOW_STATE        => workflow_state,
           YEAR_FACET            => year_facet,
         }

data/lib/ddr/models/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Models
-    VERSION = "3.0.0.beta.13"
+    VERSION = "3.0.0.beta.14"
   end
 end

data/spec/auth/ability_spec.rb

@@ -148,28 +148,45 @@ module Ddr::Auth
       let(:obj) { Ddr::Models::Base.new }
 
       describe "publish" do
-        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) }
+        describe "when role-based permissions permit publish" do
+          before do
+            allow(obj).to receive(:effective_permissions) { [ Permissions::PUBLISH ] }
           end
-          describe "when the object is not publishable" do
-            before { allow(obj).to receive(:publishable?) { false } }
+          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 the object is published" do
-          before { allow(obj).to receive(:published?) { true } }
-          it { should be_able_to(:unpublish, obj) }
+        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 the object is not published" do
+        describe "when role-based permissions do not permit unpublish" do
           it { should_not be_able_to(:unpublish, obj) }
         end
       end

data/spec/models/indexing_spec.rb

@@ -12,28 +12,41 @@ module Ddr::Models
       let(:role4) { FactoryGirl.build(:role, :editor, :person, :policy) }
 
       before do
+        obj.aspace_id = "aspace_dccea43034e1b8261e14cf999e86449d"
+        obj.display_format = "Image"
+        obj.doi << "http://doi.org/10.1000/182"
+        obj.fcrepo3_pid = "duke:1"
         obj.license = "cc-by-nc-nd-40"
         obj.local_id = "foo"
-        obj.doi << "http://doi.org/10.1000/182"
         obj.permanent_id = "ark:/99999/fk4zzz"
         obj.permanent_url = "http://id.library.duke.edu/ark:/99999/fk4zzz"
-        obj.display_format = "Image"
         obj.roles.grant role1, role2, role3, role4
-        obj.aspace_id = "aspace_dccea43034e1b8261e14cf999e86449d"
-        obj.fcrepo3_pid = "duke:1"
+        obj.save
+        obj.reload
       end
 
+      its([Indexing::ACCESS_ROLE]) { is_expected.to eq(obj.roles.to_json) }
+      its([Indexing::ASPACE_ID]) { is_expected.to eq("aspace_dccea43034e1b8261e14cf999e86449d") }
+      its([Indexing::DISPLAY_FORMAT]) { is_expected.to eq("Image") }
+      its([Indexing::DOI]) { is_expected.to eq(["http://doi.org/10.1000/182"]) }
+      its([Indexing::FCREPO3_PID]) { is_expected.to eq("duke:1") }
       its([Indexing::LICENSE]) { is_expected.to eq("cc-by-nc-nd-40") }
       its([Indexing::LOCAL_ID]) { is_expected.to eq("foo") }
-      its([Indexing::DOI]) { is_expected.to eq(["http://doi.org/10.1000/182"]) }
       its([Indexing::PERMANENT_ID]) { is_expected.to eq("ark:/99999/fk4zzz") }
-      its([Indexing::PERMANENT_URL]) { is_expected.to eq("http://id.library.duke.edu/ark:/99999/fk4zzz") }
-      its([Indexing::DISPLAY_FORMAT]) { is_expected.to eq("Image") }
-      its([Indexing::ACCESS_ROLE]) { is_expected.to eq(obj.roles.to_json) }
-      its([Indexing::ASPACE_ID]) { is_expected.to eq("aspace_dccea43034e1b8261e14cf999e86449d") }
-      its([Indexing::POLICY_ROLE]) { is_expected.to contain_exactly(role2.agent, role3.agent, role4.agent) }
+      its([Indexing::PERMANENT_URL]) {
+        is_expected.to eq("http://id.library.duke.edu/ark:/99999/fk4zzz")
+      }
+      its([Indexing::POLICY_ROLE]) {
+        is_expected.to contain_exactly(role2.agent, role3.agent, role4.agent)
+      }
       its([Indexing::RESOURCE_ROLE]) { is_expected.to contain_exactly(role1.agent) }
-      its([Indexing::FCREPO3_PID]) { is_expected.to eq("duke:1") }
+
+      describe "when it doesn't have a permanent id" do
+        before {
+          obj.permanent_id = nil
+        }
+        its([Indexing::UNIQUE_ID]) { is_expected.to eq([obj.id]) }
+      end
     end
 
     describe "content-bearing object indexing" do

data/spec/support/shared_examples_for_ddr_models.rb

@@ -6,6 +6,38 @@ RSpec.shared_examples "a DDR model" do
   it_behaves_like "an object that has identifiers"
   it_behaves_like "a fixity checkable object"
 
+  describe "#to_param" do
+    before {
+      subject.save(validate: false) if subject.new_record?
+    }
+    describe "when it has a permanent id" do
+      before {
+        subject.permanent_id = "ark:/99999/fk4rx95k8w"
+      }
+      its(:to_param) { is_expected.to eq("fk4rx95k8w") }
+    end
+    describe "when it does not have a permanent id" do
+      its(:to_param) { is_expected.to_not be_nil }
+      its(:to_param) { is_expected.to eq(subject.id) }
+    end
+  end
+
+  describe ".find_by_unique_id" do
+    before {
+      subject.permanent_id = "ark:/99999/fk4rx95k8w"
+      subject.save(validate: false)
+    }
+    it "finds by Fedora id" do
+      expect(described_class.find_by_unique_id(subject.id)).to eq(subject)
+    end
+    it "finds by permanent id" do
+      expect(described_class.find_by_unique_id("ark:/99999/fk4rx95k8w")).to eq(subject)
+    end
+    it "finds by permanent id suffix" do
+      expect(described_class.find_by_unique_id("fk4rx95k8w")).to eq(subject)
+    end
+  end
+
   describe "events" do
     describe "on deletion with #destroy" do
       before { subject.save(validate: false) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta.13
+  version: 3.0.0.beta.14
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2016-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails