hydra-works 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56fe0f1919fdd32fe127f5d3e0fc759eb781d74d
-  data.tar.gz: a6f9183d56fd7911150ca4ce152bb5280471135c
+  metadata.gz: 8cefb87e089349c82c73439d52e233d4bb75a7d3
+  data.tar.gz: db102c0181dbb73a50e18980d97567466446bd8b
 SHA512:
-  metadata.gz: 98a261ed13442400b6f41cb607d4b32e0f9fe8297ddd463d919ee1b69e19cb5704c1d41659566ad0f77b2f521b3ec140f3990b7eddc8b78af203bafbfc562eff
-  data.tar.gz: 65a823283ea04b931451b685c8dc19bed6b666ea18199cc7a23c6140e463c243c2eb6b1afa5b47e8df18b2eea0d4839acb632eaf2df3d6ff812162d94169d3e3
+  metadata.gz: 020a75d61769ec1ec016b6a08faab106c620684f3648836cf70d2764b447a754ea1127259f4eaca6fe36dea5ac219d423caf61f4898adc39aa6bd18b7fcb03c8
+  data.tar.gz: 10995a20095c6b0690c957b4fa31fbf3f9ce90b62f2107a90666db92fc98cbef43a97323bccb64f1eb8a1ab63632aa65cff9868b91e29da350753c8378f8a8c5

data/.gitignore

@@ -16,6 +16,7 @@ spec/internal
 mkmf.log
 jetty
 fcrepo4-data
+fcrepo4-test-data/
 .DS_Store
 .ruby-gemset
 .ruby-version

data/.rubocop.yml

@@ -78,3 +78,7 @@ RSpec/InstanceVariable:
 RSpec/DescribedClass:
   Exclude:
     - spec/hydra/works/models/concerns/generic_file/characterization_spec.rb
+
+RSpec/AnyInstance:
+  Exclude:
+    - spec/hydra/works/services/persist_derivatives_spec.rb

data/Rakefile

@@ -4,30 +4,26 @@ require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
 require 'solr_wrapper'
 require 'fcrepo_wrapper'
+require 'active_fedora/rake_support'
 
-desc 'Run style checker'
-RuboCop::RakeTask.new(:rubocop) do |task|
-  task.requires << 'rubocop-rspec'
-  task.fail_on_error = true
-end
+namespace :works do
+  desc 'Run style checker'
+  RuboCop::RakeTask.new(:rubocop) do |task|
+    task.requires << 'rubocop-rspec'
+    task.fail_on_error = true
+  end
 
-desc 'Run test suite and style checker'
-task :spec do
-  Rake::Task['rubocop'].invoke
-  RSpec::Core::RakeTask.new(:spec)
-end
+  RSpec::Core::RakeTask.new(:rspec)
 
-desc 'Spin up Solr & Fedora and run the test suite'
-task :ci do
-  solr_params = { port: 8983, verbose: true, managed: true }
-  fcrepo_params = { port: 8984, 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
+  desc 'Start up Solr & FCRepo and run the test suite'
+  task :spec do
+    with_test_server do
+      Rake::Task['works:rspec'].invoke
     end
   end
 end
 
+desc 'Spin up Solr & Fedora and run the test suite'
+task ci: ['works:rubocop', 'works:spec']
+
 task default: :ci

data/lib/hydra/works/models/concerns/work_behavior.rb

@@ -18,6 +18,7 @@ module Hydra::Works
 
     included do
       type [Hydra::PCDM::Vocab::PCDMTerms.Object, Vocab::WorksTerms.Work]
+      before_destroy :remove_from_parents
     end
 
     def works
@@ -70,5 +71,16 @@ module Hydra::Works
     def in_works
       ordered_by.select { |parent| parent.class.included_modules.include?(Hydra::Works::WorkBehavior) }.to_a
     end
+
+    private
+
+      # Remove this object from parent works or collections
+      def remove_from_parents
+        ordered_by.each do |parent|
+          parent.ordered_members.delete(self) # Delete the list node
+          parent.members.delete(self) # Delete the indirect container Proxy
+          parent.save! # record the changes to the ordered members
+        end
+      end
   end
 end

data/lib/hydra/works/services/add_file_to_file_set.rb

@@ -57,13 +57,13 @@ module Hydra::Works
         # @param object for mimetype to be determined. Attempts to use methods: :mime_type, :content_type, and :path.
         def determine_mime_type(file)
           if file.respond_to? :mime_type
-            return file.mime_type
+            file.mime_type
           elsif file.respond_to? :content_type
-            return file.content_type
+            file.content_type
           elsif file.respond_to? :path
-            return Hydra::PCDM::GetMimeTypeForFile.call(file.path)
+            Hydra::PCDM::GetMimeTypeForFile.call(file.path)
           else
-            return 'application/octet-stream'
+            'application/octet-stream'
           end
         end
 

data/lib/hydra/works/version.rb

@@ -1,5 +1,5 @@
 module Hydra
   module Works
-    VERSION = '0.7.0'.freeze
+    VERSION = '0.7.1'.freeze
   end
 end

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

@@ -69,6 +69,15 @@ describe Hydra::Works::Collection do
       it 'returns only works' do
         expect(subject).to eq [work1, work2]
       end
+
+      context "after deleting a member" do
+        before do
+          collection.save
+          work1.destroy
+          collection.reload
+        end
+        it { is_expected.to eq [work2] }
+      end
     end
   end
 

data/spec/hydra/works/models/work_spec.rb

@@ -207,7 +207,7 @@ describe Hydra::Works::Work do
     end
   end
 
-  describe 'should have parent work and collection accessors' do
+  describe 'parent work and collection accessors' do
     let(:collection1) { Hydra::Works::Collection.new }
     before do
       collection1.ordered_members << work2

data/spec/hydra/works/services/characterization_service_spec.rb

@@ -93,8 +93,8 @@ describe Hydra::Works::CharacterizationService do
       allow(characterization).to receive(:characterize).and_return(fits_response)
     end
 
-    it 'does not explode with an error.' do
-      expect { described_class.run(file_set) }.to_not raise_error
+    it 'does not explode with an error' do
+      expect { described_class.run(file_set) }.not_to raise_error
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-works
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-05 00:00:00.000000000 Z
+date: 2016-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-pcdm
@@ -340,3 +340,4 @@ test_files:
 - spec/hydra/works_spec.rb
 - spec/spec_helper.rb
 - spec/support/file_set_helper.rb
+has_rdoc: