ddr-models 2.0.1 → 2.1.0.rc1

data/spec/models/has_struct_metadata_spec.rb

@@ -38,8 +38,8 @@ module Ddr
         before { item.datastreams[Ddr::Datastreams::STRUCT_METADATA].content = multiple_struct_maps_structure }
         it "should index the JSON representation of the structure" do
           indexing = item.to_solr
-          expect(indexing.keys).to include(Ddr::IndexFields::STRUCT_MAPS)
-          expect(indexing[Ddr::IndexFields::STRUCT_MAPS]).to eq(expected_json)
+          expect(indexing.keys).to include(Ddr::Index::Fields::STRUCT_MAPS)
+          expect(indexing[Ddr::Index::Fields::STRUCT_MAPS]).to eq(expected_json)
         end
       end
 

data/spec/models/indexing_spec.rb

@@ -0,0 +1,40 @@
+module Ddr::Models
+  RSpec.describe Indexing do
+
+    let(:obj) { FactoryGirl.build(:item) }
+
+    let(:role1) { FactoryGirl.build(:role, :curator, :person, :resource) }
+    let(:role2) { FactoryGirl.build(:role, :curator, :person, :policy) }
+    let(:role3) { FactoryGirl.build(:role, :editor, :group, :policy) }
+    let(:role4) { FactoryGirl.build(:role, :editor, :person, :policy) }
+
+    subject { obj.index_fields }
+
+    before do
+      obj.license = "cc-by-nc-nd-40"
+      obj.rightsMetadata.license.title = ["License Title"]
+      obj.rightsMetadata.license.description = ["License Description"]
+      obj.rightsMetadata.license.url = ["http://library.duke.edu"]
+      obj.local_id = "foo"
+      obj.adminMetadata.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
+    end
+
+    its([Indexing::LICENSE]) { is_expected.to eq("cc-by-nc-nd-40") }
+    its([Indexing::LICENSE_TITLE]) { is_expected.to eq("License Title") }
+    its([Indexing::LICENSE_DESCRIPTION]) { is_expected.to eq("License Description") }
+    its([Indexing::LICENSE_URL]) { is_expected.to eq("http://library.duke.edu") }
+    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::POLICY_ROLE]) { is_expected.to contain_exactly(role2.agent.first, role3.agent.first, role4.agent.first) }
+    its([Indexing::RESOURCE_ROLE]) { is_expected.to contain_exactly(role1.agent.first) }
+
+  end
+end

data/spec/models/solr_document_spec.rb

@@ -2,32 +2,48 @@ require 'spec_helper'
 
 RSpec.describe SolrDocument, type: :model, contacts: true do
 
-  describe "#inherited_license" do
-    let(:apo_solr_response) { [{"system_create_dtsi"=>"2015-03-10T15:20:16Z", "system_modified_dtsi"=>"2015-03-10T15:21:50Z", "object_state_ssi"=>"A", "active_fedora_model_ssi"=>"Collection", "id"=>"changeme:224", "object_profile_ssm"=>["{\"datastreams\":{\"DC\":{\"dsLabel\":\"Dublin Core Record for this object\",\"dsVersionID\":\"DC1.0\",\"dsCreateDate\":\"2015-03-10T15:20:16Z\",\"dsState\":\"A\",\"dsMIME\":\"text/xml\",\"dsFormatURI\":\"http://www.openarchives.org/OAI/2.0/oai_dc/\",\"dsControlGroup\":\"X\",\"dsSize\":341,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"changeme:224+DC+DC1.0\",\"dsLocationType\":null,\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"0555f020bbfc94c07745f530af4195fed9cf4e4ba539a30727f2d2d5743627be\"},\"RELS-EXT\":{\"dsLabel\":\"Fedora Object-to-Object Relationship Metadata\",\"dsVersionID\":\"RELS-EXT.1\",\"dsCreateDate\":\"2015-03-10T15:20:18Z\",\"dsState\":\"A\",\"dsMIME\":\"application/rdf+xml\",\"dsFormatURI\":null,\"dsControlGroup\":\"X\",\"dsSize\":417,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"changeme:224+RELS-EXT+RELS-EXT.1\",\"dsLocationType\":null,\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"6a7c2621534cd1cb28d9cfa7e45bb128a1f3c05028e29def4dea479be9596d7d\"},\"descMetadata\":{\"dsLabel\":\"Descriptive Metadata for this object\",\"dsVersionID\":\"descMetadata.1\",\"dsCreateDate\":\"2015-03-10T15:20:18Z\",\"dsState\":\"A\",\"dsMIME\":\"application/n-triples\",\"dsFormatURI\":null,\"dsControlGroup\":\"M\",\"dsSize\":80,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"changeme:224+descMetadata+descMetadata.1\",\"dsLocationType\":\"INTERNAL_ID\",\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"bbba526a1ca47f19dfe110f25a0a721bda481dc414f7ec89e3f02c5562eaa9a2\"},\"rightsMetadata\":{\"dsLabel\":null,\"dsVersionID\":\"rightsMetadata.0\",\"dsCreateDate\":\"2015-03-10T15:20:17Z\",\"dsState\":\"A\",\"dsMIME\":\"text/xml\",\"dsFormatURI\":null,\"dsControlGroup\":\"M\",\"dsSize\":550,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"changeme:224+rightsMetadata+rightsMetadata.0\",\"dsLocationType\":\"INTERNAL_ID\",\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"210d5a228bd96e22b20723de1dd20ea8d897252063713d0815369c49045c5c05\"},\"properties\":{},\"thumbnail\":{},\"adminMetadata\":{},\"defaultRights\":{\"dsLabel\":null,\"dsVersionID\":\"defaultRights.0\",\"dsCreateDate\":\"2015-03-10T15:21:50Z\",\"dsState\":\"A\",\"dsMIME\":\"text/xml\",\"dsFormatURI\":null,\"dsControlGroup\":\"M\",\"dsSize\":634,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"changeme:224+defaultRights+defaultRights.0\",\"dsLocationType\":\"INTERNAL_ID\",\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"1a2d9e665228d5e3cbf5f8ddd0d641172c20f98b4e05d62f741b7b9010696ad0\"}},\"objLabel\":null,\"objOwnerId\":\"fedoraAdmin\",\"objModels\":[\"info:fedora/afmodel:Collection\",\"info:fedora/fedora-system:FedoraObject-3.0\"],\"objCreateDate\":\"2015-03-10T15:20:16Z\",\"objLastModDate\":\"2015-03-10T15:20:18Z\",\"objDissIndexViewURL\":\"http://localhost:8983/fedora/objects/changeme%3A224/methods/fedora-system%3A3/viewMethodIndex\",\"objItemIndexViewURL\":\"http://localhost:8983/fedora/objects/changeme%3A224/methods/fedora-system%3A3/viewItemIndex\",\"objState\":\"A\"}"], "title_tesim"=>["Test Collection"], "edit_access_person_ssim"=>["coblej@duke.edu"], "inheritable_read_access_group_ssim"=>["public"], "is_governed_by_ssim"=>["info:fedora/changeme:224"], "has_model_ssim"=>["info:fedora/afmodel:Collection"], "title_ssi"=>"Test Collection", "internal_uri_ssi"=>"info:fedora/changeme:224", "default_license_description_tesim"=>["Default License Description"], "default_license_title_tesim"=>["Default License Title"], "default_license_url_tesim"=>["http://test.license.org/"], "_version_"=>1495270331036729344, "timestamp"=>"2015-03-10T15:21:50.793Z"}] }
-    before do
-      allow(subject).to receive(:admin_policy_pid).and_return('changeme:224')
-      allow(ActiveFedora::SolrService).to receive(:query).and_return(apo_solr_response)
+  describe "index field method access" do
+    describe "when there is an index field" do
+      before { Ddr::Index::Fields.const_set(:FOO_BAR, "foo_bar_ssim") }
+      after { Ddr::Index::Fields.send(:remove_const, :FOO_BAR) }
+      describe "and the field is not present" do
+        its(:foo_bar) { is_expected.to be_nil }
+      end
+      describe "and the field is a single value (not an array)" do
+        before { subject[Ddr::Index::Fields::FOO_BAR] = "foo" }
+        its(:foo_bar) { is_expected.to eq("foo") }
+      end
+      describe "and the field value is an array" do
+        before { subject[Ddr::Index::Fields::FOO_BAR] = ["foo", "bar"] }
+        its(:foo_bar) { is_expected.to eq("foo, bar") }
+      end
     end
-    it "should return a hash of the default license attributes of the governing object" do
-      expect(subject.inherited_license).to include(title: "Default License Title",
-                                                    description: "Default License Description",
-                                                    url: "http://test.license.org/")
+    describe "when there is no index field" do
+      it "should raise an exception" do
+        expect { subject.foo_bar }.to raise_error(NoMethodError)
+      end
     end
   end
 
-  describe "#permanent_id" do
-    before { subject[Ddr::IndexFields::PERMANENT_ID] = "foo" }
-    its(:permanent_id) { is_expected.to eq("foo") }
+  describe "#admin_policy_uri" do
+    describe "when is_governed_by is not set" do
+      its(:admin_policy_uri) { 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") }
+    end
   end
 
   describe "#admin_policy" do
-    describe "when there is not admin policy relationship" 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 }
     end
     describe "where there is an admin policy relationship" do
       let(:admin_policy) { FactoryGirl.create(:collection) }
       before do
-        subject[Ddr::IndexFields::IS_GOVERNED_BY] = [ admin_policy.internal_uri ]
+        subject[Ddr::Index::Fields::IS_GOVERNED_BY] = [ admin_policy.internal_uri ]
       end
       it "should get the admin policy document" do
         expect(subject.admin_policy.id).to eq(admin_policy.id)
@@ -35,19 +51,39 @@ RSpec.describe SolrDocument, type: :model, contacts: true do
     end
   end
 
-  describe "#local_id" do
-    before { subject[Ddr::IndexFields::LOCAL_ID] = "abcdef" }
-    its(:local_id) { is_expected.to eq("abcdef") }
+  describe "#parent_uri" 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") }
+    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") }
+      end
+      describe "when is_member_of_collection is not present" do
+        its(:parent_uri) { is_expected.to be_nil }
+      end
+    end
   end
 
-  describe "#admin_set" do
-    before { subject[Ddr::IndexFields::ADMIN_SET] = "foobar" }
-    its(:admin_set) { should eq("foobar") }
+  describe "#parent" do
+    describe "when there is a parent URI" 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 }
+      end
+      its(:parent) { is_expected.to eq(doc) }
+    end
+    describe "when there is no parent URI" do
+      its(:parent) { is_expected.to be_nil }
+    end
   end
 
   describe "#roles" do
     let(:json) { "[{\"role_type\":[\"Editor\"],\"agent\":[\"Editors\"],\"scope\":[\"policy\"]},{\"role_type\":[\"Contributor\"],\"agent\":[\"bob@example.com\"],\"scope\":[\"resource\"]}]" }
-    before { subject[Ddr::IndexFields::ACCESS_ROLE] = json }
+    before { subject[Ddr::Index::Fields::ACCESS_ROLE] = json }
     it "should deserialize the roles from JSON" do
       expect(subject.roles.to_a)
         .to eq([Ddr::Auth::Roles::Role.build(type: "Editor", agent: "Editors", scope: "policy"),
@@ -55,11 +91,6 @@ RSpec.describe SolrDocument, type: :model, contacts: true do
     end
   end
 
-  describe "#display_format" do
-    before { subject[Ddr::IndexFields::DISPLAY_FORMAT] = "Image" }
-    its(:display_format) { should eq("Image") }
-  end
-
   describe "#struct_maps" do
     context "no indexed struct maps" do
       it "should return an empty hash" do
@@ -67,7 +98,7 @@ RSpec.describe SolrDocument, type: :model, contacts: true do
       end
     end
     context "indexed struct maps" do
-      before { subject[Ddr::IndexFields::STRUCT_MAPS] = multiple_struct_maps_structure_to_json }
+      before { subject[Ddr::Index::Fields::STRUCT_MAPS] = multiple_struct_maps_structure_to_json }
       it "should return a hash of the struct maps" do
         expect(subject.struct_maps).to eq(JSON.parse(multiple_struct_maps_structure_to_json))
       end
@@ -81,7 +112,7 @@ RSpec.describe SolrDocument, type: :model, contacts: true do
       end
     end
     context "indexed struct maps" do
-      before { subject[Ddr::IndexFields::STRUCT_MAPS] = multiple_struct_maps_structure_to_json }
+      before { subject[Ddr::Index::Fields::STRUCT_MAPS] = multiple_struct_maps_structure_to_json }
       context "requested struct map is indexed" do
         it "should return the struct map" do
           expect(subject.struct_map('default')).to eq(JSON.parse(multiple_struct_maps_structure_to_json)["default"])
@@ -95,11 +126,6 @@ RSpec.describe SolrDocument, type: :model, contacts: true do
     end
   end
 
-  describe "#display_format" do
-    before { subject[Ddr::IndexFields::DISPLAY_FORMAT] = "Image" }
-    its(:display_format) { should eq("Image") }
-  end
-
   describe "contacts" do
     before do
       allow(YAML).to receive(:load_file) { { 'xa' => { 'name' => 'Contact A', 'short_name' => 'A' },
@@ -108,17 +134,16 @@ RSpec.describe SolrDocument, type: :model, contacts: true do
     end
     describe "#research_help" do
       context "object has research help contact" do
-        before { subject[Ddr::IndexFields::RESEARCH_HELP_CONTACT] = 'yb' }
+        before { subject[Ddr::Index::Fields::RESEARCH_HELP_CONTACT] = 'yb' }
         it "should return the object's research help contact" do
           expect(subject.research_help.slug).to eq('yb')
         end
       end
       context "object does not have research help contact" do
         context "collection has research help contact" do
-          let(:apo_solr_response) { [{"system_create_dtsi"=>"2015-03-10T15:20:16Z", "system_modified_dtsi"=>"2015-03-10T15:21:50Z", "object_state_ssi"=>"A", "active_fedora_model_ssi"=>"Collection", "id"=>"changeme:224", "object_profile_ssm"=>["{\"datastreams\":{\"DC\":{\"dsLabel\":\"Dublin Core Record for this object\",\"dsVersionID\":\"DC1.0\",\"dsCreateDate\":\"2015-03-10T15:20:16Z\",\"dsState\":\"A\",\"dsMIME\":\"text/xml\",\"dsFormatURI\":\"http://www.openarchives.org/OAI/2.0/oai_dc/\",\"dsControlGroup\":\"X\",\"dsSize\":341,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"changeme:224+DC+DC1.0\",\"dsLocationType\":null,\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"0555f020bbfc94c07745f530af4195fed9cf4e4ba539a30727f2d2d5743627be\"},\"RELS-EXT\":{\"dsLabel\":\"Fedora Object-to-Object Relationship Metadata\",\"dsVersionID\":\"RELS-EXT.1\",\"dsCreateDate\":\"2015-03-10T15:20:18Z\",\"dsState\":\"A\",\"dsMIME\":\"application/rdf+xml\",\"dsFormatURI\":null,\"dsControlGroup\":\"X\",\"dsSize\":417,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"changeme:224+RELS-EXT+RELS-EXT.1\",\"dsLocationType\":null,\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"6a7c2621534cd1cb28d9cfa7e45bb128a1f3c05028e29def4dea479be9596d7d\"},\"descMetadata\":{\"dsLabel\":\"Descriptive Metadata for this object\",\"dsVersionID\":\"descMetadata.1\",\"dsCreateDate\":\"2015-03-10T15:20:18Z\",\"dsState\":\"A\",\"dsMIME\":\"application/n-triples\",\"dsFormatURI\":null,\"dsControlGroup\":\"M\",\"dsSize\":80,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"changeme:224+descMetadata+descMetadata.1\",\"dsLocationType\":\"INTERNAL_ID\",\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"bbba526a1ca47f19dfe110f25a0a721bda481dc414f7ec89e3f02c5562eaa9a2\"},\"rightsMetadata\":{\"dsLabel\":null,\"dsVersionID\":\"rightsMetadata.0\",\"dsCreateDate\":\"2015-03-10T15:20:17Z\",\"dsState\":\"A\",\"dsMIME\":\"text/xml\",\"dsFormatURI\":null,\"dsControlGroup\":\"M\",\"dsSize\":550,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"changeme:224+rightsMetadata+rightsMetadata.0\",\"dsLocationType\":\"INTERNAL_ID\",\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"210d5a228bd96e22b20723de1dd20ea8d897252063713d0815369c49045c5c05\"},\"properties\":{},\"thumbnail\":{},\"adminMetadata\":{},\"defaultRights\":{\"dsLabel\":null,\"dsVersionID\":\"defaultRights.0\",\"dsCreateDate\":\"2015-03-10T15:21:50Z\",\"dsState\":\"A\",\"dsMIME\":\"text/xml\",\"dsFormatURI\":null,\"dsControlGroup\":\"M\",\"dsSize\":634,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"changeme:224+defaultRights+defaultRights.0\",\"dsLocationType\":\"INTERNAL_ID\",\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"1a2d9e665228d5e3cbf5f8ddd0d641172c20f98b4e05d62f741b7b9010696ad0\"}},\"objLabel\":null,\"objOwnerId\":\"fedoraAdmin\",\"objModels\":[\"info:fedora/afmodel:Collection\",\"info:fedora/fedora-system:FedoraObject-3.0\"],\"objCreateDate\":\"2015-03-10T15:20:16Z\",\"objLastModDate\":\"2015-03-10T15:20:18Z\",\"objDissIndexViewURL\":\"http://localhost:8983/fedora/objects/changeme%3A224/methods/fedora-system%3A3/viewMethodIndex\",\"objItemIndexViewURL\":\"http://localhost:8983/fedora/objects/changeme%3A224/methods/fedora-system%3A3/viewItemIndex\",\"objState\":\"A\"}"], "title_tesim"=>["Test Collection"], "edit_access_person_ssim"=>["coblej@duke.edu"], "inheritable_read_access_group_ssim"=>["public"], "is_governed_by_ssim"=>["info:fedora/changeme:224"], "has_model_ssim"=>["info:fedora/afmodel:Collection"], "title_ssi"=>"Test Collection", "internal_uri_ssi"=>"info:fedora/changeme:224", Ddr::IndexFields::RESEARCH_HELP_CONTACT=>"xa", "_version_"=>1495270331036729344, "timestamp"=>"2015-03-10T15:21:50.793Z"}] }
+          let(:admin_policy) { described_class.new({Ddr::Index::Fields::RESEARCH_HELP_CONTACT=>["xa"]}) }
           before do
-            allow(subject).to receive(:admin_policy_pid).and_return('changeme:224')
-            allow(ActiveFedora::SolrService).to receive(:query).and_return(apo_solr_response)
+            allow(subject).to receive(:admin_policy) { admin_policy }
           end
           it "should return the collection's research help contact" do
             expect(subject.research_help.slug).to eq("xa")
@@ -133,4 +158,38 @@ RSpec.describe SolrDocument, type: :model, contacts: true do
     end
   end
 
+  describe "structural metadata" do
+    describe "#multires_image_file_paths" do
+      context "no structural metadata" do
+        its(:multires_image_file_paths) { is_expected.to match([]) }
+      end
+      context "structural metadata" do
+        let(:struct_map) do
+          {"type"=>"default", "divs"=>
+            [{"id"=>"viccb010010010", "label"=>"1", "order"=>"1", "type"=>"Image", "fptrs"=>["test:5"], "divs"=>[]},
+             {"id"=>"viccb010020010", "label"=>"2", "order"=>"2", "type"=>"Image", "fptrs"=>["test:6"], "divs"=>[]},
+             {"id"=>"viccb010030010", "label"=>"3", "order"=>"3", "type"=>"Image", "fptrs"=>["test:7"], "divs"=>[]}]
+          }
+        end
+        before { allow(subject).to receive(:struct_map) { struct_map } }
+        context "no structural objects with multi-res images" do
+          before do
+            allow(SolrDocument).to receive(:find).with('test:5') { double(multires_image_file_path: nil) }
+            allow(SolrDocument).to receive(:find).with('test:6') { double(multires_image_file_path: nil) }
+            allow(SolrDocument).to receive(:find).with('test:7') { double(multires_image_file_path: nil) }
+          end
+          its(:multires_image_file_paths) { is_expected.to match([]) }
+        end
+        context "structural objects with multi-res images" do
+          let(:expected_result) { [ "/path/file1.ptif", "/path/file2.ptif" ] }
+          before do
+            allow(SolrDocument).to receive(:find).with('test:5') { double(multires_image_file_path: "/path/file1.ptif") }
+            allow(SolrDocument).to receive(:find).with('test:6') { double(multires_image_file_path: nil) }
+            allow(SolrDocument).to receive(:find).with('test:7') { double(multires_image_file_path: "/path/file2.ptif") }
+          end
+          its(:multires_image_file_paths) { is_expected.to match(expected_result) }
+        end
+      end
+    end
+  end
 end

data/spec/models/year_facet_spec.rb

@@ -0,0 +1,65 @@
+module Ddr::Models
+  RSpec.describe YearFacet do
+
+    subject { described_class.new(obj) }
+    let(:obj) { Item.new }
+    before { obj.date = [ date ] }
+
+    describe "splitting on semicolons" do
+      let(:date) { "1935; 1936; 1937; 1938" }
+      its(:values) { is_expected.to eq([1935, 1936, 1937, 1938]) }
+    end
+
+    describe "year range" do
+      %w( 1935-1940 1935/1940 ).each do |value|
+        describe value do
+          let(:date) { value }
+          its(:values) { is_expected.to eq((1935..1940).to_a) }
+        end
+      end
+    end
+
+    describe "in decade" do
+      %w( 192x 192X 192? 192- 192-? ).each do |value|
+        describe value do
+          let(:date) { value }
+          its(:values) { is_expected.to eq((1920..1929).to_a) }
+        end
+      end
+    end
+
+    describe "in century -- YYxx (19xx)" do
+      let(:date) { "19xx" }
+      its(:values) { is_expected.to eq((1900..1999).to_a) }
+    end
+
+    describe "decade" do
+      %w( 1920s 1920s? ).each do |value|
+        describe value do
+          let(:date) { value }
+          its(:values) { is_expected.to eq((1920..1929).to_a) }
+        end
+      end
+    end
+
+    describe "year + month" do
+      %w( 2010-01 2010/01 ).each do |value|
+        describe value do
+          let(:date) { value }
+          its(:values) { is_expected.to eq([2010]) }
+        end
+      end
+    end
+
+    describe "between" do
+      let(:date) { "Between 1965 and 1968" }
+      its(:values) { is_expected.to eq((1965..1968).to_a) }
+    end
+
+    describe "year" do
+      let(:date) { "1965" }
+      its(:values) { is_expected.to eq([1965]) }
+    end
+
+  end
+end

data/spec/spec_helper.rb

@@ -23,13 +23,6 @@ Dir[File.join(File.dirname(__FILE__), "support", "*.rb")].each { |f| require f }
 
 DatabaseCleaner.strategy = :truncation
 
-require "ddr-antivirus"
-Ddr::Antivirus.configure do |config|
-  config.scanner_adapter = :null
-  require "logger"
-  config.logger = Logger.new(File::NULL)
-end
-
 RSpec.configure do |config|
 
   config.include ActionDispatch::TestProcess
@@ -116,6 +109,7 @@ RSpec.configure do |config|
       config.external_file_store = Dir.mktmpdir
       config.multires_image_external_file_store = Dir.mktmpdir
       config.external_file_subpath_pattern = "--"
+      config.fits_home = Dir.mktmpdir
     end
   end
 

data/spec/support/shared_examples_for_ddr_models.rb

@@ -2,9 +2,7 @@ RSpec.shared_examples "a DDR model" do
 
   it_behaves_like "a describable object"
   it_behaves_like "a governable object"
-  it_behaves_like "a licensable object"
   it_behaves_like "an access controllable object"
-  it_behaves_like "an object that has properties"
   it_behaves_like "an object that has a display title"
   it_behaves_like "an object that has identifiers"
 

data/spec/support/shared_examples_for_has_content.rb

@@ -5,6 +5,8 @@ RSpec.shared_examples "an object that can have content" do
 
   subject { described_class.new(title: [ "I Have Content!" ]) }
 
+  before { allow(Resque).to receive(:enqueue) }
+
   it "should delegate :validate_checksum! to :content" do
     checksum = "dea56f15b309e47b74fa24797f85245dda0ca3d274644a96804438bbd659555a"
     expect(subject.content).to receive(:validate_checksum!).with(checksum, "SHA-256")
@@ -22,20 +24,20 @@ RSpec.shared_examples "an object that can have content" do
     let(:file) { fixture_file_upload("imageA.tif", "image/tiff") }
     before { subject.upload file }
     it "should index the content ds control group" do
-      expect(subject.to_solr).to include(Ddr::IndexFields::CONTENT_CONTROL_GROUP)
+      expect(subject.to_solr).to include(Ddr::Index::Fields::CONTENT_CONTROL_GROUP)
     end
   end
 
   describe "extracted text" do
     describe "when it is not present" do
       its(:has_extracted_text?) { should be false }
-      its(:to_solr) { should_not include(Ddr::IndexFields::EXTRACTED_TEXT) }
+      its(:to_solr) { should_not include(Ddr::Index::Fields::EXTRACTED_TEXT) }
     end
     describe "when it is present" do
       before { subject.extractedText.content = "This is my text. See Spot run." }
       its(:has_extracted_text?) { should be true }
       it "should be indexed" do
-        expect(subject.to_solr[Ddr::IndexFields::EXTRACTED_TEXT]).to eq("This is my text. See Spot run.")
+        expect(subject.to_solr[Ddr::Index::Fields::EXTRACTED_TEXT]).to eq("This is my text. See Spot run.")
       end
     end
   end
@@ -71,6 +73,22 @@ RSpec.shared_examples "an object that can have content" do
           expect(subject.derivatives).to receive(:update_derivatives)
           subject.save
         end
+        describe "file characterization" do
+          context "characterize files is false" do
+            before { allow(Ddr::Models).to receive(:characterize_files?) { false } }
+            it "should not enqueue a FITS file characterization job" do
+              expect(Resque).to_not receive(:enqueue).with(Ddr::Jobs::FitsFileCharacterization, instance_of(String))
+              subject.save
+            end
+          end
+          context "characterize files is true" do
+            before { allow(Ddr::Models).to receive(:characterize_files?) { true } }
+            it "should enqueue a FITS file characterization job" do
+              expect(Resque).to receive(:enqueue).with(Ddr::Jobs::FitsFileCharacterization, instance_of(String))
+              subject.save
+            end
+          end
+        end
       end
 
       context "and it's an existing object with content" do
@@ -80,6 +98,22 @@ RSpec.shared_examples "an object that can have content" do
           expect(subject.derivatives).to receive(:update_derivatives)
           subject.upload! file
         end
+        describe "file characterization" do
+          context "characterize files is false" do
+            before { allow(Ddr::Models).to receive(:characterize_files?) { false } }
+            it "should not enqueue a FITS file characterization job" do
+              expect(Resque).to_not receive(:enqueue).with(Ddr::Jobs::FitsFileCharacterization, instance_of(String))
+              subject.upload! file
+            end
+          end
+          context "characterize files is true" do
+            before { allow(Ddr::Models).to receive(:characterize_files?) { true } }
+            it "should enqueue a FITS file characterization job" do
+              expect(Resque).to receive(:enqueue).with(Ddr::Jobs::FitsFileCharacterization, instance_of(String))
+              subject.upload! file
+            end
+          end
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0.rc1
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-21 00:00:00.000000000 Z
+date: 2015-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -67,20 +67,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
-- !ruby/object:Gem::Dependency
-  name: ddr-antivirus
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -199,6 +185,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.12'
+- !ruby/object:Gem::Dependency
+  name: ddr-aux-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: ddr-antivirus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -357,6 +371,7 @@ files:
 - lib/ddr-models.rb
 - lib/ddr/actions.rb
 - lib/ddr/actions/fixity_check.rb
+- lib/ddr/actions/virus_check.rb
 - lib/ddr/auth.rb
 - lib/ddr/auth/ability.rb
 - lib/ddr/auth/ability_definitions.rb
@@ -412,9 +427,9 @@ files:
 - lib/ddr/datastreams/administrative_metadata_datastream.rb
 - lib/ddr/datastreams/datastream_behavior.rb
 - lib/ddr/datastreams/descriptive_metadata_datastream.rb
+- lib/ddr/datastreams/fits_datastream.rb
 - lib/ddr/datastreams/metadata_datastream.rb
 - lib/ddr/datastreams/plain_text_datastream.rb
-- lib/ddr/datastreams/properties_datastream.rb
 - lib/ddr/datastreams/structural_metadata_datastream.rb
 - lib/ddr/derivatives.rb
 - lib/ddr/derivatives/generator.rb
@@ -431,14 +446,32 @@ files:
 - lib/ddr/events/update_event.rb
 - lib/ddr/events/validation_event.rb
 - lib/ddr/events/virus_check_event.rb
+- lib/ddr/index.rb
+- lib/ddr/index/abstract_query_result.rb
+- lib/ddr/index/connection.rb
+- lib/ddr/index/csv_query_result.rb
+- lib/ddr/index/document_builder.rb
+- lib/ddr/index/field.rb
+- lib/ddr/index/fields.rb
+- lib/ddr/index/filter.rb
+- lib/ddr/index/filters.rb
+- lib/ddr/index/legacy_license_fields.rb
+- lib/ddr/index/query.rb
+- lib/ddr/index/query_builder.rb
+- lib/ddr/index/query_clause.rb
+- lib/ddr/index/query_result.rb
+- lib/ddr/index/query_value.rb
+- lib/ddr/index/response.rb
+- lib/ddr/index/unique_key_field.rb
 - lib/ddr/index_fields.rb
 - lib/ddr/jobs.rb
-- lib/ddr/jobs/migrate_legacy_authorization.rb
+- lib/ddr/jobs/fits_file_characterization.rb
 - lib/ddr/jobs/permanent_id.rb
 - lib/ddr/managers.rb
 - lib/ddr/managers/derivatives_manager.rb
 - lib/ddr/managers/manager.rb
 - lib/ddr/managers/permanent_id_manager.rb
+- lib/ddr/managers/technical_metadata_manager.rb
 - lib/ddr/managers/workflow_manager.rb
 - lib/ddr/metadata.rb
 - lib/ddr/metadata/premis_event.rb
@@ -446,6 +479,7 @@ files:
 - lib/ddr/models/access_controllable.rb
 - lib/ddr/models/base.rb
 - lib/ddr/models/describable.rb
+- lib/ddr/models/effective_license.rb
 - lib/ddr/models/engine.rb
 - lib/ddr/models/error.rb
 - lib/ddr/models/event_loggable.rb
@@ -457,15 +491,16 @@ files:
 - lib/ddr/models/has_children.rb
 - lib/ddr/models/has_content.rb
 - lib/ddr/models/has_multires_image.rb
-- lib/ddr/models/has_properties.rb
 - lib/ddr/models/has_struct_metadata.rb
 - lib/ddr/models/has_thumbnail.rb
 - lib/ddr/models/indexing.rb
-- lib/ddr/models/licensable.rb
+- lib/ddr/models/inherited_license.rb
+- lib/ddr/models/license.rb
 - lib/ddr/models/solr_document.rb
 - lib/ddr/models/struct_div.rb
 - lib/ddr/models/structure.rb
 - lib/ddr/models/version.rb
+- lib/ddr/models/year_facet.rb
 - lib/ddr/notifications.rb
 - lib/ddr/utils.rb
 - lib/ddr/vocab.rb
@@ -487,10 +522,8 @@ files:
 - spec/auth/group_spec.rb
 - spec/auth/groups_spec.rb
 - spec/auth/ldap_gateway_spec.rb
-- spec/auth/legacy_authorization_spec.rb
 - spec/auth/legacy_default_permissions_spec.rb
 - spec/auth/legacy_permissions_spec.rb
-- spec/auth/legacy_roles_spec.rb
 - spec/auth/roles/detached_role_set_spec.rb
 - spec/auth/roles/property_role_set_spec.rb
 - spec/auth/roles/role_set_query_spec.rb
@@ -503,6 +536,7 @@ files:
 - spec/controllers/application_controller_spec.rb
 - spec/controllers/including_role_based_access_controls_enforcement_spec.rb
 - spec/controllers/users/sessions_controller_spec.rb
+- spec/datastreams/fits_datastream_spec.rb
 - spec/derivatives/png_generator_spec.rb
 - spec/derivatives/ptif_generator_spec.rb
 - spec/dummy/README.rdoc
@@ -563,6 +597,8 @@ files:
 - spec/factories/user_factories.rb
 - spec/fixtures/16bit.tif
 - spec/fixtures/8bit.tif
+- spec/fixtures/fits/document.xml
+- spec/fixtures/fits/image.xml
 - spec/fixtures/imageA.tif
 - spec/fixtures/imageB.tif
 - spec/fixtures/imageC.tif
@@ -570,24 +606,31 @@ files:
 - spec/fixtures/sample.pdf
 - spec/fixtures/target.png
 - spec/helpers/models_helper_spec.rb
-- spec/jobs/migrate_legacy_authorization_spec.rb
+- spec/index/filter_spec.rb
+- spec/index/filters_spec.rb
+- spec/index/query_spec.rb
+- spec/jobs/fits_file_characterization_spec.rb
 - spec/managers/derivatives_manager_spec.rb
+- spec/managers/technical_metadata_manager_spec.rb
 - spec/models/active_fedora_base_spec.rb
 - spec/models/active_fedora_datastream_spec.rb
 - spec/models/attachment_spec.rb
 - spec/models/collection_spec.rb
 - spec/models/component_spec.rb
 - spec/models/descriptive_metadata_datastream_spec.rb
+- spec/models/effective_license_spec.rb
 - spec/models/events_spec.rb
 - spec/models/file_management_spec.rb
 - spec/models/has_admin_metadata_spec.rb
 - spec/models/has_children_spec.rb
 - spec/models/has_struct_metadata_spec.rb
+- spec/models/indexing_spec.rb
 - spec/models/item_spec.rb
 - spec/models/solr_document_spec.rb
 - spec/models/struct_div_spec.rb
 - spec/models/structure_spec.rb
 - spec/models/target_spec.rb
+- spec/models/year_facet_spec.rb
 - spec/routing/user_routing_spec.rb
 - spec/spec_helper.rb
 - spec/support/ezid_mock_identifier.rb
@@ -599,9 +642,7 @@ files:
 - spec/support/shared_examples_for_events.rb
 - spec/support/shared_examples_for_governables.rb
 - spec/support/shared_examples_for_has_content.rb
-- spec/support/shared_examples_for_has_properties.rb
 - spec/support/shared_examples_for_indexing.rb
-- spec/support/shared_examples_for_licensable.rb
 - spec/support/shared_examples_for_non_collection_models.rb
 - spec/support/shared_examples_for_role_sets.rb
 - spec/support/structural_metadata_helper.rb
@@ -622,9 +663,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -642,10 +683,8 @@ test_files:
 - spec/auth/group_spec.rb
 - spec/auth/groups_spec.rb
 - spec/auth/ldap_gateway_spec.rb
-- spec/auth/legacy_authorization_spec.rb
 - spec/auth/legacy_default_permissions_spec.rb
 - spec/auth/legacy_permissions_spec.rb
-- spec/auth/legacy_roles_spec.rb
 - spec/auth/roles/detached_role_set_spec.rb
 - spec/auth/roles/property_role_set_spec.rb
 - spec/auth/roles/role_set_query_spec.rb
@@ -658,6 +697,7 @@ test_files:
 - spec/controllers/application_controller_spec.rb
 - spec/controllers/including_role_based_access_controls_enforcement_spec.rb
 - spec/controllers/users/sessions_controller_spec.rb
+- spec/datastreams/fits_datastream_spec.rb
 - spec/derivatives/png_generator_spec.rb
 - spec/derivatives/ptif_generator_spec.rb
 - spec/dummy/README.rdoc
@@ -718,6 +758,8 @@ test_files:
 - spec/factories/user_factories.rb
 - spec/fixtures/16bit.tif
 - spec/fixtures/8bit.tif
+- spec/fixtures/fits/document.xml
+- spec/fixtures/fits/image.xml
 - spec/fixtures/imageA.tif
 - spec/fixtures/imageB.tif
 - spec/fixtures/imageC.tif
@@ -725,24 +767,31 @@ test_files:
 - spec/fixtures/sample.pdf
 - spec/fixtures/target.png
 - spec/helpers/models_helper_spec.rb
-- spec/jobs/migrate_legacy_authorization_spec.rb
+- spec/index/filter_spec.rb
+- spec/index/filters_spec.rb
+- spec/index/query_spec.rb
+- spec/jobs/fits_file_characterization_spec.rb
 - spec/managers/derivatives_manager_spec.rb
+- spec/managers/technical_metadata_manager_spec.rb
 - spec/models/active_fedora_base_spec.rb
 - spec/models/active_fedora_datastream_spec.rb
 - spec/models/attachment_spec.rb
 - spec/models/collection_spec.rb
 - spec/models/component_spec.rb
 - spec/models/descriptive_metadata_datastream_spec.rb
+- spec/models/effective_license_spec.rb
 - spec/models/events_spec.rb
 - spec/models/file_management_spec.rb
 - spec/models/has_admin_metadata_spec.rb
 - spec/models/has_children_spec.rb
 - spec/models/has_struct_metadata_spec.rb
+- spec/models/indexing_spec.rb
 - spec/models/item_spec.rb
 - spec/models/solr_document_spec.rb
 - spec/models/struct_div_spec.rb
 - spec/models/structure_spec.rb
 - spec/models/target_spec.rb
+- spec/models/year_facet_spec.rb
 - spec/routing/user_routing_spec.rb
 - spec/spec_helper.rb
 - spec/support/ezid_mock_identifier.rb
@@ -754,9 +803,7 @@ test_files:
 - spec/support/shared_examples_for_events.rb
 - spec/support/shared_examples_for_governables.rb
 - spec/support/shared_examples_for_has_content.rb
-- spec/support/shared_examples_for_has_properties.rb
 - spec/support/shared_examples_for_indexing.rb
-- spec/support/shared_examples_for_licensable.rb
 - spec/support/shared_examples_for_non_collection_models.rb
 - spec/support/shared_examples_for_role_sets.rb
 - spec/support/structural_metadata_helper.rb