ddr-models 2.11.0 → 3.0.0.alpha.1

data/spec/auth/effective_permissions_spec.rb

@@ -2,7 +2,7 @@ module Ddr::Auth
   RSpec.describe EffectivePermissions do
 
     let(:resource) { FactoryGirl.build(:item) }
-    let(:policy) { Collection.new(pid: "coll:1") }
+    let(:policy) { Collection.new(pid: "coll-1") }
     let(:agents) { [ "Editors", "bob@example.com" ] }
     
     before do

data/spec/auth/effective_roles_spec.rb

@@ -2,7 +2,7 @@ module Ddr::Auth
   RSpec.describe EffectiveRoles do
     
     let(:resource) { FactoryGirl.build(:item) }
-    let(:policy) { Collection.new(pid: "coll:1") }
+    let(:policy) { Collection.new(pid: "coll-1") }
     let(:agents) { [ "Editors", "bob@example.com", "public" ] }
     let(:editor) { Roles::Role.build type: "Editor", agent: "Editors", scope: "policy" }
     let(:downloader) { FactoryGirl.build(:role, :downloader, :public) }

data/spec/auth/ldap_gateway_spec.rb

@@ -0,0 +1,9 @@
+require "net/ldap"
+
+module Ddr::Auth
+  RSpec.describe LdapGateway do
+
+    # write some tests or delete this module
+
+  end
+end

data/spec/contacts/contacts_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+module Ddr
+  RSpec.describe Contacts, contacts: true do
+
+    before do
+      allow(YAML).to receive(:load_file) { { 'a' => { 'name' => 'Contact A', 'short_name' => 'A' },
+                                             'b' => { 'name' => 'Contact B', 'short_name' => 'B' } } }
+      Contacts.load_contacts
+    end
+
+    describe "load_contacts" do
+      it "should load the contacts" do
+        expect(Contacts.contacts.to_h).to_not be_empty
+      end
+    end
+
+    describe "get" do
+      it "should return the appropriate contact" do
+        expect(Contacts.get('a').name).to eq('Contact A')
+        expect(Contacts.get('b').name).to eq('Contact B')
+      end
+    end
+
+  end
+end

data/spec/controllers/including_role_based_access_controls_enforcement_spec.rb

@@ -31,17 +31,17 @@ RSpec.describe ApplicationController, type: :controller do
       collections[2].roles.grant type: "Viewer", agent: "foo:bar", scope: "policy"
       collections[2].save
     end
-    it "should return a list of internal URIs for collections on which the current ability has a role" do
-      expect(subject.policy_role_policies).to match_array([collections[0].internal_uri, collections[1].internal_uri])
+    it "should return a list of IDs for collections on which the current ability has a role" do
+      expect(subject.policy_role_policies).to match_array([collections[0].id, collections[1].id])
     end
   end
 
   describe "#policy_role_filters" do
     before do
-      allow(subject).to receive(:policy_role_policies) { ["info:fedora/test:13", "info:fedora/test:45"] }
+      allow(subject).to receive(:policy_role_policies) { ["test-13", "test-45"] }
     end
-    it "should include clauses for is_governed_by relationships to the #policy_role_policies" do
-      expect(subject.policy_role_filters).to eq("_query_:\"{!raw f=#{Ddr::Index::Fields::IS_GOVERNED_BY}}info:fedora/test:13\" OR _query_:\"{!raw f=#{Ddr::Index::Fields::IS_GOVERNED_BY}}info:fedora/test:45\"")
+    it "should include clauses for isGovernedBy relationships to the #policy_role_policies" do
+      expect(subject.policy_role_filters).to eq("_query_:\"{!raw f=#{Ddr::Index::Fields::IS_GOVERNED_BY}}test-13\" OR _query_:\"{!raw f=#{Ddr::Index::Fields::IS_GOVERNED_BY}}test-45\"")
     end
   end
 

data/spec/derivatives/multires_image_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+module Ddr::Derivatives
+  RSpec.describe MultiresImage do
+
+    subject { described_class }
+
+    let(:object) { Component.new }
+
+    describe '#generatable?' do
+      context 'object does not have content' do
+        it "should not be generatable" do
+          expect(subject.generatable?(object)).to be_falsey
+        end
+      end
+      context 'object has content' do
+        before { allow(object).to receive(:has_content?) { true } }
+        context 'content is a tiff image' do
+          before { allow(object).to receive(:content_type) { 'image/tiff' } }
+          it "should be generatable" do
+            expect(subject.generatable?(object)).to be_truthy
+          end
+        end
+        context 'content is not a tiff image' do
+          before { allow(object).to receive(:content_type) { 'image/jpeg' } }
+          it "should not be generatable" do
+            expect(subject.generatable?(object)).to be_falsey
+          end
+        end
+      end
+
+      describe '.has_derivative?' do
+        context 'does not have multires image' do
+          it 'should not have the derivative' do
+            expect(subject.has_derivative?(object)).to be_falsey
+          end
+        end
+        context 'has multires image' do
+          before { allow(object).to receive(:multires_image_file_path) { '/tmp/foo.ptif' } }
+          it 'should have the derivative' do
+            expect(subject.has_derivative?(object)).to be_truthy
+          end
+        end
+      end
+
+    end
+  end
+end

data/spec/derivatives/png_generator_spec.rb

@@ -1,27 +1,22 @@
+require 'spec_helper'
+
 module Ddr::Derivatives
   RSpec.describe PngGenerator do
 
     describe "generate" do
       let(:tempdir) { Dir.mktmpdir }
-      let(:output_file) { File.new(File.join(tempdir, "output.png"), 'wb') }
+      let(:output_path) { File.join(tempdir, "output.png") }
       let(:options) { "-resize '100x100>'" }
-      let(:generator) { described_class.new(source, output_file.path, options) }
+      let(:generator) { described_class.new(options) }
       after { FileUtils.rmdir(tempdir) }
       context "tiff source" do
-        let(:source) { File.join(Ddr::Models::Engine.root, "spec", "fixtures", "imageA.tif") }
-        it "should generate a non-empty file" do
-          generator.generate
-          expect(File.size(output_file.path)).to be > 0
-        end
-      end
-      context "animated gif source" do
-        let(:source) { File.join(Ddr::Models::Engine.root, "spec", "fixtures", "arrow1rightred_e0.gif") }
+        let(:source_path) { File.join(Ddr::Models::Engine.root, "spec", "fixtures", "imageA.tif") }
         it "should generate a non-empty file" do
-          generator.generate
-          expect(File.size(output_file.path)).to be > 0
+          generator.generate(source_path, output_path)
+          expect(File.size(output_path)).to be > 0
         end
       end
     end
 
   end
-end
+end

data/spec/derivatives/ptif_generator_spec.rb

@@ -1,29 +1,31 @@
+require 'spec_helper'
+
 module Ddr::Derivatives
   RSpec.describe PtifGenerator do
 
     describe "generate" do
       let(:tempdir) { Dir.mktmpdir }
-      let(:output_file) { File.new(File.join(tempdir, "output.ptif"), 'wb') }
+      let(:output_path) { File.join(tempdir, "output.ptif") }
       let(:options) { "jpeg:90,tile:256x256,pyramid" }
-      let(:generator) { described_class.new(source, output_file.path, options) }
+      let(:generator) { described_class.new(options) }
       after { FileUtils.rmdir(tempdir) }
       context "tiff source" do
         context "8-bit source" do
-          let(:source) { File.join(Ddr::Models::Engine.root, "spec", "fixtures", "8bit.tif") }
+          let(:source_path) { File.join(Ddr::Models::Engine.root, "spec", "fixtures", "8bit.tif") }
           it "should generate a non-empty file" do
-            generator.generate
-            expect(File.size(output_file.path)).to be > 0
+            generator.generate(source_path, output_path)
+            expect(File.size(output_path)).to be > 0
           end
         end
         context "16-bit source" do
-          let(:source) { File.join(Ddr::Models::Engine.root, "spec", "fixtures", "16bit.tif") }
+          let(:source_path) { File.join(Ddr::Models::Engine.root, "spec", "fixtures", "16bit.tif") }
           it "should generate a non-empty file" do
-            generator.generate
-            expect(File.size(output_file.path)).to be > 0
+            generator.generate(source_path, output_path)
+            expect(File.size(output_path)).to be > 0
           end
         end
       end
     end
 
   end
-end
+end

data/spec/derivatives/thumbnail_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+module Ddr::Derivatives
+  RSpec.describe Thumbnail do
+
+    subject { described_class }
+
+    let(:object) { Component.new }
+
+    describe '.generatable?' do
+      context 'object does not have content' do
+        it "should not be generatable" do
+          expect(subject.generatable?(object)).to be_falsey
+        end
+      end
+      context 'object has content' do
+        before { allow(object).to receive(:has_content?) { true } }
+        context 'content is an image' do
+          before { allow(object).to receive(:image?) { true } }
+          it "should be generatable" do
+            expect(subject.generatable?(object)).to be_truthy
+          end
+        end
+        context 'content is not an image' do
+          before { allow(object).to receive(:image?) { false } }
+          it "should not be generatable" do
+            expect(subject.generatable?(object)).to be_falsey
+          end
+        end
+      end
+    end
+
+    describe '.has_derivative?' do
+      context 'does not have thumbnail' do
+        it 'should not have the derivative' do
+          expect(subject.has_derivative?(object)).to be_falsey
+        end
+      end
+      context 'has thumbnail' do
+        before { allow(object).to receive(:has_thumbnail?) { true } }
+        it 'should have the derivative' do
+          expect(subject.has_derivative?(object)).to be_truthy
+        end
+      end
+    end
+
+  end
+end

data/spec/dummy/config/environments/test.rb

@@ -13,7 +13,7 @@ Rails.application.configure do
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_files  = true
+  config.serve_static_assets  = true
   config.static_cache_control = 'public, max-age=3600'
 
   # Show full error reports and disable caching.

data/spec/dummy/db/schema.rb

@@ -11,50 +11,48 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20161021201011) do
+ActiveRecord::Schema.define(version: 20150713171838) do
 
-  create_table "events", force: :cascade do |t|
+  create_table "events", force: true do |t|
     t.datetime "event_date_time"
     t.integer  "user_id"
-    t.string   "type",            limit: 255
-    t.string   "pid",             limit: 255
-    t.string   "software",        limit: 255
+    t.string   "type"
+    t.string   "pid"
+    t.string   "software"
     t.text     "comment"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "summary",         limit: 255
-    t.string   "outcome",         limit: 255
+    t.string   "summary"
+    t.string   "outcome"
     t.text     "detail"
     t.text     "exception",       limit: 65535
-    t.string   "user_key",        limit: 255
-    t.string   "permanent_id",    limit: 255
+    t.string   "user_key"
   end
 
   add_index "events", ["event_date_time"], name: "index_events_on_event_date_time"
   add_index "events", ["outcome"], name: "index_events_on_outcome"
-  add_index "events", ["permanent_id"], name: "index_events_on_permanent_id"
   add_index "events", ["pid"], name: "index_events_on_pid"
   add_index "events", ["type"], name: "index_events_on_type"
 
-  create_table "users", force: :cascade do |t|
-    t.string   "email",                  limit: 255, default: "", null: false
-    t.string   "encrypted_password",     limit: 255, default: "", null: false
-    t.string   "reset_password_token",   limit: 255
+  create_table "users", force: true do |t|
+    t.string   "email",                  default: "", null: false
+    t.string   "encrypted_password",     default: "", null: false
+    t.string   "reset_password_token"
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",                      default: 0
+    t.integer  "sign_in_count",          default: 0
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
-    t.string   "current_sign_in_ip",     limit: 255
-    t.string   "last_sign_in_ip",        limit: 255
-    t.datetime "created_at",                                      null: false
-    t.datetime "updated_at",                                      null: false
-    t.string   "username",               limit: 255, default: "", null: false
-    t.string   "first_name",             limit: 255
-    t.string   "middle_name",            limit: 255
-    t.string   "nickname",               limit: 255
-    t.string   "last_name",              limit: 255
-    t.string   "display_name",           limit: 255
+    t.string   "current_sign_in_ip"
+    t.string   "last_sign_in_ip"
+    t.datetime "created_at",                          null: false
+    t.datetime "updated_at",                          null: false
+    t.string   "username",               default: "", null: false
+    t.string   "first_name"
+    t.string   "middle_name"
+    t.string   "nickname"
+    t.string   "last_name"
+    t.string   "display_name"
   end
 
   add_index "users", ["email"], name: "index_users_on_email"

data/spec/factories/attachment_factories.rb

@@ -1,8 +1,8 @@
 FactoryGirl.define do
 
   factory :attachment do
-    title [ "Test Attachment" ]
-    sequence(:identifier) { |n| [ "att%05d" % n ] }
+    dc_title [ "Test Attachment" ]
+    sequence(:dc_identifier) { |n| [ "att%05d" % n ] }
     after(:build) do |a|
       a.upload File.new(File.join(Ddr::Models::Engine.root.to_s, 'spec', 'fixtures', 'sample.docx'))
     end

data/spec/factories/collection_factories.rb

@@ -1,9 +1,8 @@
 FactoryGirl.define do
 
   factory :collection do
-    title [ "Test Collection" ]
-    admin_set "foo"
-    sequence(:identifier) { |n| [ "coll%05d" % n ] }
+    dc_title [ "Test Collection" ]
+    sequence(:dc_identifier) { |n| [ "coll%05d" % n ] }
   end
 
 end

data/spec/factories/component_factories.rb

@@ -1,8 +1,8 @@
 FactoryGirl.define do
 
   factory :component do
-    title [ "Test Component" ]
-    sequence(:identifier) { |n| [ "cmp%05d" % n ] }
+    dc_title [ "Test Component" ]
+    sequence(:dc_identifier) { |n| [ "cmp%05d" % n ] }
     after(:build) do |c|
       c.upload File.new(File.join(Ddr::Models::Engine.root.to_s, "spec", "fixtures", "imageA.tif"))
     end

data/spec/factories/item_factories.rb

@@ -1,8 +1,8 @@
 FactoryGirl.define do
 
   factory :item do
-    title [ "Test Item" ]
-    sequence(:identifier) { |n| [ "item%05d" % n ] }
+    dc_title [ "Test Item" ]
+    sequence(:dc_identifier) { |n| [ "item%05d" % n ] }
   end
 
 end

data/spec/factories/structure_factories.rb

@@ -2,7 +2,7 @@ require 'support/structural_metadata_helper'
 
 FactoryGirl.define do
 
-  factory :structures, class: Ddr::Models::Structure do
+  factory :structure, class: Ddr::Models::Structure do
 
     factory :simple_structure do
       initialize_with do
@@ -16,12 +16,6 @@ FactoryGirl.define do
       end
     end
 
-    factory :nested_structure_mptr do
-      initialize_with do
-        new(nested_structure_mptr_document)
-      end
-    end
-
     factory :multiple_struct_maps_structure do
       initialize_with do
         new(multiple_struct_maps_structure_document)
@@ -30,4 +24,4 @@ FactoryGirl.define do
 
   end
 
-end
+end

data/spec/factories/test_model_factories.rb

@@ -7,19 +7,27 @@ end
 
 class TestParent < TestModel
   include Ddr::Models::HasChildren
-  has_many :children, property: :is_part_of, class_name: 'TestChild'
+  has_many :children,
+           predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf,
+           class_name: 'TestChild'
 end
 
 class TestChild < TestModel
-  belongs_to :parent, property: :is_part_of, class_name: 'TestParent'
+  belongs_to :parent,
+             predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf,
+             class_name: 'TestParent'
 end
 
 class TestModelOmnibus < TestModel
   include Ddr::Models::Governable
   include Ddr::Models::HasContent
   include Ddr::Models::HasAttachments
-  has_many :children, property: :is_part_of, class_name: 'TestChild'
-  belongs_to :parent, property: :is_part_of, class_name: 'TestParent'
+  has_many :children,
+           predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf,
+           class_name: 'TestChild'
+  belongs_to :parent,
+             predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf,
+             class_name: 'TestParent'
 end
 
 FactoryGirl.define do