columns_on_demand 2.0.1 → 3.0.0

data/README

@@ -21,8 +21,10 @@ Compatibility
 
 Supports mysql, mysql2, postgresql, and sqlite3.
 
-Currently tested against Rails 2.3.14, 3.0.17, 3.1.8, and 3.2.8.  Note that
-3.0 and 3.1 have ActiveRecord regressions that will affect sqlite users.
+Currently tested against Rails 3.2.13 and 3.1.8, on Ruby 1.8.7 and 2.0.0p0.
+Was also tested compatible with 2.3.14, 3.0.17.
+
+Note that 3.0 and 3.1 have ActiveRecord regressions that will affect sqlite users.
 
 
 Example
@@ -42,4 +44,4 @@ class Example
 end
 
 
-Copyright (c) 2008-2012 Will Bryant, Sekuda Ltd, released under the MIT license
+Copyright (c) 2008-2013 Will Bryant, Sekuda Ltd, released under the MIT license

data/lib/columns_on_demand.rb

@@ -7,20 +7,6 @@ module ColumnsOnDemand
       extend ClassMethods
       include InstanceMethods
 
-      if ActiveRecord::VERSION::MAJOR > 2
-        relation # set up @relation
-        class << @relation # but always modify @relation, not the temporary returned by .relation if there's a where(type condition)
-          def build_select_with_columns_on_demand(arel, selects)
-            unless selects.empty?
-              build_select_without_columns_on_demand(arel, selects)
-            else
-              arel.project(Arel::SqlLiteral.new(@klass.default_select(true)))
-            end
-          end
-          alias_method_chain :build_select, :columns_on_demand
-        end
-      end
-      
       class <<self
         unless ActiveRecord.const_defined?(:AttributeMethods) &&
                ActiveRecord::AttributeMethods::const_defined?(:Serialization) &&
@@ -140,6 +126,20 @@ module ColumnsOnDemand
       end
     end
   end
+
+  module RelationMethods
+    def build_select_with_columns_on_demand(arel, selects)
+      if selects.empty?
+        build_select_without_columns_on_demand(arel, default_select(true))
+      else
+        build_select_without_columns_on_demand(arel, selects)
+      end
+    end
+  end
 end
 
 ActiveRecord::Base.send(:extend, ColumnsOnDemand::BaseMethods)
+if ActiveRecord.const_defined?(:Relation)
+  ActiveRecord::Relation.send(:include, ColumnsOnDemand::RelationMethods)
+  ActiveRecord::Relation.alias_method_chain :build_select, :columns_on_demand
+end

data/lib/columns_on_demand/version.rb

@@ -1,3 +1,3 @@
 module ColumnsOnDemand
-  VERSION = '2.0.1'
+  VERSION = '3.0.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: columns_on_demand
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 7
   prerelease: 
   segments: 
-  - 2
+  - 3
   - 0
-  - 1
-  version: 2.0.1
+  - 0
+  version: 3.0.0
 platform: ruby
 authors: 
 - Will Bryant
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-18 00:00:00 Z
+date: 2013-04-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord