effective_memberships 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f8c32ed9ffd17db6a7c0826bfb9eb72615ec3e7049adbb9f18b99cb8957c905
-  data.tar.gz: 5685ca74db5bd94d757c6a209b135160a015fddd2900ba6d66b55976a495eaa9
+  metadata.gz: 152cb649994812a9e71e4d82b04f99d0a0d2da20064081219239ef63f365fba0
+  data.tar.gz: f097af6a8b3a4d47411811aa14d057a9fc560af59af7ab7930aa758b6791a202
 SHA512:
-  metadata.gz: 9590986cb17a70c70183acfa7a4bf7dbc23959fd9482058737a916f767feedeb77a14444f2b6f1ed9631bb1c4d7d70affaf46e38f879a0af1a6acdc4ac480c94
-  data.tar.gz: 4dc42f6e02b50adad0c8c714ee64e97ef398828a391736db51348fed377ced92784cf116f21f147edec98eea06c365925d4d0efce559001c839d2ad89826e7ca
+  metadata.gz: e5680e89bfb7636106d19ac96c123774a0738d8f1d3e8e65b3610401b966f8a4c94706ab9a59c1139a66b7d7c3e427f87b427f1334f60e2bcfe1db0ef2b6e369
+  data.tar.gz: ffb7954bae9a87273672f5ae803a79427a21b31f8edbf22e5cfe381ab0cf506e64e44316cf8b41777de1ea31eb3f02da1283c0ca7a422dfae229d4e24ef67204

data/app/models/concerns/effective_memberships_owner.rb

@@ -53,10 +53,12 @@ module EffectiveMembershipsOwner
   end
 
   def effective_memberships_owners
-    owners = users if respond_to?(:users) && users.any? { |user| user.class.respond_to?(:effective_memberships_owner?) }
-    owners = organizations if respond_to?(:organizations) && organizations.any? { |organization| organization.class.respond_to?(:effective_memberships_owner?) }
+    owners = organizations if self.class.respond_to?(:effective_organizations_user?)
+    owners = users if self.class.respond_to?(:effective_organizations_organization?)
 
-    owners || [self]
+    owners = Array(owners).reject { |owner| owner.try(:archived?) }
+
+    owners.presence || [self]
   end
 
   # This is the calculated way of determining if an owner is a member or not.

data/app/models/effective/membership.rb

@@ -26,7 +26,7 @@ module Effective
       timestamps
     end
 
-    scope :deep, -> { includes(:membership_categories) }
+    scope :deep, -> { includes(membership_categories: :category) }
     scope :sorted, -> { order(:id) }
 
     scope :with_paid_fees_through, -> (period = nil) {

data/lib/effective_memberships/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMemberships
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_memberships
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-20 00:00:00.000000000 Z
+date: 2022-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails