organizations 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3c621c2b6bb7bd32be611858d49af9cb12cf9fa80bc0309d1227eafc819f8d8
-  data.tar.gz: c6028a9e424ab92432c44ae45bcba367d2a70eab56e3901314b1d5ff9b9b102f
+  metadata.gz: d3074b8343b80c07b277e1038a0181981274d1baaa7a52af85dd425edf09c5d3
+  data.tar.gz: 8529247495ba8c215216cf4acea19e7764b3e20ac16d997a1ca3b1ecc49f86d7
 SHA512:
-  metadata.gz: 267e7126501538f4461616e2be708f1b3696a016b428135337193dc8eaf24532a446a9c651b1989610862025298cbb4b9ab38b7f1d901b0fcb3f49f68d28ec56
-  data.tar.gz: 98d2dbd1b5369c247c6b8147c7472f0b53e74aa25c0c000b8458834ddff6e81f0ec6f3e599611f2ba8ef10b2dd88ddb5775fe15816cef13d57fb48a393ddce6a
+  metadata.gz: cb91ccb8891c4a17c65a85698c13c15931505c3d32688bc075402fdc8582dbd0ecaf2a6a0e581696f471991cd23344998563f340206855c9532352da22086fc7
+  data.tar.gz: 1e15480d1f104e0fddea00dd2509223a7b43707e9eccd8930461c24928c3c81338387ba6e95e6b093058ee1bed2741c15b8c2ba919d8ba2449cdd98388f54a62

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 ## [Unreleased]
 
+## [0.9.0] - 2026-10-25
+
+**The current organization, outside controllers.** One addition, opt-in to read. No migration is needed.
+
+### Added
+
+- **`Organizations::Current`**, an `ActiveSupport::CurrentAttributes` with one attribute, `organization`. The controller helpers set it whenever `current_organization` resolves or changes (a fallback, `switch_to_organization!`, `current_organization =`, a cleared session), so models and mailers in the same request can read it. Rails resets it before every request and every job. Session-based resolution is unchanged.
+- **`Organizations.with_organization(organization) { ... }`** for jobs, scripts and consoles. It sets the organization for the block, returns the block's value, and puts back the previous one afterwards, also when the block raises, so blocks nest.
+- The README documents the one seam for a host's tenant context (for example a PostgreSQL setting that row-level security policies read): prepend a module that overrides `Organizations::Current#organization=`, which every change goes through, and add a `resets` callback. Asked for by ReplyBrain, whose reused gems must be scoped per request and per job.
+
 ## [0.8.1] - 2026-10-25
 
 **The joins take the lock order of the destroys.** A patch release with one fix. No migration is needed.

data/README.md

@@ -2033,6 +2033,41 @@ Organizations.configure do |config|
 end
 ```
 
+### The current organization outside controllers
+
+Once `current_organization` resolves in a request, the same organization is in `Organizations::Current.organization`, readable from models, mailers and anything else that runs in that request. It follows switches, and Rails resets it when the request ends. Resolve it early, with `before_action :require_organization!` or a `current_organization` call, so the rest of the request sees it.
+
+Jobs, scripts and consoles have no controller, so they say which organization they act for:
+
+```ruby
+class SendInvoiceJob < ApplicationJob
+  def perform(invoice)
+    Organizations.with_organization(invoice.organization) do
+      InvoiceMailer.paid(invoice).deliver_now
+    end
+  end
+end
+```
+
+The block puts back whatever was current before, even when it raises, so blocks nest. Rails resets `Organizations::Current` before every job too.
+
+Every change goes through one writer, `Organizations::Current.organization=`, and every reset through its `resets` callbacks. Those two points are where to hook your own tenant context, such as the PostgreSQL setting your row-level security policies read (a `SET LOCAL` in the transaction they run in):
+
+```ruby
+# config/initializers/organizations.rb
+module TenantContext
+  def organization=(organization)
+    super
+    Tenant.enter(organization) # your code: remember it, set the database setting...
+  end
+end
+
+Organizations::Current.prepend(TenantContext)
+Organizations::Current.resets { Tenant.leave }
+```
+
+Session-based resolution is unchanged: the session still decides which organization is current, and `Organizations::Current` only publishes it.
+
 ### Integrates with acts_as_tenant
 
 For automatic query scoping, include the integration concern:

data/lib/organizations/controller_helpers.rb

@@ -38,7 +38,7 @@ module Organizations
     # Returns the current organization from session
     # Validates membership - if user was removed, auto-switches to next available org
     # Falls back to most recently joined org if no session set
-    # Memoized within the request
+    # Memoized within the request, and published as Organizations::Current.organization
     # @return [Organizations::Organization, nil]
     def current_organization
       return @_current_organization if defined?(@_current_organization)
@@ -58,7 +58,7 @@ module Organizations
       if org && user.is_member_of?(org)
         # Valid membership - use this org
         user._current_organization_id = org.id
-        @_current_organization = org
+        self.resolved_current_organization = org
       else
         # User was removed from this org OR no session set
         # Auto-switch to next available org (most recently joined)
@@ -68,9 +68,9 @@ module Organizations
         if fallback_org
           session[session_key] = fallback_org.id
           user._current_organization_id = fallback_org.id
-          @_current_organization = fallback_org
+          self.resolved_current_organization = fallback_org
         else
-          @_current_organization = nil
+          self.resolved_current_organization = nil
         end
       end
     end
@@ -459,7 +459,7 @@ module Organizations
 
       if org
         session[session_key] = org.id
-        @_current_organization = org
+        self.resolved_current_organization = org
         forget_current_membership!
 
         # Update user's context
@@ -578,13 +578,21 @@ module Organizations
     def clear_organization_session!
       session_key = Organizations.configuration.session_key
       session.delete(session_key)
-      @_current_organization = nil
+      self.resolved_current_organization = nil
       forget_current_membership!
 
       user = organizations_current_user
       user&.clear_organization_cache!
     end
 
+    # Memoizes the organization for this request and publishes it to
+    # Organizations::Current, so models and the host's tenant hook see the
+    # one the helpers resolved.
+    def resolved_current_organization=(organization)
+      @_current_organization = organization
+      Organizations::Current.organization = organization
+    end
+
     # Drop the memoized membership so the next current_membership call reads
     # it again for the organization that is current by then. Assigning nil
     # would not do: current_membership memoizes nil too, so it would keep

data/lib/organizations/current.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require "active_support/current_attributes"
+
+module Organizations
+  # The organization the current request or job acts for.
+  #
+  # The controller helpers set it whenever `current_organization` resolves
+  # or changes (a switch, a fallback, a sign-out from the organization).
+  # Jobs and scripts set it with `Organizations.with_organization`. Rails
+  # resets it before every request and every job, so a value never leaks
+  # from one to the next.
+  #
+  #   Organizations::Current.organization # => #<Organizations::Organization id: 42>
+  #
+  # It is the one place a host hooks its own tenant context, such as a
+  # PostgreSQL setting that row-level security policies read: every change
+  # goes through `organization=`, and every reset through `resets`.
+  #
+  #   module TenantContext
+  #     def organization=(organization)
+  #       super
+  #       Tenant.enter(organization)
+  #     end
+  #   end
+  #
+  #   Organizations::Current.prepend(TenantContext)
+  #   Organizations::Current.resets { Tenant.leave }
+  class Current < ActiveSupport::CurrentAttributes
+    attribute :organization
+  end
+end

data/lib/organizations/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Organizations
-  VERSION = "0.8.1"
+  VERSION = "0.9.0"
 end

data/lib/organizations.rb

@@ -112,6 +112,7 @@ module Organizations
   autoload :ActsAsTenantIntegration, "organizations/acts_as_tenant_integration"
   autoload :TestHelpers, "organizations/test_helpers"
   autoload :CurrentUserResolution, "organizations/current_user_resolution"
+  autoload :Current, "organizations/current"
   autoload :InvitationAcceptanceResult, "organizations/invitation_acceptance_result"
   autoload :InvitationAcceptanceFailure, "organizations/invitation_acceptance_failure"
   autoload :EmailNormalizer, "organizations/email_normalizer"
@@ -213,6 +214,21 @@ module Organizations
       raise
     end
 
+    # Runs the block with `organization` as the current organization, then
+    # puts back whatever was current before, even if the block raises. For
+    # jobs, scripts and consoles, where no controller resolves one.
+    #
+    # @example
+    #   Organizations.with_organization(invoice.organization) do
+    #     InvoiceMailer.paid(invoice).deliver_now
+    #   end
+    #
+    # @param organization [Organizations::Organization, nil]
+    # @return the block's value
+    def with_organization(organization, &)
+      Current.set(organization: organization, &)
+    end
+
     # Reset configuration to defaults
     # Primarily used in tests
     def reset_configuration!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: organizations
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - rameerez
@@ -155,6 +155,7 @@ files:
 - lib/organizations/callbacks.rb
 - lib/organizations/configuration.rb
 - lib/organizations/controller_helpers.rb
+- lib/organizations/current.rb
 - lib/organizations/current_user_resolution.rb
 - lib/organizations/email_normalizer.rb
 - lib/organizations/engine.rb