hyrax 2.7.0 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b78347854928dad8c8ee7c063242ffcef844aee8427243009be48ca4ec809c2
-  data.tar.gz: cc0bf69bb012226fc582822e86d395cce0de87da0d749ee45104cc5c78cfaacd
+  metadata.gz: 731a42bde181b39c81b360a8a83ef939a9a01b3bb6e7f8f5e98f1b36da124606
+  data.tar.gz: 0bd8f8fd540eff1a6f118d6590713b7bd878b25ac4629c2026ddda6098523c0d
 SHA512:
-  metadata.gz: d6ff706b2405317225f143f78f5b1903dbf676d7d0d7846cf1b3d144f530e568792c92184f818b07cabdcd8479b2a5eaf27bbe17a66c08a4b76c67559321fe2b
-  data.tar.gz: 07cff94f6fd86bc3a796d0a1d1af3879b5acebc4d36017f04b63d593b56c53f2d223851f672f232fbb344042fdd64d75393f281036e19de95527ba5fcb6bab65
+  metadata.gz: 312c1d0360bbb528b90612691cbf916d6e8112a824a4b5ed82a109c65abff4e008c47863d75f7d903989da339c90b186e9809ee19f32de277c6a9ae2074ebab7
+  data.tar.gz: f6bb151a8727316ee41203ca7e63caa77b38fd27ab38f10404341048d461a1efd22569ca18d894e73432960d77385a0da9d062101cf459dd8d3d517dc1fb2415

data/app/actors/hyrax/actors/attach_members_actor.rb

@@ -30,10 +30,16 @@ module Hyrax
           # checking for existing works to avoid rewriting/loading works that are
           # already attached
           existing_works = env.curation_concern.member_ids
+          boolean_type_caster = ActiveModel::Type::Boolean.new
+
           attributes_collection.each do |attributes|
             next if attributes['id'].blank?
-            if existing_works.include?(attributes['id'])
-              remove(env.curation_concern, attributes['id']) if has_destroy_flag?(attributes)
+            if boolean_type_caster.cast(attributes['_destroy'])
+              # Likely someone in the UI sought to add the collection, then
+              # changed their mind and checked the "delete" checkbox and posted
+              # their update.
+              next unless existing_works.include?(attributes['id'])
+              remove(env.curation_concern, attributes['id'])
             else
               add(env, attributes['id'])
             end

data/app/actors/hyrax/actors/collections_membership_actor.rb

@@ -46,10 +46,15 @@ module Hyrax
           attributes_collection = attributes_collection.sort_by { |i, _| i.to_i }.map { |_, attributes| attributes }
           # checking for existing works to avoid rewriting/loading works that are already attached
           existing_collections = env.curation_concern.member_of_collection_ids
+          boolean_type_caster = ActiveModel::Type::Boolean.new
           attributes_collection.each do |attributes|
             next if attributes['id'].blank?
-            if existing_collections.include?(attributes['id'])
-              remove(env.curation_concern, attributes['id']) if has_destroy_flag?(attributes)
+            if boolean_type_caster.cast(attributes['_destroy'])
+              # Likely someone in the UI sought to add the collection, then
+              # changed their mind and checked the "delete" checkbox and posted
+              # their update.
+              next unless existing_collections.include?(attributes['id'])
+              remove(env.curation_concern, attributes['id'])
             else
               add(env, attributes['id'])
             end
@@ -115,13 +120,6 @@ module Hyrax
           curation_concern.member_of_collections.delete(collection)
         end
 
-        # Determines if a hash contains a truthy _destroy key.
-        # rubocop:disable Naming/PredicateName
-        def has_destroy_flag?(hash)
-          ActiveFedora::Type::Boolean.new.cast(hash['_destroy'])
-        end
-        # rubocop:enable Naming/PredicateName
-
         # Extact a singleton collection id from the collection attributes and save it in env.  Later in the actor stack,
         # in apply_permission_template_actor.rb, `env.attributes[:collection_id]` will be used to apply the
         # permissions of the collection to the created work.  With one and only one collection, the work is seen as

data/lib/hyrax/version.rb

@@ -1,3 +1,3 @@
 module Hyrax
-  VERSION = '2.7.0'.freeze
+  VERSION = '2.7.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyrax
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.1
 platform: ruby
 authors:
 - Justin Coyne
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-02 00:00:00.000000000 Z
+date: 2020-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -2387,8 +2387,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Hyrax is a front-end based on the robust Samvera framework, providing a user