effective_committees 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b64f9b12ecd4b0b3b70dd361f5fbe9c25b37009f167c68c92b7d0a0501bdbb7d
-  data.tar.gz: b3e5bbcadbd792f9f98d0bc5cb65aad229ae24fea3bae2aa7a0063f8e1535295
+  metadata.gz: 2f8cd4e1b3dc27e4baa6206e02cfa679cae82026ab3006320c0fd3faa7b710a6
+  data.tar.gz: af3689f3c635f417988147e98edfc5bdf8f7f5e324f791965b594f21652bbf5a
 SHA512:
-  metadata.gz: 340c2c724dfab35ab4b3b901cd5035805496b4a7e6029abfaf3f490fbe957c1fdc99312c0fb72712577c2983083182baaf0c7a075baa08a5d9aae8c82b38a7fe
-  data.tar.gz: af0d65a2e6b320347dfd169ce5710712cda0eab4c33d80da5e386b8a2262e03b431d32ec922f8fa9a7579ab370a901811192bee4254c98e719856341b518e8b5
+  metadata.gz: c10c50b9dcdfb26a07be5072a5b76d25c7c33fe1cf1d7ffea69a6dedc7db75779ee355534c6fc4404fe545077b0df3ef5659b2d3abc71549a7286069fb5ff6b4
+  data.tar.gz: dd3865586a9442ceaa0b85ee5c1699a2153b52b055c95a08d627b56ec5ad7cfaf4745a81c784876bded93ca5e0e68bc11418576e9e2270d1d50e8046f321b8b5

data/app/models/concerns/effective_committees_user.rb

@@ -16,7 +16,7 @@ module EffectiveCommitteesUser
   end
 
   included do
-    has_many :committee_members, -> { Effective::CommitteeMember.sorted },
+    has_many :committee_members, -> { Effective::CommitteeMember.sorted.includes(:committee) },
       class_name: 'Effective::CommitteeMember', inverse_of: :user, dependent: :delete_all
 
     accepts_nested_attributes_for :committee_members, allow_destroy: true
@@ -32,17 +32,20 @@ module EffectiveCommitteesUser
 
   # Instance Methods
 
+  # Returns the user's currently-active term on this committee, or nil.
+  # A user may hold multiple terms on the same committee (history of past roles).
   def committee_member(committee:)
-    committee_members.find { |rep| rep.committee_id == committee.id }
+    committee_members.select(&:active?).find { |cm| cm.committee_id == committee.id }
   end
 
-  # Find or build
+  # Find-active-or-build-new. If the user has no active term, build a fresh row
+  # (expired terms are history and are not edited in place through this helper).
   def build_committee_member(committee:)
     committee_member(committee: committee) || committee_members.build(committee: committee)
   end
 
   def committees
-    committee_members.includes(:committee).select { |cm| cm.active? && !cm.marked_for_destruction? }.map { |cm| cm.committee }
+    committee_members.select(&:active?).map { |cm| cm.committee }.uniq
   end
 
   # When activity is for sequential uploaded files, group them together like: "12 files were added to Board of Directors - April 2025 Meeting"
@@ -61,8 +64,8 @@ module EffectiveCommitteesUser
     # Returns an Array of Arrays where some are 1 length groups
     # Others are multiple length groups of file changes to one folder
     logs = logs.slice_when do |a, b|
-      (a.changes_to_id != b.changes_to_id) || 
-      (a.associated_type != b.associated_type) || 
+      (a.changes_to_id != b.changes_to_id) ||
+      (a.associated_type != b.associated_type) ||
       (b.associated_type == "Effective::CommitteeFolder") ||
       (a.associated.try(:committee_folder_id) != b.associated.try(:committee_folder_id))
     end

data/app/models/effective/committee.rb

@@ -55,12 +55,13 @@ module Effective
     # Returns the user's currently-active term on this committee, or nil.
     # For the full history including expired terms, use committee_members_for(user:).
     def committee_member(user:)
-      committee_members.find { |member| member.user_id == user.id && member.active? }
+      committee_members.find { |cm| cm.user_id == user.id && cm.active? }
     end
 
     # All terms (active and expired) a user has served on this committee.
+    # Do not add uniq here
     def committee_members_for(user:)
-      committee_members.select { |member| member.user_id == user.id }
+      committee_members.select { |cm| cm.user_id == user.id }
     end
 
     # Find-active-or-build-new. If the user has no active term, build a fresh row
@@ -70,11 +71,11 @@ module Effective
     end
 
     def users
-      committee_members.reject(&:marked_for_destruction?).map(&:user)
+      committee_members.map(&:user).uniq
     end
 
     def emails
-      committee_members.reject(&:marked_for_destruction?).select(&:active?).map(&:email).compact.join(', ')
+      committee_members.select(&:active?).map(&:email).compact.uniq.join(', ')
     end
 
     def children

data/app/models/effective/committee_agenda_item.rb

@@ -28,7 +28,7 @@ module Effective
     end
 
     scope :sorted, -> { order(:position) }
-    scope :deep,   -> { includes(:rich_text_body) }
+    scope :deep,   -> { includes(:committee, :committee_folder, :rich_text_body) }
 
     validates :title, presence: true, length: { maximum: 250 }
     validates :position, presence: true

data/app/models/effective/committee_member.rb

@@ -61,11 +61,8 @@ module Effective
     validates :user, presence: true
     validates :position, presence: true
 
-    validates :user_id, if: -> { user_id && user_type && committee_id && committee_type },
-      uniqueness: { scope: [:committee_id, :committee_type], message: 'already belongs to this committee' }
-
     validate(if: -> { start_on && end_on }) do
-      self.errors.add(:end_on, 'must be after start date') unless end_on > start_on
+      errors.add(:end_on, 'must be after start date') unless end_on > start_on
     end
 
     def to_s

data/app/views/effective/committees/_dashboard_agendas.html.haml

@@ -1,7 +1,7 @@
 - agenda_committees = current_user.committees.select(&:agenda_mode?)
 - upcoming = agenda_committees.flat_map { |c| Effective::CommitteeFolder.where(committee: c).upcoming_meetings.limit(5) }.sort_by(&:meeting_date).first(5)
 
-- if upcoming.any? || recent.any?
+- if upcoming.present?
   %h3 Upcoming Meetings
 
   - if upcoming.any?

data/app/views/effective/committees/volunteers_and_committees.html.haml

@@ -1,9 +1,9 @@
 = render('layout') do
   - @committees.each do |committee|
     %h3= committee
-    = committee.body.to_s
+    = committee.body
 
-    - members = committee.committee_members.select(&:active?).sort_by(&:to_s)
+    - members = committee.committee_members.select(&:active?).uniq(&:user_id)
     %ul
       - members.each do |member|
         %li

data/lib/effective_committees/version.rb

@@ -1,3 +1,3 @@
 module EffectiveCommittees
-  VERSION = '0.10.0'.freeze
+  VERSION = '0.10.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_committees
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-05-06 00:00:00.000000000 Z
+date: 2026-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails