hydra-pcdm 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0be7a3fa222eb99a0aac81f40a4946f03231891
-  data.tar.gz: c13f936e7d5b45e39e80108e91c7dc1a96f37336
+  metadata.gz: 34be4330f2d67658ff23d0ca81d507a8148cd017
+  data.tar.gz: 8a99d7df6d98e0b3d065c808da63b90dcc99fc81
 SHA512:
-  metadata.gz: 91fa47b049b2886f33a8ff57e33c002926ebecc21d2209d6d50691b4ff8d4bc6c35be05f2a83e7ab64d87c43998b71c216687bf2db6f4d26ba990dcfb8dffc83
-  data.tar.gz: 1a15fc8ebba626fa74a78931d88f4dab56ee2e0880293c587a4b19406859961d672bca76cd1b47f4da9c731f55159f52b6bf39b6d06e31f08430ff91ede3ea2d
+  metadata.gz: e0a70541608c6409dd236b136b1c0441200866887f5161d89132e52eb7c373a62ab9d296d8a243a8836515bb2dcc32d3571e5a4d92d1b7b3c8d01fc55d2bcdf0
+  data.tar.gz: 71ee5d660565ff2accb6f69f7342d9399f9f64c44ec1766a0d8d8d1129c4ff9ca68e5f470a48029ff825367f286c6aded5488a79418179efea17b0cc43c10509

data/README.md

@@ -17,7 +17,7 @@ Add these lines to your application's Gemfile:
 
 ```ruby
   gem 'active-fedora', '~> 9.3'
-  gem 'hydra-pcdm', '~> 0.1'
+  gem 'hydra-pcdm', '~> 0.4'
 ```
 
 And then execute:

data/Rakefile

@@ -24,7 +24,7 @@ task ci: ['jetty:clean'] do
   error = Jettywrapper.wrap(jetty_params) do
     Rake::Task['spec'].invoke
   end
-  fail "test failures: #{error}" if error
+  raise "test failures: #{error}" if error
 end
 
 task default: :ci

data/lib/hydra/pcdm/models/concerns/collection_behavior.rb

@@ -50,15 +50,5 @@ module Hydra::PCDM
     def pcdm_collection?
       true
     end
-
-    def child_collections
-      warn '[DEPRECATION] `child_collections` is deprecated in Hydra::PCDM.  Please use `collections` instead.  This has a target date for removal of 10-31-2015'
-      ordered_collections
-    end
-
-    def child_collection_ids
-      warn '[DEPRECATION] `child_collection_ids` is deprecated in Hydra::PCDM.  Please use `collection_ids` instead.  This has a target date for removal of 10-31-2015'
-      ordered_collection_ids
-    end
   end
 end

data/lib/hydra/pcdm/models/concerns/object_behavior.rb

@@ -40,12 +40,7 @@ module Hydra::PCDM
     end
 
     def in_objects
-      ordered_by.select(&:pcdm_object?).to_a
-    end
-
-    def parent_objects
-      warn '[DEPRECATION] `parent_objects` is deprecated in Hydra::PCDM.  Please use `in_objects` instead.  This has a target date for removal of 10-31-2015'
-      in_objects
+      member_of.select(&:pcdm_object?).to_a
     end
 
     # Returns directly contained files that have the requested RDF Type

data/lib/hydra/pcdm/models/concerns/pcdm_behavior.rb

@@ -48,29 +48,14 @@ module Hydra::PCDM
       ordered_objects.map(&:id)
     end
 
-    def parents
-      warn '[DEPRECATION] `parents` is deprecated in Hydra::PCDM.  Please use `ordered_by` instead.  This has a target date for removal of 10-31-2015'
-      ordered_by.to_a
-    end
-
     def in_collections
       member_of.select(&:pcdm_collection?).to_a
     end
 
-    def parent_collections
-      warn '[DEPRECATION] `parent_collections` is deprecated in Hydra::PCDM.  Please use `in_collections` instead.  This has a target date for removal of 10-31-2015'
-      in_collections
-    end
-
     def in_collection_ids
       in_collections.map(&:id)
     end
 
-    def parent_collection_ids
-      warn '[DEPRECATION] `parent_collection_ids` is deprecated in Hydra::PCDM.  Please use `in_collection_ids` instead.  This has a target date for removal of 10-31-2015'
-      in_collection_ids
-    end
-
     def ancestor?(record)
       ancestor_checker.ancestor?(record)
     end
@@ -78,15 +63,5 @@ module Hydra::PCDM
     def ancestor_checker
       @ancestor_checker ||= ::Hydra::PCDM::AncestorChecker.new(self)
     end
-
-    def child_objects
-      warn '[DEPRECATION] `child_objects` is deprecated in Hydra::PCDM.  Please use `objects` instead.  This has a target date for removal of 10-31-2015'
-      ordered_objects
-    end
-
-    def child_object_ids
-      warn '[DEPRECATION] `child_object_ids` is deprecated in Hydra::PCDM.  Please use `object_ids` instead.  This has a target date for removal of 10-31-2015'
-      object_ids
-    end
   end
 end

data/lib/hydra/pcdm/services/file/get_mime_type.rb

@@ -1,7 +1,7 @@
 module Hydra::PCDM
   class GetMimeTypeForFile
     def self.call(path)
-      fail ArgumentError, 'supplied argument should be a path to a file' unless path.is_a?(String)
+      raise ArgumentError, 'supplied argument should be a path to a file' unless path.is_a?(String)
       mime_types = ::MIME::Types.of(::File.basename(path))
       mime_types.empty? ? 'application/octet-stream' : mime_types.first.content_type
     end

data/lib/hydra/pcdm/validators/ancestor_validator.rb

@@ -12,7 +12,7 @@ module Hydra::PCDM::Validators
 
     def validate!
       return unless owner.ancestor?(record)
-      fail ArgumentError, "#{record.class} with ID: #{record.id} failed to pass AncestorChecker validation"
+      raise ArgumentError, "#{record.class} with ID: #{record.id} failed to pass AncestorChecker validation"
     end
   end
 end

data/lib/hydra/pcdm/validators/pcdm_object_validator.rb

@@ -2,7 +2,7 @@ module Hydra::PCDM::Validators
   class PCDMObjectValidator
     def self.validate!(_association, record)
       unless record.try(:pcdm_object?)
-        fail ActiveFedora::AssociationTypeMismatch, "#{record} is not a PCDM object."
+        raise ActiveFedora::AssociationTypeMismatch, "#{record} is not a PCDM object."
       end
     end
   end

data/lib/hydra/pcdm/validators/pcdm_validator.rb

@@ -2,7 +2,7 @@ module Hydra::PCDM::Validators
   class PCDMValidator
     def self.validate!(_reflection, record)
       if !record.try(:pcdm_object?) && !record.try(:pcdm_collection?)
-        fail ActiveFedora::AssociationTypeMismatch, "#{record} is not a PCDM object or collection."
+        raise ActiveFedora::AssociationTypeMismatch, "#{record} is not a PCDM object or collection."
       end
     end
   end

data/lib/hydra/pcdm/version.rb

@@ -1,5 +1,5 @@
 module Hydra
   module PCDM
-    VERSION = '0.3.2'.freeze
+    VERSION = '0.4.0'.freeze
   end
 end

data/spec/hydra/pcdm/models/collection_spec.rb

@@ -609,23 +609,4 @@ describe Hydra::PCDM::Collection do
       it { is_expected.to eq IndexingStuff::AltIndexer }
     end
   end
-
-  describe 'make sure deprecated methods still work' do
-    it 'deprecated methods should pass' do
-      collection1.ordered_members = [collection2]
-      expect(collection1.ordered_members << collection3).to eq [collection2, collection3]
-      expect(collection1.ordered_members += [collection4]).to eq [collection2, collection3, collection4]
-      expect(collection1.ordered_members << object1).to eq [collection2, collection3, collection4, object1]
-      expect(collection1.ordered_members << object2).to eq [collection2, collection3, collection4, object1, object2]
-      expect(collection1.ordered_members += [object3]).to eq [collection2, collection3, collection4, object1, object2, object3]
-      collection1.save # required until issue AF-Agg-75 is fixed
-      expect(collection2.parent_collections).to eq [collection1]
-      expect(collection2.parents).to eq [collection1]
-      expect(collection2.parent_collection_ids).to eq [collection1.id]
-      expect(collection1.child_objects).to eq [object1, object2, object3]
-      expect(collection1.child_object_ids).to eq [object1.id, object2.id, object3.id]
-      expect(collection1.child_collections).to eq [collection2, collection3, collection4]
-      expect(collection1.child_collection_ids).to eq [collection2.id, collection3.id, collection4.id]
-    end
-  end
 end

data/spec/hydra/pcdm/models/object_spec.rb

@@ -151,37 +151,67 @@ describe Hydra::PCDM::Object do
     subject { object.in_objects }
     let(:collection) { Hydra::PCDM::Collection.new }
     let(:parent_object) { described_class.new }
-    before do
-      collection.ordered_members = [object]
-      parent_object.ordered_members = [object]
-      parent_object.save
-      collection.save
+    context 'using ordered_members' do
+      before do
+        collection.ordered_members = [object]
+        parent_object.ordered_members = [object]
+        parent_object.save
+        collection.save
+      end
+
+      it 'finds objects that aggregate the object' do
+        expect(subject).to eq [parent_object]
+      end
     end
+    context 'using members' do
+      before do
+        collection.members = [object]
+        parent_object.members = [object]
+        parent_object.save
+        collection.save
+      end
 
-    it 'finds objects that aggregate the object' do
-      expect(subject).to eq [parent_object]
+      it 'finds objects that aggregate the object' do
+        expect(subject).to eq [parent_object]
+      end
     end
   end
 
   describe 'in_collections' do
-    let(:object) { described_class.create }
     subject { object.in_collections }
     let(:object) { described_class.create }
     let(:collection1) { Hydra::PCDM::Collection.new }
     let(:collection2) { Hydra::PCDM::Collection.new }
     let(:parent_object) { described_class.new }
-    before do
-      collection1.ordered_members = [object]
-      collection2.ordered_members = [object]
-      parent_object.ordered_members = [object]
-      parent_object.save
-      collection1.save
-      collection2.save
+    context 'using ordered_members' do
+      before do
+        collection1.ordered_members = [object]
+        collection2.ordered_members = [object]
+        parent_object.ordered_members = [object]
+        parent_object.save
+        collection1.save
+        collection2.save
+      end
+
+      it 'finds collections that aggregate the object' do
+        expect(subject).to match_array [collection1, collection2]
+        expect(subject.count).to eq 2
+      end
     end
+    context 'using members' do
+      before do
+        collection1.members = [object]
+        collection2.members = [object]
+        parent_object.members = [object]
+        parent_object.save
+        collection1.save
+        collection2.save
+      end
 
-    it 'finds collections that aggregate the object' do
-      expect(subject).to match_array [collection1, collection2]
-      expect(subject.count).to eq 2
+      it 'finds collections that aggregate the object' do
+        expect(subject).to match_array [collection1, collection2]
+        expect(subject.count).to eq 2
+      end
     end
   end
 
@@ -486,20 +516,4 @@ describe Hydra::PCDM::Object do
       it { is_expected.to eq IndexingStuff::AltIndexer }
     end
   end
-
-  describe 'make sure deprecated methods still work' do
-    let(:object1) { described_class.new }
-    let(:object2) { described_class.new }
-    let(:object3) { described_class.new }
-    let(:object4) { described_class.new }
-
-    it 'deprecated methods should pass' do
-      object1.ordered_members = [object2]
-      expect(object1.ordered_members << object3).to eq [object2, object3]
-      expect(object1.ordered_members += [object4]).to eq [object2, object3, object4]
-      object1.save # required until issue AF-Agg-75 is fixed
-      expect(object2.parent_objects).to eq [object1]
-      expect(object2.parents).to eq [object1]
-    end
-  end
 end

data/spec/spec_helper.rb

@@ -2,10 +2,9 @@ ENV['environment'] ||= 'test'
 require 'simplecov'
 require 'coveralls'
 
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-  SimpleCov::Formatter::HTMLFormatter,
-  Coveralls::SimpleCov::Formatter
-]
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new(
+  [SimpleCov::Formatter::HTMLFormatter,
+   Coveralls::SimpleCov::Formatter])
 SimpleCov.start 'rails'
 
 require 'bundler/setup'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-pcdm
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - E. Lynette Rayle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -191,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Portland Common Data Model (PCDM)
@@ -206,4 +206,3 @@ test_files:
 - spec/hydra/pcdm/services/file/get_mime_type_spec.rb
 - spec/hydra/pcdm_spec.rb
 - spec/spec_helper.rb
-has_rdoc: