Skip to content

Commit

Permalink
Fixes some naming conventions on the default_scope change
Browse files Browse the repository at this point in the history
  • Loading branch information
Daniel Neighman committed Jul 15, 2008
1 parent 74dc532 commit 09783ab
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions lib/dm-core/scope.rb
Expand Up @@ -3,10 +3,10 @@ module Scope
Model.append_extensions self

# @api private
def default_scope(repo = nil)
repo = self.default_repository_name if repo == :default || repo.nil?
def default_scope(repository_name = nil)
repository_name = self.default_repository_name if repository_name == :default || repository_name.nil?
@default_scope ||= Hash.new{|h,k| h[k] = {}}
@default_scope[repo]
@default_scope[repository_name]
end

# @api private
Expand Down Expand Up @@ -50,9 +50,9 @@ def scope_stack

# @api private
def default_scope_for_query(query)
name = query.repository.name
default_name = query.model.default_repository_name
self.default_scope(default_name).merge(self.default_scope(name))
repository_name = query.repository.name
default_repository_name = query.model.default_repository_name
self.default_scope(default_repository_name).merge(self.default_scope(repository_name))
end
end # module Scope
end # module DataMapper

0 comments on commit 09783ab

Please sign in to comment.