Seperate file for calculations

Andrew Kane
1 parent 234cdc2c
Showing 4 changed files with 30 additions and 28 deletions Show diff stats
lib/groupdate/active_record.rb
lib/groupdate/calculations.rb
lib/groupdate/series.rb
test/test_helper.rb
 require "active_record"
 require "groupdate/order_hack"
 require "groupdate/scopes"
+require "groupdate/calculations"
 require "groupdate/series"
  
 ActiveRecord::Base.send(:extend, Groupdate::Scopes)
@@ -0,0 +1,26 @@
+module Groupdate
+  class Calculations
+    attr_reader :relation
+
+    def initialize(relation)
+      @relation = relation
+    end
+
+    def include?(method)
+      # https://github.com/rails/rails/blob/master/activerecord/lib/active_record/relation/calculations.rb
+      ActiveRecord::Calculations.method_defined?(method) || custom_calculations.include?(method)
+    end
+
+    def custom_calculations
+      return [] if !model.respond_to?(:groupdate_calculation_methods)
+      model.groupdate_calculation_methods
+    end
+
+    private
+
+    def model
+      return if !relation.respond_to?(:klass)
+      relation.klass
+    end
+  end
+end
@@ -27,29 +27,4 @@ module Groupdate
       nil
     end
   end
-
-  class Calculations
-    attr_reader :relation
-
-    def initialize(relation)
-      @relation = relation
-    end
-
-    def include?(method)
-      # https://github.com/rails/rails/blob/master/activerecord/lib/active_record/relation/calculations.rb
-      ActiveRecord::Calculations.method_defined?(method) || custom_calculations.include?(method)
-    end
-
-    def custom_calculations
-      return [] if !model.respond_to?(:groupdate_calculation_methods)
-      model.groupdate_calculation_methods
-    end
-
-    private
-
-    def model
-      return if !relation.respond_to?(:klass)
-      relation.klass
-    end
-  end
 end
@@ -361,9 +361,9 @@ module TestDatabase
   # custom model calculation methods
  
   def test_custom_model_calculation_method
-    create_user "2014-05-01", 1
-    create_user "2014-05-01", 2
-    create_user "2014-05-03", 3
+    create_user "2014-05-01"
+    create_user "2014-05-01"
+    create_user "2014-05-03"
  
     expected = {
       Date.parse("2014-05-01") => 2,
1	1	require "active_record"
2	2	require "groupdate/order_hack"
3	3	require "groupdate/scopes"
	4	+require "groupdate/calculations"
4	5	require "groupdate/series"
5	6
6	7	ActiveRecord::Base.send(:extend, Groupdate::Scopes)
...	...
...	...	@@ -0,0 +1,26 @@
	1	+module Groupdate
	2	+ class Calculations
	3	+ attr_reader :relation
	4	+
	5	+ def initialize(relation)
	6	+ @relation = relation
	7	+ end
	8	+
	9	+ def include?(method)
	10	+ # https://github.com/rails/rails/blob/master/activerecord/lib/active_record/relation/calculations.rb
	11	+ ActiveRecord::Calculations.method_defined?(method) \|\| custom_calculations.include?(method)
	12	+ end
	13	+
	14	+ def custom_calculations
	15	+ return [] if !model.respond_to?(:groupdate_calculation_methods)
	16	+ model.groupdate_calculation_methods
	17	+ end
	18	+
	19	+ private
	20	+
	21	+ def model
	22	+ return if !relation.respond_to?(:klass)
	23	+ relation.klass
	24	+ end
	25	+ end
	26	+end
...	...
...	...	@@ -27,29 +27,4 @@ module Groupdate
27	27	nil
28	28	end
29	29	end
30		-
31		- class Calculations
32		- attr_reader :relation
33		-
34		- def initialize(relation)
35		- @relation = relation
36		- end
37		-
38		- def include?(method)
39		- # https://github.com/rails/rails/blob/master/activerecord/lib/active_record/relation/calculations.rb
40		- ActiveRecord::Calculations.method_defined?(method) \|\| custom_calculations.include?(method)
41		- end
42		-
43		- def custom_calculations
44		- return [] if !model.respond_to?(:groupdate_calculation_methods)
45		- model.groupdate_calculation_methods
46		- end
47		-
48		- private
49		-
50		- def model
51		- return if !relation.respond_to?(:klass)
52		- relation.klass
53		- end
54		- end
55	30	end
...	...
...	...	@@ -361,9 +361,9 @@ module TestDatabase
361	361	# custom model calculation methods
362	362
363	363	def test_custom_model_calculation_method
364		- create_user "2014-05-01", 1
365		- create_user "2014-05-01", 2
366		- create_user "2014-05-03", 3
	364	+ create_user "2014-05-01"
	365	+ create_user "2014-05-01"
	366	+ create_user "2014-05-03"
367	367
368	368	expected = {
369	369	Date.parse("2014-05-01") => 2,
...	...