organizations 0.8.1 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3c621c2b6bb7bd32be611858d49af9cb12cf9fa80bc0309d1227eafc819f8d8
-  data.tar.gz: c6028a9e424ab92432c44ae45bcba367d2a70eab56e3901314b1d5ff9b9b102f
+  metadata.gz: bd2f1f7295aa0ba982150d0f5917b5ad002b9115fabd0bb4b645e8c5d5c68f15
+  data.tar.gz: 6821a5a24efe57ef744118ea038f75fc04c703e5528bb3170ffa81536738a3f6
 SHA512:
-  metadata.gz: 267e7126501538f4461616e2be708f1b3696a016b428135337193dc8eaf24532a446a9c651b1989610862025298cbb4b9ab38b7f1d901b0fcb3f49f68d28ec56
-  data.tar.gz: 98d2dbd1b5369c247c6b8147c7472f0b53e74aa25c0c000b8458834ddff6e81f0ec6f3e599611f2ba8ef10b2dd88ddb5775fe15816cef13d57fb48a393ddce6a
+  metadata.gz: 376ad9c58f8888e9120f9232836b633ce847e1fb900dca2f1968b6052881eaa05039c3e606ad1a346e37ec5823b7c77dd2d70a5fe68f653de7c89b11b27e232e
+  data.tar.gz: 451933a3d39140138e7690c071c9d9becfa6b57fd79aded5bc6ec8eae88f4b7d37b3e718d10afd9709e68ed3ffb8a4037d313807f92f3f98d92f263b29132db1

data/CHANGELOG.md

@@ -1,4 +1,18 @@
-## [Unreleased]
+## [0.9.1] - 2026-11-09
+
+### Fixed
+
+- `max_organizations` holds under concurrency. `create_organization!` counted the user's owned organizations before its transaction, so two creates at the same moment could both count below the limit and both insert, and a host that sells organization slots gave away an extra one. When the limit is set, the count now runs inside the transaction under a lock on the user's row (the gem's lock order: the user row first), so the second create waits and then raises `OrganizationLimitReached`. That count skips the query cache, so a count read earlier in the same request cannot stand in for it. Without a limit nothing changes and nothing is locked.
+
+## [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
 

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/models/concerns/has_organizations.rb

@@ -488,15 +488,12 @@ module Organizations
             attributes = name_or_attributes.is_a?(Hash) ? name_or_attributes : { name: name_or_attributes }
             Organizations::Organization.ensure_personal_owner_is_owner!(attributes, self)
 
-            # Check max organizations limit
             settings = self.class.organization_settings
             max = settings[:max_organizations]
-            if max && owned_organizations.count >= max
-              raise OrganizationLimitReached, Organizations.t(:"errors.organization_limit_reached", max: max)
-            end
 
             org = nil
             ActiveRecord::Base.transaction do
+              ensure_below_organization_limit!(max) if max
               org = Organizations::Organization.create!(attributes)
 
               Organizations::Membership.create!(
@@ -757,6 +754,18 @@ module Organizations
 
           private
 
+          # The limit is counted under a lock on this user's row, so two
+          # concurrent creates cannot both count below it and both insert.
+          # A user row first keeps the gem's lock order (RowLocks). Uncached:
+          # a count read earlier in the request must not stand in for the one
+          # taken under the lock.
+          def ensure_below_organization_limit!(max)
+            self.class.unscoped.where(self.class.primary_key => id).lock.pick(self.class.primary_key)
+            return if ActiveRecord::Base.uncached { owned_organizations.count } < max
+
+            raise OrganizationLimitReached, Organizations.t(:"errors.organization_limit_reached", max: max)
+          end
+
           def create_personal_organization_if_configured
             # Check condition inside callback (not via `if:` option) to ensure
             # proper evaluation of instance state, including singleton methods

data/lib/organizations/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Organizations
-  VERSION = "0.8.1"
+  VERSION = "0.9.1"
 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,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: organizations
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.1
 platform: ruby
 authors:
 - rameerez
 bindir: exe
 cert_chain: []
-date: 2026-10-25 00:00:00.000000000 Z
+date: 2026-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -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