Permalink
Browse files

merging scope additions into model additions since it's basically the…

… same behavior
  • Loading branch information...
1 parent e3f70f5 commit 610c8e1c08123a6dbe179d6466220e9625179f0c @ryanb committed Aug 28, 2008
Showing with 4 additions and 14 deletions.
  1. +0 −1 lib/scope_builder.rb
  2. +4 −0 lib/scope_builder/model_additions.rb
  3. +0 −13 lib/scope_builder/scope_additions.rb
View
@@ -1,4 +1,3 @@
$:.unshift(File.dirname(__FILE__))
require 'scope_builder/model_additions'
-require 'scope_builder/scope_additions'
require 'scope_builder/builder'
@@ -15,3 +15,7 @@ class ActiveRecord::Base
class ActiveRecord::Associations::AssociationProxy
include ScopeBuilder::ModelAdditions
end
+
+class ActiveRecord::NamedScope::Scope
+ include ScopeBuilder::ModelAdditions
+end
@@ -1,13 +0,0 @@
-module ScopeBuilder
- module ScopeAdditions
- def scope_builder
- builder = Builder.new(self)
- yield(builder) if block_given?
- builder
- end
- end
-end
-
-class ActiveRecord::NamedScope::Scope
- include ScopeBuilder::ScopeAdditions
-end

0 comments on commit 610c8e1

Please sign in to comment.