datescope 0.0.4 → 0.0.5

data/lib/datescope.rb

@@ -1,4 +1,6 @@
 require "datescope/version"
-require "datescope/base.rb"
-
+require "datescope/intervals.rb"
+require "datescope/extension.rb"
 
+ActiveRecord::Base.send(:extend, DateScope::Extension)
+ActiveRecord::Relation.send(:include, DateScope::Extension)

data/lib/datescope/extension.rb

@@ -0,0 +1,29 @@
+module DateScope
+
+  module Extension
+    def today
+      where("created_at >= ?", Intervals.today[:start])
+    end
+
+    def this_week
+      where("created_at >= ?", Intervals.this_week[:start])
+    end
+
+    def this_month
+      where("created_at >= ?", Intervals.this_month[:start])
+    end
+
+    def last_month
+      where("created_at >= ? and created_at <= ?", Intervals.last_month[:start], Intervals.last_month[:end])
+    end
+
+    def month_before_last_month
+      where("created_at >= ? and created_at <= ?", Intervals.month_before_last_month[:start], Intervals.month_before_last_month[:end])
+    end
+
+    def this_year
+      where("created_at >= ?", Intervals.this_year[:start])
+    end
+  end
+
+end

data/lib/datescope/intervals.rb

@@ -0,0 +1,33 @@
+module DateScope
+
+  module Intervals
+    def self.today
+      {:start => 0.day.ago.beginning_of_day, :end => 0.day.ago.end_of_day}
+    end
+
+    def self.this_week
+      {:start => 0.week.ago.beginning_of_week, :end => 0.week.ago.end_of_week}
+    end
+
+    def self.this_month
+      {:start => 0.month.ago.beginning_of_month, :end => 0.month.ago.end_of_month}
+    end
+
+    def self.this_year
+      {:start => 0.year.ago.beginning_of_year, :end => 0.year.ago.end_of_year}
+    end
+
+    def self.last_month
+      {:start => 1.month.ago.beginning_of_month, :end => 1.month.ago.end_of_month}
+    end
+
+    def self.month_before_last_month
+      {:start => 2.month.ago.beginning_of_month, :end => 2.month.ago.end_of_month}
+    end
+
+    def self.all
+      {:start => Time.at(0), :end => Time.at(2**31-1)}
+    end
+  end
+
+end

data/lib/datescope/version.rb

@@ -1,3 +1,3 @@
 module Datescope
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -2,7 +2,7 @@
 name: datescope
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Laszlo Papp
@@ -40,7 +40,8 @@ files:
 - Rakefile
 - datescope.gemspec
 - lib/datescope.rb
-- lib/datescope/base.rb
+- lib/datescope/extension.rb
+- lib/datescope/intervals.rb
 - lib/datescope/version.rb
 homepage: http://github.com/luciditydigital/datescope
 licenses: []

data/lib/datescope/base.rb

@@ -1,33 +0,0 @@
-module DateScope
-
-  module Extension
-    def today
-      where("created_at >= ?", 0.day.ago.beginning_of_day)
-    end
-
-    def this_week
-      where("created_at >= ?", 0.week.ago.beginning_of_week)
-    end
-
-    def this_month
-      where("created_at >= ?", 0.month.ago.beginning_of_month)
-    end
-
-    def last_month
-      where("created_at >= ? and created_at <= ?", 1.month.ago.beginning_of_month, 1.month.ago.end_of_month)
-    end
-
-    def month_before_last_month
-      where("created_at >= ? and created_at <= ?", 2.month.ago.beginning_of_month, 2.month.ago.end_of_month)
-    end
-
-    def this_year
-      where("created_at >= ?", 0.year.ago.beginning_of_year)
-    end
-  end
-
-end
-
-ActiveRecord::Base.send(:extend, DateScope::Extension)
-ActiveRecord::Relation.send(:include, DateScope::Extension)
-