effective_memberships 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 276edc8f53de07b32c2a6f5467727cda1ca37a4748dd6fccf37fd8657150e1b8
-  data.tar.gz: '097342ca3d781331f2d660e0e027016b34c67d0f13f24b535b2703c0d30cf212'
+  metadata.gz: d5a9ac211f2370d13d88ee7b8ce0345c4c8363c530dd60dccbe4bc2da046bf98
+  data.tar.gz: 69f0f40f0116c65bea68c949424921b2a87b821e50e664fc73b1312f90c79a79
 SHA512:
-  metadata.gz: 87669cf4f1bc83980b9f915916a509d1580cb4ba14545c178bf344f9dfe9f0c9c8c7b45f6e350fc38d1ae4aa9f2ef0c1de93382e8e310fc368623b007b4a1a4e
-  data.tar.gz: 1c71acefad1595cc972e63399a4709c1d934f1f487c439bf593feb8cdb9d2167a7ea703f2d36ad78e010c727e128d7548a0b26847538ea3ba81ab48d69ba3ba4
+  metadata.gz: 7edb8681ca649e8aa121cf38add83c1e21277a968682e8b183f5f3197a84dd061f5ebac01c0da824c64f59c93f47e17d46ea43d81ee4b31a1cb485235b24f7e7
+  data.tar.gz: 4fe46479e76c85a356861d4b42f2e1b59675c3726e61c9791044b85133679e87f5d2b66e7a719311fe6c15a6d25a89db04f2b4f20232c462c5a028cf2c013f85

data/app/models/concerns/effective_memberships_registrar.rb

@@ -206,32 +206,58 @@ module EffectiveMembershipsRegistrar
     save!(owner, date: date)
   end
 
-  # This clears the status entirely from user
-  def status_remove!(owner, date: nil)
-    status_change!(owner, to: nil, date: date)
+  def status_clear!(owner, date: nil)
+    raise('expecting a memberships owner') unless owner.class.respond_to?(:effective_memberships_owner?)
+    raise('owner must have an existing membership. use register! instead') if owner.membership.blank?
+
+    status_assign!(owner, date: date, status: [])
   end
 
-  # To can be nil to clear the status entirely
-  def status_change!(owner, to:, date: nil)
+  def status_add!(owner, status:, date: nil)
     raise('expecting a memberships owner') unless owner.class.respond_to?(:effective_memberships_owner?)
     raise('owner must have an existing membership. use register! instead') if owner.membership.blank?
 
-    from = owner.membership.status
+    status_assign!(owner, date: date, status: owner.membership.statuses + Array(status))
+  end
 
-    raise('expecting a to memberships status') if to.present? && !to.class.respond_to?(:effective_memberships_status?)
-    raise('expecting a from memberships status') if from.present? && !from.class.respond_to?(:effective_memberships_status?)
-    raise('expected to and from to be different') if from == to
+  def status_remove!(owner, status:, date: nil)
+    raise('expecting a memberships owner') unless owner.class.respond_to?(:effective_memberships_owner?)
+    raise('owner must have an existing membership. use register! instead') if owner.membership.blank?
 
-    date ||= Time.zone.now
+    status_assign!(owner, date: date, status: owner.membership.statuses - Array(status))
+  end
+
+  def status_assign!(owner, status:, date: nil)
+    raise('expecting a memberships owner') unless owner.class.respond_to?(:effective_memberships_owner?)
 
     membership = owner.membership
+    raise('owner must have an existing membership. use register! instead') if membership.blank?
 
-    # Assign Status
-    membership.build_membership_status(status: to) if to.present?
-    membership.membership_status(status: from).mark_for_destruction if from.present?
+    statuses = Array(status)
+    raise('expected a memberships status') unless statuses.blank? || statuses.all? { |status| status.class.respond_to?(:effective_memberships_status?) }
 
-    # Save
-    save!(owner, date: date)
+    # Add
+    statuses.each do |status|
+      next if membership.membership_status(status: status).present?
+      membership.build_membership_status(status: status)
+    end
+
+    # Remove
+    membership.statuses.each do |existing|
+      next if statuses.include?(existing)
+      membership.membership_status(status: existing).mark_for_destruction
+    end
+
+    changed = membership.membership_statuses.any? { |ms| ms.new_record? || ms.marked_for_destruction? }
+
+    if changed
+      date ||= Time.zone.now
+
+      membership.registration_on = date # Always new registration_on
+      save!(owner, date: date)
+    end
+
+    true
   end
 
   def remove!(owner, date: nil)

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.6.5'
+  VERSION = '0.6.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Code and Effect