ddr-models 3.0.0.beta.7 → 3.0.0.beta.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 060df180f9e6610db843d353037b1686bb9b6e31
-  data.tar.gz: 487bafe0d10284c8033ba37fb578aeb8f9e949aa
+  metadata.gz: b9040fdb0b6cda2736d299291211c5a4dde620d7
+  data.tar.gz: 42b318beb27882963fc49a4d1278cb94e1116851
 SHA512:
-  metadata.gz: deef36f8b5996ad1df4852a3d4849f2543d907659f8ab27ab50e4b8dfbb0ba5f8e90b50d37d6b16568f68bd05f7af87cbdbed7face50f42fd346dfb8bb069f5b
-  data.tar.gz: b5483a469cadbf2ba1075470dcaefc363c792077694c7b091045bc83242f6d28789dfdcb2017a01a189d62ef92c6efcc60eee5f04dcb70d08f8a2de0a03fd2c1
+  metadata.gz: 54f897c2bd20fe04d9877aa5e7b761fe3a29896128009d03d2cf2b80ab3cca5761cfac041bf11043e2fff9cf879f0bfdd714eb72a4355a934876f76c00a33515
+  data.tar.gz: 8a7a65a4d731561e19baf8b19439bffd467d0ec02cfcf68951af458c4645e1238b04aee7b8497ce2f16d1d015423cf6dc8e99776b5f431d94fdf44ae3ce71332

data/.gitignore

@@ -6,3 +6,4 @@ spec/dummy/db/*.sqlite3
 spec/dummy/db/*.sqlite3-journal
 spec/dummy/log/*
 tmp
+.bundle

data/README.md

@@ -4,8 +4,6 @@ A Rails engine providing Hydra and ActiveRecord models and common services for t
 
 [![Gem Version](https://badge.fury.io/rb/ddr-models.svg)](http://badge.fury.io/rb/ddr-models)
 [![Build Status](https://travis-ci.org/duke-libraries/ddr-models.svg?branch=develop)](https://travis-ci.org/duke-libraries/ddr-models)
-[![Coverage Status](https://coveralls.io/repos/duke-libraries/ddr-models/badge.png?branch=develop)](https://coveralls.io/r/duke-libraries/ddr-models?branch=develop)
-[![Code Climate](https://codeclimate.com/github/duke-libraries/ddr-models/badges/gpa.svg)](https://codeclimate.com/github/duke-libraries/ddr-models)
 
 ## Installation
 

data/config/fedora.yml

@@ -0,0 +1,15 @@
+development:
+  user: fedoraAdmin
+  password: fedoraAdmin
+  url: http://127.0.0.1:8983/fedora/rest
+  base_path: /dev
+test: 
+  user: fedoraAdmin
+  password: fedoraAdmin
+  url: http://127.0.0.1:8983/fedora/rest
+  base_path: /test
+production:
+  user: fedoraAdmin
+  password: fedoraAdmin
+  url: http://127.0.0.1:8080/fedora/rest
+  base_path: /prod

data/config/initializers/subscriptions.rb

@@ -16,3 +16,4 @@ ActiveSupport::Notifications.subscribe(Ddr::Notifications::UPDATE, Ddr::Events::
 
 # Deletion
 ActiveSupport::Notifications.subscribe(Ddr::Notifications::DELETION, Ddr::Events::DeletionEvent)
+ActiveSupport::Notifications.subscribe(Ddr::Notifications::DELETION, Ddr::Jobs::DeleteMultiresImage)

data/config/solr.yml

@@ -0,0 +1,6 @@
+development:
+  url: http://localhost:8983/solr/development
+test: 
+  url: <%= "http://localhost:#{ENV['TEST_JETTY_PORT'] || 8983}/solr/test" %>
+production:
+  url: http://your.production.server:8080/bl_solr/core0 

data/ddr-models.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency "rails", "~> 4.1.13"
   s.add_dependency "activeresource"
   s.add_dependency "active-triples", "~> 0.7.2"
-  s.add_dependency "active-fedora", "~> 9.6.2"
+  s.add_dependency "active-fedora", "~> 9.8.1"
   s.add_dependency "hydra-validations", "~> 0.5"
   s.add_dependency "devise", "~> 3.4"
   s.add_dependency "omniauth-shibboleth", "~> 1.2.0"

data/lib/ddr/datastreams.rb

@@ -1,34 +1,41 @@
-require 'active_fedora'
-
 module Ddr
   module Datastreams
     extend ActiveSupport::Autoload
+    extend Deprecation
 
-    CONTENT = "content"
-    DC = "DC"
-    DEFAULT_RIGHTS = "defaultRights"
-    DESC_METADATA = "descMetadata"
-    EXTRACTED_TEXT = "extractedText"
-    FITS = "fits".freeze
-    RELS_EXT = "RELS-EXT"
-    RIGHTS_METADATA = "rightsMetadata"
-    STRUCT_METADATA = "structMetadata"
-    THUMBNAIL = "thumbnail"
+    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_MD5    = "MD5"
+    CHECKSUM_TYPE_SHA1   = "SHA-1"
     CHECKSUM_TYPE_SHA256 = "SHA-256"
     CHECKSUM_TYPE_SHA384 = "SHA-384"
     CHECKSUM_TYPE_SHA512 = "SHA-512"
 
     CHECKSUM_TYPES = [ CHECKSUM_TYPE_MD5, CHECKSUM_TYPE_SHA1, CHECKSUM_TYPE_SHA256, CHECKSUM_TYPE_SHA384, CHECKSUM_TYPE_SHA512 ]
 
-    autoload :DatastreamBehavior
-    autoload :DescriptiveMetadataDatastream
-    autoload :FitsDatastream
-    autoload :MetadataDatastream
-    autoload :PlainTextDatastream
-    autoload :StructuralMetadataDatastream
+    def self.const_missing(name)
+      case name
+      when :FitsDatastream
+        Deprecation.warn(self, "Ddr::Datastreams::FitsDatastream is deprecated." \
+                               " Use Ddr::Models::FitsXmlFile instead.")
+        Ddr::Models::FitsXmlFile
+      when :StructuralMetadataDatastream
+        Deprecation.warn(self, "Ddr::Datastreams::StructuralMetadataDatastream is deprecated." \
+                               " Use Ddr::Models::StructuralMetadataFile instead.")
+        Ddr::Models::StructuralMetadataFile
+      when :PlainTextDatastream
+        Deprecation.warn(self, "Ddr::Datastreams::PlainTextDatastream is deprecated." \
+                               " Use Ddr::Models::File instead.")
+        Ddr::Models::File
+      else
+        super
+      end
+    end
 
   end
 end

data/lib/ddr/datastreams/fits_datastream.rb

@@ -1,5 +1,6 @@
 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
@@ -74,11 +75,6 @@ module Ddr::Datastreams
       builder.doc
     end
 
-    # TODO fix or remove
-    # def prefix
-    #   "fits__"
-    # end
-
     def modified
       ng_xml
         .xpath("//fits:fileinfo/fits:lastmodified[@toolname != '#{EXIFTOOL}']", fits: FITS_XMLNS)

data/lib/ddr/events/event.rb

@@ -39,7 +39,9 @@ module Ddr
       # Receive message sent by ActiveSupport::Notifications
       def self.call(*args)
         notification = ActiveSupport::Notifications::Event.new(*args)
-        create(notification.payload)
+        evt = new
+        attrs = notification.payload.dup.keep_if { |k, v| evt.has_attribute?(k) }
+        evt.update(attrs)
       end
 
       # Scopes

data/lib/ddr/index/query_builder.rb

@@ -91,18 +91,6 @@ module Ddr::Index
   #
   class QueryBuilder
 
-    # Builds a Query object
-    # @yield [builder] a new QueryBuilder instance.
-    # @return [Query]
-    def self.build
-      Deprecation.warn(self,
-                       "`Ddr::Index::QueryBuilder.build` is deprecated and will be removed in ddr-models 3.0." \
-                       " Use `Ddr::Index::QueryBuilder.new` instead.")
-      builder = new
-      yield builder
-      builder.query
-    end
-
     attr_reader :query
 
     def initialize(query = nil, &block)
@@ -146,11 +134,6 @@ module Ddr::Index
     # @param orderings [Hash<Field, String>]
     # @return [QueryBuilder] self
     def order_by(*orderings)
-      unless orderings.first.is_a? Hash
-        Deprecation.warn(QueryBuilder, "`order_by` will require a hash of orderings in ddr-models 3.0.")
-        field, order = orderings
-        return order_by(field => order)
-      end
       query.sort += orderings.first.map { |field, order| SortOrder.new(field: field, order: order) }
       self
     end

data/lib/ddr/jobs.rb

@@ -2,6 +2,7 @@ module Ddr
   module Jobs
     extend ActiveSupport::Autoload
 
+    autoload :DeleteMultiresImage
     autoload :FitsFileCharacterization
     autoload :FixityCheck
     autoload :Job

data/lib/ddr/jobs/delete_multires_image.rb

@@ -0,0 +1,21 @@
+module Ddr::Jobs
+  class DeleteMultiresImage
+    extend Job
+
+    @queue = :general
+
+    def self.call(*args)
+      event = ActiveSupport::Notifications::Event.new(*args)
+      if event.name == Ddr::Notifications::DELETION &&
+         file_uri = event.payload[:multires_image_file_path]
+        Resque.enqueue(self, file_uri)
+      end
+    end
+
+    def self.perform(file_uri)
+      path = Ddr::Utils.path_from_uri(file_uri)
+      File.unlink(path)
+    end
+
+  end
+end

data/lib/ddr/models.rb

@@ -7,7 +7,6 @@ require 'hydra/validations'
 
 module Ddr
   extend ActiveSupport::Autoload
-  extend Deprecation
 
   autoload :Actions
   autoload :Auth
@@ -22,22 +21,13 @@ module Ddr
   autoload :Utils
   autoload :Vocab
 
-  def self.const_missing(name)
-    if name == :IndexFields
-      Deprecation.warn(Ddr::Models, "`Ddr::IndexFields` is deprecated and will be removed in ddr-models 3.0." \
-                                    " Use `Ddr::Index::Fields` instead.")
-      Index::Fields
-    else
-      super
-    end
-  end
-
   module Models
     extend ActiveSupport::Autoload
 
     autoload :AdminSet
     autoload :AttachedFileProfile
     autoload :AttachedFilesProfile
+    autoload :AutoVersion
     autoload :Base
     autoload :ChecksumInvalid, 'ddr/models/error'
     autoload :Contact
@@ -45,6 +35,7 @@ module Ddr
     autoload :DerivativeGenerationFailure, 'ddr/models/error'
     autoload :Error
     autoload :EventLoggable
+    autoload :File
     autoload :FileCharacterization
     autoload :FileManagement
     autoload :FindingAid
@@ -66,9 +57,15 @@ module Ddr
     autoload :UrlSafeId
     autoload :Validatable
     autoload :Validator
+    autoload :Versionable
     autoload :WithContentFile
     autoload :YearFacet
 
+    autoload_under "files" do
+      autoload :FitsXmlFile
+      autoload :StructuralMetadataFile
+    end
+
     autoload_under "licenses" do
       autoload :AdminPolicyLicense
       autoload :EffectiveLicense

data/lib/ddr/models/auto_version.rb

@@ -0,0 +1,13 @@
+module Ddr::Models
+  module AutoVersion
+
+    def self.extended(base)
+      base.include Versionable
+
+      base.class_eval do
+        after_save :create_version
+      end
+    end
+
+  end
+end

data/lib/ddr/models/base.rb

@@ -11,9 +11,10 @@ module Ddr::Models
     include Indexing
     include Hydra::Validations
     include HasAdminMetadata
+    extend AutoVersion
 
     after_destroy do
-      notify_event :deletion
+      notify_event(:deletion, deletion_event_payload)
     end
 
     DescriptiveMetadata.mapping.each do |name, term|
@@ -115,5 +116,9 @@ module Ddr::Models
       self
     end
 
+    def deletion_event_payload
+      {}
+    end
+
   end
 end

data/lib/ddr/{datastreams/datastream_behavior.rb → models/file.rb}

@@ -1,28 +1,29 @@
-module Ddr::Datastreams
-  module DatastreamBehavior
+require 'tempfile'
+
+module Ddr::Models
+  class File < ActiveFedora::File
+    extend AutoVersion
     extend Deprecation
 
     DEFAULT_FILE_EXTENSION = "bin"
     STRFTIME_FORMAT = "%Y-%m-%dT%H:%M:%S.%LZ"
 
     def dsid
-      Deprecation.warn(DatastreamBehavior,
-                       "`dsid` is no longer a datastream/file method. Use `File.basename(id)`.")
+      Deprecation.warn(File, "`dsid` is no longer a file method. Use `::File.basename(id)`.")
       if id
         ::File.basename(id)
       end
     end
 
     def dsCreateDate
-      Deprecation.warn(DatastreamBehavior,
-                       "`dsCreateDate` is no longer a datastream/file method. Use `create_date` instead.")
+      Deprecation.warn(File, "`dsCreateDate` is no longer a file method. Use `create_date` instead.")
       create_date
     end
 
     def validate_checksum!(checksum_value, checksum_type=nil)
-      raise Ddr::Models::Error, "Checksum cannot be validated on new datastream." if new_record?
-      raise Ddr::Models::Error, "Checksum cannot be validated on unpersisted content." if content_changed?
-      raise Ddr::Models::ChecksumInvalid, "The repository internal checksum validation failed." unless check_fixity
+      raise Error, "Checksum cannot be validated on new file." if new_record?
+      raise Error, "Checksum cannot be validated on unpersisted content." if content_changed?
+      raise ChecksumInvalid, "The repository internal checksum validation failed." unless check_fixity
       algorithm = checksum_type || checksum.algorithm
       calculated_checksum = if algorithm == checksum.algorithm
                               checksum.value
@@ -30,9 +31,9 @@ module Ddr::Datastreams
                               content_digest(algorithm)
                             end
       if checksum_value == calculated_checksum
-        "The checksum #{algorithm}:#{checksum_value} is valid for datastream #{dsid}."
+        "The checksum #{algorithm}:#{checksum_value} is valid for file #{dsid}."
       else
-        raise Ddr::Models::ChecksumInvalid, "The checksum #{algorithm}:#{checksum_value} is not valid for datastream #{dsid}."
+        raise ChecksumInvalid, "The checksum #{algorithm}:#{checksum_value} is not valid for file #{dsid}."
       end
     end
 
@@ -44,7 +45,7 @@ module Ddr::Datastreams
       Ddr::Utils.digest(content, algorithm)
     end
 
-    # Return default file extension for datastream based on MIME type
+    # Return default file extension for file based on MIME type
     def default_file_extension
       mimetypes = MIME::Types[mime_type]
       return mimetypes.first.extensions.first unless mimetypes.empty?
@@ -67,7 +68,7 @@ module Ddr::Datastreams
 
     def tempfile(prefix: nil, suffix: nil)
       if empty?
-        raise Ddr::Models::Error, "Refusing to create tempfile for empty datastream!"
+        raise Error, "Refusing to create tempfile for empty file!"
       end
       prefix ||= default_file_prefix + "--"
       suffix ||= "." + default_file_extension

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

@@ -0,0 +1,85 @@
+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
+
+    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

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

@@ -0,0 +1,9 @@
+module Ddr::Models
+  class StructuralMetadataFile < File
+
+    def default_mime_type
+      'text/xml'
+    end
+
+  end
+end

data/lib/ddr/models/has_content.rb

@@ -5,9 +5,9 @@ module Ddr
       extend Deprecation
 
       included do
-        contains Ddr::Datastreams::CONTENT
-        contains Ddr::Datastreams::EXTRACTED_TEXT, class_name: 'Ddr::Datastreams::PlainTextDatastream'
-        contains Ddr::Datastreams::FITS, class_name: 'Ddr::Datastreams::FitsDatastream'
+        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'
 
         property :legacy_original_filename,
                  predicate: RDF::Vocab::PREMIS.hasOriginalName,

data/lib/ddr/models/has_multires_image.rb

@@ -1,12 +1,14 @@
-module Ddr
-  module Models
-    module HasMultiresImage
-      extend ActiveSupport::Concern
+module Ddr::Models
+  module HasMultiresImage
+    extend ActiveSupport::Concern
 
-      included do
-        property :multires_image_file_path, predicate: Ddr::Vocab::Asset.multiresImageFilePath, multiple: false
-      end
+    included do
+      property :multires_image_file_path, predicate: Ddr::Vocab::Asset.multiresImageFilePath, multiple: false
+    end
 
+    def deletion_event_payload
+      super.merge(multires_image_file_path: multires_image_file_path)
     end
+
   end
 end

data/lib/ddr/models/has_thumbnail.rb

@@ -1,24 +1,22 @@
-module Ddr
-  module Models
-    module HasThumbnail
-      extend ActiveSupport::Concern
+module Ddr::Models
+  module HasThumbnail
+    extend ActiveSupport::Concern
 
-      included do
-        contains Ddr::Datastreams::THUMBNAIL
-      end
+    included do
+      contains Ddr::Datastreams::THUMBNAIL, class_name: "Ddr::Models::File"
+    end
 
-      def thumbnail_changed?
-        thumbnail.content_changed?
-      end
+    def thumbnail_changed?
+      thumbnail.content_changed?
+    end
 
-      def copy_thumbnail_from(other)
-        if other && other.has_thumbnail?
-          self.thumbnail.content = other.thumbnail.content
-          self.thumbnail.mimeType = other.thumbnail.mimeType if thumbnail_changed?
-        end
-        thumbnail_changed?
+    def copy_thumbnail_from(other)
+      if other && other.has_thumbnail?
+        self.thumbnail.content = other.thumbnail.content
+        self.thumbnail.mimeType = other.thumbnail.mimeType if thumbnail_changed?
       end
-
+      thumbnail_changed?
     end
+
   end
 end

data/lib/ddr/models/solr_document.rb

@@ -9,12 +9,12 @@ module Ddr::Models
     class NotFound < Error; end
 
     module ClassMethods
-      def find(id)
-        query = Ddr::Index::QueryBuilder.build { |q| q.id(id) }
+      def find(doc_id)
+        query = Ddr::Index::Query.new { id doc_id }
         if doc = query.docs.first
           return doc
         end
-        raise NotFound, "SolrDocument not found for \"#{id}\"."
+        raise NotFound, "SolrDocument not found for \"#{doc_id}\"."
       end
     end
 

data/lib/ddr/models/version.rb

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

data/lib/ddr/models/versionable.rb

@@ -0,0 +1,12 @@
+module Ddr::Models
+  module Versionable
+
+    # Override AF::Versionable
+    # @example
+    #   => "version.20160205153424.643252000"
+    def version_name
+      "version.#{Time.now.utc.strftime('%Y%m%d%H%M%S.%N')}"
+    end
+
+  end
+end

data/lib/ddr/models/with_content_file.rb

@@ -13,7 +13,7 @@ module Ddr::Models
     # @yield [String] the path to the tempfile containing content
     def with_temp_file
       filename = original_filename || content.default_file_name
-      basename = [ File.basename(filename, ".*"), File.extname(filename) ]
+      basename = [ ::File.basename(filename, ".*"), ::File.extname(filename) ]
       infile = Tempfile.open(basename, Ddr::Models.tempdir, encoding: 'ascii-8bit')
       begin
         infile.write(content.content)
@@ -22,12 +22,12 @@ module Ddr::Models
         yield infile.path
       ensure
         infile.close unless infile.closed?
-        File.unlink(infile)
+        ::File.unlink(infile)
       end
     end
 
     def verify_checksum!(file)
-      digest = Ddr::Utils.digest(File.read(file), content.checksum.algorithm)
+      digest = Ddr::Utils.digest(::File.read(file), content.checksum.algorithm)
       if digest != content.checksum.value
         raise ChecksumInvalid, "The checksum of the downloaded file does not match the stored checksum of the content."
       end

data/spec/dummy/config/fedora.yml

@@ -0,0 +1,15 @@
+development:
+  user: fedoraAdmin
+  password: fedoraAdmin
+  url: http://127.0.0.1:8983/fedora/rest
+  base_path: /dev
+test: 
+  user: fedoraAdmin
+  password: fedoraAdmin
+  url: http://127.0.0.1:8983/fedora/rest
+  base_path: /test
+production:
+  user: fedoraAdmin
+  password: fedoraAdmin
+  url: http://127.0.0.1:8080/fedora/rest
+  base_path: /prod

data/spec/dummy/config/solr.yml

@@ -0,0 +1,6 @@
+development:
+  url: http://localhost:8983/solr/development
+test: 
+  url: <%= "http://localhost:#{ENV['TEST_JETTY_PORT'] || 8983}/solr/test" %>
+production:
+  url: http://your.production.server:8080/bl_solr/core0 

data/spec/models/{active_fedora_datastream_spec.rb → file_spec.rb}

@@ -1,12 +1,34 @@
 require 'spec_helper'
 
-module ActiveFedora
-  RSpec.describe Datastream do
+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
-          expect { subject.tempfile { |f| puts f.path } }.to raise_error(Ddr::Models::Error)
+          expect { subject.tempfile { |f| puts f.path } }.to raise_error(Error)
         end
       end
       describe "when the datastream has content" do
@@ -37,7 +59,8 @@ module ActiveFedora
               it "should start with the id" do
                 allow(subject).to receive(:id) { "4f/78/97/71/4f789771-c663-466a-98a8-fd7c6fa0f452/foo" }
                 subject.tempfile do |f|
-                  expect(::File.basename(f.path).start_with?("4f_78_97_71_4f789771-c663-466a-98a8-fd7c6fa0f452_foo--")).to be true
+                  expect(::File.basename(f.path).start_with?("4f_78_97_71_4f789771-c663-466a-98a8-fd7c6fa0f452_foo--"))
+                    .to be true
                 end
               end
             end
@@ -66,13 +89,15 @@ module ActiveFedora
         context "the datstream is new" do
           before { allow(subject).to receive(:new_record?) { true } }
           it "should raise an exception" do
-            expect { subject.validate_checksum!("bb3200c2ddaee4bd7b9a4dc1ad3e10ed886eaef1") }.to raise_error(Ddr::Models::Error)
+            expect { subject.validate_checksum!("bb3200c2ddaee4bd7b9a4dc1ad3e10ed886eaef1") }
+              .to raise_error(Error)
           end
         end
         context "the datastream content has changed" do
           before { allow(subject).to receive(:content_changed?) { true } }
           it "should raise an exception" do
-            expect { subject.validate_checksum!("bb3200c2ddaee4bd7b9a4dc1ad3e10ed886eaef1") }.to raise_error(Ddr::Models::Error)
+            expect { subject.validate_checksum!("bb3200c2ddaee4bd7b9a4dc1ad3e10ed886eaef1") }
+              .to raise_error(Error)
           end
         end
       end
@@ -86,7 +111,7 @@ module ActiveFedora
           before { allow(subject).to receive(:check_fixity) { false } }
           it "should raise an error" do
             expect { subject.validate_checksum!(checksum.value, checksum.algorithm) }
-              .to raise_error(Ddr::Models::ChecksumInvalid)
+              .to raise_error(ChecksumInvalid)
           end
         end
         context "and the repository internal checksum is valid" do
@@ -118,7 +143,7 @@ module ActiveFedora
           context "and the checksum doesn't match" do
             it "should raise an exception" do
               expect { subject.validate_checksum!("0123456789abcdef", checksum.algorithm) }
-                .to raise_error(Ddr::Models::ChecksumInvalid)
+                .to raise_error(ChecksumInvalid)
             end
           end
         end

data/spec/models/has_multires_image_spec.rb

@@ -0,0 +1,23 @@
+module Ddr::Models
+  RSpec.describe HasMultiresImage do
+
+    subject { FactoryGirl.create(:component) }
+
+    describe "cleaning up multires image file after destroy" do
+      before {
+        @file = Tempfile.create('foo')
+        @path = @file.path
+      }
+      after {
+        ::File.unlink(@path) if ::File.exist?(@path)
+      }
+      it "deletes the file" do
+        subject.multires_image_file_path = "file:#{@path}"
+        subject.save!
+        subject.destroy
+        expect(::File.exist?(@path)).to be false
+      end
+    end
+
+  end
+end

data/spec/models/with_content_file_spec.rb

@@ -6,20 +6,20 @@ module Ddr::Models
     it "yields a temp file path to the block and deletes the temp file afterwards" do
       WithContentFile.new(obj) do |path|
         @path = path
-        expect(File.exist?(path)).to be true
+        expect(::File.exist?(path)).to be true
       end
-      expect(File.exist?(@path)).to be false
+      expect(::File.exist?(@path)).to be false
     end
 
     it "deletes the temp file even when an exception is raised in the block" do
       begin
         WithContentFile.new(obj) do |path|
           @path = path
-          expect(File.exist?(path)).to be true
+          expect(::File.exist?(path)).to be true
           raise Error, "error"
         end
       rescue Error
-        expect(File.exist?(@path)).to be false
+        expect(::File.exist?(@path)).to be false
       end
     end
 

data/spec/support/shared_examples_for_ddr_models.rb

@@ -22,4 +22,24 @@ RSpec.shared_examples "a DDR model" do
     end
   end
 
+  describe "versioning" do
+    describe "on create" do
+      it "creates a version" do
+        expect { subject.save(validate: false) }
+          .to change(subject, :has_versions?).from(false).to(true)
+      end
+    end
+    describe "on update" do
+      before { subject.save(validate: false) }
+      it "creates a version" do
+        expect {
+          subject.dc_title = ["Changed Title"]
+          subject.save(validate: false)
+        }.to change {
+          subject.versions.all.size
+        }.by(1)
+      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.7
+  version: 3.0.0.beta.8
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-02 00:00:00.000000000 Z
+date: 2016-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.6.2
+        version: 9.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 9.6.2
+        version: 9.8.1
 - !ruby/object:Gem::Dependency
   name: hydra-validations
   requirement: !ruby/object:Gem::Requirement
@@ -399,12 +399,13 @@ files:
 - app/views/devise/sessions/new.html.erb
 - app/views/devise/shared/_links.erb
 - bin/rails
+- config/fedora.yml
 - config/initializers/active_fedora_base.rb
-- config/initializers/active_fedora_file.rb
 - config/initializers/devise.rb
 - config/initializers/subscriptions.rb
 - config/locales/ddr-models.en.yml
 - config/routes.rb
+- config/solr.yml
 - db/migrate/20141021233359_create_events.rb
 - db/migrate/20141021234156_create_minted_ids.rb
 - db/migrate/20141103192146_create_workflow_state.rb
@@ -468,12 +469,8 @@ files:
 - lib/ddr/auth/user.rb
 - lib/ddr/auth/web_auth_context.rb
 - lib/ddr/datastreams.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/structural_metadata_datastream.rb
 - lib/ddr/derivatives.rb
 - lib/ddr/derivatives/derivative.rb
 - lib/ddr/derivatives/generators/generator.rb
@@ -513,6 +510,7 @@ files:
 - lib/ddr/index/sort_order.rb
 - lib/ddr/index/unique_key_field.rb
 - lib/ddr/jobs.rb
+- lib/ddr/jobs/delete_multires_image.rb
 - lib/ddr/jobs/fits_file_characterization.rb
 - lib/ddr/jobs/fixity_check.rb
 - lib/ddr/jobs/job.rb
@@ -531,13 +529,17 @@ files:
 - lib/ddr/models/admin_set.rb
 - lib/ddr/models/attached_file_profile.rb
 - lib/ddr/models/attached_files_profile.rb
+- lib/ddr/models/auto_version.rb
 - lib/ddr/models/base.rb
 - lib/ddr/models/contact.rb
 - lib/ddr/models/engine.rb
 - lib/ddr/models/error.rb
 - lib/ddr/models/event_loggable.rb
+- lib/ddr/models/file.rb
 - lib/ddr/models/file_characterization.rb
 - lib/ddr/models/file_management.rb
+- lib/ddr/models/files/fits_xml_file.rb
+- lib/ddr/models/files/structural_metadata_file.rb
 - lib/ddr/models/finding_aid.rb
 - lib/ddr/models/fixity_checkable.rb
 - lib/ddr/models/governable.rb
@@ -570,6 +572,7 @@ files:
 - lib/ddr/models/validatable.rb
 - lib/ddr/models/validator.rb
 - lib/ddr/models/version.rb
+- lib/ddr/models/versionable.rb
 - lib/ddr/models/with_content_file.rb
 - lib/ddr/models/year_facet.rb
 - lib/ddr/notifications.rb
@@ -633,6 +636,7 @@ files:
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
+- spec/dummy/config/fedora.yml
 - spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/cookies_serializer.rb
@@ -644,6 +648,7 @@ files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
+- spec/dummy/config/solr.yml
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/assets/.keep
 - spec/dummy/log/.keep
@@ -688,7 +693,6 @@ files:
 - 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/admin_set_spec.rb
 - spec/models/attachment_spec.rb
 - spec/models/collection_spec.rb
@@ -699,9 +703,11 @@ files:
 - spec/models/events_spec.rb
 - spec/models/file_characterization_spec.rb
 - spec/models/file_management_spec.rb
+- spec/models/file_spec.rb
 - spec/models/finding_aid_spec.rb
 - spec/models/has_admin_metadata_spec.rb
 - spec/models/has_children_spec.rb
+- spec/models/has_multires_image_spec.rb
 - spec/models/has_struct_metadata_spec.rb
 - spec/models/indexing_spec.rb
 - spec/models/item_spec.rb
@@ -804,6 +810,7 @@ test_files:
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
+- spec/dummy/config/fedora.yml
 - spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/cookies_serializer.rb
@@ -815,6 +822,7 @@ test_files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
+- spec/dummy/config/solr.yml
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/assets/.keep
 - spec/dummy/log/.keep
@@ -859,7 +867,6 @@ test_files:
 - 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/admin_set_spec.rb
 - spec/models/attachment_spec.rb
 - spec/models/collection_spec.rb
@@ -870,9 +877,11 @@ test_files:
 - spec/models/events_spec.rb
 - spec/models/file_characterization_spec.rb
 - spec/models/file_management_spec.rb
+- spec/models/file_spec.rb
 - spec/models/finding_aid_spec.rb
 - spec/models/has_admin_metadata_spec.rb
 - spec/models/has_children_spec.rb
+- spec/models/has_multires_image_spec.rb
 - spec/models/has_struct_metadata_spec.rb
 - spec/models/indexing_spec.rb
 - spec/models/item_spec.rb

data/config/initializers/active_fedora_file.rb

@@ -1,5 +0,0 @@
-module ActiveFedora
-  class File
-    include Ddr::Datastreams::DatastreamBehavior
-  end
-end

data/lib/ddr/datastreams/metadata_datastream.rb

@@ -1,44 +0,0 @@
-module Ddr
-  module Datastreams
-    class MetadataDatastream < ActiveFedora::NtriplesRDFDatastream
-
-      def self.term_names
-        properties.keys.map(&:to_sym).sort
-      end
-
-      # Returns ActiveTriplesTerm now that this is an RDF datastream
-      def values term
-        term == :format ? self.format : self.send(term)
-      end
-
-      # Update term with values
-      # Note that empty values (nil or "") are rejected from values array
-      def set_values term, values
-        if values.respond_to?(:reject!)
-          values.reject! { |v| v.blank? }
-        else
-          values = nil if values.blank?
-        end
-        begin
-          self.send("#{term}=", values)
-        rescue NoMethodError
-          raise ArgumentError, "No such term: #{term}"
-        end
-      end
-
-      # Add value to term
-      # Note that empty value (nil or "") is not added
-      def add_value term, value
-        begin
-          unless value.blank?
-            values = values(term).to_a << value
-            set_values term, values
-          end
-        rescue NoMethodError
-          raise ArgumentError, "No such term: #{term}"
-        end
-      end
-
-    end
-  end
-end

data/lib/ddr/datastreams/plain_text_datastream.rb

@@ -1,9 +0,0 @@
-module Ddr
-  module Datastreams
-    class PlainTextDatastream < ActiveFedora::Datastream
-      def self.default_attributes
-        super.merge(mimeType: "text/plain")
-      end
-    end
-  end
-end

data/lib/ddr/datastreams/structural_metadata_datastream.rb

@@ -1,11 +0,0 @@
-require "rdf/vocab"
-
-module Ddr
-  module Datastreams
-    class StructuralMetadataDatastream < ActiveFedora::Datastream
-      def self.default_attributes
-        super.merge({ mimeType: 'text/xml', dsLabel: 'Structural metadata for this object' })
-      end
-    end
-  end
-end