effective_polls 0.5.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7aad1bd9e73e91f2daafec85f96ee0edadc5d9a618f46e215ca8fb400cb583c
-  data.tar.gz: 22ca5d2826cd93b308f639bf916232e251d67a2d920620355527637803e33fb5
+  metadata.gz: aeea63d1d031f9751443c64f3113cf04f92cb564df3b5e2a96d67f28fbc921b6
+  data.tar.gz: f86d75f535b04ccbe7aba717a28a30f6f2e2c984b12217d17d5835a51f74c55c
 SHA512:
-  metadata.gz: fbe536eb8f006644ea3ad63ac1f3686df9738b3632f1057ed0e7f3936024ccbc13a2021c9d7f3a9605903cfe60d588dc1a9c9184de7b4c948b40f014ad5c37f2
-  data.tar.gz: dd50f7920f207a8b246849f937a28e9fd15901c1aefdb5accd29670583f0fd6f206c3ff10ef831598d10d6580f30622b4c19f6235d55f40d3dea36b95f3fafb2
+  metadata.gz: ac6766f7c1c99724ab5b531e6fc114eac48f5489d8e2864e59b96c3e36b8950cc9c47d8fd3b661490a790b8183c36bacee6a8ea7890128c8de7586917f165e3d
+  data.tar.gz: 917faf44d9918eb10b2dacff690d3fb624c2e150aead4a32d20dfc4a3c677c092277d34a7635da2c1df952f2344af7148c4e2e179a0bbf5fe58e17358f617802

data/app/models/concerns/effective_polls_user.rb

@@ -21,6 +21,9 @@ module EffectivePollsUser
 
   # The list of all available audience scopes for the Poll Selected Users
   def poll_audience_scopes
+  end
+
+  def default_poll_audience_scopes
     scopes = [
       ['All Users', :all]
     ]
@@ -39,6 +42,18 @@ module EffectivePollsUser
       end
     end
 
+    if self.class.try(:effective_committees_user?)
+      scopes += Effective::Committee.sorted.map do |committee|
+        ["All #{committee} committee members", "with_committee_id_#{committee.id}"]
+      end
+    end
+
+    if self.class.try(:acts_as_role_restricted?)
+      scopes += EffectiveRoles.roles.map do |role|
+        ["All #{role} role users", "with_role_id_#{role}"]
+      end
+    end
+
     scopes
   end
 
@@ -46,18 +61,23 @@ module EffectivePollsUser
   def poll_audience_scope(value)
     collection = self.class.respond_to?(:unarchived) ? self.class.unarchived : self.class
 
-    # If we respond to the fill value, call it
-    return collection.send(value) if collection.respond_to?(value)
-
     # Parse the value
     name, id = value.to_s.split('_id_')
 
     case name.try(:to_sym)
     when :members_with_category
-      collection.members_with_category(EffectiveMemberships.Category.find(id))
-    else
-      raise("unknown poll_audience_scope for #{value}")
+      return collection.members_with_category(EffectiveMemberships.Category.find_by_id(id))
+    when :with_committee
+      return collection.with_committee(Effective::Committee.find_by_id(id))
+    when :with_role
+      return collection.with_role(id)
     end
+
+    # Otherwise we don't know what this scope is
+    raise("unknown poll_audience_scope for #{value}. Expected #{self.class.name} to have a scope named #{value}") unless collection.respond_to?(value) 
+
+    # If we respond to the fill value, call it
+    collection.send(value) 
   end
 
   def available_polls

data/lib/effective_polls/version.rb

@@ -1,3 +1,3 @@
 module EffectivePolls
-  VERSION = '0.5.1'
+  VERSION = '0.5.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_polls
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-26 00:00:00.000000000 Z
+date: 2023-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails