ddr-models 2.4.2 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1aeee77be1941cef872cdef9833e667f3e5c93e
-  data.tar.gz: cf6d46b137d160d69bef0f300a7230f223f7d7fc
+  metadata.gz: 60aeffdbd5511ea08d1026c736a808724cc37032
+  data.tar.gz: ef4f116ab09428bb84892a0dda1116fa6398ca6e
 SHA512:
-  metadata.gz: cbabe3f6c1a20248a908bd5b0e57f3ce6ac8bd3688d8dffa29008ed8a863fbafe0cc0c32a4183a3c908ca815af990982d2b284367f8f62a78880b1d49e96b366
-  data.tar.gz: b8900cd65a8d06bfb1395cd36f975cb51b7228342713800443f050ee984a0d7d9a6579c2c9e759a012eb8e6c45fda1070cdc42aa3f8a887233dd9917880596b3
+  metadata.gz: 894a0941891ab5be56e3b2ad982f278a4128c7a9200860c13aa84d67dad1df801164af02ea338607aa486d5d02d7941a9b4ab50e700d5e043e87e391d9569f8e
+  data.tar.gz: 9bcfbb033acd735b78db25cab76bf76a9abc7485fd77cb22782be53efc19401434818d2c8bbbd91b225afca4f21b1ab3cdb15bcec7678fadeea121eb89c05ba3

data/lib/ddr/index/fields.rb

@@ -13,6 +13,7 @@ module Ddr::Index
     COLLECTION_FACET            = Field.new :collection_facet, :facetable
     COLLECTION_URI              = Field.new :collection_uri, :symbol
     CONTENT_CONTROL_GROUP       = Field.new :content_control_group, :searchable, type: :string
+    CONTENT_CREATE_DATE         = Field.new :content_create_date, :stored_sortable, type: :date
     CONTENT_SIZE                = Field.new :content_size, solr_name: "content_size_lsi"
     CONTENT_SIZE_HUMAN          = Field.new :content_size_human, :symbol
     CONTRIBUTOR_FACET           = Field.new :contributor_facet, :facetable

data/lib/ddr/models/indexing.rb

@@ -1,3 +1,5 @@
+require 'time'
+
 module Ddr
   module Models
     module Indexing
@@ -57,6 +59,7 @@ module Ddr
           fields.merge!(last_virus_check.to_solr) if last_virus_check
         end
         if has_content?
+          fields[CONTENT_CREATE_DATE] = Ddr::Utils.solr_date(content.createDate)
           fields[CONTENT_CONTROL_GROUP] = content.controlGroup
           fields[CONTENT_SIZE] = content_size
           fields[CONTENT_SIZE_HUMAN] = content_human_size

data/lib/ddr/models/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Models
-    VERSION = "2.4.2"
+    VERSION = "2.4.3"
   end
 end

data/spec/models/indexing_spec.rb

@@ -1,42 +1,54 @@
 module Ddr::Models
   RSpec.describe Indexing do
 
-    let(:obj) { FactoryGirl.build(:item) }
+    subject { obj.index_fields }
 
-    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) }
+    describe "general indexing" do
+      let(:obj) { FactoryGirl.build(:item) }
 
-    subject { obj.index_fields }
+      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) }
+
+      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
+        obj.aspace_id = "aspace_dccea43034e1b8261e14cf999e86449d"
+      end
 
-    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
-      obj.aspace_id = "aspace_dccea43034e1b8261e14cf999e86449d"
+      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) }
+      its([Indexing::ASPACE_ID]) { is_expected.to eq("aspace_dccea43034e1b8261e14cf999e86449d") }
     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) }
-    its([Indexing::ASPACE_ID]) { is_expected.to eq("aspace_dccea43034e1b8261e14cf999e86449d") }
+    describe "content-bearing object indexing" do
+      let(:obj) { FactoryGirl.create(:component) }
+      let!(:create_date) { Time.parse("2016-01-22T21:50:33Z") }
+      before {
+        allow(obj.content).to receive(:createDate) { create_date }
+      }
+
+      its([Indexing::CONTENT_CREATE_DATE]) { is_expected.to eq "2016-01-22T21:50:33Z" }
+    end
 
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.3
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails