hydra-pcdm 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80641f7f7b83b286fd156fa78ad16a63fc4d53bb
-  data.tar.gz: ff6757a964f8bb297f0792a91699da1905af4d12
+  metadata.gz: 612abf9f197aa3262b01ce197d9ef86e9ffbdaaa
+  data.tar.gz: a3112ae87173e39da38a9e0b4a26ec41031be03b
 SHA512:
-  metadata.gz: f3539067b5813ac793627a3850f78cbf3828522f1d001f69949a30da8893edae9fa3f3aeae35faf70735fe19760d6e6431b7f4d94a4379b724a792d50eade636
-  data.tar.gz: a77ebae69ba14da6d11844877cb8a6f6e1d04f748404081921056efe0ac2dd985699c320bd08409297afe0c3f28304c63a8b30746ed0e95b4bf376a0632abc00
+  metadata.gz: 7bd4157e52e24c7be2e8125f05464c7bcffccd19a0abdca74afd9fafcb545f6fbeafbdae0fe69457aa94c6d79273b6746b602839bf9b24946a495b2ba24c2825
+  data.tar.gz: 38fbd6f1beca513ff55a939bbd75c39019895dc0b7ebe614390772bebe8917deed01050d2030628b49feb16ddf4a23a478c21c345768f03b0ff470d707732be5

data/README.md

@@ -1,13 +1,12 @@
 # Hydra::PCDM
 
 [![Version](https://badge.fury.io/rb/hydra-pcdm.png)](http://badge.fury.io/rb/hydra-pcdm)
-[![Build Status](https://travis-ci.org/projecthydra-labs/hydra-pcdm.svg?branch=master)](https://travis-ci.org/projecthydra-labs/hydra-pcdm)
-[![Coverage Status](https://coveralls.io/repos/projecthydra-labs/hydra-pcdm/badge.svg?branch=master)](https://coveralls.io/r/projecthydra-labs/hydra-pcdm?branch=master)
-[![Code Climate](https://codeclimate.com/github/projecthydra-labs/hydra-pcdm/badges/gpa.svg)](https://codeclimate.com/github/projecthydra-labs/hydra-pcdm)
+[![Build Status](https://travis-ci.org/projecthydra/hydra-pcdm.svg?branch=master)](https://travis-ci.org/projecthydra/hydra-pcdm)
+[![Coverage Status](https://coveralls.io/repos/projecthydra/hydra-pcdm/badge.svg?branch=master)](https://coveralls.io/r/projecthydra/hydra-pcdm?branch=master)
+[![Code Climate](https://codeclimate.com/github/projecthydra/hydra-pcdm/badges/gpa.svg)](https://codeclimate.com/github/projecthydra/hydra-pcdm)
 [![Apache 2.0 License](http://img.shields.io/badge/APACHE2-license-blue.svg)](./LICENSE)
 [![Contribution Guidelines](http://img.shields.io/badge/CONTRIBUTING-Guidelines-blue.svg)](./CONTRIBUTING.md)
 [![API Docs](http://img.shields.io/badge/API-docs-blue.svg)](http://rubydoc.info/gems/hydra-pcdm)
-[![Stories in Ready](https://badge.waffle.io/projecthydra-labs/hydra-works.png?source=projecthydra-labs%2Fhydra-pcdm&label=ready&title=Ready)](https://waffle.io/projecthydra-labs/hydra-works?source=projecthydra-labs%2Fhydra-pcdm)
 
 Hydra implementation of the Portland Common Data Model (PCDM)
 

data/Rakefile

@@ -1,9 +1,10 @@
 require 'bundler/gem_tasks'
 require 'rspec/core'
 require 'rspec/core/rake_task'
-require 'rubocop/rake_task'
-require 'fcrepo_wrapper'
 require 'solr_wrapper'
+require 'fcrepo_wrapper'
+require 'rubocop/rake_task'
+require 'active_fedora/rake_support'
 
 desc 'Run style checker'
 RuboCop::RakeTask.new(:rubocop) do |task|
@@ -11,23 +12,21 @@ RuboCop::RakeTask.new(:rubocop) do |task|
   task.fail_on_error = true
 end
 
-desc 'Run test suite and style checker'
+desc 'Run test suite'
 task :spec do
-  Rake::Task['rubocop'].invoke
   RSpec::Core::RakeTask.new(:spec)
 end
 
-desc 'Spin up Solr & Fedora and run the test suite'
-task :ci do
-  solr_params = { port: 8985, verbose: true, managed: true }
-  fcrepo_params = { port: 8986, verbose: true, managed: true }
-  SolrWrapper.wrap(solr_params) do |solr|
-    solr.with_collection(name: 'hydra-test', dir: File.join(File.expand_path('.', File.dirname(__FILE__)), 'solr', 'config')) do
-      FcrepoWrapper.wrap(fcrepo_params) do
-        Rake::Task['spec'].invoke
-      end
-    end
+desc 'Spin up test servers and run specs'
+task :spec_with_app_load do
+  with_test_server do
+    Rake::Task['spec'].invoke
   end
 end
 
+desc 'Spin up Solr & Fedora and run the test suite'
+task ci: :rubocop do
+  Rake::Task['spec_with_app_load'].invoke
+end
+
 task default: :ci

data/hydra-pcdm.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'active-fedora', '~> 10.0'
+  spec.add_dependency 'active-fedora', '>= 10', '< 12'
   spec.add_dependency 'mime-types', '>= 1'
 
   spec.add_development_dependency 'bundler', '~> 1.6'

data/lib/hydra/pcdm/version.rb

@@ -1,5 +1,5 @@
 module Hydra
   module PCDM
-    VERSION = '0.8.1'.freeze
+    VERSION = '0.8.2'.freeze
   end
 end

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

@@ -15,7 +15,7 @@ describe Hydra::PCDM::Collection do
       collection1.members += [collection2, collection3]
       collection1.ordered_members << collection4
 
-      expect(collection1.collections).to eq [collection2, collection3, collection4]
+      expect(collection1.collections).to match_array [collection2, collection3, collection4]
       expect(collection1.ordered_collections).to eq [collection4]
     end
   end
@@ -25,7 +25,7 @@ describe Hydra::PCDM::Collection do
       collection1.members += [collection2, collection3]
       collection1.ordered_members << collection4
 
-      expect(collection1.collection_ids).to eq [collection2.id, collection3.id, collection4.id]
+      expect(collection1.collection_ids).to match_array [collection2.id, collection3.id, collection4.id]
     end
   end
 
@@ -34,7 +34,7 @@ describe Hydra::PCDM::Collection do
       collection1.members += [object1, object2]
       collection1.ordered_members << object3
 
-      expect(collection1.objects).to eq [object1, object2, object3]
+      expect(collection1.objects).to match_array [object1, object2, object3]
       expect(collection1.ordered_objects).to eq [object3]
     end
   end
@@ -44,7 +44,7 @@ describe Hydra::PCDM::Collection do
       collection1.members += [object1, object2]
       collection1.ordered_members << object3
 
-      expect(collection1.object_ids).to eq [object1.id, object2.id, object3.id]
+      expect(collection1.object_ids).to match_array [object1.id, object2.id, object3.id]
     end
   end
 
@@ -416,29 +416,29 @@ describe Hydra::PCDM::Collection do
         subject.related_objects << object1
         subject.related_objects << object2
         subject.related_objects << object3
-        expect(subject.related_objects).to eq [object1, object2, object3]
+        expect(subject.related_objects).to match_array [object1, object2, object3]
       end
 
       it 'removes first related object when changes are in memory' do
         expect(subject.related_objects.delete(object1)).to eq [object1]
-        expect(subject.related_objects).to eq [object2, object3]
+        expect(subject.related_objects).to match_array [object2, object3]
       end
 
       it 'removes last related object when changes are in memory' do
         expect(subject.related_objects.delete(object3)).to eq [object3]
-        expect(subject.related_objects).to eq [object1, object2]
+        expect(subject.related_objects).to match_array [object1, object2]
       end
 
       it 'removes middle related object when changes are in memory' do
         expect(subject.related_objects.delete(object2)).to eq [object2]
-        expect(subject.related_objects).to eq [object1, object3]
+        expect(subject.related_objects).to match_array [object1, object3]
       end
 
       it 'removes middle related object when changes are saved' do
-        expect(subject.related_objects).to eq [object1, object2, object3]
+        expect(subject.related_objects).to contain_exactly object1, object2, object3
         expect(subject.related_objects.delete(object2)).to eq [object2]
         subject.save
-        expect(subject.reload.related_objects).to eq [object1, object3]
+        expect(subject.reload.related_objects).to contain_exactly object1, object3
       end
     end
 

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

@@ -363,29 +363,29 @@ describe Hydra::PCDM::Object do
         subject.related_objects << object3
         subject.related_objects << object4
         subject.related_objects << object5
-        expect(subject.related_objects).to eq [object1, object2, object3, object4, object5]
+        expect(subject.related_objects).to match_array [object1, object2, object3, object4, object5]
       end
 
       it 'remove first related object when changes are in memory' do
         expect(subject.related_objects.delete(object1)).to eq [object1]
-        expect(subject.related_objects).to eq [object2, object3, object4, object5]
+        expect(subject.related_objects).to match_array [object2, object3, object4, object5]
       end
 
       it 'remove last related object when changes are in memory' do
         expect(subject.related_objects.delete(object5)).to eq [object5]
-        expect(subject.related_objects).to eq [object1, object2, object3, object4]
+        expect(subject.related_objects).to match_array [object1, object2, object3, object4]
       end
 
       it 'remove middle related object when changes are in memory' do
         expect(subject.related_objects.delete(object3)).to eq [object3]
-        expect(subject.related_objects).to eq [object1, object2, object4, object5]
+        expect(subject.related_objects).to match_array [object1, object2, object4, object5]
       end
 
       it 'remove middle related object when changes are saved' do
-        expect(subject.related_objects).to eq [object1, object2, object3, object4, object5]
+        expect(subject.related_objects).to contain_exactly object1, object2, object3, object4, object5
         expect(subject.related_objects.delete(object3)).to eq [object3]
         subject.save
-        expect(subject.reload.related_objects).to eq [object1, object2, object4, object5]
+        expect(subject.reload.related_objects).to contain_exactly object1, object2, object4, object5
       end
     end
 
@@ -446,7 +446,7 @@ describe Hydra::PCDM::Object do
           expect(object.filter_files_by_type(pcdm_thumbnail_uri)).to eq [thumbnail]
         end
         it 'only overrides the #files method when you specify :type' do
-          expect(object.files).to eq [file, thumbnail]
+          expect(object.files).to match_array [file, thumbnail]
         end
       end
       context 'when the object does NOT have any files with that type' do

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: hydra-pcdm
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - E. Lynette Rayle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-12 00:00:00.000000000 Z
+date: 2016-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '10'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '10'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -222,4 +228,3 @@ test_files:
 - spec/hydra/pcdm/services/file/get_mime_type_spec.rb
 - spec/hydra/pcdm_spec.rb
 - spec/spec_helper.rb
-has_rdoc: