<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>lib/active_record/named_scope/column_scope.rb</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -5,12 +5,12 @@ Selecting only specified columns can safe you resources and processing time.
 I wrote this plugin because I do this all the time and I don't want to cripple
 my code anymore.
 
-ColumnScope is build on top of NamedScope so it should work with Ruby on
+ColumnScope is build on top of NamedScope so it only works with Ruby on
 Rails 2.1+.
 
 == Examples:
 
-  Item.selects(:name).proxy_options[:select] # =&gt; '&quot;items&quot;.name'
+  Item.selects(:name).proxy_options[:select] # =&gt; '&quot;items&quot;.&quot;name&quot;'
 
   content = 'Foo Bar Baz'
 
@@ -31,4 +31,12 @@ Rails 2.1+.
 
 See test/column_scope_test.rb for more examples.
 
+== Install (rails):
+
+  $ script/plugin install git://github.com/boof/column_scope.git
+
+  # alternativly:
+  $ cd vendor/plugins
+  $ git clone git://github.com/boof/column_scope.git
+
 Copyright (c) 2008 Florian A&#223;mann, released under the MIT license</diff>
      <filename>README.rdoc</filename>
    </modified>
    <modified>
      <diff>@@ -1,10 +1,15 @@
-require &quot;#{ File.dirname __FILE__ }/lib/column_scope&quot;
-ActiveRecord::NamedScope::Scope.class_eval do
-  include ColumnScope::ScopeMethods
-end
+require &quot;#{ File.dirname __FILE__ }/lib/active_record/named_scope/column_scope&quot;
+
 ActiveRecord::Base.class_eval do
-  extend ColumnScope::ScopeMethods
+  extend ActiveRecord::NamedScope::ColumnScope::ScopeMethods
+
   def self.values
-    ColumnScope::ValueExtractor.new self, column_names
+    ActiveRecord::NamedScope::ColumnScope::
+        ValueExtractor.new self, column_names
   end
+
+end
+
+ActiveRecord::NamedScope::Scope.class_eval do
+  include ActiveRecord::NamedScope::ColumnScope::ScopeMethods
 end</diff>
      <filename>init.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,34 +1,29 @@
 require 'test_helper'
 
-module ColumnScopeTestHelper
-
-  def self.content
-    'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.'
-  end
-
-  class Item &lt; ActiveRecord::Base
-    named_scope :with_name, proc { |name|
-      { :conditions =&gt; ['name = ?', name] }
-    }
-  end
-  Item.create :name =&gt; 'foo', :value =&gt; 1, :content =&gt; content
-  Item.create :name =&gt; 'bar', :value =&gt; 2, :content =&gt; content
-  Item.create :name =&gt; 'baz', :value =&gt; 3, :content =&gt; content
-
+class Item &lt; ActiveRecord::Base
+  named_scope :named, proc { |n| { :conditions =&gt; ['name = ?', n] } }
 end
+CONTENT = 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.'
+
+Item.create :name =&gt; 'foo', :value =&gt; 1, :content =&gt; CONTENT
+Item.create :name =&gt; 'bar', :value =&gt; 2, :content =&gt; CONTENT
+Item.create :name =&gt; 'baz', :value =&gt; 3, :content =&gt; CONTENT
 
 class ColumnScopeTest &lt; ActiveSupport::TestCase
-  include ColumnScopeTestHelper
 
   test &quot;verify that items name column is selected&quot; do
-    assert Item.selects(:name).proxy_options[:select] == '&quot;items&quot;.&quot;name&quot;'
+    assert_equal '&quot;items&quot;.&quot;name&quot;', Item.selects(:name).proxy_options[:select]
   end
   test &quot;verify that items name column is selected with distinct&quot; do
-    assert Item.selects(:name).uniq!.proxy_options[:select] == 'DISTINCT &quot;items&quot;.&quot;name&quot;'
+    assert_equal 'DISTINCT &quot;items&quot;.&quot;name&quot;', Item.selects(:name).uniq!.proxy_options[:select]
   end
   test &quot;verify that items name and items value columns are selected&quot; do
-    assert Item.selects(:name, :value).proxy_options[:select] == '&quot;items&quot;.&quot;name&quot;,&quot;items&quot;.&quot;value&quot;'
-    assert Item.rejects(:id, :content, :timestamps).proxy_options[:select] == '&quot;items&quot;.&quot;name&quot;,&quot;items&quot;.&quot;value&quot;'
+    expectation = '&quot;items&quot;.&quot;name&quot;,&quot;items&quot;.&quot;value&quot;'
+    result1     = Item.selects(:name, :value).proxy_options[:select]
+    result2     = Item.rejects(:id, :content, :timestamps).proxy_options[:select]
+
+    assert_equal expectation, result1
+    assert_equal expectation, result2
   end
 
   test &quot;verify select only name results in an array with foo bar and baz&quot; do
@@ -48,27 +43,23 @@ class ColumnScopeTest &lt; ActiveSupport::TestCase
     assert_equal expectation, result2
   end
   test &quot;verify first distinct content is the lorem ipsum&quot; do
-    expectation = ColumnScopeTestHelper.content
+    expectation = CONTENT
     result      = Item.select_first :distinct_content
 
     assert_equal expectation, result
   end
   test &quot;verify find returns 3 and baz&quot; do
     expectation = ['baz', 3]
-    result1     = Item.with_name('baz').selects(:name, :value).values.first
-    result2     = Item.with_name('baz').rejects(:content, :id, :timestamps).values.first
-    result3     = Item.with_name('baz').select_first(:name__value)
+    result1     = Item.named('baz').selects(:name, :value).values.first
+    result2     = Item.named('baz').rejects(:content, :id, :timestamps).values.first
+    result3     = Item.named('baz').select_first(:name__value)
 
     assert_equal expectation, result1
     assert_equal expectation, result2
     assert_equal expectation, result3
   end
   test &quot;verify values returns values ordered&quot; do
-    expectation = [
-      ['foo', 1, ColumnScopeTestHelper.content],
-      ['bar', 2, ColumnScopeTestHelper.content],
-      ['baz', 3, ColumnScopeTestHelper.content]
-    ]
+    expectation = [['foo',1,CONTENT],['bar',2,CONTENT],['baz',3,CONTENT]]
     # select values and drop id and timestamps
     result = Item.values.all.each { |tpl| tpl.shift; tpl.pop; tpl.pop }
 </diff>
      <filename>test/column_scope_test.rb</filename>
    </modified>
    <modified>
      <diff>@@ -14,3 +14,5 @@ ActiveRecord::Base.connection.instance_eval do
     t.timestamps
   end
 end
+
+# ... maybe I should Stub a database Adapter?</diff>
      <filename>test/database_setup.rb</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>lib/column_scope.rb</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>fc0e372a5f4d76b56a5df019646a4e6d4b010f0b</id>
    </parent>
  </parents>
  <author>
    <name>Florian A&#223;mann</name>
    <email>florian.assmann@email.de</email>
  </author>
  <url>http://github.com/boof/column_scope/commit/2728648e199520be755207ff5f6c47b35b57b0a3</url>
  <id>2728648e199520be755207ff5f6c47b35b57b0a3</id>
  <committed-date>2009-01-02T02:07:38-08:00</committed-date>
  <authored-date>2009-01-02T02:07:38-08:00</authored-date>
  <message>Documentation and speed improvements.
 * fixed deprecated documentation
 * added install note to README.rdoc
 * moved ColumnScope into ActiveRecord::NamedScope
 * ValueExtractor uses send instead of calling procs
 * some minor tweaks</message>
  <tree>6167b2c2c9feaa95321cfbf1660b7914130810c4</tree>
  <committer>
    <name>Florian A&#223;mann</name>
    <email>florian.assmann@email.de</email>
  </committer>
</commit>
