userlist-rails 0.6.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa029bf122f3f49769fb1a618bb41a1d6da63994bceb98e214a92cdd36f80a30
-  data.tar.gz: '0097422a814d7321137ea008846e37999355f065bf016ac8fe3e7b9be9fc2466'
+  metadata.gz: b37f407aa0fafadcfd37cece33e49bb05d04e2891b442717f167e0f0391f1c99
+  data.tar.gz: e69bde3e0e95de200a7196bf10c30abd5f68be569fec68af7ea756b542f36017
 SHA512:
-  metadata.gz: a61a015fa3f0b673766568a6093698163eb5a1cee9dd10217c071b487f6a88c64acaefc28ee85ef432336e8e51aa5d189746fb78c395cf347cdfdb194bae6119
-  data.tar.gz: c8d6c754bbe733e2863aeed4708299740b9fca1e6ac1461a9731a45a60b90cd621b2aeecf85a2f8917e20889b5c9beeefd9f14fb080536a85a37436bd2db0ae5
+  metadata.gz: 2b103ab51d54698367fe4d30b115dbc9afbaac61e6a35afa87790892a8f993c205dfc2bea47818c0719a84101743126c24aa1d2facc49fbf35fbc9d362493f49
+  data.tar.gz: c5882c73da7629605644ee62c8562d42fdb5339338020adbcfeec85143c3b98a281fafcfc342eeff16ec25cf317b466341f7fb1fd6749f34cb514e83258de386

data/.github/workflows/test.yml

@@ -5,13 +5,14 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - 2.7
           - 3.0
           - 3.1
           - 3.2
+          - 3.3
+          - 3.4
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}

data/CHANEGLOG.md

@@ -1,5 +1,12 @@
 # Userlist for Ruby on Rails Changelog
 
+## Unreleased (main)
+
+## v1.0.0 (2025-04-08)
+
+- Fix detection of relationships when there are multiple associations between users and companies
+- Register Userlist::DeliveryMethod when it's available
+
 ## v0.6.2 (2023-11-30)
 
 - Upgrades dependencies
@@ -11,7 +18,7 @@
 ## v0.6.0 (2021-05-14)
 
 - Improves handling of relationships across different setups (1:1, 1:n, and n:m)
-- Automatically call userlist_* methods on models in transforms
+- Automatically call userlist\_\* methods on models in transforms
 
 ## v0.5.3 (2021-04-15)
 
@@ -48,7 +55,6 @@
 - Use Userlist::Push::Resources to transform payloads
 - Upgrades dependencies
 
-
 ## v0.2.2 (2019-03-18)
 
 - Adds support for Ruby 2.2

data/lib/userlist/rails/extensions/user.rb

@@ -17,6 +17,14 @@ module Userlist
           base.extend(ClassMethods)
         end
 
+        def identifier
+          super if !payload.respond_to?(:destroyed?) || !payload.destroyed?
+        end
+
+        def identifiers
+          super if payload.respond_to?(:destroyed?) && payload.destroyed?
+        end
+
         def push?
           super && (!payload.respond_to?(:push?) || payload.push?)
         end

data/lib/userlist/rails/railtie.rb

@@ -36,7 +36,7 @@ module Userlist
       end
 
       initializer 'userlist.helpers' do
-        ActiveSupport.on_load :action_view do
+        ActiveSupport.on_load(:action_view) do
           include Userlist::Rails::Helpers
         end
       end
@@ -75,6 +75,12 @@ module Userlist
           end
         end
       end
+
+      initializer 'userlist.delivery_method', before: 'action_mailer.set_configs' do
+        ActiveSupport.on_load(:action_mailer) do
+          ActionMailer::Base.add_delivery_method(:userlist, Userlist::DeliveryMethod) if defined?(Userlist::DeliveryMethod)
+        end
+      end
     end
   end
 end

data/lib/userlist/rails/transform.rb

@@ -27,11 +27,15 @@ module Userlist
       end
 
       def push?
-        (!model.respond_to?(:userlist_push?) || model.userlist_push?)
+        !model.respond_to?(:userlist_push?) || model.userlist_push?
       end
 
       def delete?
-        (!model.respond_to?(:userlist_delete?) || model.userlist_delete?)
+        !model.respond_to?(:userlist_delete?) || model.userlist_delete?
+      end
+
+      def destroyed?
+        model.try(:destroyed?)
       end
 
     private

data/lib/userlist/rails/transforms/user.rb

@@ -12,6 +12,7 @@ module Userlist
             :identifier,
             :properties,
             :relationships,
+            :identifiers,
             :email,
             :signed_up_at
           ]
@@ -33,6 +34,10 @@ module Userlist
           model.try(:created_at)
         end
 
+        def default_identifiers
+          [{ scope: 'custom', identifier: self[:identifier] }]
+        end
+
       private
 
         def build_relationship(record)

data/lib/userlist/rails/version.rb

@@ -1,5 +1,5 @@
 module Userlist
   module Rails
-    VERSION = '0.6.2'.freeze
+    VERSION = '1.0.0'.freeze
   end
 end

data/lib/userlist/rails.rb

@@ -11,6 +11,12 @@ module Userlist
       :userlist_user
     ].freeze
 
+    REFLECTION_PRIORITY = [
+      ActiveRecord::Reflection::ThroughReflection,
+      ActiveRecord::Reflection::HasManyReflection,
+      ActiveRecord::Reflection::HasOneReflection
+    ].freeze
+
     def self.with_current_user(user)
       Thread.current[:userlist_current_user] = user
       yield
@@ -56,7 +62,10 @@ module Userlist
     def self.find_reflection(from, to)
       return unless from && to
 
-      from.reflect_on_all_associations.find { |r| r.class_name == to.to_s }
+      from
+        .reflect_on_all_associations
+        .sort_by { |r| REFLECTION_PRIORITY.index(r.class) || REFLECTION_PRIORITY.length }
+        .find { |r| r.class_name == to.to_s }
     end
 
     def self.find_association_between(from, to)
@@ -75,11 +84,13 @@ module Userlist
       model.instance_variable_set(:@userlist_callbacks_registered, true)
     end
 
-    def self.setup_callback(type, model, scope, method)
+    def self.setup_callback(type, model, scope, default_method)
       return unless callback_method = [:after_commit, :"after_#{type}"].find { |m| model.respond_to?(m) }
 
       callback = lambda do
         begin
+          method = try(:"userlist_#{type}_behavior") || default_method
+
           relation = Userlist::Push.public_send(scope)
           relation.public_send(method, self)
         rescue Userlist::Error => e

data/userlist-rails.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activesupport', '>= 5.0'
   spec.add_dependency 'railties', '>= 5.0'
-  spec.add_dependency 'userlist', '~> 0.8', '>= 0.8.1'
+  spec.add_dependency 'userlist', '~> 1.0'
 
   spec.metadata = { 'rubygems_mfa_required' => 'true' }
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: userlist-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Benedikt Deicke
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-30 00:00:00.000000000 Z
+date: 2025-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,21 +43,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.1
-description:
+        version: '1.0'
 email:
 - benedikt@userlist.com
 executables: []
@@ -102,7 +94,6 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -117,8 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.21
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Rails integration for Userlist
 test_files: []