ddr-models 3.0.0.beta.9 → 3.0.0.beta.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 423038a832d4b54a31f8f97b4db56125f018baae
-  data.tar.gz: c0a001fc155f0d5b810974cd7800b3b2cd4c2dac
+  metadata.gz: acfc5ee132f67a3bcd39524c3cb2b3b54e6904a3
+  data.tar.gz: 8ee6e1cf1e7cbd8cd023d3ccc851b7eea2950803
 SHA512:
-  metadata.gz: d9fc9f1685c4cd2401742d4604da2f36e68cb02f5a4a40e6933e5c460b15c48f14f39d1e0eccb5f78cfb608504b4569fdb80bf6dabb0805a22ced925fc322775
-  data.tar.gz: 1ebe59d6ab822b9abbecbde28876a0bdc050533e6b3cf965056bf4a4105de19037bf5e48dc64e25777f2433936e90432ac58d1e7fbc2b6bdd9595193cb91fdf6
+  metadata.gz: 7e470d2d199991ca2d8f8cdcd0300cc8c9c28f5d5339132c18d5f892ede55197577a030adbcbcf5966edfd3f79d72b2825c4e78216902760f0582337d23a0a90
+  data.tar.gz: 17a7d44df2345a1c740afc6f4f9fb08243858cbb4b9a8bd1a16c8b91c8567b4db633c7a33c661d18bf02b9e148deb3e3a0d7030bda432611b9e9bcca472edae7

data/config/initializers/active_fedora_base.rb

@@ -37,13 +37,8 @@ ActiveFedora::Base.class_eval do
       governable? && admin_policy.present?
     end
 
-    def has_rights_metadata?
-      ds = self.datastreams[Ddr::Datastreams::RIGHTS_METADATA]
-      ds && ds.size && ds.size > 0
-    end
-
     def can_have_struct_metadata?
-      datastreams.key? Ddr::Datastreams::STRUCT_METADATA
+      datastreams.key? Ddr::Models::File::STRUCT_METADATA
     end
 
     def has_struct_metadata?

data/lib/ddr/auth/ability_definitions/datastream_ability_definitions.rb

@@ -8,11 +8,11 @@ module Ddr
       # Datastreams not listed cannot be downloaded, except of
       # course by the :manage ability.
       DATASTREAM_DOWNLOAD_ABILITIES = {
-        Ddr::Datastreams::CONTENT         => :download,
-        Ddr::Datastreams::EXTRACTED_TEXT  => :download,
-        Ddr::Datastreams::FITS            => :read,
-        Ddr::Datastreams::STRUCT_METADATA => :read,
-        Ddr::Datastreams::THUMBNAIL       => :read,
+        Ddr::Models::File::CONTENT         => :download,
+        Ddr::Models::File::EXTRACTED_TEXT  => :download,
+        Ddr::Models::File::FITS            => :read,
+        Ddr::Models::File::STRUCT_METADATA => :read,
+        Ddr::Models::File::THUMBNAIL       => :read,
       }.freeze
 
       def call

data/lib/ddr/datastreams.rb

@@ -3,13 +3,6 @@ module Ddr
     extend ActiveSupport::Autoload
     extend Deprecation
 
-    CONTENT         = "content".freeze
-    DESC_METADATA   = "descMetadata".freeze
-    EXTRACTED_TEXT  = "extractedText".freeze
-    FITS            = "fits".freeze
-    STRUCT_METADATA = "structMetadata".freeze
-    THUMBNAIL       = "thumbnail".freeze
-
     CHECKSUM_TYPE_MD5    = "MD5"
     CHECKSUM_TYPE_SHA1   = "SHA-1"
     CHECKSUM_TYPE_SHA256 = "SHA-256"
@@ -20,6 +13,10 @@ module Ddr
 
     def self.const_missing(name)
       case name
+      when :CONTENT, :DESC_METADATA, :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 :FitsDatastream
         Deprecation.warn(self, "Ddr::Datastreams::FitsDatastream is deprecated." \
                                " Use Ddr::Models::FitsXmlFile instead.")

data/lib/ddr/derivatives/thumbnail.rb

@@ -28,9 +28,9 @@ module Ddr::Derivatives
     def store(object, output_path)
       output_file = File.open(output_path, 'rb')
       object.reload if object.persisted?
-      object.add_file output_file, path: Ddr::Datastreams::THUMBNAIL, mime_type: generator.class.output_mime_type
+      object.add_file output_file, path: Ddr::Models::File::THUMBNAIL, mime_type: generator.class.output_mime_type
       object.save!
     end
 
   end
-end
+end

data/lib/ddr/index/fields.rb

@@ -88,8 +88,8 @@ module Ddr::Index
     end
 
     def self.descmd
-      @descmd ||= Ddr::Datastreams::DescriptiveMetadataDatastream.properties.map do |base, config|
-        Field.new base, *(config.behaviors)
+      @descmd ||= Ddr::Models::DescriptiveMetadata.field_names.map do |base|
+        Field.new(base, :stored_searchable)
       end
     end
 

data/lib/ddr/models/file.rb

@@ -2,9 +2,15 @@ require 'tempfile'
 
 module Ddr::Models
   class File < ActiveFedora::File
-    extend AutoVersion
     extend Deprecation
 
+    CONTENT         = "content".freeze
+    DESC_METADATA   = "descMetadata".freeze
+    EXTRACTED_TEXT  = "extractedText".freeze
+    FITS            = "fits".freeze
+    STRUCT_METADATA = "structMetadata".freeze
+    THUMBNAIL       = "thumbnail".freeze
+
     DEFAULT_FILE_EXTENSION = "bin"
     STRFTIME_FORMAT = "%Y-%m-%dT%H:%M:%S.%LZ"
 

data/lib/ddr/models/files/fits_xml_file.rb

@@ -1,6 +1,5 @@
 module Ddr::Models
   class FitsXmlFile < ActiveFedora::OmDatastream
-    extend AutoVersion
 
     FITS_XMLNS = "http://hul.harvard.edu/ois/xml/ns/fits/fits_output".freeze
     FITS_SCHEMA = "http://hul.harvard.edu/ois/xml/xsd/fits/fits_output.xsd".freeze

data/lib/ddr/models/governable.rb

@@ -9,26 +9,6 @@ module Ddr
                    class_name: "Collection"
       end
 
-      def inherited_permissions
-        admin_policy ? admin_policy.default_permissions : []
-      end
-
-      def inherited_rights
-        admin_policy.datastreams[Ddr::Datastreams::DEFAULT_RIGHTS] if admin_policy
-      end
-
-      # Creates convenience methods:
-      # inherited_discover_users, inherited_discover_groups,
-      # inherited_read_users, inherited_read_groups,
-      # inherited_edit_user, inherited_edit_groups
-      ["discover", "read", "edit"].each do |access|
-        ["user", "group"].each do |type|
-          define_method("inherited_#{access}_#{type}s") do
-            admin_policy ? admin_policy.send("default_#{access}_#{type}s") : []
-          end
-        end
-      end
-
       def copy_admin_policy_from(other)
         if admin_policy = other.admin_policy
           self.admin_policy = admin_policy

data/lib/ddr/models/has_content.rb

@@ -5,9 +5,9 @@ module Ddr
       extend Deprecation
 
       included do
-        contains Ddr::Datastreams::CONTENT, class_name: 'Ddr::Models::File'
-        contains Ddr::Datastreams::EXTRACTED_TEXT, class_name: 'Ddr::Models::File'
-        contains Ddr::Datastreams::FITS, class_name: 'Ddr::Models::FitsXmlFile'
+        contains Ddr::Models::File::CONTENT, class_name: 'Ddr::Models::File'
+        contains Ddr::Models::File::EXTRACTED_TEXT, class_name: 'Ddr::Models::File'
+        contains Ddr::Models::File::FITS, class_name: 'Ddr::Models::FitsXmlFile'
 
         property :legacy_original_filename,
                  predicate: RDF::Vocab::PREMIS.hasOriginalName,
@@ -26,7 +26,7 @@ module Ddr
 
       # Convenience method wrapping FileManagement#add_file
       def upload(file, opts={})
-        add_file(file, opts.merge(path: Ddr::Datastreams::CONTENT))
+        add_file(file, opts.merge(path: Ddr::Models::File::CONTENT))
       end
 
       # Set content to file and save

data/lib/ddr/models/has_struct_metadata.rb

@@ -4,13 +4,14 @@ module Ddr
       extend ActiveSupport::Concern
 
       included do
-        contains Ddr::Datastreams::STRUCT_METADATA, class_name: 'Ddr::Datastreams::StructuralMetadataDatastream'
+        contains Ddr::Models::File::STRUCT_METADATA,
+                 class_name: 'Ddr::Models::StructuralMetadataFile'
       end
 
       def structure
         unless @structure
-          if datastreams[Ddr::Datastreams::STRUCT_METADATA].content
-            @structure = Ddr::Models::Structure.new(Nokogiri::XML(datastreams[Ddr::Datastreams::STRUCT_METADATA].content))
+          if datastreams[Ddr::Models::File::STRUCT_METADATA].content
+            @structure = Ddr::Models::Structure.new(Nokogiri::XML(datastreams[Ddr::Models::File::STRUCT_METADATA].content))
           end
         end
         @structure

data/lib/ddr/models/has_thumbnail.rb

@@ -3,7 +3,7 @@ module Ddr::Models
     extend ActiveSupport::Concern
 
     included do
-      contains Ddr::Datastreams::THUMBNAIL, class_name: "Ddr::Models::File"
+      contains Ddr::Models::File::THUMBNAIL, class_name: "Ddr::Models::File"
     end
 
     def thumbnail_changed?

data/lib/ddr/models/solr_document.rb

@@ -135,15 +135,15 @@ module Ddr::Models
     end
 
     def has_thumbnail?
-      has_datastream?(Ddr::Datastreams::THUMBNAIL)
+      has_datastream?(Ddr::Models::File::THUMBNAIL)
     end
 
     def has_content?
-      has_datastream?(Ddr::Datastreams::CONTENT)
+      has_datastream?(Ddr::Models::File::CONTENT)
     end
 
     def content_ds
-      datastreams[Ddr::Datastreams::CONTENT]
+      datastreams[Ddr::Models::File::CONTENT]
     end
 
     def content_mime_type

data/lib/ddr/models/version.rb

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

data/spec/managers/derivatives_manager_spec.rb

@@ -24,7 +24,7 @@ module Ddr
       end
 
       describe "generators called" do
-        before { object.add_file file, path: Ddr::Datastreams::CONTENT }
+        before { object.add_file file, path: Ddr::Models::File::CONTENT }
         context "all derivatives" do
           context "not multires_image_able" do
             let(:object) { ContentBearing.new }
@@ -85,10 +85,10 @@ module Ddr
         describe "thumbnail" do
           let(:object) { ContentBearing.create }
           it "should create content in the thumbnail datastream" do
-            expect(object.datastreams[Ddr::Datastreams::THUMBNAIL]).to_not be_present
+            expect(object.datastreams[Ddr::Models::File::THUMBNAIL]).to_not be_present
             object.derivatives.generate_derivative Ddr::Derivatives::DERIVATIVES[:thumbnail]
-            expect(object.datastreams[Ddr::Datastreams::THUMBNAIL]).to be_present
-            expect(object.datastreams[Ddr::Datastreams::THUMBNAIL].size).to be > 0
+            expect(object.datastreams[Ddr::Models::File::THUMBNAIL]).to be_present
+            expect(object.datastreams[Ddr::Models::File::THUMBNAIL].size).to be > 0
           end
         end
         describe "ptif" do

data/spec/models/active_fedora_base_spec.rb

@@ -95,7 +95,7 @@ RSpec.describe ActiveFedora::Base do
     end
     describe "#has_thumbnail?" do
       let(:thumbnailable) { Thumbnailable.new }
-      before { allow(thumbnailable.datastreams[Ddr::Datastreams::THUMBNAIL]).to receive(:has_content?).and_return(true) }
+      before { allow(thumbnailable.datastreams[Ddr::Models::File::THUMBNAIL]).to receive(:has_content?).and_return(true) }
       it "should return true if object has a thumbnail, else false" do
         expect(thumbnailable).to have_thumbnail
         expect(Thumbnailable.new).not_to have_thumbnail
@@ -121,7 +121,7 @@ RSpec.describe ActiveFedora::Base do
     end
     describe "#has_content?" do
       let(:contentable) { Contentable.new }
-      before { allow(contentable.datastreams[Ddr::Datastreams::CONTENT]).to receive(:has_content?).and_return(true) }
+      before { allow(contentable.datastreams[Ddr::Models::File::CONTENT]).to receive(:has_content?).and_return(true) }
       it "should return true if object has content, else false" do
         expect(contentable).to have_content
         expect(Contentable.new).not_to have_content

data/spec/models/file_spec.rb

@@ -3,28 +3,6 @@ require 'spec_helper'
 module Ddr::Models
   RSpec.describe File do
 
-    describe "versioning" do
-      let(:obj) { FactoryGirl.build(:component) }
-      describe "on create" do
-        it "creates a version" do
-          expect { obj.save }.to change { obj.content.has_versions? }.from(false).to(true)
-          obj.save
-          expect(obj.content.versions.all.size).to eq 1
-        end
-      end
-      describe "on update" do
-        it "creates a version" do
-            obj.save
-            expect {
-              obj.upload fixture_file_upload("imageB.tif", "image/tiff")
-              obj.save
-            }.to change {
-              obj.content.versions.all.size
-            }.by(1)
-        end
-      end
-    end
-
     describe "#tempfile" do
       describe "when the datastream has no content" do
         it "should raise an exception" do

data/spec/{datastreams/fits_datastream_spec.rb → models/fits_xml_file_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-module Ddr::Datastreams
-  RSpec.describe FitsDatastream do
+module Ddr::Models
+  RSpec.describe FitsXmlFile do
 
     let(:fits_xml) do
       <<-XML

data/spec/models/has_struct_metadata_spec.rb

@@ -13,7 +13,7 @@ module Ddr
           end
         end
         context "existing structural metadata" do
-          before { item.datastreams[Ddr::Datastreams::STRUCT_METADATA].content = simple_structure }
+          before { item.datastreams[Ddr::Models::File::STRUCT_METADATA].content = simple_structure }
           it "should return the structural metadata" do
             expect(item.structure.to_xml).to be_equivalent_to(simple_structure)
           end
@@ -35,7 +35,7 @@ module Ddr
 
       describe "indexing" do
         let(:expected_json) { multiple_struct_maps_structure_to_json }
-        before { item.datastreams[Ddr::Datastreams::STRUCT_METADATA].content = multiple_struct_maps_structure }
+        before { item.datastreams[Ddr::Models::File::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::Index::Fields::STRUCT_MAPS)
@@ -45,4 +45,4 @@ module Ddr
 
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta.9
+  version: 3.0.0.beta.10
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-09 00:00:00.000000000 Z
+date: 2016-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -469,8 +469,6 @@ files:
 - lib/ddr/auth/user.rb
 - lib/ddr/auth/web_auth_context.rb
 - lib/ddr/datastreams.rb
-- lib/ddr/datastreams/descriptive_metadata_datastream.rb
-- lib/ddr/datastreams/fits_datastream.rb
 - lib/ddr/derivatives.rb
 - lib/ddr/derivatives/derivative.rb
 - lib/ddr/derivatives/generators/generator.rb
@@ -604,7 +602,6 @@ files:
 - spec/auth/web_auth_context_spec.rb
 - spec/controllers/application_controller_spec.rb
 - spec/controllers/users/sessions_controller_spec.rb
-- spec/datastreams/fits_datastream_spec.rb
 - spec/derivatives/multires_image_spec.rb
 - spec/derivatives/png_generator_spec.rb
 - spec/derivatives/ptif_generator_spec.rb
@@ -704,6 +701,7 @@ files:
 - spec/models/file_management_spec.rb
 - spec/models/file_spec.rb
 - spec/models/finding_aid_spec.rb
+- spec/models/fits_xml_file_spec.rb
 - spec/models/has_admin_metadata_spec.rb
 - spec/models/has_children_spec.rb
 - spec/models/has_struct_metadata_spec.rb
@@ -778,7 +776,6 @@ test_files:
 - spec/auth/web_auth_context_spec.rb
 - spec/controllers/application_controller_spec.rb
 - spec/controllers/users/sessions_controller_spec.rb
-- spec/datastreams/fits_datastream_spec.rb
 - spec/derivatives/multires_image_spec.rb
 - spec/derivatives/png_generator_spec.rb
 - spec/derivatives/ptif_generator_spec.rb
@@ -878,6 +875,7 @@ test_files:
 - spec/models/file_management_spec.rb
 - spec/models/file_spec.rb
 - spec/models/finding_aid_spec.rb
+- spec/models/fits_xml_file_spec.rb
 - spec/models/has_admin_metadata_spec.rb
 - spec/models/has_children_spec.rb
 - spec/models/has_struct_metadata_spec.rb

data/lib/ddr/datastreams/descriptive_metadata_datastream.rb

@@ -1,43 +0,0 @@
-module Ddr
-  module Datastreams
-    class DescriptiveMetadataDatastream < MetadataDatastream
-
-      class_attribute :vocabularies
-      self.vocabularies = [RDF::DC, Ddr::Vocab::DukeTerms].freeze
-
-      def self.default_attributes
-        super.merge(:mimeType => 'application/n-triples')
-      end
-
-      def self.indexers
-        # Add term_name => [indexers] mapping to customize indexing
-        {}
-      end
-
-      def self.default_indexers
-        [:stored_searchable]
-      end
-
-      def self.indexers_for(term_name)
-        indexers.fetch(term_name, default_indexers)
-      end
-
-      # Add terms from the vocabularies as properties
-      vocabularies.each do |vocab|
-        Ddr::Vocab::Vocabulary.property_terms(vocab).each do |term|
-          term_name = Ddr::Vocab::Vocabulary.term_name(vocab, term)
-          property term_name, predicate: term do |index|
-            index.as *indexers_for(term_name)
-          end
-        end
-      end
-
-      # Override ActiveFedora::Rdf::Indexing#apply_prefix(name) to not
-      # prepend the index field name with a string based on the datastream id.
-      def apply_prefix(name)
-        name
-      end
-
-    end
-  end
-end

data/lib/ddr/datastreams/fits_datastream.rb

@@ -1,85 +0,0 @@
-module Ddr::Datastreams
-  class FitsDatastream < ActiveFedora::OmDatastream
-    extend AutoVersion
-
-    FITS_XMLNS = "http://hul.harvard.edu/ois/xml/ns/fits/fits_output".freeze
-    FITS_SCHEMA = "http://hul.harvard.edu/ois/xml/xsd/fits/fits_output.xsd".freeze
-
-    EXIFTOOL = "Exiftool"
-
-    set_terminology do |t|
-      t.root(path: "fits",
-             xmlns: FITS_XMLNS,
-             schema: FITS_SCHEMA)
-      t.version(path: {attribute: "version"})
-      t.timestamp(path: {attribute: "timestamp"})
-      t.identification {
-        t.identity {
-          t.mimetype(path: {attribute: "mimetype"})
-          t.format_label(path: {attribute: "format"})
-          t.version
-          t.externalIdentifier
-          t.pronom_identifier(path: "externalIdentifier", attributes: {type: "puid"})
-        }
-      }
-      t.fileinfo {
-        t.size
-        t.creatingApplicationName
-        t.created
-        t.lastmodified
-      }
-      t.filestatus {
-        t.valid
-        t.well_formed(path: "well-formed")
-      }
-      t.metadata {
-        t.image {
-          t.imageWidth
-          t.imageHeight
-          t.colorSpace
-        }
-        t.document {
-          # TODO - configure to get from Tika?
-          # t.encoding
-        }
-        t.text
-        t.audio
-        t.video
-      }
-
-      ## proxy terms
-      # identification / identity
-      t.media_type           proxy: [:identification, :identity, :mimetype]
-      t.format_label         proxy: [:identification, :identity, :format_label]
-      t.format_version       proxy: [:identification, :identity, :version]
-      t.pronom_identifier    proxy: [:identification, :identity, :pronom_identifier]
-      # filestatus
-      t.valid                proxy: [:filestatus, :valid]
-      t.well_formed          proxy: [:filestatus, :well_formed]
-      # fileinfo
-      t.created              proxy: [:fileinfo, :created]
-      t.creating_application proxy: [:fileinfo, :creatingApplicationName]
-      t.extent               proxy: [:fileinfo, :size]
-      # image metadata
-      t.image_width          proxy: [:metadata, :image, :imageWidth]
-      t.image_height         proxy: [:metadata, :image, :imageHeight]
-      t.color_space          proxy: [:metadata, :image, :colorSpace]
-    end
-
-    def self.xml_template
-      builder = Nokogiri::XML::Builder.new do |xml|
-        xml.fits("xmlns"=>FITS_XMLNS,
-                 "xmlns:xsi"=>"http://www.w3.org/2001/XMLSchema-instance",
-                 "xsi:schemaLocation"=>"http://hul.harvard.edu/ois/xml/ns/fits/fits_output http://hul.harvard.edu/ois/xml/xsd/fits/fits_output.xsd")
-      end
-      builder.doc
-    end
-
-    def modified
-      ng_xml
-        .xpath("//fits:fileinfo/fits:lastmodified[@toolname != '#{EXIFTOOL}']", fits: FITS_XMLNS)
-        .map(&:text)
-    end
-
-  end
-end