ddr-models 2.4.0.rc1 → 2.4.0.rc2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/ddr/models.rb +1 -0
- data/lib/ddr/models/admin_set.rb +3 -1
- data/lib/ddr/models/contact.rb +3 -1
- data/lib/ddr/models/error.rb +3 -0
- data/lib/ddr/models/licenses/license.rb +3 -1
- data/lib/ddr/models/version.rb +1 -1
- data/spec/models/admin_set_spec.rb +27 -9
- data/spec/models/contact_spec.rb +31 -11
- data/spec/models/has_admin_metadata_spec.rb +2 -2
- data/spec/models/license_spec.rb +30 -11
- data/spec/models/solr_document_spec.rb +2 -2
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: f1c49fbe59e6c5428bb0bc0386cc8540645a68a4
|
4
|
+
data.tar.gz: 2d4611d4cb06dd91ff9cada3c9e9cf6f4ec27ced
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 26122a595e168eebe097b956e44f91e4b06465fe62c02a443036a3b848b436987fecceab9fc007608216fd2c255b27d810b0ecbe548997a503a07e02a48fb434
|
7
|
+
data.tar.gz: 28c0e57885bab002e0309f293b72c6f53c51cbbd9227a0fcd50411c267c3b61167c7089e9cf1ba445d590ebad8051171acd009401a875304b644e85ef3f13ddc
|
data/lib/ddr/models.rb
CHANGED
data/lib/ddr/models/admin_set.rb
CHANGED
data/lib/ddr/models/contact.rb
CHANGED
data/lib/ddr/models/error.rb
CHANGED
@@ -9,10 +9,12 @@ module Ddr::Models
|
|
9
9
|
|
10
10
|
def self.call(obj)
|
11
11
|
if obj.license
|
12
|
-
license = get(:find, url: obj.license)
|
12
|
+
license = new get(:find, url: obj.license)
|
13
13
|
license.pid = obj.pid
|
14
14
|
license
|
15
15
|
end
|
16
|
+
rescue ActiveResource::ResourceNotFound => e
|
17
|
+
raise Ddr::Models::NotFoundError, e
|
16
18
|
end
|
17
19
|
|
18
20
|
def to_s
|
data/lib/ddr/models/version.rb
CHANGED
@@ -1,25 +1,43 @@
|
|
1
1
|
module Ddr::Models
|
2
|
-
RSpec.describe AdminSet do
|
2
|
+
RSpec.describe AdminSet, ddr_aux: true do
|
3
3
|
|
4
4
|
describe ".call" do
|
5
|
-
subject { described_class.call(obj) }
|
6
5
|
let(:obj) { Item.new }
|
7
6
|
|
8
7
|
describe "when the object has an admin set" do
|
9
|
-
before
|
10
|
-
|
11
|
-
|
12
|
-
described_class.
|
8
|
+
before { obj.admin_set = "dvs" }
|
9
|
+
describe "and the admin set code is found" do
|
10
|
+
before {
|
11
|
+
allow(described_class).to receive(:get).with(:find, code: "dvs") {
|
12
|
+
{"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"}
|
13
|
+
}
|
14
|
+
}
|
15
|
+
it "returns an AdminSet instance" do
|
16
|
+
expect(described_class.call(obj)).to be_a(described_class)
|
17
|
+
end
|
18
|
+
end
|
19
|
+
describe "and the admin set is not found" do
|
20
|
+
before {
|
21
|
+
allow(described_class).to receive(:get).with(:find, code: "dvs")
|
22
|
+
.and_raise(ActiveResource::ResourceNotFound, "404")
|
23
|
+
}
|
24
|
+
it "raises an exception" do
|
25
|
+
expect { described_class.call(obj) }.to raise_error(Ddr::Models::NotFoundError)
|
13
26
|
end
|
14
27
|
end
|
15
|
-
|
16
|
-
its(:to_s) { is_expected.to eq("Data and Visualization Services") }
|
17
28
|
end
|
18
29
|
|
19
30
|
describe "when the object does not have an admin set" do
|
20
|
-
it
|
31
|
+
it "returns nil" do
|
32
|
+
expect(described_class.call(obj)).to be_nil
|
33
|
+
end
|
21
34
|
end
|
22
35
|
end
|
23
36
|
|
37
|
+
describe "instance methods" do
|
38
|
+
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") }
|
39
|
+
its(:to_s) { is_expected.to eq("Data and Visualization Services") }
|
40
|
+
end
|
41
|
+
|
24
42
|
end
|
25
43
|
end
|
data/spec/models/contact_spec.rb
CHANGED
@@ -1,20 +1,40 @@
|
|
1
1
|
module Ddr::Models
|
2
|
-
RSpec.describe Contact do
|
2
|
+
RSpec.describe Contact, ddr_aux: true do
|
3
3
|
|
4
4
|
describe ".call" do
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
5
|
+
describe "when the slug is found" do
|
6
|
+
before {
|
7
|
+
allow(described_class).to receive(:get).with(:find, slug: "abc") {
|
8
|
+
{"id"=>1, "slug"=>"abc", "name"=>"A, B, and C Services", "short_name"=>"ABCS",
|
9
|
+
"url"=>"http://library.inst.edu/abc", "phone"=>"555-1234", "email"=>"abc@library.inst.edu",
|
10
|
+
"ask"=>"http://library.inst.edu/abc-ask", "created_at"=>"2015-09-15T16:15:58.514Z",
|
11
|
+
"updated_at"=>"2015-09-15T16:15:58.514Z"}
|
12
|
+
}
|
13
|
+
}
|
14
|
+
it "returns a Contact instance" do
|
15
|
+
expect(described_class.call("abc")).to be_a(described_class)
|
16
|
+
end
|
17
|
+
end
|
18
|
+
describe "when the slug is not found" do
|
19
|
+
before {
|
20
|
+
allow(described_class).to receive(:get).with(:find, slug: "abc")
|
21
|
+
.and_raise(ActiveResource::ResourceNotFound, "404")
|
22
|
+
}
|
23
|
+
it "raises an exception" do
|
24
|
+
expect { described_class.call("abc") }.to raise_error(Ddr::Models::NotFoundError)
|
15
25
|
end
|
16
26
|
end
|
27
|
+
end
|
17
28
|
|
29
|
+
describe "instance methods" do
|
30
|
+
subject {
|
31
|
+
described_class.new(
|
32
|
+
"id"=>1, "slug"=>"abc", "name"=>"A, B, and C Services", "short_name"=>"ABCS",
|
33
|
+
"url"=>"http://library.inst.edu/abc", "phone"=>"555-1234", "email"=>"abc@library.inst.edu",
|
34
|
+
"ask"=>"http://library.inst.edu/abc-ask", "created_at"=>"2015-09-15T16:15:58.514Z",
|
35
|
+
"updated_at"=>"2015-09-15T16:15:58.514Z"
|
36
|
+
)
|
37
|
+
}
|
18
38
|
its(:to_s) { is_expected.to eq("A, B, and C Services") }
|
19
39
|
end
|
20
40
|
|
@@ -179,10 +179,10 @@ module Ddr::Models
|
|
179
179
|
describe "contacts" do
|
180
180
|
before do
|
181
181
|
allow(Ddr::Models::Contact).to receive(:get).with(:find, slug: 'xa') do
|
182
|
-
|
182
|
+
{'id'=>1, 'slug'=>'xa', 'name'=>'Contact A', 'short_name'=>'A'}
|
183
183
|
end
|
184
184
|
allow(Ddr::Models::Contact).to receive(:get).with(:find, slug: 'yb') do
|
185
|
-
|
185
|
+
{'id'=>1, 'slug'=>'yb', 'name'=>'Contact B', 'short_name'=>'B'}
|
186
186
|
end
|
187
187
|
end
|
188
188
|
describe "#research_help" do
|
data/spec/models/license_spec.rb
CHANGED
@@ -1,26 +1,45 @@
|
|
1
1
|
module Ddr::Models
|
2
|
-
RSpec.describe License do
|
2
|
+
RSpec.describe License, ddr_aux: true do
|
3
3
|
|
4
4
|
describe ".call" do
|
5
|
-
subject { described_class.call(obj) }
|
6
|
-
|
7
5
|
describe "when the object has a license URL" do
|
8
|
-
let(:
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
6
|
+
let(:obj) { double(pid: "test:1", license: "http://example.com") }
|
7
|
+
describe "and the license is found" do
|
8
|
+
before {
|
9
|
+
allow(described_class).to receive(:get).with(:find, url: "http://example.com") {
|
10
|
+
{"id"=>1, "url"=>"http://example.com", "title"=>"A License"}
|
11
|
+
}
|
12
|
+
}
|
13
|
+
it "returns a License instance" do
|
14
|
+
expect(described_class.call(obj)).to be_a(described_class)
|
15
|
+
end
|
16
|
+
it "sets `pid` to the object pid" do
|
17
|
+
expect(described_class.call(obj).pid).to eq("test:1")
|
18
|
+
end
|
19
|
+
end
|
20
|
+
describe "and the license is not found" do
|
21
|
+
before {
|
22
|
+
allow(described_class).to receive(:get).with(:find, url: "http://example.com")
|
23
|
+
.and_raise(ActiveResource::ResourceNotFound, "404")
|
24
|
+
}
|
25
|
+
it "raises an exception" do
|
26
|
+
expect { described_class.call(obj) }.to raise_error(Ddr::Models::NotFoundError)
|
13
27
|
end
|
14
28
|
end
|
15
|
-
its(:pid) { is_expected.to eq("test:1") }
|
16
|
-
its(:to_s) { is_expected.to eq("A License") }
|
17
29
|
end
|
18
30
|
|
19
31
|
describe "when the object does not have a license" do
|
20
32
|
let(:obj) { double(pid: "test:1", license: nil) }
|
21
|
-
it
|
33
|
+
it "returns nil" do
|
34
|
+
expect(described_class.call(obj)).to be_nil
|
35
|
+
end
|
22
36
|
end
|
23
37
|
end
|
24
38
|
|
39
|
+
describe "instance methods" do
|
40
|
+
subject { described_class.new("id"=>1, "url"=>"http://example.com", "title"=>"A License") }
|
41
|
+
its(:to_s) { is_expected.to eq("A License") }
|
42
|
+
end
|
43
|
+
|
25
44
|
end
|
26
45
|
end
|
@@ -129,10 +129,10 @@ RSpec.describe SolrDocument, type: :model, contacts: true do
|
|
129
129
|
describe "contacts" do
|
130
130
|
before do
|
131
131
|
allow(Ddr::Models::Contact).to receive(:get).with(:find, slug: 'xa') do
|
132
|
-
|
132
|
+
{'id'=>1, 'slug'=>'xa', 'name'=>'Contact A', 'short_name'=>'A'}
|
133
133
|
end
|
134
134
|
allow(Ddr::Models::Contact).to receive(:get).with(:find, slug: 'yb') do
|
135
|
-
|
135
|
+
{'id'=>1, 'slug'=>'yb', 'name'=>'Contact B', 'short_name'=>'B'}
|
136
136
|
end
|
137
137
|
end
|
138
138
|
describe "#research_help" do
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ddr-models
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.4.0.
|
4
|
+
version: 2.4.0.rc2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Jim Coble
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2015-12-
|
12
|
+
date: 2015-12-11 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: rails
|