Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 5 additions & 21 deletions lib/active_model/relation/scoping.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,33 +7,17 @@ module Scoping

module ClassMethods
def current_scope
ScopeRegistry.current_scope(self)
Registry.scopes[name]
end

def current_scope=(value)
ScopeRegistry.set_current_scope(self, value)
Registry.scopes.store(name, value)
end
end

class ScopeRegistry
class << self
delegate :current_scope, :set_current_scope, to: :instance

def instance
ActiveSupport::IsolatedExecutionState[:active_model_scope_registry] ||= new
end
end

def initialize
@current_scope = {}
end

def current_scope(model)
@current_scope[model.name]
end

def set_current_scope(model, value)
@current_scope[model.name] = value
class Registry
def self.scopes
ActiveSupport::IsolatedExecutionState[:active_model_relation_scope_registry] ||= {}
end
end
end
Expand Down