curation_concerns 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5724b0cc33c0984a364df05e23c2d70e87774570
-  data.tar.gz: e62c0d3a3f0dce54d769cc3522e06095010d3d9e
+  metadata.gz: f3c0fb572ee30be72797187fd41faad361941190
+  data.tar.gz: 331f8797938142e122b127d0d738a79d868f96ee
 SHA512:
-  metadata.gz: 3e5ece7596c1c81423c676c9b05ae9f4a1593a6949c0723791d5b157187afac9538fb5a6c4a2ec23edf096a9448acf14e36a0fa417151c6751f04260eb1d03bf
-  data.tar.gz: 2d8fdbf9ff483440ddbf1cba706309edbe7f89f33684965ac8e186c1926263b5650332fdc6bf3365a136db3d3a370fb99cd66743f3128097b9e327ffb811ef41
+  metadata.gz: fad6acfde6bdc26121c851eb3c33cf254729f4a5c54182abb440314a66ae65bcb03472a30f12404bbdc5ef81431ba40b08b873c2aa7b8d32bf45fe99ad54890e
+  data.tar.gz: 89a1a9ce749024b859eaa183f86bacda26bc499594510f926fb5367dd5a3ed6fe5c371046a8dd4c95edf1d542f3a4f16093174c33be6fef2de887ce99da0fa83

data/.travis.yml

@@ -2,10 +2,11 @@ language: ruby
 cache: bundler
 sudo: false
 rvm:
-  - 2.2
+  - 2.3.1
 env:
   global:
   - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
+  - RAILS_VERSION=4.2.7
 notifications:
   irc:
     channels:

data/RELEASING.md

@@ -1,4 +1,4 @@
 * Checkout the master branch.
 * Bump version number in `lib/curation_concerns/version.rb`
-* Commit your change with a message such as: `Bumped version to x.y.z`
+* Commit your change with a message such as: `Bump version to x.y.z`
 * Release the gem to rubygems.org: `rake release` This also pushes the code to github.

data/app/actors/curation_concerns/actors/apply_order_actor.rb

@@ -15,12 +15,14 @@ module CurationConcerns
           (existing_members_ids - ordered_member_ids).each do |old_id|
             work = ::ActiveFedora::Base.find(old_id)
             curation_concern.ordered_members.delete(work)
+            curation_concern.members.delete(work)
           end
 
           (ordered_member_ids - existing_members_ids).each do |work_id|
             work = ::ActiveFedora::Base.find(work_id)
             curation_concern.ordered_members << work
           end
+          curation_concern.save
           true
         end
 

data/app/controllers/concerns/curation_concerns/embargoes_controller_behavior.rb

@@ -4,10 +4,6 @@ module CurationConcerns
     include CurationConcerns::ManagesEmbargoes
     include CurationConcerns::Collections::AcceptsBatches
 
-    included do
-      skip_before_action :normalize_identifier, only: :update
-    end
-
     def index
       authorize! :index, Hydra::AccessControls::Embargo
     end

data/app/controllers/concerns/curation_concerns/leases_controller_behavior.rb

@@ -4,10 +4,6 @@ module CurationConcerns
     include CurationConcerns::ManagesEmbargoes
     include CurationConcerns::Collections::AcceptsBatches
 
-    included do
-      skip_before_action :normalize_identifier, only: :update
-    end
-
     def index
       authorize! :index, Hydra::AccessControls::Lease
     end

data/app/controllers/concerns/curation_concerns/manages_embargoes.rb

@@ -11,6 +11,7 @@ module CurationConcerns
       load_and_authorize_resource class: ActiveFedora::Base, instance_name: :curation_concern
     end
 
+    # This is an override of CurationConcerns::ApplicationController
     def deny_access(exception)
       redirect_to root_path, alert: exception.message
     end

data/curation_concerns.gemspec

@@ -20,9 +20,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'hydra-head', '>= 10.0.0', '< 11'
   spec.add_dependency 'blacklight', '~> 6.3'
-  spec.add_dependency "breadcrumbs_on_rails", "~> 2.3"
-  spec.add_dependency "jquery-ui-rails"
-  spec.add_dependency "simple_form", '~> 3.1'
+  spec.add_dependency 'breadcrumbs_on_rails', '>= 2.3', '< 4'
+  spec.add_dependency 'jquery-ui-rails'
+  spec.add_dependency 'simple_form', '~> 3.1'
   spec.add_dependency 'hydra-editor', '>= 2', '< 4'
   spec.add_dependency 'blacklight_advanced_search', '~> 6.0'
   spec.add_dependency 'rails_autolink'
@@ -60,5 +60,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop', '~> 0.39'
   spec.add_development_dependency 'rubocop-rspec', '~> 1.4.1'
   spec.add_development_dependency 'webmock'
-
 end

data/lib/curation_concerns/version.rb

@@ -1,3 +1,3 @@
 module CurationConcerns
-  VERSION = "1.3.1".freeze
+  VERSION = '1.3.2'.freeze
 end

data/spec/actors/curation_concerns/apply_order_actor_spec.rb

@@ -56,5 +56,25 @@ describe CurationConcerns::Actors::ApplyOrderActor do
         expect(subject.update(attributes)).to be true
       end
     end
+
+    context 'without an ordered_member_id that was associated with the curation concern' do
+      let(:curation_concern) { create(:work_with_two_children, user: user) }
+      let(:attributes) { { ordered_member_ids: ["Blah2"] } }
+      let(:root_actor) { double }
+      before do
+        allow(CurationConcerns::Actors::RootActor).to receive(:new).and_return(root_actor)
+        allow(root_actor).to receive(:update).with({}).and_return(true)
+        child.title = ["Generic Title"]
+        child.apply_depositor_metadata(user.user_key)
+        child.save!
+        curation_concern.apply_depositor_metadata(user.user_key)
+        curation_concern.save!
+      end
+      it "removes the first child" do
+        expect(subject.update(attributes)).to be true
+        expect(curation_concern.members.size).to eq(1)
+        expect(curation_concern.ordered_member_ids.size).to eq(1)
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curation_concerns
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-09 00:00:00.000000000 Z
+date: 2016-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hydra-head
@@ -50,16 +50,22 @@ dependencies:
   name: breadcrumbs_on_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement