ddr-models 2.4.0.rc1 → 2.4.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1f085bb5aae0c19afb4bb644fd674800bce2a9e
-  data.tar.gz: 11d41a2e56d71b9087d5cc8d7154f52c86a2f28c
+  metadata.gz: f1c49fbe59e6c5428bb0bc0386cc8540645a68a4
+  data.tar.gz: 2d4611d4cb06dd91ff9cada3c9e9cf6f4ec27ced
 SHA512:
-  metadata.gz: 50dd901a973431067800bbbbc33f1f4b9fb2fd8f1a53eb6797132197b410bccefdf9a6f5d6d5717d6c03441e0bded2e4e0ce59e5394e929f1b26d2809194c0bc
-  data.tar.gz: 587d288987202fd4c8f9375bdd4d37e1bcc044ac11573a76d7b84730618ee2cbd234f0c4cb7e8e845ec8b69711c468ac824f5640de47822981aaa0ffaa353dac
+  metadata.gz: 26122a595e168eebe097b956e44f91e4b06465fe62c02a443036a3b848b436987fecceab9fc007608216fd2c255b27d810b0ecbe548997a503a07e02a48fb434
+  data.tar.gz: 28c0e57885bab002e0309f293b72c6f53c51cbbd9227a0fcd50411c267c3b61167c7089e9cf1ba445d590ebad8051171acd009401a875304b644e85ef3f13ddc

data/lib/ddr/models.rb

@@ -62,6 +62,7 @@ module Ddr
     autoload :HasStructMetadata
     autoload :HasThumbnail
     autoload :Indexing
+    autoload :NotFoundError, 'ddr/models/error'
     autoload :SolrDocument
     autoload :StructDiv
     autoload :Structure

data/lib/ddr/models/admin_set.rb

@@ -7,8 +7,10 @@ module Ddr::Models
 
     def self.call(obj)
       if obj.admin_set
-        get(:find, code: obj.admin_set)
+        new get(:find, code: obj.admin_set)
       end
+    rescue ActiveResource::ResourceNotFound => e
+      raise Ddr::Models::NotFoundError, e
     end
 
     def to_s

data/lib/ddr/models/contact.rb

@@ -6,7 +6,9 @@ module Ddr::Models
     self.site = ENV["DDR_AUX_API_URL"]
 
     def self.call(slug)
-      get(:find, slug: slug)
+      new get(:find, slug: slug)
+    rescue ActiveResource::ResourceNotFound => e
+      raise Ddr::Models::NotFoundError, e
     end
 
     def to_s

data/lib/ddr/models/error.rb

@@ -11,5 +11,8 @@ module Ddr
 
     # Content model casting error
     class ContentModelError < Error; end
+
+    # A model instance was not found
+    class NotFoundError < Error; end
   end
 end

data/lib/ddr/models/licenses/license.rb

@@ -9,10 +9,12 @@ module Ddr::Models
 
     def self.call(obj)
       if obj.license
-        license = get(:find, url: obj.license)
+        license = new get(:find, url: obj.license)
         license.pid = obj.pid
         license
       end
+    rescue ActiveResource::ResourceNotFound => e
+      raise Ddr::Models::NotFoundError, e
     end
 
     def to_s

data/lib/ddr/models/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Models
-    VERSION = "2.4.0.rc1"
+    VERSION = "2.4.0.rc2"
   end
 end

data/spec/models/admin_set_spec.rb

@@ -1,25 +1,43 @@
 module Ddr::Models
-  RSpec.describe AdminSet do
+  RSpec.describe AdminSet, ddr_aux: true do
 
     describe ".call" do
-      subject { described_class.call(obj) }
       let(:obj) { Item.new }
 
       describe "when the object has an admin set" do
-        before do
-          obj.admin_set = "dvs"
-          allow(described_class).to receive(:get).with(:find, code: "dvs") do
-            described_class.new("id"=>1, "code"=>"dvs", "title"=>"Data and Visualization Services", "created_at"=>"2015-09-15T16:15:58.514Z", "updated_at"=>"2015-09-15T16:15:58.514Z")
+        before { obj.admin_set = "dvs" }
+        describe "and the admin set code is found" do
+          before {
+            allow(described_class).to receive(:get).with(:find, code: "dvs") {
+              {"id"=>1, "code"=>"dvs", "title"=>"Data and Visualization Services", "created_at"=>"2015-09-15T16:15:58.514Z", "updated_at"=>"2015-09-15T16:15:58.514Z"}
+            }
+          }
+          it "returns an AdminSet instance" do
+            expect(described_class.call(obj)).to be_a(described_class)
+          end
+        end
+        describe "and the admin set is not found" do
+          before {
+            allow(described_class).to receive(:get).with(:find, code: "dvs")
+                                       .and_raise(ActiveResource::ResourceNotFound, "404")
+          }
+          it "raises an exception" do
+            expect { described_class.call(obj) }.to raise_error(Ddr::Models::NotFoundError)
           end
         end
-
-        its(:to_s) { is_expected.to eq("Data and Visualization Services") }
       end
 
       describe "when the object does not have an admin set" do
-        it { is_expected.to be_nil }
+        it "returns nil" do
+          expect(described_class.call(obj)).to be_nil
+        end
       end
     end
 
+    describe "instance methods" do
+      subject { described_class.new("id"=>1, "code"=>"dvs", "title"=>"Data and Visualization Services", "created_at"=>"2015-09-15T16:15:58.514Z", "updated_at"=>"2015-09-15T16:15:58.514Z") }
+      its(:to_s) { is_expected.to eq("Data and Visualization Services") }
+    end
+
   end
 end

data/spec/models/contact_spec.rb

@@ -1,20 +1,40 @@
 module Ddr::Models
-  RSpec.describe Contact do
+  RSpec.describe Contact, ddr_aux: true do
 
     describe ".call" do
-      subject { described_class.call(slug) }
-      let(:slug) { 'abc' }
-
-      before do
-        allow(described_class).to receive(:get).with(:find, slug: slug) do
-          described_class.new(
-              "id"=>1, "slug"=>"abc", "name"=>"A, B, and C Services", "short_name"=>"ABCS",
-              "url"=>"http://library.inst.edu/abc", "phone"=>"555-1234", "email"=>"abc@library.inst.edu",
-              "ask"=>"http://library.inst.edu/abc-ask", "created_at"=>"2015-09-15T16:15:58.514Z",
-              "updated_at"=>"2015-09-15T16:15:58.514Z")
+      describe "when the slug is found" do
+        before {
+          allow(described_class).to receive(:get).with(:find, slug: "abc") {
+            {"id"=>1, "slug"=>"abc", "name"=>"A, B, and C Services", "short_name"=>"ABCS",
+             "url"=>"http://library.inst.edu/abc", "phone"=>"555-1234", "email"=>"abc@library.inst.edu",
+             "ask"=>"http://library.inst.edu/abc-ask", "created_at"=>"2015-09-15T16:15:58.514Z",
+             "updated_at"=>"2015-09-15T16:15:58.514Z"}
+          }
+        }
+        it "returns a Contact instance" do
+          expect(described_class.call("abc")).to be_a(described_class)
+        end
+      end
+      describe "when the slug is not found" do
+        before {
+          allow(described_class).to receive(:get).with(:find, slug: "abc")
+                                     .and_raise(ActiveResource::ResourceNotFound, "404")
+        }
+        it "raises an exception" do
+          expect { described_class.call("abc") }.to raise_error(Ddr::Models::NotFoundError)
         end
       end
+    end
 
+    describe "instance methods" do
+      subject {
+        described_class.new(
+          "id"=>1, "slug"=>"abc", "name"=>"A, B, and C Services", "short_name"=>"ABCS",
+          "url"=>"http://library.inst.edu/abc", "phone"=>"555-1234", "email"=>"abc@library.inst.edu",
+          "ask"=>"http://library.inst.edu/abc-ask", "created_at"=>"2015-09-15T16:15:58.514Z",
+          "updated_at"=>"2015-09-15T16:15:58.514Z"
+        )
+      }
       its(:to_s) { is_expected.to eq("A, B, and C Services") }
     end
 

data/spec/models/has_admin_metadata_spec.rb

@@ -179,10 +179,10 @@ module Ddr::Models
       describe "contacts" do
         before do
           allow(Ddr::Models::Contact).to receive(:get).with(:find, slug: 'xa') do
-            Ddr::Models::Contact.new('id'=>1, 'slug'=>'xa', 'name'=>'Contact A', 'short_name'=>'A')
+            {'id'=>1, 'slug'=>'xa', 'name'=>'Contact A', 'short_name'=>'A'}
           end
           allow(Ddr::Models::Contact).to receive(:get).with(:find, slug: 'yb') do
-            Ddr::Models::Contact.new('id'=>1, 'slug'=>'yb', 'name'=>'Contact B', 'short_name'=>'B')
+            {'id'=>1, 'slug'=>'yb', 'name'=>'Contact B', 'short_name'=>'B'}
           end
         end
         describe "#research_help" do

data/spec/models/license_spec.rb

@@ -1,26 +1,45 @@
 module Ddr::Models
-  RSpec.describe License do
+  RSpec.describe License, ddr_aux: true do
 
     describe ".call" do
-      subject { described_class.call(obj) }
-
       describe "when the object has a license URL" do
-        let(:url) { "http://example.com" }
-        let(:obj) { double(pid: "test:1", license: url) }
-        before do
-          allow(described_class).to receive(:get).with(:find, url: url) do
-            described_class.new(url: url, title: "A License")
+        let(:obj) { double(pid: "test:1", license: "http://example.com") }
+        describe "and the license is found" do
+          before {
+            allow(described_class).to receive(:get).with(:find, url: "http://example.com") {
+              {"id"=>1, "url"=>"http://example.com", "title"=>"A License"}
+            }
+          }
+          it "returns a License instance" do
+            expect(described_class.call(obj)).to be_a(described_class)
+          end
+          it "sets `pid` to the object pid" do
+            expect(described_class.call(obj).pid).to eq("test:1")
+          end
+        end
+        describe "and the license is not found" do
+          before {
+            allow(described_class).to receive(:get).with(:find, url: "http://example.com")
+                                       .and_raise(ActiveResource::ResourceNotFound, "404")
+          }
+          it "raises an exception" do
+            expect { described_class.call(obj) }.to raise_error(Ddr::Models::NotFoundError)
           end
         end
-        its(:pid) { is_expected.to eq("test:1") }
-        its(:to_s) { is_expected.to eq("A License") }
       end
 
       describe "when the object does not have a license" do
         let(:obj) { double(pid: "test:1", license: nil) }
-        it { is_expected.to be_nil }
+        it "returns nil" do
+          expect(described_class.call(obj)).to be_nil
+        end
       end
     end
 
+    describe "instance methods" do
+      subject { described_class.new("id"=>1, "url"=>"http://example.com", "title"=>"A License") }
+      its(:to_s) { is_expected.to eq("A License") }
+    end
+
   end
 end

data/spec/models/solr_document_spec.rb

@@ -129,10 +129,10 @@ RSpec.describe SolrDocument, type: :model, contacts: true do
   describe "contacts" do
     before do
       allow(Ddr::Models::Contact).to receive(:get).with(:find, slug: 'xa') do
-        Ddr::Models::Contact.new('id'=>1, 'slug'=>'xa', 'name'=>'Contact A', 'short_name'=>'A')
+        {'id'=>1, 'slug'=>'xa', 'name'=>'Contact A', 'short_name'=>'A'}
       end
       allow(Ddr::Models::Contact).to receive(:get).with(:find, slug: 'yb') do
-        Ddr::Models::Contact.new('id'=>1, 'slug'=>'yb', 'name'=>'Contact B', 'short_name'=>'B')
+        {'id'=>1, 'slug'=>'yb', 'name'=>'Contact B', 'short_name'=>'B'}
       end
     end
     describe "#research_help" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 2.4.0.rc1
+  version: 2.4.0.rc2
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-10 00:00:00.000000000 Z
+date: 2015-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails