yfactorial-utility_scopes 0.2.0 → 0.2.1

data/CHANGELOG

@@ -1,3 +1,8 @@
+0.2.1
+
+* Fixed except named scope not correctly determining its base class
+  (as reported by Marcus Crafter: http://github.com/crafterm)
+
 0.2.0
 
 * Added except scope from danielmorrison (http://github.com/danielmorrison)

data/README.textile

@@ -57,12 +57,14 @@ h3. With (eager-loading)
 The @with@ scope let's you eager load your model associations.  So instead of having to invoke @find(:all, :include => [:association1, :association2])@ just pass these association names into
 the @with@ named scope:
 
+  <pre><code>
   # Get all articles and eager-load their comments, each comments' user, article contributors
   # and the article author.
   Article.with({ :comments => :user }, :contributors, :author)
   
   # Get all articles and eager-load their comments
   Article.with(:comments)
+  </code></pre>
 
 Again, just pass in the same arguments into @eager@ that you would pass in as the @:include@ value to "ActiveRecord::Base#find":http://api.rubyonrails.com/classes/ActiveRecord/Base.html#M001298
 
@@ -94,16 +96,18 @@ will be used:
 If you would like to specify a different default value you can do so on a per class basis
 using @default_limit@:
 
+  <pre><code>
   # Set the default limit to be 15  
   class Article < ActiveRecord::Base
     default_limit 15
   end
   
   Article.limited  # Get the first 15 articles
+  </code></pre>
   
 h3. Ordered
 
-_Note: the @ordered@ scope cannot be chained with any other @ordered@ clauses_
+_Note: the @ordered@ scope cannot be chained with any other @order@ clauses_
 
 @ordered@ lets you dynamically specify the ordering of your result set.  If no
 arguments are given it will default to @created_at DESC@:
@@ -115,6 +119,7 @@ arguments are given it will default to @created_at DESC@:
 If you would like to specify a different default sort order you can do so on a per class basis
 using @ordered_by@:
 
+  <pre><code>
   # Set the default order to be "published_at DESC"
   class Article < ActiveRecord::Base
     ordered_by 'published_at DESC'
@@ -122,6 +127,7 @@ using @ordered_by@:
  
   Article.ordered              # Get all articles ordered by "published_at DESC"
   Article.ordered("rank ASC")  # Get all articles ordered by "rank ASC"
+  </code></pre>
 
 The current default ordering for a class can always be accessed via @default_ordering@:
 

data/lib/utility_scopes/except.rb

@@ -1,9 +1,30 @@
 module UtilityScopes
   module Except
     
-    def self.included(within)
-      
+    def self.included(within)      
       within.class_eval do
+        
+        # Give every class the ability to add to itself the except named
+        # scope
+        extend ClassMethods
+        
+        # And automatically do so for all its subclasses
+        def self.inherited_with_except_scope_hook(child)
+          inherited_without_except_scope_hook(child)
+          child.attach_except_utility_scope
+        end
+        class << self
+          alias_method_chain :inherited, :except_scope_hook
+        end
+      end
+    end
+    
+    module ClassMethods
+      
+      # Must be a class method called directly on AR::Base subclasses
+      # so named_scope knows who its base class, and thus, table_name
+      # and primary_key are.
+      def attach_except_utility_scope
       
         # Allow easy rejection of items. 
         # Can take an a single id or ActiveRecord object, or an array of them
@@ -14,8 +35,7 @@ module UtilityScopes
           # nil or empty array causes issues here with mysql
           item_or_list.blank? ? {} : {:conditions => ["#{quoted_table_name}.#{primary_key} NOT IN (?)", item_or_list]}
         }
-        
-      end
+      end      
     end
   end
 end

data/lib/utility_scopes/ordered.rb

@@ -1,3 +1,4 @@
+#TODO: use base_class to get rid off duplication?
 module UtilityScopes
   module Ordered
     

data/spec/except_spec.rb

@@ -5,8 +5,8 @@ describe "except scope" do
   before do
     uses_fixture(:article)
     # Stub these so it doesn't try to hit the (non-existant) database
-    ActiveRecord::Base.stub!(:quoted_table_name).and_return('articles')
-    ActiveRecord::Base.stub!(:primary_key).and_return('id')
+    Article.stub!(:quoted_table_name).and_return("'articles'")
+    Article.stub!(:primary_key).and_return('id')
   end
   
   it "should not change the scope with nil" do
@@ -15,11 +15,11 @@ describe "except scope" do
   
   it "should return all items except the one specified" do
     item = 123
-    Article.except(item).proxy_options.should == {:conditions => ['articles.id NOT IN (?)', item]}
+    Article.except(item).proxy_options.should == {:conditions => ["'articles'.id NOT IN (?)", item]}
   end
   
   it "should return all items except ones in the list specified" do
     list = [123, 456, 7]
-    Article.except(list).proxy_options.should == {:conditions => ['articles.id NOT IN (?)', list]}
+    Article.except(list).proxy_options.should == {:conditions => ["'articles'.id NOT IN (?)", list]}
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: yfactorial-utility_scopes
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Ryan Daigle
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-21 00:00:00 -07:00
+date: 2008-09-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency