effective_polls 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7aad1bd9e73e91f2daafec85f96ee0edadc5d9a618f46e215ca8fb400cb583c
-  data.tar.gz: 22ca5d2826cd93b308f639bf916232e251d67a2d920620355527637803e33fb5
+  metadata.gz: '0866cfca4a02dfa03072115499d8170354a405a59dc5b3f7c41fa0cd47572488'
+  data.tar.gz: 1c281a7ef70e127dfa155011d1be9d5976bde1750b09ef7d30ae3ae72d549fbc
 SHA512:
-  metadata.gz: fbe536eb8f006644ea3ad63ac1f3686df9738b3632f1057ed0e7f3936024ccbc13a2021c9d7f3a9605903cfe60d588dc1a9c9184de7b4c948b40f014ad5c37f2
-  data.tar.gz: dd50f7920f207a8b246849f937a28e9fd15901c1aefdb5accd29670583f0fd6f206c3ff10ef831598d10d6580f30622b4c19f6235d55f40d3dea36b95f3fafb2
+  metadata.gz: 7d754ccfdbd61b07fbd358b2e32b71ba3d04eab8baffc35d7c8d95267f08cbbbc469812bda3661ddab70173fbe08825472185fe5ddbeeb4f88c300835ebc0839
+  data.tar.gz: c66bb05e2cc63164b889591e5239b58a094e803b64c406ceef6d10ff575d1a218d10751b66d20ff639891e8c242d5e1cb0ac3e457ae513b3d4172c27bd17b630

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,12 @@ module EffectivePollsUser
       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 +55,21 @@ 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(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.2'
 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.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-26 00:00:00.000000000 Z
+date: 2023-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails