effective_memberships 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b5129f1448e268a4dd8977f9ad66e4d85f6ea9a2430f4ef5ac301a134f273fd
-  data.tar.gz: cc623fb32179f8157d28d80260ab32733fec716afbcdc0b887f76f1106fca241
+  metadata.gz: 3d93c9f826d21228e86c0b10e7f30453ba7201dd00e9eab65f9b332850d4cfd6
+  data.tar.gz: 75520c50d89f83b7f2f0657efcd3f581b058ab2af756640bccb6d5bf4fb66207
 SHA512:
-  metadata.gz: 414b1c1c2b7a166fc214d35a62b6b7f5f19cddd6845852dfd0c1bc255720601673eb2607ba1456f1b5c28a92ca3092d92554577855965428e0eb2ffd7cd892b6
-  data.tar.gz: c78a8ebee8e8e56493e89519242ebcec959603f87f877c55683fea709fc29d09c7ac3de5260124e58b1a69021ad6abb0716584826518207ef9722a5a746e98ac
+  metadata.gz: e63960291256ab28e1ae9e4a8e1949cabaf24d31ded3bdd2e74c5240ba6539431e24bf6bac5161f933b92243db98dde91cbada1f654ced95bd4725f0583d2677
+  data.tar.gz: 20ac5d9b6a2f1021b2df5391aa6751f48061cd9c672709870eeb303e17205968d57121089b2d851596b4e2780fe2fa903f61cfeb9969aa91ab11202f03e7eb46

data/app/models/concerns/effective_memberships_category.rb

@@ -169,6 +169,10 @@ module EffectiveMembershipsCategory
     category_type == 'Organization'
   end
 
+  def membership_number_required?
+    true
+  end
+
   def prorated_fee(date:)
     send("prorated_#{date.strftime('%b').downcase}").to_i
   end

data/app/models/concerns/effective_memberships_registrar.rb

@@ -53,7 +53,6 @@ module EffectiveMembershipsRegistrar
 
     # Default Date and next number
     date ||= Time.zone.now
-    number = next_membership_number(owner, to: categories.first) if number.blank?
     period = period(date: date)
     period_end_on = period_end_on(date: date)
 
@@ -63,7 +62,8 @@ module EffectiveMembershipsRegistrar
     # Assign Dates
     membership.joined_on ||= date  # Only if not already present
 
-    # Assign Number
+    # Assign Number (this could be nil)
+    number = next_membership_number(owner, to: categories.first) if number.blank?
     membership.number ||= number
     membership.number_as_integer ||= (Integer(number) rescue nil)
 
@@ -111,7 +111,6 @@ module EffectiveMembershipsRegistrar
 
     # Default Date and next number
     date ||= Time.zone.now
-    number = next_membership_number(owner, to: to) if number.blank?
     period = period(date: date)
     period_end_on = period_end_on(date: date)
 
@@ -122,7 +121,8 @@ module EffectiveMembershipsRegistrar
     membership.joined_on ||= date  # Only if not already present
     membership.registration_on = date  # Always new registration_on
 
-    # Assign Number
+    # Assign Number (this could be nil)
+    number = next_membership_number(owner, to: to) if number.blank?
     membership.number = number
     membership.number_as_integer = (Integer(number) rescue nil)
 
@@ -305,7 +305,11 @@ module EffectiveMembershipsRegistrar
 
   def next_membership_number(owner, to:)
     raise('expecting a memberships owner') unless owner.class.respond_to?(:effective_memberships_owner?)
-    raise('expecting a membership category') unless Array(to).all? { |to| to.class.respond_to?(:effective_memberships_category?) }
+
+    categories = Array(to)
+    raise('expecting a membership category') unless categories.all? { |cat| cat.class.respond_to?(:effective_memberships_category?) }
+
+    return nil if categories.none?(&:membership_number_required?)
 
     # Just a simple number right now
     number = (Effective::Membership.all.max_number || 0) + 1

data/app/models/effective/membership.rb

@@ -51,10 +51,12 @@ module Effective
     end
 
     before_validation(if: -> { number_changed? }) do
-      self.number_as_integer = (Integer(number) rescue nil)
+      self.number_as_integer = (number.present? ? (Integer(number) rescue nil) : nil)
     end
 
-    validates :number, presence: true, uniqueness: true
+    validates :number, uniqueness: { allow_blank: true }
+    validates :number, presence: true, if: -> { categories.any?(:membership_number_required?) }
+
     validates :joined_on, presence: true
     validates :registration_on, presence: true
     validates :membership_categories, presence: true
@@ -80,7 +82,7 @@ module Effective
         (statuses.to_sentence if statuses.present?),
         (categories.to_sentence if categories.present?),
         'member',
-        "##{number_was}",
+        ("##{number_was}" if number_was.present?),
         "who joined #{joined_on&.strftime('%F') || '-'}",
         ("and last registered #{registration_on.strftime('%F')}" if registration_on > joined_on),
         (". Membership is Not In Good Standing because #{bad_standing_reason}" if bad_standing?)

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.6.2'
+  VERSION = '0.6.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-30 00:00:00.000000000 Z
+date: 2022-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails