include_date_scopes 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cee42ed898449ecf0d0043d481554367f1f336cf
-  data.tar.gz: 9d9fcc175ec25d960018d25f3418a444bda5b8af
+  metadata.gz: 021ad778ab98e5426f71ce97ed4b1f775a7ed7b6
+  data.tar.gz: 88b07877a83621f0e3635ecd6c5f56444dd2945f
 SHA512:
-  metadata.gz: 253e111483d596a0527aec9622fa935adb190e20f06c8a20decb4bcafe67e45190863ac3b052e31d8921f3ac1f0bd94e3d50757516f8b6a54e6415e8392f0b80
-  data.tar.gz: 2968b9a43364d6bba30018bff43cb43178e8a40149af7176308d627ab11580e0ffba36772bb2b9779a650dda3e76ade1326ae3e78ec7b8c146d0b454517afec1
+  metadata.gz: fb4eba3ef62ae0fd8ed4c7f6b38f3cd3687a731ef9d9f5bdf31dc52819d48a1811358dfd0fe724d7022712b5bc8fe73ce52f1114f1136d0b85fd51cf7b69629b
+  data.tar.gz: 275795d84b9139079aa45329190b8996ed812075856b82fbee4256fa28178c81974ca299f22b9e73e92a83d5dcbd557acb271e0d35ebef6eb5385293e107d7ef

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    include_date_scopes (0.9.0)
+    include_date_scopes (0.9.1)
       activerecord (< 4)
       railties
 

data/lib/include_date_scopes/date_scopes.rb

@@ -60,7 +60,7 @@ module IncludeDateScopes
         end
 
         define_singleton_method :"#{prefix}on_or_before" do |time| 
-          where(t[column_name].lte (time.is_a?(Date) ? time.to_time : time))
+          where(t[column_name].lteq (time.is_a?(Date) ? time.to_time : time))
         end
 
         define_singleton_method :"#{prefix}before" do |time| 
@@ -80,7 +80,7 @@ module IncludeDateScopes
         end
 
         define_singleton_method :"#{prefix}on" do |day| 
-          __send__(:"#{prefix}between", day.midnight, (day + 1.day).midnight)
+          __send__(:"#{prefix}between", day.beginning_of_day, day.end_of_day)
         end
 
         define_singleton_method :"#{prefix}day" do |day| 
@@ -95,45 +95,63 @@ module IncludeDateScopes
           __send__(:"#{prefix}after", 1.hour.ago)
         end
 
-        define_singleton_method :"#{prefix}last_week" do
-          __send__(:"#{prefix}after", 1.week.ago)
+        define_singleton_method :"#{prefix}last_n_seconds" do |count|
+          __send__(:"#{prefix}on_or_after", count.seconds.ago)
         end
 
-        define_singleton_method :"#{prefix}last_30days" do
-          __send__(:"#{prefix}after", 30.days.ago)
+        define_singleton_method :"#{prefix}last_n_minutes" do |count|
+          __send__(:"#{prefix}on_or_after", count.minutes.ago)
         end
 
-        define_singleton_method :"#{prefix}today" do
-          __send__(:"#{prefix}on", Date.today)
+        define_singleton_method :"#{prefix}last_n_hours" do |count|
+          __send__(:"#{prefix}on_or_after", count.hours.ago)
         end
 
-        define_singleton_method :"#{prefix}this_week" do
-          __send__(:"#{prefix}between", (Date.today - Date.today.wday.days).midnight, (Date.today + 1.day).midnight)
+        define_singleton_method :"#{prefix}next_n_seconds" do |count|
+          __send__(:"#{prefix}on_or_before", count.seconds.from_now)
         end
 
-        define_singleton_method :"#{prefix}this_month" do
-          __send__(:"#{prefix}between", (Date.today.at_beginning_of_month).midnight, (Date.today + 1.day).midnight)
+        define_singleton_method :"#{prefix}next_n_minutes" do |count|
+          __send__(:"#{prefix}on_or_before", count.minutes.from_now)
         end
 
-        define_singleton_method :"#{prefix}yesterday" do
-          __send__(:"#{prefix}on", Date.yesterday)
+        define_singleton_method :"#{prefix}next_n_hours" do |count|
+          __send__(:"#{prefix}on_or_before", count.hours.from_now)
         end
 
-        define_singleton_method :"#{prefix}most_recent" do
-          order("#{column_name} desc")
+        define_singleton_method :"#{prefix}this_minute" do
+          __send__(:"#{prefix}between", Time.now.change(sec: 0), Time.now.change(sec: 59, usec: Rational(999999999, 1000)))
+        end
+
+        define_singleton_method :"#{prefix}this_hour" do
+          __send__(:"#{prefix}between", 1.hour.ago.end_of_hour, Time.now.end_of_hour)
+        end
+
+        define_singleton_method :"#{prefix}this_week" do
+          __send__(:"#{prefix}between", 1.week.ago.end_of_week, Time.now.end_of_week)
+        end
+
+        define_singleton_method :"#{prefix}this_month" do
+          __send__(:"#{prefix}between", 1.month.ago.end_of_month, Time.now.end_of_month)
+        end
+
+        define_singleton_method :"#{prefix}this_year" do
+          __send__(:"#{prefix}between", 1.year.ago.end_of_year, Time.now.end_of_year)
         end
 
+        define_common_scopes t, prefix, column_name
       end
 
       def define_date_scopes_for(column_name, prepend_name = false)
         prefix = prepend_name ? "#{column_name}_" : ""
+        t = self.arel_table
 
         define_singleton_method :"#{prefix}between" do |start_date, stop_date|
-          where(t[column_name].gteq(start_date).and(t[column_name].lte stop_date))
+          where(t[column_name].gteq(start_date).and(t[column_name].lteq stop_date))
         end
 
         define_singleton_method :"#{prefix}on_or_before" do |date| 
-          where( t[column_name].lte date )
+          where( t[column_name].lteq date )
         end
 
         define_singleton_method :"#{prefix}before" do |date| 
@@ -152,6 +170,24 @@ module IncludeDateScopes
           where(t[column_name].eq date)
         end
 
+        define_singleton_method :"#{prefix}this_week" do
+          __send__(:"#{prefix}between", Date.today.beginning_of_week, Date.today.end_of_week)
+        end
+
+        define_singleton_method :"#{prefix}this_month" do
+          __send__(:"#{prefix}between", Date.today.beginning_of_month, Date.today.end_of_month)
+        end
+
+        define_singleton_method :"#{prefix}this_year" do
+          __send__(:"#{prefix}between", Date.today.beginning_of_year, Date.today.end_of_year)
+        end
+
+        define_common_scopes t, prefix, column_name
+      end
+
+      def define_common_scopes(arel, prefix, column_name)
+        t = arel
+
         define_singleton_method :"#{prefix}day" do |day|
           __send__(:"#{prefix}on", day)
         end
@@ -160,222 +196,55 @@ module IncludeDateScopes
           __send__(:"#{prefix}on", Date.today)
         end
 
+        define_singleton_method :"#{prefix}yesterday" do
+          __send__(:"#{prefix}on", Date.yesterday)
+        end
+
         define_singleton_method :"#{prefix}last_week" do
           __send__(:"#{prefix}after", 1.week.ago)
         end
 
-        define_singleton_method :"#{prefix}last_30days" do
-          __send__(:"#{prefix}after", 30.days.ago)
+        define_singleton_method :"#{prefix}last_month" do
+          __send__(:"#{prefix}after", 1.month.ago)
         end
 
-        define_singleton_method :"#{prefix}yesterday" do
-          __send__(:"#{prefix}on", Date.yesterday)
+        define_singleton_method :"#{prefix}last_year" do
+          __send__(:"#{prefix}after", 1.year.ago)
+        end
+
+        define_singleton_method :"#{prefix}last_n_days" do |count|
+          __send__(:"#{prefix}on_or_after", count.days.ago)
+        end
+
+        define_singleton_method :"#{prefix}last_n_months" do |count|
+          __send__(:"#{prefix}on_or_after", count.months.ago)
+        end
+
+        define_singleton_method :"#{prefix}last_n_years" do |count|
+          __send__(:"#{prefix}on_or_after", count.years.ago)
+        end
+
+        define_singleton_method :"#{prefix}next_n_days" do |count|
+          __send__(:"#{prefix}on_or_before", count.days.from_now)
+        end
+
+        define_singleton_method :"#{prefix}next_n_months" do |count|
+          __send__(:"#{prefix}on_or_before", count.months.from_now)
+        end
+
+        define_singleton_method :"#{prefix}next_n_years" do |count|
+          __send__(:"#{prefix}on_or_before", count.years.from_now)
+        end
+
+        define_singleton_method :"#{prefix}last_30days" do
+          __send__(:"#{prefix}after", 30.days.ago)
         end
 
         define_singleton_method :"#{prefix}most_recent" do
           order("#{column_name} desc")
         end
-
       end
     end
   end
 end
-  # 
-  # module DateScopes
-  #   extend ActiveSupport::Concern
-  #   
-  #   module ClassMethods
-  #     def include_date_scopes
-  #       include_date_scopes_for :created_at
-  #     end
-  # 
-  #     def include_date_scopes_for(column, prepend_name = false)
-  #       return unless self.table_exists?
-  #       if self.columns_hash[column.to_s].try(:type) == :datetime
-  #         define_timestamp_scopes_for column, prepend_name
-  #       elsif self.columns_hash[column.to_s].try(:type) == :date
-  #         define_date_scopes_for column, prepend_name
-  #       end
-  #     end
-  # 
-  #     def include_named_date_scopes_for(column)
-  #       include_date_scopes_for column, true
-  #     end
-  # 
-  #     protected
-  # 
-  #     def process_timestamp_argument(arg, inclusive_range = false)
-  #       if arg.is_a?(Time) || arg.is_a?(DateTime)
-  #         return arg
-  #       elsif arg.is_a?(Date) && inclusive_range
-  #         return arg + 1.day
-  #       elsif arg.is_a?(Date) && !inclusive_range
-  #         return arg
-  #       else
-  #         raise ArgumentError, "Unexpected argument class for timestamp scope: #{arg.class.name}"
-  #       end
-  #     end
-  # 
-  #     def process_date_argument(arg)
-  #       if arg.is_a?(Time) || arg.is_a?(DateTime)
-  #         return arg.to_date
-  #       elsif arg.is_a?(Date)
-  #         return arg
-  #       else
-  #         raise ArgumentError, "Unexpected argument class for timestamp scope: #{arg.class.name}"
-  #       end
-  #     end
-  # 
-  #     def define_timestamp_scopes_for(column_name, prepend_name = false)
-  #       prefix = prepend_name ? "#{column_name}_" : ""
-  # 
-  #       define_singleton_method :"#{prefix}before" do |time,inclusive=false|
-  #         time = process_timestamp_argument(time, inclusive)
-  #         if inclusive
-  #           where{__send__(column_name).lte time}
-  #         else
-  #           where{__send__(column_name).lt time}
-  #         end
-  #       end
-  # 
-  #       define_singleton_method :"#{prefix}after" do |time, inclusive=false|
-  #         time = process_timestamp_argument(time, inclusive)
-  #         if inclusive
-  #           where{__send__(column_name).gte time}
-  #         else
-  #           where{__send__(column_name).gt time}
-  #         end
-  #       end
-  # 
-  #       define_singleton_method :"#{prefix}between" do |start_time, stop_time|
-  #         on_or_after(start_time).on_or_before(stop_time)
-  #       end
-  # 
-  #       define_singleton_method :"#{prefix}on_or_after" do |time|
-  #         after(time,true)
-  #       end
-  # 
-  #       define_singleton_method :"#{prefix}on_or_before" do |time|
-  #         before(time,true)
-  #       end
-  # 
-  #       define_singleton_method :"#{prefix}on_or_before_date" do |time|
-  #         on_or_before(time.to_date)
-  #       end
-  # 
-  #       define_singleton_method :"#{prefix}on_or_after_date" do |time|
-  #         on_or_after(time)
-  #       end
-  # 
-  #       define_singleton_method :"#{prefix}on" do |day|
-  #         between(day.midnight, (day + 1.day).midnight)
-  #       end
-  # 
-  #       define_singleton_method :"#{prefix}day" do |day|
-  #         on(day)
-  #       end
-  # 
-  #       define_singleton_method :"#{prefix}last_24_hours" do
-  #         after(24.hours.ago)
-  #       end
-  # 
-  #       define_singleton_method :"#{prefix}last_hour" do
-  #         after(1.hour.ago)
-  #       end
-  # 
-  #       define_singleton_method :"#{prefix}last_week" do
-  #         after(1.week.ago)
-  #       end
-  # 
-  #       define_singleton_method :"#{prefix}last_30days" do
-  #         after(30.days.ago)
-  #       end
-  # 
-  #       define_singleton_method :"#{prefix}today" do
-  #         on(Date.today)
-  #       end
-  # 
-  #       define_singleton_method :"#{prefix}this_week" do
-  #         between((Date.today - Date.today.wday.days).midnight, (Date.today + 1.day).midnight)
-  #       end
-  # 
-  #       define_singleton_method :"#{prefix}this_month" do
-  #         between((Date.today.at_beginning_of_month).midnight, (Date.today + 1.day).midnight)
-  #       end
-  # 
-  #       define_singleton_method :"#{prefix}yesterday" do
-  #         on(Date.yesterday)
-  #       end
-  # 
-  #       define_singleton_method :"#{prefix}most_recent" do
-  #         order("#{column_name} desc")
-  #       end
-  # 
-  #     end
-  # 
-  #     def define_date_scopes_for(column_name, prepend_name = false)
-  #       prefix = prepend_name ? "#{column_name}_" : ""
-  # 
-  #       define_singleton_method :"#{prefix}before" do |date,inclusive=false|
-  #         date = process_date_argument(date)
-  #         if inclusive
-  #           where{__send__(column_name).lte date}
-  #         else
-  #           where{__send__(column_name).lt date}
-  #         end
-  #       end
-  # 
-  #       define_singleton_method :"#{prefix}after" do |date, inclusive=false|
-  #         date = process_date_argument(date)
-  #         if inclusive
-  #           where{__send__(column_name).gte date}
-  #         else
-  #           where{__send__(column_name).gt date}
-  #         end
-  #       end
-  # 
-  #       define_singleton_method :"#{prefix}on" do |date|
-  #         date = process_date_argument(date)
-  #         where{__send__(column_name).eq date}
-  #       end
-  # 
-  #       define_singleton_method :"#{prefix}between" do |start_date, stop_date|
-  #         on_or_after(start_date).on_or_before(stop_date)
-  #       end
-  # 
-  #       define_singleton_method :"#{prefix}on_or_before" do |date|
-  #         before(date,true)
-  #       end
-  # 
-  #       define_singleton_method :"#{prefix}on_or_after" do |date|
-  #         after(date,true)
-  #       end
-  # 
-  #       define_singleton_method :"#{prefix}day" do |day|
-  #         on(day)
-  #       end
-  # 
-  #       define_singleton_method :"#{prefix}today" do
-  #         on(Date.today)
-  #       end
-  # 
-  #       define_singleton_method :"#{prefix}last_week" do
-  #         after(1.week.ago)
-  #       end
-  # 
-  #       define_singleton_method :"#{prefix}last_30days" do
-  #         after(30.days.ago)
-  #       end
-  # 
-  #       define_singleton_method :"#{prefix}yesterday" do
-  #         on(Date.yesterday)
-  #       end
-  # 
-  #       define_singleton_method :"#{prefix}most_recent" do
-  #         order("#{column_name} desc")
-  #       end
-  # 
-  #     end
-  #   end
-  # end
 

data/lib/include_date_scopes/version.rb

@@ -1,4 +1,4 @@
 
 module IncludeDateScopes
-  VERSION = '0.9.1'.freeze
+  VERSION = '0.9.2'.freeze
 end

data/spec/lib/date_scopes_spec.rb

@@ -1,211 +1,43 @@
 require 'spec_helper'
 
 describe "Post" do
-  describe 'default date scopes' do
+  describe 'default timestamp scopes' do
     before(:all) do
       define_model_class do
         include_date_scopes
       end
     end
 
-    it_behaves_like "with basic date scopes"
+    it_behaves_like "timestamp scopes"
   end
 
-  describe 'date scopes on another column' do
+  describe 'timestamp scopes on another column' do
     before(:all) do
       define_model_class do
         include_date_scopes_for :updated_at
       end
     end
 
-    it_behaves_like "with basic date scopes", :updated_at
+    it_behaves_like "timestamp scopes", :updated_at
   end
 
-  describe 'date scopes with name prepended' do
+  describe 'timestamp scopes with name prepended' do
     before(:all) do
       define_model_class do
         include_named_date_scopes_for :show_at
       end
     end
 
-    before(:all) { Timecop.freeze Time.local(2013,02,15,06,30) }
-
-    let!(:last_month_obj) { Post.create! :show_at => 1.month.ago }
-    let!(:last_week_obj) { Post.create! :show_at => 1.week.ago }
-    let!(:yesterday_obj) { Post.create! :show_at => 24.hours.ago }
-    let!(:hour_ago_obj) { Post.create! :show_at => 1.hour.ago }
-    let!(:five_minute_ago_obj) { Post.create! :show_at => 5.minutes.ago }
-    let!(:after_midnight_ago_obj) { Post.create! :show_at => Date.today.midnight + 5.minutes }
-    let!(:before_midnight_ago_obj) { Post.create! :show_at => Date.today.midnight - 5.minutes }
-
-    describe ":between" do
-      context "with DateTime" do
-        subject { Post.show_at_between(2.hours.ago, 1.minute.ago) }
-
-        it { should_not include last_week_obj }
-        it { should_not include yesterday_obj }
-        it { should include hour_ago_obj }
-        it { should include five_minute_ago_obj }
-      end
-      context "with Date" do
-        subject { Post.show_at_between(2.days.ago.to_date, Date.today) }
-
-        it { should_not include last_week_obj }
-        it { should include yesterday_obj }
-        it { should include hour_ago_obj }
-        it { should include five_minute_ago_obj }
-      end
-    end
-
-    describe ":after" do
-      context "with DateTime" do
-        subject { Post.show_at_after(2.hours.ago) }
-
-        it { should_not include last_week_obj }
-        it { should_not include yesterday_obj }
-        it { should include hour_ago_obj }
-        it { should include five_minute_ago_obj }
-      end
-      context "with Date" do
-        subject { Post.show_at_after(2.days.ago.to_date) }
-
-        it { should_not include last_week_obj }
-        it { should include yesterday_obj }
-        it { should include hour_ago_obj }
-        it { should include five_minute_ago_obj }
-      end
-    end
-
-    describe ":on_or_after_date" do
-      context "with DateTime" do
-        subject { Post.show_at_on_or_after_date(2.hours.ago) }
-
-        it { should_not include last_week_obj }
-        it { should_not include yesterday_obj }
-        it { should include hour_ago_obj }
-        it { should include five_minute_ago_obj }
-      end
-      context "with Date" do
-        subject { Post.show_at_on_or_after_date(2.days.ago.to_date) }
-
-        it { should_not include last_week_obj }
-        it { should include yesterday_obj }
-        it { should include hour_ago_obj }
-        it { should include five_minute_ago_obj }
-      end
-    end
-
-    describe ":before" do
-      context "with DateTime" do
-        subject { Post.show_at_before(2.hours.ago) }
-
-        it { should include last_week_obj }
-        it { should include yesterday_obj }
-        it { should_not include hour_ago_obj }
-        it { should_not include five_minute_ago_obj }
-      end
-      context "with Date" do
-        subject { Post.show_at_before(Date.today) }
-
-        it { should include last_week_obj }
-        it { should include yesterday_obj }
-        it { should_not include hour_ago_obj }
-        it { should_not include five_minute_ago_obj }
-      end
-    end
-
-    describe ":on_or_before_date" do
-      context "with DateTime" do
-        subject { Post.show_at_on_or_before_date(25.hours.ago) }
-
-        it { should include last_week_obj }
-        it { should include yesterday_obj }
-        it { should_not include hour_ago_obj }
-        it { should_not include five_minute_ago_obj }
-      end
-      context "with Date" do
-        subject { Post.show_at_on_or_before_date(Date.yesterday) }
+    it_behaves_like "timestamp scopes", :show_at, 'show_at_'
+  end
 
-        it { should include last_week_obj }
-        it { should include yesterday_obj }
-        it { should_not include hour_ago_obj }
-        it { should_not include five_minute_ago_obj }
+  describe 'date scopes' do
+    before(:all) do
+      define_model_class do
+        include_date_scopes_for :show_until
       end
     end
 
-    describe ":today" do
-      subject { Post.show_at_today }
-
-      it { should_not include last_week_obj }
-      it { should_not include yesterday_obj }
-      it { should include hour_ago_obj }
-      it { should include five_minute_ago_obj }
-    end
-
-    describe ":yesterday" do
-      subject { Post.show_at_yesterday }
-
-      it { should_not include last_week_obj }
-      it { should include yesterday_obj }
-      it { should_not include hour_ago_obj }
-      it { should_not include five_minute_ago_obj }
-    end
-
-    describe ":last_24_hours" do
-      subject { Post.show_at_last_24_hours }
-
-      it { should_not include last_week_obj }
-      it { should_not include yesterday_obj }
-      it { should include hour_ago_obj }
-      it { should include five_minute_ago_obj }
-    end
-
-    describe ":last_hour" do
-      subject { Post.show_at_last_hour }
-
-      it { should_not include last_week_obj }
-      it { should_not include yesterday_obj }
-      it { should_not include hour_ago_obj } # should not because this is exclusive
-      it { should include five_minute_ago_obj }
-    end
-
-    describe ":last_week" do
-      subject { Post.show_at_last_week }
-
-      it { should_not include last_week_obj }
-      it { should include yesterday_obj }
-      it { should include hour_ago_obj }
-      it { should include five_minute_ago_obj }
-    end
-
-    describe ":last_30_days" do
-      subject { Post.show_at_last_30days }
-
-      it { should_not include last_month_obj }
-      it { should include last_week_obj }
-      it { should include yesterday_obj }
-      it { should include hour_ago_obj }
-      it { should include five_minute_ago_obj }
-    end
-
-    describe ":this_week" do
-      subject { Post.show_at_this_week }
-
-      it { should_not include last_week_obj }
-      it { should include yesterday_obj }
-      it { should include hour_ago_obj }
-      it { should include five_minute_ago_obj }
-      it { should include before_midnight_ago_obj }
-    end
-
-    describe ":this_month" do
-      subject { Post.show_at_this_month }
-
-      it { should_not include last_month_obj }
-      it { should include last_week_obj }
-      it { should include yesterday_obj }
-      it { should include hour_ago_obj }
-      it { should include five_minute_ago_obj }
-    end
+    it_behaves_like 'date scopes', :show_until
   end
 end