ddr-models 2.1.0.rc1 → 2.1.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb4f77d35e8d4b3d23267f2f32b6176f935d547d
-  data.tar.gz: 15ac1cebb4342dde18d4e8bfab92749c69805add
+  metadata.gz: 60a46f8934fb0e5f4ffdf51e407c3a06f55ef8c7
+  data.tar.gz: 6f55b69df1b4a3339ebbe852df239efeda75c905
 SHA512:
-  metadata.gz: 706dafc8320ac5bf5ae153fc963368c143b2a7ad0dbac3a1155751102b3398016a575dc4449c46753bdc45a568ff6872fe5d3526e21323cc0d15c7207af504f5
-  data.tar.gz: 0309ef94db398e32ec350c0671108e5d5cca3406ad65ab71325da2eddc0581e3d7e788dee29767381b875859c204d5b5a705cee8b73ebee907f4789a36ce7462
+  metadata.gz: 6a3dc6282c61f4eeaa20a960a83ad28f4063938173820e914363af58b477c40f6d7a5ca8c3e0ddd6811d74f7de084ce363e5c94abee94c60edbced1211f6df74
+  data.tar.gz: bd639d6c6ca73ce6e760c7917c6c29878de3a06dd4e134e4e5bd346a112530412cab2db1174c2b15afb6ef360b555a364098dbd7986dc9739eb0aa0c28a945a7

data/ddr-models.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
   s.add_dependency "rdf-vocab", "~> 0.8"
   s.add_dependency "net-ldap", "~> 0.11"
   s.add_dependency "cancancan", "~> 1.12"
-  s.add_dependency "ddr-aux-client", "~> 1.1"
+  s.add_dependency "ddr-aux-client", "~> 1.2", ">= 1.2.1"
   s.add_dependency "ddr-antivirus", "2.0.0"
 
   s.add_development_dependency "bundler", "~> 1.7"

data/lib/ddr/datastreams/administrative_metadata_datastream.rb

@@ -43,6 +43,9 @@ module Ddr
       property :license,
                predicate: RDF::DC.license
 
+      property :ead_id,
+               predicate: Ddr::Vocab::Asset.eadId
+
     end
   end
 end

data/lib/ddr/index/fields.rb

@@ -7,6 +7,12 @@ module Ddr::Index
       const_get(name.to_s.upcase, false)
     end
 
+    def self.techmd
+      constants(false)
+        .select { |c| c =~ /\ATECHMD_/ }
+        .map    { |c| const_get(c) }
+    end
+
     ID = UniqueKeyField.instance
     PID = UniqueKeyField.instance
 
@@ -26,6 +32,7 @@ module Ddr::Index
     DEPOSITOR                   = Field.new :depositor, :stored_sortable
     DISPLAY_FORMAT              = Field.new :display_format, :stored_sortable
     DOI                         = Field.new :doi, :symbol
+    EAD_ID                      = Field.new :ead_id, :stored_sortable
     EXTRACTED_TEXT              = Field.new :extracted_text, :searchable, type: :text
     HAS_MODEL                   = Field.new :has_model, :symbol
     IDENTIFIER_ALL              = Field.new :identifier_all, :symbol

data/lib/ddr/managers/technical_metadata_manager.rb

@@ -11,7 +11,6 @@ module Ddr::Managers
              :image_width, :image_height, :color_space,
              to: :fits
 
-    alias_method :file_size, :extent
     alias_method :last_modified, :modified
 
     def fits?

data/lib/ddr/models.rb

@@ -31,6 +31,7 @@ module Ddr
     extend ActiveSupport::Autoload
 
     autoload :AccessControllable
+    autoload :AdminSet
     autoload :Base
     autoload :ChecksumInvalid, 'ddr/models/error'
     autoload :ContentModelError, 'ddr/models/error'
@@ -40,6 +41,7 @@ module Ddr
     autoload :Error
     autoload :EventLoggable
     autoload :FileManagement
+    autoload :FindingAid
     autoload :FixityCheckable
     autoload :Governable
     autoload :HasAdminMetadata
@@ -87,6 +89,10 @@ module Ddr
       alias :characterize_files? :characterize_files
     end
 
+    mattr_accessor :ead_xml_base_url do
+      "http://library.duke.edu/rubenstein/findingaids/"
+    end
+
     # Yields an object with module configuration accessors
     def self.configure
       yield self

data/lib/ddr/models/admin_set.rb

@@ -0,0 +1,17 @@
+require "ddr_aux/client"
+
+module Ddr::Models
+  class AdminSet < DdrAux::Client::AdminSet
+
+    def self.call(obj)
+      if obj.admin_set
+        find(code: obj.admin_set)
+      end
+    end
+
+    def to_s
+      title
+    end
+
+  end
+end

data/lib/ddr/models/finding_aid.rb

@@ -0,0 +1,30 @@
+module Ddr::Models
+  class FindingAid
+
+    attr_reader :ead_id
+
+    def initialize(ead_id)
+      @ead_id = ead_id
+    end
+
+    def url
+      @url ||= doc.css("eadid").attr("url").text
+    end
+
+    def title
+      @title ||= doc.css("titleproper").children.first.text.strip
+    end
+
+    private
+
+    # @raise [OpenURI::HTTPError] if 404, etc.
+    def doc
+      @doc ||= Nokogiri::XML(open(ead_xml_url))
+    end
+
+    def ead_xml_url
+      Ddr::Models.ead_xml_base_url + ead_id + ".xml"
+    end
+
+  end
+end

data/lib/ddr/models/has_admin_metadata.rb

@@ -19,6 +19,7 @@ module Ddr::Models
                      :permanent_url,
                      :research_help_contact,
                      :workflow_state,
+                     :ead_id,
                      datastream: "adminMetadata",
                      multiple: false
 
@@ -74,6 +75,12 @@ module Ddr::Models
       InheritedLicense.call(self)
     end
 
+    def finding_aid
+      if ead_id
+        FindingAid.new(ead_id)
+      end
+    end
+
     private
 
     def update_permanent_id_on_destroy

data/lib/ddr/models/indexing.rb

@@ -20,6 +20,7 @@ module Ddr
           DEPOSITOR             => depositor,
           DISPLAY_FORMAT        => display_format,
           DOI                   => adminMetadata.doi,
+          EAD_ID                => ead_id,
           IDENTIFIER_ALL        => all_identifiers,
           INTERNAL_URI          => internal_uri,
           LICENSE               => license,

data/lib/ddr/models/license.rb

@@ -1,37 +1,20 @@
-require "ostruct"
 require "ddr_aux/client"
 
 module Ddr::Models
-  class License < SimpleDelegator
+  class License < DdrAux::Client::License
 
-    class << self
-      def get(url)
-        new DdrAux::Client.find_license(url: url)
-      end
-
-      def all
-        DdrAux::Client.licenses.map { |l| new(l) }
-      end
+    attr_accessor :pid
 
-      def call(obj)
-        if obj.license
-          l = get obj.license
-          l[:licensed] = obj.pid
-          l
-        end
+    def self.call(obj)
+      if obj.license
+        license = find(url: obj.license)
+        license.pid = obj.pid
+        license
       end
     end
 
-    def initialize(args={})
-      super OpenStruct.new(args)
-    end
-
-    def to_json
-      to_h.to_json
-    end
-
-    def ==(other)
-      other.is_a?(self.class) && other.__getobj__ == __getobj__
+    def to_s
+      title
     end
 
   end

data/lib/ddr/models/solr_document.rb

@@ -209,6 +209,13 @@ module Ddr::Models
       struct_map_docs(type).map { |doc| doc.multires_image_file_path }.compact
     end
 
+    # DRY HasAdminMetadata
+    def finding_aid
+      if ead_id
+        FindingAid.new(ead_id)
+      end
+    end
+
     private
 
     def targets_query

data/lib/ddr/models/version.rb

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

data/lib/ddr/vocab/asset.rb

@@ -15,6 +15,9 @@
         label: "Administrative Set",
         comment: "A name under which objects (principally collections) are grouped for administrative purposes."
 
+      property "eadId",
+        label: "EAD ID"
+
     end
   end
 end

data/spec/models/admin_set_spec.rb

@@ -0,0 +1,25 @@
+module Ddr::Models
+  RSpec.describe AdminSet do
+
+    describe ".call" do
+      subject { described_class.call(obj) }
+
+      describe "when the object has an admin set" do
+        let(:obj) { double(admin_set: "dvs") }
+        before do
+          allow(described_class).to receive(:find).with(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")
+          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
+        let(:obj) { double(admin_set: nil) }
+        it { is_expected.to be_nil }
+      end
+    end
+
+  end
+end

data/spec/models/effective_license_spec.rb

@@ -7,10 +7,11 @@ module Ddr::Models
     let(:obj) { mock.new }
 
     let(:url) { "https://creativecommons.org/licenses/by-nc-nd/4.0/" }
+
     let(:license) { License.new(url: url) }
-    before { allow(License).to receive(:get).with(url) { license } }
+    before { allow(License).to receive(:find).with(url: url) { license } }
 
-    describe "when the object has a licence" do
+    describe "when the object has a license" do
       before { obj.license = url }
       it { is_expected.to eq(license) }
     end

data/spec/models/finding_aid_spec.rb

@@ -0,0 +1,39 @@
+module Ddr::Models
+  RSpec.describe FindingAid do
+
+    subject { described_class.new("ead") }
+
+    let(:ead_xml) do
+      <<-EOS
+<?xml version="1.0" encoding="UTF-8"?>
+<ead xmlns="urn:isbn:1-931666-22-9"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="urn:isbn:1-931666-22-9 http://www.loc.gov/ead/ead.xsd">
+   <eadheader countryencoding="iso3166-1"
+              dateencoding="iso8601"
+              findaidstatus="published"
+              langencoding="iso639-2b"
+              repositoryencoding="iso15511">
+      <eadid url="http://example.com/ead/">ead</eadid>
+      <filedesc>
+         <titlestmt>
+            <titleproper>Guide to the Perplexed
+              <num>00001</num>
+            </titleproper>
+          </titlestmt>
+      </filedesc>
+   </eadheader>
+</ead>
+EOS
+    end
+
+    before do
+      allow(subject).to receive(:doc) { Nokogiri::XML(ead_xml) }
+    end
+
+    its(:title) { is_expected.to eq("Guide to the Perplexed") }
+    its(:url) { is_expected.to eq("http://example.com/ead/") }
+
+  end
+end

data/spec/models/license_spec.rb

@@ -0,0 +1,24 @@
+module Ddr::Models
+  RSpec.describe License 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(:find).with(url: url) { described_class.new(url: url, title: "A License") }
+        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 }
+      end
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 2.1.0.rc1
+  version: 2.1.0.rc2
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-17 00:00:00.000000000 Z
+date: 2015-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -191,14 +191,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: ddr-antivirus
   requirement: !ruby/object:Gem::Requirement
@@ -477,6 +483,7 @@ files:
 - lib/ddr/metadata/premis_event.rb
 - lib/ddr/models.rb
 - lib/ddr/models/access_controllable.rb
+- lib/ddr/models/admin_set.rb
 - lib/ddr/models/base.rb
 - lib/ddr/models/describable.rb
 - lib/ddr/models/effective_license.rb
@@ -484,6 +491,7 @@ files:
 - lib/ddr/models/error.rb
 - lib/ddr/models/event_loggable.rb
 - lib/ddr/models/file_management.rb
+- lib/ddr/models/finding_aid.rb
 - lib/ddr/models/fixity_checkable.rb
 - lib/ddr/models/governable.rb
 - lib/ddr/models/has_admin_metadata.rb
@@ -614,6 +622,7 @@ files:
 - spec/managers/technical_metadata_manager_spec.rb
 - spec/models/active_fedora_base_spec.rb
 - spec/models/active_fedora_datastream_spec.rb
+- spec/models/admin_set_spec.rb
 - spec/models/attachment_spec.rb
 - spec/models/collection_spec.rb
 - spec/models/component_spec.rb
@@ -621,11 +630,13 @@ files:
 - spec/models/effective_license_spec.rb
 - spec/models/events_spec.rb
 - spec/models/file_management_spec.rb
+- spec/models/finding_aid_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/license_spec.rb
 - spec/models/solr_document_spec.rb
 - spec/models/struct_div_spec.rb
 - spec/models/structure_spec.rb
@@ -775,6 +786,7 @@ test_files:
 - spec/managers/technical_metadata_manager_spec.rb
 - spec/models/active_fedora_base_spec.rb
 - spec/models/active_fedora_datastream_spec.rb
+- spec/models/admin_set_spec.rb
 - spec/models/attachment_spec.rb
 - spec/models/collection_spec.rb
 - spec/models/component_spec.rb
@@ -782,11 +794,13 @@ test_files:
 - spec/models/effective_license_spec.rb
 - spec/models/events_spec.rb
 - spec/models/file_management_spec.rb
+- spec/models/finding_aid_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/license_spec.rb
 - spec/models/solr_document_spec.rb
 - spec/models/struct_div_spec.rb
 - spec/models/structure_spec.rb