Fixed enumerable for ActiveRecord 3.1

Andrew Kane
1 parent dc8fc08d
Showing 5 changed files with 48 additions and 30 deletions Show diff stats
lib/groupdate.rb
lib/groupdate/active_record.rb
lib/groupdate/enumerable.rb
lib/groupdate/scopes.rb
test/enumerable_test.rb
 require "active_support/time"
 require "groupdate/version"
+
+module Groupdate
+  FIELDS = [:second, :minute, :hour, :day, :week, :month, :year, :day_of_week, :hour_of_day]
+  METHODS = FIELDS.map{|v| :"group_by_#{v}" }
+
+  mattr_accessor :week_start, :day_start, :time_zone
+  self.week_start = :sun
+  self.day_start = 0
+end
+
 require "groupdate/magic"
 begin
   require "active_record"
@@ -8,9 +18,3 @@ rescue LoadError
 end
 require "groupdate/active_record" if defined?(ActiveRecord)
 require "groupdate/enumerable"
-
-module Groupdate
-  mattr_accessor :week_start, :day_start, :time_zone
-  self.week_start = :sun
-  self.day_start = 0
-end
@@ -3,6 +3,25 @@ require &quot;groupdate/scopes&quot;
 ActiveRecord::Base.send(:extend, Groupdate::Scopes)
+module ActiveRecord
+  class Relation
+
+    if ActiveRecord::VERSION::MAJOR == 3 and ActiveRecord::VERSION::MINOR < 2
+
+      def method_missing_with_hack(method, *args, &block)
+        if Groupdate::METHODS.include?(method)
+          scoping { @klass.send(method, *args, &block) }
+        else
+          method_missing_without_hack(method, *args, &block)
+        end
+      end
+      alias_method_chain :method_missing, :hack
+
+    end
+
+  end
+end
+
 # hack for **unfixed** rails issue
 # https://github.com/rails/rails/issues/7121
 module ActiveRecord
 module Enumerable
-  # skip due to ActiveRecord bug
-  unless defined?(ActiveRecord) and ActiveRecord::VERSION::MAJOR == 3 and ActiveRecord::VERSION::MINOR < 2
-    [:second, :minute, :hour, :day, :week, :month, :year, :day_of_week, :hour_of_day].each do |field|
-      define_method :"group_by_#{field}" do |options = {}, &block|
-        Groupdate::Magic.new(field, options).group_by(self, &block)
-      end
+  Groupdate::FIELDS.each do |field|
+    define_method :"group_by_#{field}" do |options = {}, &block|
+      Groupdate::Magic.new(field, options).group_by(self, &block)
     end
   end
@@ -5,7 +5,7 @@ require &quot;active_record&quot;
 module Groupdate
   module Scopes
-    [:second, :minute, :hour, :day, :week, :month, :year, :day_of_week, :hour_of_day].each do |field|
+    Groupdate::FIELDS.each do |field|
       define_method :"group_by_#{field}" do |*args|
         args = args.dup
         options = args[-1].is_a?(Hash) ? args.pop : {}
 require_relative "test_helper"
-unless ActiveRecord::VERSION::MAJOR == 3 and ActiveRecord::VERSION::MINOR < 2
-  class TestEnumerable < Minitest::Unit::TestCase
-    include TestGroupdate
+class TestEnumerable < Minitest::Unit::TestCase
+  include TestGroupdate
-    def test_enumerable
-      user_a = User.new(created_at: utc.parse("2014-01-21"))
-      user_b = User.new(created_at: utc.parse("2014-03-14"))
-      expected = {
-        utc.parse("2014-01-01") => [user_a],
-        utc.parse("2014-02-01") => [],
-        utc.parse("2014-03-01") => [user_b]
-      }
-      assert_equal expected, [user_a, user_b].group_by_month(&:created_at)
-    end
-
-    def call_method(method, field, options)
-      Hash[ User.all.to_a.send(:"group_by_#{method}", options){|u| u.send(field) }.map{|k, v| [k, v.size] } ]
-    end
+  def test_enumerable
+    user_a = User.new(created_at: utc.parse("2014-01-21"))
+    user_b = User.new(created_at: utc.parse("2014-03-14"))
+    expected = {
+      utc.parse("2014-01-01") => [user_a],
+      utc.parse("2014-02-01") => [],
+      utc.parse("2014-03-01") => [user_b]
+    }
+    assert_equal expected, [user_a, user_b].group_by_month(&:created_at)
+  end
+  def call_method(method, field, options)
+    Hash[ User.all.to_a.send(:"group_by_#{method}", options){|u| u.send(field) }.map{|k, v| [k, v.size] } ]
   end
+
 end
	@@ -3,6 +3,25 @@ require "groupdate/scopes"		@@ -3,6 +3,25 @@ require "groupdate/scopes"
3		3
4	ActiveRecord::Base.send(:extend, Groupdate::Scopes)	4	ActiveRecord::Base.send(:extend, Groupdate::Scopes)
5		5
		6	+module ActiveRecord
		7	+ class Relation
		8	+
		9	+ if ActiveRecord::VERSION::MAJOR == 3 and ActiveRecord::VERSION::MINOR < 2
		10	+
		11	+ def method_missing_with_hack(method, *args, &block)
		12	+ if Groupdate::METHODS.include?(method)
		13	+ scoping { @klass.send(method, *args, &block) }
		14	+ else
		15	+ method_missing_without_hack(method, *args, &block)
		16	+ end
		17	+ end
		18	+ alias_method_chain :method_missing, :hack
		19	+
		20	+ end
		21	+
		22	+ end
		23	+end
		24	+
6	# hack for unfixed rails issue	25	# hack for unfixed rails issue
7	# https://github.com/rails/rails/issues/7121	26	# https://github.com/rails/rails/issues/7121
8	module ActiveRecord	27	module ActiveRecord
	@@ -5,7 +5,7 @@ require "active_record"		@@ -5,7 +5,7 @@ require "active_record"
5	module Groupdate	5	module Groupdate
6	module Scopes	6	module Scopes
7		7
8	- [:second, :minute, :hour, :day, :week, :month, :year, :day_of_week, :hour_of_day].each do \|field\|	8	+ Groupdate::FIELDS.each do \|field\|
9	define_method :"group_by_#{field}" do \|*args\|	9	define_method :"group_by_#{field}" do \|*args\|
10	args = args.dup	10	args = args.dup
11	options = args[-1].is_a?(Hash) ? args.pop : {}	11	options = args[-1].is_a?(Hash) ? args.pop : {}