ddr-models 3.0.0.beta.11 → 3.0.0.beta.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b649796b2ae7a3e6d271ae693967c20ffcaf09c6
-  data.tar.gz: a08a5a96113854923916d642994a458f0899edef
+  metadata.gz: 4f083a735027958d5b91d4c88489f3fb4aa89c5d
+  data.tar.gz: 0a23cbc2083fa5981c83b51bd1fbf886a4b98e40
 SHA512:
-  metadata.gz: 92bf5752a52715353c0c6e8bc88a009e0840a1d23caff13383c10c5bb900600dfdce1e30691ff0f2c9dd02e8756806d407e4e785bc67ee9050a9d09dbb40f554
-  data.tar.gz: 35f6bc9504c3500b54ec397dc0fc904de3c00a0a6226e52f1438d2698c7016a34e73bf3843a2b3c509a9cd0a9bcf86fed83a9e402f88f7974e8c12d27d0335f6
+  metadata.gz: a140e0f42c7ccfceee28286980a357be7673b942b04d61ac032d8c6dd0c2f4d267318ea81f79830dce77c404c72ed2f9972efc99ae0eafe6481d10df59075454
+  data.tar.gz: c93e6bb6856409f9ef4fdd728839fc84f41b62073df089792b8b566895aec1b4aa61b0ccd82158538ee3310891a6176a37c78919a623a78de7dbc5dabdf4e778

data/lib/ddr/datastreams.rb

@@ -13,10 +13,14 @@ module Ddr
 
     def self.const_missing(name)
       case name
-      when :CONTENT, :DESC_METADATA, :EXTRACTED_TEXT, :FITS, :STRUCT_METADATA, :THUMBNAIL
+      when :CONTENT, :EXTRACTED_TEXT, :FITS, :STRUCT_METADATA, :THUMBNAIL
         Deprecation.warn(self, "Ddr::Datastreams::#{name} is deprecated." \
                                " Use Ddr::Models::File::#{name} instead.")
         Ddr::Models::File.const_get(name)
+      when :DESC_METADATA
+        Deprecation.warn(self, "Ddr::Datastreams::DESC_METADATA is deprecated." \
+                               " Use Ddr::Models::Metadata::DESC_METADATA instead.")
+        Ddr::Models::Metadata::DESC_METADATA
       when :FitsDatastream
         Deprecation.warn(self, "Ddr::Datastreams::FitsDatastream is deprecated." \
                                " Use Ddr::Models::FitsXmlFile instead.")

data/lib/ddr/managers/permanent_id_manager.rb

@@ -10,10 +10,11 @@ module Ddr
     #
     class PermanentIdManager
 
-      PERMANENT_URL_BASE = "http://id.library.duke.edu/"
+      PERMANENT_URL_BASE   = "http://id.library.duke.edu/"
       ASSIGN_EVENT_SUMMARY = "Permanent ID assignment"
-      SOFTWARE = Ezid::Client.version
-      FCREPO3_PID = "fcrepo3.pid"
+      SOFTWARE             = Ezid::Client.version
+      FCREPO3_PID          = "fcrepo3.pid"
+      FCREPO4_ID           = "fcrepo4.id"
 
       attr_reader :object
 
@@ -56,7 +57,7 @@ EZID Metadata:
       def default_metadata
         { :profile => "dc",
           :export => "no",
-          FCREPO3_PID => object.pid
+          FCREPO4_ID => object.id
         }
       end
 

data/lib/ddr/models.rb

@@ -74,6 +74,7 @@ module Ddr
     end
 
     autoload_under "metadata" do
+      autoload :AdministrativeMetadata
       autoload :DescriptiveMetadata
       autoload :Metadata
       autoload :MetadataMapping

data/lib/ddr/models/base.rb

@@ -35,6 +35,15 @@ module Ddr::Models
       model_and_id
     end
 
+    def adminMetadata
+      Deprecation.warn(Base, "`adminMetadata` is deprecated; use `admin_metadata` instead.")
+      admin_metadata
+    end
+
+    def admin_metadata
+      @admin_metadata ||= AdministrativeMetadata.new(self)
+    end
+
     def descMetadata
       Deprecation.warn(Base, "`descMetadata` is deprecated; use `desc_metadata` instead.")
       desc_metadata
@@ -44,10 +53,6 @@ module Ddr::Models
       @desc_metadata ||= DescriptiveMetadata.new(self)
     end
 
-    def has_desc_metadata?
-      desc_metadata.has_content?
-    end
-
     def desc_metadata_terms(*args)
       return DescriptiveMetadata.unqualified_names.sort if args.empty?
       arg = args.pop

data/lib/ddr/models/file.rb

@@ -5,7 +5,6 @@ module Ddr::Models
     extend Deprecation
 
     CONTENT         = "content".freeze
-    DESC_METADATA   = "descMetadata".freeze
     EXTRACTED_TEXT  = "extractedText".freeze
     FITS            = "fits".freeze
     STRUCT_METADATA = "structMetadata".freeze
@@ -14,6 +13,15 @@ module Ddr::Models
     DEFAULT_FILE_EXTENSION = "bin"
     STRFTIME_FORMAT = "%Y-%m-%dT%H:%M:%S.%LZ"
 
+    def self.const_missing(name)
+      case name
+        when :DESC_METADATA
+          Deprecation.warn(self, "Ddr::File::DESC_METADATA is deprecated." \
+                               " Use Ddr::Models::Metadata::DESC_METADATA instead.")
+          Ddr::Models::Metadata::DESC_METADATA
+      end
+    end
+
     def dsid
       Deprecation.warn(File, "`dsid` is no longer a file method. Use `::File.basename(id)`.")
       if id

data/lib/ddr/models/metadata/administrative_metadata.rb

@@ -0,0 +1,53 @@
+require "forwardable"
+
+module Ddr::Models
+  class AdministrativeMetadata
+    extend Forwardable
+    include Metadata
+
+
+    class << self
+      def field_names
+        [ :access_roles,
+          :admin_set,
+          :aspace_id,
+          :depositor,
+          :display_format,
+          :doi,
+          :ead_id,
+          :fcrepo3_pid,
+          :license,
+          :local_id,
+          :permanent_id,
+          :permanent_url,
+          :research_help_contact,
+          :workflow_state
+        ]
+      end
+
+      alias_method :unqualified_names, :field_names
+      alias_method :field_readers, :field_names
+
+      def field_writers
+        field_names.map { |name| "#{name}=".to_sym }
+      end
+
+      def property_terms
+        field_names.each_with_object({}) do |term, memo|
+          memo[term] = term
+        end
+      end
+
+    end
+
+    attr_reader :object
+
+    def_delegators :object, *field_readers
+    def_delegators :object, *field_writers
+
+    def initialize(object)
+      @object = object
+    end
+
+  end
+end

data/lib/ddr/models/metadata/descriptive_metadata.rb

@@ -24,6 +24,13 @@ module Ddr::Models
       def field_writers
         field_names.map { |name| "#{name}=".to_sym }
       end
+
+      def property_terms
+        mapping.terms.each_with_object({}) do |term, memo|
+          memo[term.unqualified_name] = term.qualified_name
+        end
+      end
+
     end
 
     self.mappings = [ MetadataMapping.dcterms, MetadataMapping.duketerms ].freeze

data/lib/ddr/models/metadata/metadata.rb

@@ -1,10 +1,29 @@
 module Ddr::Models
   module Metadata
+    extend ActiveSupport::Concern
+
+    ADMIN_METADATA = 'admin_metadata'.freeze
+    DESC_METADATA  = 'desc_metadata'.freeze
+
+    included do
+      def self.property_term(term)
+        property_terms[term]
+      end
+    end
 
     def values(term)
       self.send(term)
     end
 
+    # Update singular term with value
+    def set_value(term, value)
+      begin
+        self.send("#{term}=", value)
+      rescue NoMethodError
+        raise ArgumentError, "No such term: #{term}"
+      end
+    end
+
     # Update term with values
     # Note that empty values (nil or "") are rejected from values array
     def set_values(term, values)
@@ -25,8 +44,13 @@ module Ddr::Models
     def add_value(term, value)
       begin
         unless value.blank?
-          values = values(term).to_a << value
-          set_values term, values
+          prop_term = self.class.property_term(term)
+          if object.class.properties[prop_term.to_s].multiple?
+            values = values(term).to_a << value
+            set_values term, values
+          else
+            set_value term, value
+          end
         end
       rescue NoMethodError
         raise ArgumentError, "No such term: #{term}"

data/lib/ddr/models/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Models
-    VERSION = "3.0.0.beta.11"
+    VERSION = "3.0.0.beta.12"
   end
 end

data/spec/models/administrative_metadata_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+module Ddr::Models
+  RSpec.describe AdministrativeMetadata do
+
+    let(:obj) { FactoryGirl.build(:item) }
+
+    describe ".property_term" do
+      it "should return the correct property term" do
+        expect(described_class.property_term(:local_id)).to eq(:local_id)
+      end
+    end
+
+    describe "using the set_values and add_value methods" do
+      let(:ds) { described_class.new(obj) }
+      before { ds.local_id = 'foo001' }
+      describe "#set_values" do
+        it "should set the value of the term to the one supplied" do
+          ds.set_value :local_id, 'bar002'
+          expect(ds.local_id).to eq('bar002')
+        end
+      end
+      describe "#add_value" do
+        it "should set the term value to the supplied value" do
+          ds.add_value :local_id, 'bar002'
+          expect(ds.local_id).to eq('bar002')
+        end
+      end
+    end
+  end
+end

data/spec/models/descriptive_metadata_spec.rb

@@ -15,6 +15,11 @@ module Ddr::Models
         expect(subject).to include(*Ddr::Vocab::Vocabulary.term_names(Ddr::Vocab::DukeTerms))
       end
     end
+    describe ".property_term" do
+      it "should return the correct property term" do
+        expect(described_class.property_term(:subject)).to eq(:dc_subject)
+      end
+    end
     describe "using the set_values and add_value methods" do
       let(:ds) { described_class.new(obj) }
       before { ds.type = ["Photograph"] }

data/spec/models/has_admin_metadata_spec.rb

@@ -63,7 +63,7 @@ module Ddr::Models
           it "sets default metadata" do
             expect(identifier.profile).to eq("dc")
             expect(identifier.export).to eq("no")
-            expect(identifier["fcrepo3.pid"]).to eq(subject.pid)
+            expect(identifier["fcrepo4.id"]).to eq(subject.id)
           end
         end
         describe "object destruction" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta.11
+  version: 3.0.0.beta.12
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -551,6 +551,7 @@ files:
 - lib/ddr/models/licenses/inherited_license.rb
 - lib/ddr/models/licenses/license.rb
 - lib/ddr/models/licenses/parent_license.rb
+- lib/ddr/models/metadata/administrative_metadata.rb
 - lib/ddr/models/metadata/descriptive_metadata.rb
 - lib/ddr/models/metadata/metadata.rb
 - lib/ddr/models/metadata/metadata_mapping.rb
@@ -687,6 +688,7 @@ files:
 - spec/managers/technical_metadata_manager_spec.rb
 - spec/models/active_fedora_base_spec.rb
 - spec/models/admin_set_spec.rb
+- spec/models/administrative_metadata_spec.rb
 - spec/models/attachment_spec.rb
 - spec/models/collection_spec.rb
 - spec/models/component_spec.rb
@@ -861,6 +863,7 @@ test_files:
 - spec/managers/technical_metadata_manager_spec.rb
 - spec/models/active_fedora_base_spec.rb
 - spec/models/admin_set_spec.rb
+- spec/models/administrative_metadata_spec.rb
 - spec/models/attachment_spec.rb
 - spec/models/collection_spec.rb
 - spec/models/component_spec.rb