audiences 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60a415497f4cea4f99f5581c92559b60e137f5cf54b3d57267cbd3ead22a72d0
-  data.tar.gz: 1039307cacefbf390c9cfd94d7eb6a31dc4c9ed1ed27290429c3a5045f1a9b86
+  metadata.gz: 8f83dd42249d90e09a66c7f11b5adb821e7f0fbc3add8089f075fe2668e79d35
+  data.tar.gz: 351a6676df1a297b691842e06fc18b721d3581a9bdd0ea6101bce2ed81cee06e
 SHA512:
-  metadata.gz: 1a45b7985d7c8e8ee3a8d0c224b254a61a599af150947f3f6b6ebc06eea0157415f9a1e50e21e33dc6121cd7421759c2107d5d70b61f57e4055b0d2d73523541
-  data.tar.gz: 91bcdc28abc2a07481a5f3f7b77ad8a7f3765c140e4afc2e248e856333537b2502a91ea7f8243f1a02ceb8857e3c6487bbc00667f82ce1616e32a817cda3fc11
+  metadata.gz: f90802d28319f4cbc95a8be9f9f2e68115ac7142ab6fcbf4c9be0437a14a2e57b6d58632e1befeb37b19ba1b2ce9de1d6f8fc2d9b674b120ee51d240e47140dd
+  data.tar.gz: d70f080cdad97a5bdfc31b701d7659a300dbeeef3c380371b1d91c7198a30c4ff9899c5106a0eb2af972e8b6d53e77ab718fb962c6f8734c960375394ffa60c6

data/docs/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Unreleased
 
+# Version 1.3.0 (2024-09-03)
+
+- Filter out inactive users by default [#382](https://github.com/powerhome/audiences/pull/382)
+
 # Version 1.2.2 (2024-08-21)
 
 - Permit configured resource attributes [#375](https://github.com/powerhome/audiences/pull/375)

data/lib/audiences/configuration.rb

@@ -46,7 +46,8 @@ module Audiences
   # @see `resource`.
   #
   config_accessor :resources do
-    { Users: Scim::Resource.new(type: :Users, attributes: ["photos" => %w[type value]]) }
+    { Users: Scim::Resource.new(type: :Users, attributes: ["active", { "photos" => %w[type value] }],
+                                filter: "active eq true") }
   end
 
   #

data/lib/audiences/scim/resource.rb

@@ -3,17 +3,20 @@
 module Audiences
   module Scim
     class Resource
-      attr_accessor :options, :type, :attributes
+      attr_accessor :options, :type, :attributes, :filter
 
-      def initialize(type:, attributes: [], **options)
+      def initialize(type:, attributes: [], filter: nil, **options)
         @type = type
         @options = options
         @attributes = ["id", "externalId", "displayName", *attributes]
+        @filter = filter
       end
 
       def query(**options)
+        options_filter = options.delete(:filter)
         ResourcesQuery.new(Scim.client, resource: self,
                                         attributes: scim_attributes,
+                                        filter: merged_filter(options_filter),
                                         **@options, **options)
       end
 
@@ -29,6 +32,13 @@ module Audiences
           end
         end.join(",")
       end
+
+      def merged_filter(filter)
+        return @filter unless filter
+        return filter unless @filter
+
+        "(#{@filter}) and (#{filter})"
+      end
     end
   end
 end

data/lib/audiences/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Audiences
-  VERSION = "1.2.2"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: audiences
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Carlos Palhares
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-21 00:00:00.000000000 Z
+date: 2024-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails