hydra-pcdm 0.0.1 → 0.1.0

data/spec/hydra/pcdm/object_indexer_spec.rb

@@ -1,20 +1,20 @@
 require 'spec_helper'
 
 describe Hydra::PCDM::ObjectIndexer do
-  let(:object) { Hydra::PCDM::Object.new }
-  let(:subobject1) { Hydra::PCDM::Object.new(id: '123') }
-  let(:subobject2) { Hydra::PCDM::Object.new(id: '456') }
-  let(:indexer) { described_class.new(object) }
+  let(:object)        { Hydra::PCDM::Object.new }
+  let(:child_object1) { Hydra::PCDM::Object.new(id: '123') }
+  let(:child_object2) { Hydra::PCDM::Object.new(id: '456') }
+  let(:indexer)       { described_class.new(object) }
 
   before do
-    allow(object).to receive(:objects).and_return([subobject1, subobject2])
+    allow(object).to receive(:child_object_ids).and_return([child_object1.id, child_object2.id])
   end
 
   describe "#generate_solr_document" do
     subject { indexer.generate_solr_document }
 
     it "has fields" do
-      expect(subject['objects_ssim']).to eq ['123', '456']
+      expect(subject['child_object_ids_ssim']).to eq ['123', '456']
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,12 @@
 ENV['environment'] ||= 'test'
+require 'simplecov'
 require 'coveralls'
+
+SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+SimpleCov.start do
+  add_filter '/spec'
+end
+
 Coveralls.wear!
 
 require 'bundler/setup'
@@ -29,6 +36,6 @@ RSpec.configure do |config|
   config.formatter = :progress
 
   config.before :suite do
-    ActiveFedora::Cleaner.clean!
+    ActiveFedora::Cleaner.clean! if ActiveFedora::Base.count > 0
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-pcdm
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - E. Lynette Rayle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-05 00:00:00.000000000 Z
+date: 2015-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activefedora-aggregation
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -112,56 +126,35 @@ files:
 - config/jetty.yml
 - hydra-pcdm.gemspec
 - lib/hydra/pcdm.rb
+- lib/hydra/pcdm/ancestor_checker.rb
 - lib/hydra/pcdm/collection_indexer.rb
+- lib/hydra/pcdm/deep_member_iterator.rb
 - lib/hydra/pcdm/models/collection.rb
 - lib/hydra/pcdm/models/concerns/collection_behavior.rb
 - lib/hydra/pcdm/models/concerns/object_behavior.rb
+- lib/hydra/pcdm/models/concerns/pcdm_behavior.rb
 - lib/hydra/pcdm/models/file.rb
 - lib/hydra/pcdm/models/object.rb
 - lib/hydra/pcdm/object_indexer.rb
-- lib/hydra/pcdm/services/collection/add_collection.rb
-- lib/hydra/pcdm/services/collection/add_object.rb
-- lib/hydra/pcdm/services/collection/add_related_object.rb
-- lib/hydra/pcdm/services/collection/get_collections.rb
-- lib/hydra/pcdm/services/collection/get_objects.rb
-- lib/hydra/pcdm/services/collection/get_related_objects.rb
-- lib/hydra/pcdm/services/collection/remove_collection.rb
-- lib/hydra/pcdm/services/collection/remove_object.rb
-- lib/hydra/pcdm/services/collection/remove_related_object.rb
 - lib/hydra/pcdm/services/file/add_type.rb
 - lib/hydra/pcdm/services/file/get_mime_type.rb
-- lib/hydra/pcdm/services/object/add_object.rb
-- lib/hydra/pcdm/services/object/add_related_object.rb
-- lib/hydra/pcdm/services/object/get_objects.rb
-- lib/hydra/pcdm/services/object/get_related_objects.rb
-- lib/hydra/pcdm/services/object/remove_object.rb
-- lib/hydra/pcdm/services/object/remove_related_object.rb
+- lib/hydra/pcdm/validators.rb
+- lib/hydra/pcdm/validators/ancestor_validator.rb
+- lib/hydra/pcdm/validators/composite_validator.rb
+- lib/hydra/pcdm/validators/pcdm_object_validator.rb
+- lib/hydra/pcdm/validators/pcdm_validator.rb
 - lib/hydra/pcdm/version.rb
 - lib/hydra/pcdm/vocab/ebucore_terms.rb
 - lib/hydra/pcdm/vocab/pcdm_terms.rb
 - lib/hydra/pcdm/vocab/sweetjpl_terms.rb
+- spec/hydra/pcdm/ancestor_checker_spec.rb
 - spec/hydra/pcdm/collection_indexer_spec.rb
+- spec/hydra/pcdm/deep_member_iterator_spec.rb
 - spec/hydra/pcdm/models/collection_spec.rb
 - spec/hydra/pcdm/models/file_spec.rb
 - spec/hydra/pcdm/models/object_spec.rb
 - spec/hydra/pcdm/object_indexer_spec.rb
-- spec/hydra/pcdm/services/collection/add_collection_spec.rb
-- spec/hydra/pcdm/services/collection/add_object_spec.rb
-- spec/hydra/pcdm/services/collection/add_related_object_spec.rb
-- spec/hydra/pcdm/services/collection/get_collections_spec.rb
-- spec/hydra/pcdm/services/collection/get_objects_spec.rb
-- spec/hydra/pcdm/services/collection/get_related_objects_spec.rb
-- spec/hydra/pcdm/services/collection/remove_collection_spec.rb
-- spec/hydra/pcdm/services/collection/remove_object_spec.rb
-- spec/hydra/pcdm/services/collection/remove_related_object_spec.rb
-- spec/hydra/pcdm/services/file/add_type_spec.rb
 - spec/hydra/pcdm/services/file/get_mime_type_spec.rb
-- spec/hydra/pcdm/services/object/add_object_spec.rb
-- spec/hydra/pcdm/services/object/add_related_object_spec.rb
-- spec/hydra/pcdm/services/object/get_objects_spec.rb
-- spec/hydra/pcdm/services/object/get_related_objects_spec.rb
-- spec/hydra/pcdm/services/object/remove_object_spec.rb
-- spec/hydra/pcdm/services/object/remove_related_object_spec.rb
 - spec/hydra/pcdm_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/projecthydra-labs/hydra-pcdm
@@ -184,32 +177,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Portland Common Data Model (PCDM)
 test_files:
+- spec/hydra/pcdm/ancestor_checker_spec.rb
 - spec/hydra/pcdm/collection_indexer_spec.rb
+- spec/hydra/pcdm/deep_member_iterator_spec.rb
 - spec/hydra/pcdm/models/collection_spec.rb
 - spec/hydra/pcdm/models/file_spec.rb
 - spec/hydra/pcdm/models/object_spec.rb
 - spec/hydra/pcdm/object_indexer_spec.rb
-- spec/hydra/pcdm/services/collection/add_collection_spec.rb
-- spec/hydra/pcdm/services/collection/add_object_spec.rb
-- spec/hydra/pcdm/services/collection/add_related_object_spec.rb
-- spec/hydra/pcdm/services/collection/get_collections_spec.rb
-- spec/hydra/pcdm/services/collection/get_objects_spec.rb
-- spec/hydra/pcdm/services/collection/get_related_objects_spec.rb
-- spec/hydra/pcdm/services/collection/remove_collection_spec.rb
-- spec/hydra/pcdm/services/collection/remove_object_spec.rb
-- spec/hydra/pcdm/services/collection/remove_related_object_spec.rb
-- spec/hydra/pcdm/services/file/add_type_spec.rb
 - spec/hydra/pcdm/services/file/get_mime_type_spec.rb
-- spec/hydra/pcdm/services/object/add_object_spec.rb
-- spec/hydra/pcdm/services/object/add_related_object_spec.rb
-- spec/hydra/pcdm/services/object/get_objects_spec.rb
-- spec/hydra/pcdm/services/object/get_related_objects_spec.rb
-- spec/hydra/pcdm/services/object/remove_object_spec.rb
-- spec/hydra/pcdm/services/object/remove_related_object_spec.rb
 - spec/hydra/pcdm_spec.rb
 - spec/spec_helper.rb

data/lib/hydra/pcdm/services/collection/add_collection.rb

@@ -1,20 +0,0 @@
-module Hydra::PCDM
-  class AddCollectionToCollection
-
-    ##
-    # Add a collection to a collection.
-    #
-    # @param [Hydra::PCDM::Collection] :parent_collection to which to add collection
-    # @param [Hydra::PCDM::Collection] :child_collection being added
-    #
-    # @return [Hydra::PCDM::Collection] the updated pcdm collection
-
-    def self.call( parent_collection, child_collection )
-      raise ArgumentError, "parent_collection must be a pcdm collection" unless Hydra::PCDM.collection? parent_collection
-      raise ArgumentError, "child_collection must be a pcdm collection" unless Hydra::PCDM.collection? child_collection
-      raise ArgumentError, "a collection can't be an ancestor of itself" if parent_collection.ancestor? child_collection
-      parent_collection.members << child_collection
-    end
-
-  end
-end

data/lib/hydra/pcdm/services/collection/add_object.rb

@@ -1,19 +0,0 @@
-module Hydra::PCDM
-  class AddObjectToCollection
-
-    ##
-    # Add an object to a collection.
-    #
-    # @param [Hydra::PCDM::Collection] :parent_collection to which to add object
-    # @param [Hydra::PCDM::Object] :child_object being added
-    #
-    # @return [Hydra::PCDM::Collection] the updated pcdm collection
-
-    def self.call( parent_collection, child_object )
-      raise ArgumentError, "parent_collection must be a pcdm collection" unless Hydra::PCDM.collection? parent_collection
-      raise ArgumentError, "child_object must be a pcdm object" unless Hydra::PCDM.object? child_object
-      parent_collection.members << child_object
-    end
-
-  end
-end

data/lib/hydra/pcdm/services/collection/add_related_object.rb

@@ -1,21 +0,0 @@
-module Hydra::PCDM
-  class AddRelatedObjectToCollection
-
-    ##
-    # Add a related object to a collection.
-    #
-    # @param [Hydra::PCDM::Collection] :parent_collection to which to add the related object
-    # @param [Hydra::PCDM::Object] :child_related_object being added
-    #
-    # @return [Hydra::PCDM::Collection] the updated pcdm collection
-
-    def self.call( parent_collection, child_related_object )
-      raise ArgumentError, 'parent_collection must be a pcdm object' unless Hydra::PCDM.collection? parent_collection
-      raise ArgumentError, 'child_related_object must be a pcdm object' unless Hydra::PCDM.object? child_related_object
-
-      # parent_collection.related_objects = parent_collection.related_objects.to_a + child_related_object
-      parent_collection.related_objects << child_related_object
-    end
-
-  end
-end

data/lib/hydra/pcdm/services/collection/get_collections.rb

@@ -1,18 +0,0 @@
-module Hydra::PCDM
-  class GetCollectionsFromCollection
-
-    ##
-    # Get member collections from a collection in order.
-    #
-    # @param [Hydra::PCDM::Collection] :parent_collection in which the child collections are members
-    #
-    # @return [Array<Hydra::PCDM::Collection>] all member collections
-
-    def self.call( parent_collection )
-      raise ArgumentError, "parent_collection must be a pcdm collection" unless Hydra::PCDM.collection? parent_collection
-
-      parent_collection.child_collections
-    end
-
-  end
-end

data/lib/hydra/pcdm/services/collection/get_objects.rb

@@ -1,18 +0,0 @@
-module Hydra::PCDM
-  class GetObjectsFromCollection
-
-    ##
-    # Get member objects from a collection in order.
-    #
-    # @param [Hydra::PCDM::Collection] :parent_collection in which the child objects are members
-    #
-    # @return [Array<Hydra::PCDM::Collection>] all member objects
-
-    def self.call( parent_collection )
-      raise ArgumentError, "parent_collection must be a pcdm collection" unless Hydra::PCDM.collection? parent_collection
-
-      parent_collection.objects
-    end
-
-  end
-end

data/lib/hydra/pcdm/services/collection/get_related_objects.rb

@@ -1,17 +0,0 @@
-module Hydra::PCDM
-  class GetRelatedObjectsFromCollection
-
-    ##
-    # Get related objects from a collection.
-    #
-    # @param [Hydra::PCDM::Collection] :parent_collection to which the child objects are related
-    #
-    # @return [Array<Hydra::PCDM::Collection>] all related objects
-
-    def self.call( parent_collection )
-      raise ArgumentError, "parent_collection must be a pcdm collection" unless Hydra::PCDM.collection? parent_collection
-      parent_collection.related_objects.to_a
-    end
-
-  end
-end

data/lib/hydra/pcdm/services/collection/remove_collection.rb

@@ -1,36 +0,0 @@
-module Hydra::PCDM
-  class RemoveCollectionFromCollection
-
-    ##
-    # Remove a collection from a collection.
-    #
-    # @param [Hydra::PCDM::Collection] :parent_collection from which to remove collection
-    # @param [Hydra::PCDM::Collection] :child_collection being removed
-    #
-    # @return [Hydra::PCDM::Collection] the updated pcdm collection
-
-    def self.call( parent_collection, child_collection )
-      raise ArgumentError, "parent_collection must be a pcdm collection" unless Hydra::PCDM.collection? parent_collection
-      raise ArgumentError, "child_collection must be a pcdm collection" unless Hydra::PCDM.collection? child_collection
-
-
-      # TODO FIX when members is empty, members.delete raises ActiveFedora::ObjectNotFoundError "Can't reload an object that hasn't been saved"  (activefedora-aggregation issue #35)
-
-      # TODO members.delete should...   (issue #103)(activefedora-aggregation issue #34)
-      #   * return child_collection when successful delete  (not Array [child_collection])
-      #   * return nil if child_collection does not exist in parent_collection
-      #   * raise error for any other problems
-
-      # TODO Per issue #103, uncomment the following line when (activefedora-aggregation issue #34) is resolved
-      # parent_collection.members.delete child_collection
-
-      # TODO Per issue #103, remove the following lines when (activefedora-aggregation issue #34) is resolved
-      return nil unless Hydra::PCDM::GetCollectionsFromCollection.call( parent_collection ).include? child_collection
-      removed_collection = parent_collection.members.delete child_collection
-      removed_collection = removed_collection.first  if removed_collection.is_a? Array
-      removed_collection
-      # END WORK-AROUND
-    end
-
-  end
-end

data/lib/hydra/pcdm/services/collection/remove_object.rb

@@ -1,43 +0,0 @@
-module Hydra::PCDM
-  class RemoveObjectFromCollection
-
-    ##
-    # Remove an object from a collection.
-    #
-    # @param [Hydra::PCDM::Collection] :parent_collection from which to remove object
-    # @param [Hydra::PCDM::Object] :child_object being removed
-    # @param [Fixnum] :nth_occurrence remove nth occurrence of this object in the list (default=1)
-    #
-    # @return [Hydra::PCDM::Collection] the updated pcdm collection
-
-    def self.call( parent_collection, child_object, nth_occurrence=1 )
-      raise ArgumentError, "parent_collection must be a pcdm collection" unless Hydra::PCDM.collection? parent_collection
-      raise ArgumentError, "child_object must be a pcdm object" unless Hydra::PCDM.object? child_object
-
-
-      # TODO FIX when members is empty, members.delete raises ActiveFedora::ObjectNotFoundError "Can't reload an object that hasn't been saved"  (activefedora-aggregation issue #35)
-
-      # TODO members.delete should...   (issue #103)(activefedora-aggregation issue #34)
-      #   * return child_object when successful delete  (not Array [child_object])
-      #   * return nil if child_object does not exist in parent_collection
-      #   * raise error for any other problems
-
-      # TODO Per issue #103, uncomment the following line when (activefedora-aggregation issue #34) is resolved
-      # parent_collection.members.delete child_object
-
-      # TODO Per issue #103, remove the following lines when (activefedora-aggregation issue #34) is resolved
-      return nil    unless parent_collection.members.include? child_object
-      removed_object = parent_collection.members.delete child_object
-      removed_object = removed_object.first  if removed_object.is_a? Array
-      removed_object
-      # END WORK-AROUND
-
-
-      # TODO -- The same object may be in the list multiple times.  (issue #102)
-      #   * How to remove nth occurrence?
-      #   * Default to removing 1st occurrence from the beginning of the list.
-
-    end
-
-  end
-end

data/lib/hydra/pcdm/services/collection/remove_related_object.rb

@@ -1,36 +0,0 @@
-module Hydra::PCDM
-  class RemoveRelatedObjectFromCollection
-
-    ##
-    # Remove an object from a collection.
-    #
-    # @param [Hydra::PCDM::Collection] :parent_collection from which to remove the related object
-    # @param [Hydra::PCDM::Object] :child_related_object being removed
-    #
-    # @return [Hydra::PCDM::Collection] the updated pcdm collection
-
-    def self.call( parent_collection, child_related_object )
-      raise ArgumentError, "parent_collection must be a pcdm collection" unless Hydra::PCDM.collection? parent_collection
-      raise ArgumentError, "child_related_object must be a pcdm object" unless Hydra::PCDM.object? child_related_object
-
-
-      # TODO FIX when related_objects is empty, related_objects.delete raises ActiveFedora::ObjectNotFoundError "Can't reload an object that hasn't been saved"  (activefedora-aggregation issue #805)
-
-      # TODO related_objects.delete should...   (issue #103)(activefedora-aggregation issue #805)
-      #   * return child_related_object when successful delete  (not Array [child_related_object])
-      #   * return nil if child_related_object does not exist in parent_collection
-      #   * raise error for any other problems
-
-      # TODO Per issue #103, uncomment the following line when (activefedora issue #805) is resolved
-      # parent_collection.related_objects.delete child_related_object
-
-      # TODO Per issue #103, remove the following lines when (activefedora issue #805) is resolved
-      return nil unless Hydra::PCDM::GetRelatedObjectsFromCollection.call( parent_collection ).include? child_related_object
-      removed_related_object = parent_collection.related_objects.delete child_related_object
-      removed_related_object = removed_related_object.first  if removed_related_object.is_a? Array
-      removed_related_object
-      # END WORK-AROUND
-    end
-
-  end
-end

data/lib/hydra/pcdm/services/object/add_object.rb

@@ -1,20 +0,0 @@
-module Hydra::PCDM
-  class AddObjectToObject
-
-    ##
-    # Add an object to an object.
-    #
-    # @param [Hydra::PCDM::Object] :parent_object to which to add object
-    # @param [Hydra::PCDM::Object] :child_object being added
-    #
-    # @return [Hydra::PCDM::Object] the updated pcdm object
-
-    def self.call( parent_object, child_object )
-      raise ArgumentError, "parent_object must be a pcdm object" unless Hydra::PCDM.object? parent_object
-      raise ArgumentError, "child_object must be a pcdm object" unless Hydra::PCDM.object? child_object
-      raise ArgumentError, "an object can't be an ancestor of itself" if parent_object.ancestor? child_object
-      parent_object.members << child_object
-    end
-
-  end
-end