ddr-models 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93a4738c22acccd452b340bd9bde7d2dbb4eac11
-  data.tar.gz: 5f3b011aa5c923fa17660db8b48bf5cb528caea2
+  metadata.gz: f6d273e1b012bea164a89a6ce3029bae9568c2b1
+  data.tar.gz: 942b1b7201d4426c1df684417d657df550604490
 SHA512:
-  metadata.gz: 6dafeee44f551b18eb0b26c674df5cfa6e776104cf3d9c0bb05375717fc68ae488f45200214d142efaeeaa33120beab0d5f2116af1d428aedd60222161a4dfb6
-  data.tar.gz: e90b570e88827930395c2ab3be39d64a1e8c2cf2bddfa20f65016c3175cdbcd77b889b65bf377a4486b14b545b6ae62863a85a63aeb7e414f4078afe29a464e7
+  metadata.gz: 76c5fdc47393e01d2e3746747f85565c1d17accb24f371e737bb5143abb73364d607315a7f7974bb0c1d95893a2133a9abf78426488209451ad4f1e912e16dff
+  data.tar.gz: 177b2529645a27c5a4c216817b3ab727b6cce26941199f42207668ef0761ab87f9f756e6bd2d98879f7bac4cceb55c57c53d7bea32b713b5bae12547b7415d8c

data/lib/ddr/models/solr_document.rb

@@ -98,23 +98,18 @@ module Ddr::Models
     end
 
     def has_admin_policy?
-      admin_policy_uri.present?
+      admin_policy_id.present?
     end
 
-    def admin_policy_uri
+    def admin_policy_id
       is_governed_by
     end
-
-    def admin_policy_pid
-      uri = admin_policy_uri
-      uri &&= ActiveFedora::Base.pid_from_uri(uri)
-    end
-    alias_method :admin_policy_id, :admin_policy_pid
+    alias_method :admin_policy_pid, :admin_policy_id
+    alias_method :admin_policy_uri, :admin_policy_id
+    deprecation_deprecate :admin_policy_pid, :admin_policy_uri
 
     def admin_policy
-      if has_admin_policy?
-        self.class.find(admin_policy_uri)
-      end
+      self.class.find(admin_policy_id) if has_admin_policy?
     end
 
     def has_children?
@@ -211,18 +206,18 @@ module Ddr::Models
       Ddr::Models::Contact.call(research_help_contact) if research_help_contact
     end
 
-    def parent_uri
+    def parent_id
       is_part_of || is_member_of_collection
     end
+    alias_method :parent_uri, :parent_id
+    deprecation_deprecate :parent_uri
 
     def has_parent?
-      parent_uri.present?
+      parent_id.present?
     end
 
     def parent
-      if has_parent?
-        self.class.find(parent_uri)
-      end
+      self.class.find(parent_id) if has_parent?
     end
 
     def multires_image_file_paths(type='default')

data/lib/ddr/models/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Models
-    VERSION = "3.0.0"
+    VERSION = "3.0.1"
   end
 end

data/spec/models/effective_license_spec.rb

@@ -4,71 +4,78 @@ module Ddr::Models
     subject { described_class.call(obj) }
 
     let(:url) { "https://creativecommons.org/licenses/by-nc-nd/4.0/" }
-
     let(:license) { License.new(url: url) }
-
-    let(:obj) { Component.new(id: "test-1") }
     let(:parent) { Item.new(id: "test-2") }
     let(:admin_policy) { Collection.new(id: "test-3") }
 
-    describe "when the object has a license" do
-      before do
-        allow(License).to receive(:call).with(obj) { license }
+    shared_examples "an effective license" do
+      describe "when the object has a license" do
+        before do
+          allow(License).to receive(:call).with(obj) { license }
+        end
+        it { is_expected.to eq(license) }
       end
-      it { is_expected.to eq(license) }
-    end
 
-    describe "when the object does not have a license" do
-      before do
-        allow(License).to receive(:call).with(obj) { nil }
-      end
-      describe "and the object has a parent" do
+      describe "when the object does not have a license" do
         before do
-          allow(obj).to receive(:parent) { parent }
+          allow(License).to receive(:call).with(obj) { nil }
         end
-        describe "and the parent has a license" do
+        describe "and the object has a parent" do
           before do
-            allow(License).to receive(:call).with(parent) { license }
+            allow(obj).to receive(:parent) { parent }
           end
-          it { is_expected.to eq(license) }
-        end
-        describe "and the parent does not have a license" do
-          before do
-            allow(License).to receive(:call).with(parent) { nil }
+          describe "and the parent has a license" do
+            before do
+              allow(License).to receive(:call).with(parent) { license }
+            end
+            it { is_expected.to eq(license) }
           end
-          it { is_expected.to be_nil }
-        end
-      end
-      describe "and the object does not have a parent" do
-        describe "and the object has an admin policy" do
-          before { allow(obj).to receive(:admin_policy) { admin_policy } }
-          describe "and the admin policy has a different id from the object" do
+          describe "and the parent does not have a license" do
             before do
-              allow(obj).to receive(:admin_policy_id) { "test-3" }
+              allow(License).to receive(:call).with(parent) { nil }
             end
-            describe "and the admin policy has a license" do
+            it { is_expected.to be_nil }
+          end
+        end
+        describe "and the object does not have a parent" do
+          describe "and the object has an admin policy" do
+            before { allow(obj).to receive(:admin_policy) { admin_policy } }
+            describe "and the admin policy has a different id from the object" do
               before do
-                allow(License).to receive(:call).with(admin_policy) { license }
+                allow(obj).to receive(:admin_policy_id) { "test-3" }
               end
-              it { is_expected.to eq(license) }
-            end
-            describe "and the admin policy does not have a license" do
-              before do
-                allow(License).to receive(:call).with(admin_policy) { nil }
+              describe "and the admin policy has a license" do
+                before do
+                  allow(License).to receive(:call).with(admin_policy) { license }
+                end
+                it { is_expected.to eq(license) }
+              end
+              describe "and the admin policy does not have a license" do
+                before do
+                  allow(License).to receive(:call).with(admin_policy) { nil }
+                end
+                it { is_expected.to be_nil }
               end
+            end
+            describe "and the admin policy has the same id as the object" do
+              before { allow(obj).to receive(:admin_policy_id) { obj.id } }
               it { is_expected.to be_nil }
             end
           end
-          describe "and the admin policy has the same id as the object" do
-            before { allow(obj).to receive(:admin_policy_id) { obj.id } }
+          describe "and the object does not have an admin policy" do
             it { is_expected.to be_nil }
           end
         end
-        describe "and the object does not have an admin policy" do
-          it { is_expected.to be_nil }
-        end
       end
     end
 
+    it_behaves_like "an effective license" do
+      let(:obj) { Component.new(id: "test-1") }
+    end
+
+    it_behaves_like "an effective license" do
+      let(:obj) { ::SolrDocument.new(id: "test-1") }
+    end
+
   end
 end

data/spec/models/solr_document_spec.rb

@@ -25,20 +25,20 @@ RSpec.describe SolrDocument, type: :model, contacts: true do
     end
   end
 
-  describe "#admin_policy_uri" do
+  describe "#admin_policy_id" do
     describe "when is_governed_by is not set" do
-      its(:admin_policy_uri) { is_expected.to be_nil }
+      its(:admin_policy_id) { is_expected.to be_nil }
     end
     describe "when is_governed_by is set" do
-      before { subject[Ddr::Index::Fields::IS_GOVERNED_BY] = "info:fedora/test:1" }
-      its(:admin_policy_uri) { should eq("info:fedora/test:1") }
+      before { subject[Ddr::Index::Fields::IS_GOVERNED_BY] = "test-1" }
+      its(:admin_policy_id) { is_expected.to eq("test-1") }
     end
   end
 
   describe "#admin_policy" do
     describe "when there is not an admin policy relationship" do
-      before { allow(subject).to receive(:admin_policy_pid) { nil } }
-      its(:admin_policy) { should be_nil }
+      before { allow(subject).to receive(:admin_policy_id) { nil } }
+      its(:admin_policy) { is_expected.to be_nil }
     end
     describe "where there is an admin policy relationship" do
       let(:admin_policy) { FactoryGirl.create(:collection) }
@@ -51,28 +51,28 @@ RSpec.describe SolrDocument, type: :model, contacts: true do
     end
   end
 
-  describe "#parent_uri" do
+  describe "#parent_id" do
     describe "when is_part_of is present" do
-      before { subject[Ddr::Index::Fields::IS_PART_OF] = "info:fedora/test:1" }
-      its(:parent_uri) { is_expected.to eq("info:fedora/test:1") }
+      before { subject[Ddr::Index::Fields::IS_PART_OF] = "test-1" }
+      its(:parent_id) { is_expected.to eq("test-1") }
     end
     describe "when is_part_of is not present" do
       describe "when is_member_of_collection is present" do
-        before { subject[Ddr::Index::Fields::IS_MEMBER_OF_COLLECTION] = "info:fedora/test:1" }
-        its(:parent_uri) { is_expected.to eq("info:fedora/test:1") }
+        before { subject[Ddr::Index::Fields::IS_MEMBER_OF_COLLECTION] = "test-1" }
+        its(:parent_id) { is_expected.to eq("test-1") }
       end
       describe "when is_member_of_collection is not present" do
-        its(:parent_uri) { is_expected.to be_nil }
+        its(:parent_id) { is_expected.to be_nil }
       end
     end
   end
 
   describe "#parent" do
-    describe "when there is a parent URI" do
-      let(:doc) { described_class.new({"id"=>"test:1"}) }
+    describe "when there is a parent ID" do
+      let(:doc) { described_class.new({"id"=>"test-1"}) }
       before do
-        allow(subject).to receive(:parent_uri) { "info:fedora/test:1" }
-        allow(described_class).to receive(:find).with("info:fedora/test:1") { doc }
+        allow(subject).to receive(:parent_id) { "test-1" }
+        allow(described_class).to receive(:find).with("test-1") { doc }
       end
       its(:parent) { is_expected.to eq(doc) }
     end

data/spec/spec_helper.rb

@@ -76,12 +76,12 @@ RSpec.configure do |config|
   # Many RSpec users commonly either run the entire suite or an individual
   # file, and it's useful to allow more verbose output when running an
   # individual spec file.
-  if config.files_to_run.one?
-    # Use the documentation formatter for detailed output,
-    # unless a formatter has already been configured
-    # (e.g. via a command-line flag).
-    config.default_formatter = 'doc'
-  end
+  # if config.files_to_run.one?
+  #   # Use the documentation formatter for detailed output,
+  #   # unless a formatter has already been configured
+  #   # (e.g. via a command-line flag).
+  #   config.default_formatter = 'doc'
+  # end
 
   # Print the 10 slowest examples and example groups at the
   # end of the spec run, to help surface which specs are running

metadata

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