active-fedora 10.0.0.beta1 → 10.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52036e2b5df62b1f60a9de0775f437b25c3a7007
-  data.tar.gz: 3dfb407e63e75f71b5a4ee179ae3bb269fb9d507
+  metadata.gz: 07a8d037c8e741276cd1c890062704b44b83bb7f
+  data.tar.gz: cd0aeb9d41cc43935197ab09ad3799092efeee75
 SHA512:
-  metadata.gz: e8f1330cc76aae3d76639026d5538c559e3b156093138f11ff736a0d0220e5bba0732b4997dc68e43f52fba756c1ebd5c77fa3d406db6ee4d9761837f3ce4cda
-  data.tar.gz: 108479da9acacf1fef63de9d734eaa3c2aa866660b75b5363474ef1283ce04938beb0f71f04eb19cee890a5bfa46cca95f866c47ce454bee36685cc94db0045c
+  metadata.gz: 87513e6d099c60a8337df0583cc7b2cd00f35624bd11d5c953700752860c7f7e822814cfe0eff28398fde92c63a9ba3b22e14a2b5ef4bb269cd02774c709418a
+  data.tar.gz: 0cff0bacb41cb397745b83638e4d4bc42038a706cf45e3c0f26d014249f22b24d72aef3bfe7fb35beb9030b9e5f8df9f30bfd4924e0e98eefdedcc9e98a3df08

data/lib/active_fedora/rake_support.rb

@@ -4,17 +4,13 @@ def with_test_server(&block)
   with_server('test', &block)
 end
 
-def with_server(environment, fcrepo_port: nil, solr_port: nil)
+def with_server(environment)
   return yield if ENV["#{environment}_SERVER_STARTED"]
 
   ENV["#{environment}_SERVER_STARTED"] = 'true'
 
-  # setting port: nil assigns a random port.
-  solr_params = { port: solr_port, verbose: true, managed: true }
-  fcrepo_params = { port: fcrepo_port, verbose: true, managed: true,
-                    enable_jms: false, fcrepo_home_dir: "fcrepo4-#{environment}-data" }
-  SolrWrapper.wrap(solr_params) do |solr|
-    ENV["SOLR_#{environment.upcase}_PORT"] = solr.port
+  SolrWrapper.wrap(load_config(:solr, environment)) do |solr|
+    ENV["SOLR_#{environment.upcase}_PORT"] = solr.port.to_s
     solr_config_path = File.join('solr', 'config')
     # Check to see if configs exist in a path relative to the working directory
     unless Dir.exist?(solr_config_path)
@@ -23,11 +19,19 @@ def with_server(environment, fcrepo_port: nil, solr_port: nil)
       solr_config_path = File.join(File.expand_path("../..", File.dirname(__FILE__)), "solr", "config")
     end
     solr.with_collection(name: "hydra-#{environment}", dir: solr_config_path) do
-      FcrepoWrapper.wrap(fcrepo_params) do |fcrepo|
-        ENV["FCREPO_#{environment.upcase}_PORT"] = fcrepo.port
+      FcrepoWrapper.wrap(load_config(:fcrepo, environment)) do |fcrepo|
+        ENV["FCREPO_#{environment.upcase}_PORT"] = fcrepo.port.to_s
         yield
       end
     end
   end
   ENV["#{environment}_SERVER_STARTED"] = 'false'
 end
+
+private
+
+def load_config(service, environment)
+  config_file = environment == 'test' ? "config/#{service}_wrapper_test.yml" : ".#{service}_wrapper"
+  return { config: config_file } if File.exist?(config_file)
+  {}
+end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "10.0.0.beta1".freeze
+  VERSION = "10.0.0.beta2".freeze
 end

data/lib/active_fedora/with_metadata.rb

@@ -4,6 +4,15 @@ module ActiveFedora
     extend ActiveSupport::Autoload
 
     autoload :MetadataNode
+    autoload :SweetJPLTerms
+    autoload :DefaultStrategy
+    autoload :DefaultSchema
+    autoload :DefaultMetadataClassFactory
+
+    included do
+      class_attribute :metadata_class_factory
+      self.metadata_class_factory = DefaultMetadataClassFactory
+    end
 
     def metadata_node
       @metadata_node ||= self.class.metadata_schema.new(self)
@@ -17,19 +26,11 @@ module ActiveFedora
 
     module ClassMethods
       def metadata(&block)
-        metadata_schema.exec_block(&block)
+        @metadata_schema = metadata_class_factory.build(self, &block)
       end
 
       def metadata_schema
-        @metadata_schema ||= MetadataNode(self)
-      end
-
-      # Make a subclass of MetadataNode named GeneratedMetadataSchema and set its
-      # parent_class attribute to have the value of the current class.
-      def MetadataNode(parent_klass)
-        klass = const_set(:GeneratedMetadataSchema, Class.new(MetadataNode))
-        klass.parent_class = parent_klass
-        klass
+        @metadata_schema ||= metadata_class_factory.build(self)
       end
     end
   end

data/lib/active_fedora/with_metadata/default_metadata_class_factory.rb

@@ -0,0 +1,31 @@
+# This builds classes for metadata nodes (nodes that describe a binary)
+module ActiveFedora::WithMetadata
+  class DefaultMetadataClassFactory
+    class_attribute :metadata_base_class, :file_metadata_schemas, :file_metadata_strategy
+    self.metadata_base_class = MetadataNode
+    self.file_metadata_schemas = [DefaultSchema]
+    self.file_metadata_strategy = DefaultStrategy
+
+    class << self
+      def build(parent, &block)
+        create_class(parent).tap do |resource_class|
+          file_metadata_schemas.each do |schema|
+            resource_class.apply_schema(schema, file_metadata_strategy)
+          end
+          resource_class.exec_block(&block) if block_given?
+        end
+      end
+
+      private
+
+        # Make a subclass of MetadataNode named GeneratedMetadataSchema and set its
+        # parent_class attribute to have the value of the current class.
+        def create_class(parent_klass)
+          Class.new(metadata_base_class).tap do |klass|
+            parent_klass.const_set(:GeneratedMetadataSchema, klass)
+            klass.parent_class = parent_klass
+          end
+        end
+    end
+  end
+end

data/lib/active_fedora/with_metadata/default_schema.rb

@@ -0,0 +1,16 @@
+# These are the default properties defined on a resource that has WithMetadata
+# added to it. This is most commonly used with ActiveFedora::File, when we want
+# to add rdf triples to a non-rdf resource and have them persisted.
+module ActiveFedora::WithMetadata
+  class DefaultSchema < ActiveTriples::Schema
+    property :label, predicate: ::RDF::RDFS.label
+    property :file_name, predicate: ::RDF::Vocab::EBUCore.filename
+    property :file_size, predicate: ::RDF::Vocab::EBUCore.fileSize
+    property :date_created, predicate: ::RDF::Vocab::EBUCore.dateCreated
+    property :has_mime_type, predicate: ::RDF::Vocab::EBUCore.hasMimeType
+    property :date_modified, predicate: ::RDF::Vocab::EBUCore.dateModified
+    property :byte_order, predicate: SweetJPLTerms.byteOrder
+    # This is a server-managed predicate which means Fedora does not let us change it.
+    property :file_hash, predicate: ::RDF::Vocab::PREMIS.hasMessageDigest
+  end
+end

data/lib/active_fedora/with_metadata/default_strategy.rb

@@ -0,0 +1,12 @@
+module ActiveFedora::WithMetadata
+  class DefaultStrategy < ActiveTriples::ExtensionStrategy
+    # override apply method to check if property already exists or reciever already has predicate defined.
+    # Do not add property if the rdf_resource already responds to the property name
+    # Do not add property if the rdf_resource already has a property with the same predicate.
+    def self.apply(resource, property)
+      return if resource.respond_to?(property.name)
+      return if resource.properties.any? { |p| p[1].predicate == property.predicate }
+      resource.property property.name, property.to_h
+    end
+  end
+end

data/lib/active_fedora/with_metadata/sweet_jpl_terms.rb

@@ -0,0 +1,10 @@
+require 'rdf'
+module ActiveFedora::WithMetadata
+  class SweetJPLTerms < RDF::StrictVocabulary('http://sweet.jpl.nasa.gov/2.2/reprDataFormat.owl#')
+    # Property definitions
+    property :byteOrder,
+             comment: ['Byte Order.'.freeze],
+             range: 'xsd:string'.freeze,
+             label: 'Byte Order'.freeze
+  end
+end

data/spec/integration/with_metadata_spec.rb

@@ -2,6 +2,12 @@ require 'spec_helper'
 
 describe ActiveFedora::WithMetadata do
   before do
+    class AdditionalSchema < ActiveTriples::Schema
+      property :new_property, predicate: ::RDF::URI("http://my.new.property/")
+    end
+
+    ActiveFedora::WithMetadata::DefaultMetadataClassFactory.file_metadata_schemas << AdditionalSchema
+
     class SampleFile < ActiveFedora::File
       include ActiveFedora::WithMetadata
 
@@ -13,6 +19,8 @@ describe ActiveFedora::WithMetadata do
 
   after do
     Object.send(:remove_const, :SampleFile)
+    Object.send(:remove_const, :AdditionalSchema)
+    ActiveFedora::WithMetadata::DefaultMetadataClassFactory.file_metadata_schemas = [ActiveFedora::WithMetadata::DefaultSchema]
   end
 
   let(:file) { SampleFile.new }
@@ -28,6 +36,18 @@ describe ActiveFedora::WithMetadata do
     it "tracks changes" do
       expect(file.title_changed?).to be true
     end
+
+    context "with defaults" do
+      subject { file }
+      it { is_expected.to respond_to(:label) }
+      it { is_expected.to respond_to(:file_name) }
+      it { is_expected.to respond_to(:file_size) }
+      it { is_expected.to respond_to(:date_created) }
+      it { is_expected.to respond_to(:has_mime_type) }
+      it { is_expected.to respond_to(:date_modified) }
+      it { is_expected.to respond_to(:byte_order) }
+      it { is_expected.to respond_to(:file_hash) }
+    end
   end
 
   describe "#save" do
@@ -83,4 +103,9 @@ describe ActiveFedora::WithMetadata do
       expect(reloaded_file.metadata_node.query(predicate: ::RDF.type).map(&:object)).to include book
     end
   end
+
+  context "when using additional schema" do
+    subject { SampleFile.new }
+    it { is_expected.to respond_to(:new_property) }
+  end
 end

data/spec/unit/with_metadata/default_metadata_class_factory_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe ActiveFedora::WithMetadata::DefaultMetadataClassFactory do
+  let(:parent) { double("Parent") }
+
+  describe "default class attributes" do
+    its(:metadata_base_class)    { is_expected.to eq(ActiveFedora::WithMetadata::MetadataNode) }
+    its(:file_metadata_schemas)  { is_expected.to eq([ActiveFedora::WithMetadata::DefaultSchema]) }
+    its(:file_metadata_strategy) { is_expected.to eq(ActiveFedora::WithMetadata::DefaultStrategy) }
+  end
+
+  describe "::build" do
+    it "sets MetadataNode to the default schema using the default strategy" do
+      expect(parent).to receive(:const_set)
+      expect(parent).to receive(:delegate).at_least(8).times
+      subject.class.build(parent)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 10.0.0.beta1
+  version: 10.0.0.beta2
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2016-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -553,7 +553,11 @@ files:
 - lib/active_fedora/versionable.rb
 - lib/active_fedora/versions_graph.rb
 - lib/active_fedora/with_metadata.rb
+- lib/active_fedora/with_metadata/default_metadata_class_factory.rb
+- lib/active_fedora/with_metadata/default_schema.rb
+- lib/active_fedora/with_metadata/default_strategy.rb
 - lib/active_fedora/with_metadata/metadata_node.rb
+- lib/active_fedora/with_metadata/sweet_jpl_terms.rb
 - lib/generators/active_fedora/config/USAGE
 - lib/generators/active_fedora/config/config_generator.rb
 - lib/generators/active_fedora/config/fedora/fedora_generator.rb
@@ -751,6 +755,7 @@ files:
 - spec/unit/solr_service_spec.rb
 - spec/unit/sparql_insert_spec.rb
 - spec/unit/validations_spec.rb
+- spec/unit/with_metadata/default_metadata_class_factory_spec.rb
 - spec/unit/with_metadata/metadata_node_spec.rb
 homepage: https://github.com/projecthydra/active_fedora
 licenses:
@@ -772,7 +777,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: A convenience libary for manipulating documents in the Fedora Repository.