include_date_scopes 0.9.9 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc5fb55e3cee51dc62e328c214250470e036e233
-  data.tar.gz: 67e4dfba26a4d5f5657ebb6a7034d9288a2e61de
+  metadata.gz: c585c13b5ffafee45ecf2db6c37812c8c003a7ae
+  data.tar.gz: 77647c80fd039022fe644e5ba3d06da80b6401b2
 SHA512:
-  metadata.gz: 36d1795e13fc032fe64b76021e418c1d844f88860643f6eb3e7778ef36eb28e8907a53974d8d2b58968dbe8349dbe0e5ef6e980b998f7abfb3f6134f5536766f
-  data.tar.gz: adaaa58c900d48536e13c3ba5884141e5e434e0e0f220c054150dfcb9f6d3feeceea2d7f1edc278dcdeef0ddcf2060bef0ef71d36fc78d56ad6feee7036ae6ca
+  metadata.gz: cba126e9c7ff5920d166a91d2e3403bd3918e4ad7633bed6822f06a6e4c8357799cf8634468bc9f2a8097cdc5a515d56829a801ba583a35946216cb79db89e41
+  data.tar.gz: cf563efd3e8820b8f3f43d9d4eef60d92a56b5ea562e30039f8949e026c93415a6ea2696b96e53ad5aec1cebd29cc91561a207da650cee16a1800c6528c2f7f0

data/.ruby-version

@@ -1 +1 @@
-2.1.2
+2.2.4

data/Gemfile

@@ -1,6 +1,5 @@
 source "http://rubygems.org"
 
-gem 'appraisal'
 gemspec
 
 # *************************************
@@ -8,7 +7,7 @@ gemspec
 # * If you have any local gems to include, create a new Gemfile at ~/.Gemfile
 # * This code will import anything in there.
 # *************************************
-# if File.exist? File.join(Dir.home,'.Gemfile')
-#   eval File.read File.join(Dir.home,'.Gemfile')
-# end
+if File.exists? File.join(Dir.home,'.Gemfile')
+  eval File.read File.join(Dir.home,'.Gemfile')
+end
 

data/README.md

@@ -30,3 +30,97 @@ class Post < ActiveRecord::Base
 end
 ```
 Now the scopes will all be prepended with `updated_at_`.  So `Post.yesterday` would become `Post.updated_at_yesterday`.
+
+Date Scopes
+-------
+
+| Method | Description |
+| --- | --- |
+| `between(start_date,stop_date)` | On or after start_date and on or before stop_date |
+| `on(date)` |  |
+| `on_or_before(date)` |  |
+| `on_or_before_date(date)` |  |
+| `on_or_after(date)` |  |
+| `on_or_after_date(date)` |  |
+| `before(date)` |  |
+| `after(date)` |  |
+| `day(date)` | Syonym for `on(date)` |
+| `today` |  |
+| `yesterday` |  |
+| `tomorrow` |  |
+| `this_day` | On the current day |
+| `this_week` | Within the current week (Monday thru Sunday) |
+| `this_month` | Within the current month |
+| `this_year` | Within the current year |
+| `next_day` | Today or tomorrow |
+| `next_week` | Today through the next 7 days |
+| `next_month` | Today through the same day next month |
+| `next_year` | Today through the same day next year  |
+| `last_day` | Yesterday or today |
+| `last_week` | Last 7 days through today |
+| `last_month` | Same day last month through today |
+| `last_year` | Same day last year through today |
+| `next_n_days(number)` | Within the next `number` days |
+| `next_n_weeks(number)` |  |
+| `next_n_months(number)` |  |
+| `next_n_years(number)` |  |
+| `last_n_days(number)` | Within the last `number` days |
+| `last_n_weeks(number)` |  |
+| `last_n_months(number)` |  |
+| `last_n_years(number)` |  |
+| `last_30_days` | Synonym for `last_n_days(30)` |
+| `most_recent` | Orders most recent first |
+
+Timestamp Scopes
+----------------
+
+| Method | Description |
+| --- | --- |
+| `between(start_time_or_date,stop_time_or_date)` | If start_date_or_time is a Date, the interval INCLUDES the start of the day; otherwise, the interval INCLUDES the argument time. If stop_date_or_time is a Date, the interval INCLUDES the end date; otherwise, the interval EXCLUDES the argument time. |
+| `on(date)` |  |
+| `on_or_before(time_or_date)` | At or before a Time argument, or on or before a Date argument |
+| `on_or_before_date(time_or_date)` | Converts a Time argument to Date |
+| `on_or_after(time_or_date)` | At or after a Time argument, or on or after a Date argument |
+| `on_or_after_date(time_or_date)` | Converts a Time argument to Date |
+| `before(time_or_date)` |  |
+| `after(time_or_date)` |  |
+| `day(date)` | Synonym for `on(date)` |
+| `today` |  |
+| `yesterday` |  |
+| `tomorrow` |  |
+| `this_minute` | Within the current minute |
+| `this_hour` | Within the current hour |
+| `this_day` | Within the current day |
+| `this_week` | Within the current week (Monday thru Sunday) |
+| `this_month` | Within the current month |
+| `this_year` | Within the current year |
+| `next_minute` | Within the next 60 seconds |
+| `next_hour` | Within the next 3600 seconds |
+| `next_day` | Within the next 86400 seconds |
+| `next_week` | Within the next 604800 seconds |
+| `next_month` | Until the same time next month |
+| `next_year` | Until the same time next year |
+| `last_minute` | From 60 seconds ago until the next second |
+| `last_hour` | From 3600 seconds ago until the next second |
+| `last_day` | From 86400 seconds ago until the next second |
+| `last_24_hours` | Synonym for `last_day` |
+| `last_week` | From 604800 seconds ago until the next second |
+| `last_month` | From the same time last month until the next second |
+| `last_year` | From the same time last year until the next second  |
+| `next_n_seconds(number)` | Within the next `number` seconds |
+| `next_n_minutes(number)` |  |
+| `next_n_hours(number)` |  |
+| `next_n_days(number)` |  |
+| `next_n_weeks(number)` |  |
+| `next_n_months(number)` |  |
+| `next_n_years(number)` |  |
+| `last_n_seconds(number)` | Within the last `number` seconds |
+| `last_n_minutes(number)` |  |
+| `last_n_hours(number)` |  |
+| `last_n_days(number)` |  |
+| `last_n_weeks(number)` |  |
+| `last_n_months(number)` |  |
+| `last_n_years(number)` |  |
+| `last_30_days` | Synonym for `last_n_days(30)` |
+| `most_recent` | Orders most recent first |
+

data/include_date_scopes.gemspec

@@ -23,5 +23,6 @@ DESCRIPTION
   s.add_dependency "railties"
   s.add_development_dependency "rspec-rails", "2.14.2"
   s.add_development_dependency "sqlite3", "1.3.9"
+  # s.add_development_dependency "mysql2", "~> 0.3.10"  # TODO: How to dynamically choose sqlite or mysql?
   s.add_development_dependency 'timecop', "0.7.1"
 end

data/lib/include_date_scopes/define_common_scopes.rb

@@ -20,16 +20,20 @@ module IncludeDateScopes
 
       [:day, :week, :month, :year].each do |time_unit|
         define_singleton_method :"#{prefix}next_#{time_unit}" do
-          __send__(:"#{prefix}between", Time.now, 1.send(time_unit).from_now)
+          now = Time.now
+          __send__(:"#{prefix}between", now, now + 1.send(time_unit))
         end
         define_singleton_method :"#{prefix}last_#{time_unit}" do
-          __send__(:"#{prefix}between", 1.send(time_unit).ago, Time.now)
+          now = Time.now
+          __send__(:"#{prefix}between", now - 1.send(time_unit), now + 1.second)
         end
         define_singleton_method :"#{prefix}next_n_#{time_unit}s" do |count|
-          __send__(:"#{prefix}between", Time.now, count.send(time_unit).from_now)
+          now = Time.now
+          __send__(:"#{prefix}between", now, now + count.send(time_unit))
         end
         define_singleton_method :"#{prefix}last_n_#{time_unit}s" do |count|
-          __send__(:"#{prefix}between", count.send(time_unit).ago, Time.now)
+          now = Time.now
+          __send__(:"#{prefix}between", now - count.send(time_unit), now + 1.second)
         end
       end
 

data/lib/include_date_scopes/define_date_scopes.rb

@@ -10,7 +10,14 @@ module IncludeDateScopes
       end
 
       {:on_or_before => :lteq, :before => :lt, :on_or_after => :gteq, :after => :gt, :on => :eq}.each do |label, op|
-        define_singleton_method :"#{prefix}#{label}" do |date| 
+        define_singleton_method :"#{prefix}#{label}" do |date_or_time|
+          if date_or_time.kind_of? Time
+            date = date_or_time.to_date
+          elsif date_or_time.kind_of? DateTime
+            date = date_or_time.to_date
+          else
+            date = date_or_time
+          end
           where t[column_name].send op, date
         end
       end
@@ -21,7 +28,8 @@ module IncludeDateScopes
 
       [:week, :month, :year].each do |time_unit|
         define_singleton_method :"#{prefix}this_#{time_unit}" do
-          __send__(:"#{prefix}between", Date.today.send(:"beginning_of_#{time_unit}"), Date.today.send(:"end_of_#{time_unit}"))
+          today = Date.today
+          __send__(:"#{prefix}between", today.send(:"beginning_of_#{time_unit}"), today.send(:"end_of_#{time_unit}"))
         end
       end
 

data/lib/include_date_scopes/define_timestamp_scopes.rb

@@ -1,4 +1,3 @@
-
 module IncludeDateScopes
   module DefineTimestampScopes
  
@@ -7,37 +6,49 @@ module IncludeDateScopes
       t = self.arel_table
 
       define_singleton_method :"#{prefix}between" do |start_date_or_time, stop_date_or_time|
+        # If start_date_or_time is a Date, the interval INCLUDES the start of the day; otherwise, the interval INCLUDES the argument time.
+        # If stop_date_or_time is a Date, the interval INCLUDES the end date; otherwise, the interval EXCLUDES the argument time.
+        # For example between(Date.today, Date.today) is equivalent to between(Date.today.midnight, Date.tomorrow.midnight).
         start_time = (start_date_or_time.is_a?(Date) ? start_date_or_time.to_time : start_date_or_time)
         stop_time = (stop_date_or_time.is_a?(Date) ? stop_date_or_time.to_time + 1.day : stop_date_or_time )
         where(t[column_name].gteq(start_time).and(t[column_name].lt stop_time))
       end
 
       define_singleton_method :"#{prefix}on_or_before_date" do |date|
-        where( t[column_name].lt date.to_date.tomorrow.midnight.gmtime )
+        where(t[column_name].lt date.to_date.tomorrow.midnight)
       end
 
-      define_singleton_method :"#{prefix}on_or_before" do |time| 
-        where(t[column_name].lteq (time.is_a?(Date) ? time.to_time : time))
+      define_singleton_method :"#{prefix}on_or_before" do |time|
+        if time.is_a?(Date)
+          where(t[column_name].lt time.to_time + 1.day)
+        else
+          where(t[column_name].lteq time)
+        end
       end
 
-      define_singleton_method :"#{prefix}before" do |time| 
-        where(t[column_name].lt (time.is_a?(Date) ? time.to_time : time))
+      define_singleton_method :"#{prefix}before" do |time|
+        time = time.to_time if time.kind_of? Date
+        where(t[column_name].lt time)
       end
 
       define_singleton_method :"#{prefix}on_or_after_date" do |time|
-        where(t[column_name].gteq time.to_date.midnight.gmtime )
+        where(t[column_name].gteq time.to_date.midnight)
       end
 
       define_singleton_method :"#{prefix}on_or_after" do |time|
-        where(t[column_name].gteq (time.is_a?(Date) ? time.to_time + 1.day : time ))
+        where(t[column_name].gteq time.to_time)
       end
 
       define_singleton_method :"#{prefix}after" do |time|
-        where(t[column_name].gt (time.is_a?(Date) ? time.to_time + 1.day : time ))
+        if time.is_a?(Date)
+          where(t[column_name].gteq time.to_time + 1.day)
+        else
+          where(t[column_name].gt time)
+        end
       end
 
       define_singleton_method :"#{prefix}on" do |day| 
-        __send__(:"#{prefix}between", day.beginning_of_day, day.end_of_day)
+        __send__(:"#{prefix}between", day.to_date, day.to_date)
       end
 
       define_singleton_method :"#{prefix}last_24_hours" do
@@ -46,31 +57,37 @@ module IncludeDateScopes
 
       [:minute, :hour].each do |time_unit|
         define_singleton_method :"#{prefix}next_#{time_unit}" do
-         __send__(:"#{prefix}between", Time.now, 1.send(time_unit).from_now)
+          start_time = Time.now
+          __send__(:"#{prefix}between", start_time, start_time + 1.send(time_unit))
         end
 
         define_singleton_method :"#{prefix}last_#{time_unit}" do
-          __send__(:"#{prefix}between", 1.send(time_unit).ago, Time.now)
+          now = Time.now
+          __send__(:"#{prefix}between", now - 1.send(time_unit), now + 1.second)
         end
       end
 
       [:seconds, :minutes, :hours].each do |time_unit|
         define_singleton_method :"#{prefix}last_n_#{time_unit}" do |count|
-          __send__(:"#{prefix}between", count.send(time_unit).ago, Time.now)
+          now = Time.now
+          __send__(:"#{prefix}between", now - count.send(time_unit), now + 1.second)
         end
 
         define_singleton_method :"#{prefix}next_n_#{time_unit}" do |count|
-          __send__(:"#{prefix}between", Time.now, count.send(time_unit).from_now)
+          start_time = Time.now
+          __send__(:"#{prefix}between", start_time, start_time + count.send(time_unit))
         end
       end
 
       define_singleton_method :"#{prefix}this_minute" do
-        __send__(:"#{prefix}between", Time.now.change(sec: 0), Time.now.change(sec: 59, usec: Rational(999999999, 1000)))
+        start_time = Time.now.change(sec: 0)
+        __send__(:"#{prefix}between", start_time, start_time + 1.minute)
       end
 
       [:hour, :day, :week, :month, :year].each do |time_unit|
         define_singleton_method :"#{prefix}this_#{time_unit}" do
-          __send__(:"#{prefix}between", 1.send(time_unit).ago.send(:"end_of_#{time_unit}"), Time.now.send(:"end_of_#{time_unit}"))
+          start_time = Time.now.send(:"beginning_of_#{time_unit}")
+          __send__(:"#{prefix}between", start_time, start_time + 1.send(:"#{time_unit}"))
         end
       end
 

data/lib/include_date_scopes/version.rb

@@ -1,4 +1,4 @@
 
 module IncludeDateScopes
-  VERSION = '0.9.9'.freeze
+  VERSION = '1.0.0'.freeze
 end

data/spec/lib/date_scopes_spec.rb

@@ -1,6 +1,12 @@
 require 'spec_helper'
 
 describe "Model" do
+
+  before(:all) do
+    # puts "Local time: #{Time.now}"
+    # puts "UTC time:   #{Time.now.gmtime}"
+  end
+
   describe 'default timestamp scopes' do
     before(:all) do
       define_model_class do
@@ -34,17 +40,19 @@ describe "Model" do
   describe 'date scopes' do
     before(:all) do
       define_model_class do
-        include_date_scopes_for :show_until
+        include_named_date_scopes_for :show_until
       end
     end
 
-    it_behaves_like 'date scopes', :show_until
+    it_behaves_like 'date scopes', :show_until, 'show_until_'
   end
 
   describe 'providing column type' do
     before(:all) do
       define_model_class do
-        include_date_scopes_for :show_at, nil, :date
+        # Note that using date scopes to query a datetime column will yield incorrect results unless
+        # the database timezone is the same as the local timezone.
+        include_date_scopes_for :show_at, true, :date
       end
     end
 
@@ -52,7 +60,9 @@ describe "Model" do
       expect(Post).not_to respond_to(:last_n_minutes)
     end
 
-    it_behaves_like 'date scopes', :show_at
+    # Note that these specs succeed because the test threshold has only date granularity.
+    # For a true datetime column the thresholds should have second granularity.
+    it_behaves_like('date scopes', :show_at, 'show_at_')
   end
 
   describe 'using a non-date argument' do
@@ -62,11 +72,11 @@ describe "Model" do
     # word that's also used by my framework.
     it 'does not raise an error' do
       define_model_class do
-        include_date_scopes_for :show_until
+        include_named_date_scopes_for :show_at
+        include_named_date_scopes_for :show_until
       end
-      expect {
-        Post.before('abc')
-      }.to_not raise_error
+      expect { Post.show_at_before('abc') }.to_not raise_error
+      expect { Post.show_until_before('abc') }.to_not raise_error
     end
   end
 

data/spec/spec_helper.rb

@@ -17,17 +17,18 @@ if RUBY_PLATFORM == "java"
   database_adapter = "jdbcsqlite3"
 else
   database_adapter = "sqlite3"
+  # database_adapter = "mysql2"
 end
 
-ActiveRecord::Base.default_timezone = :local
+ActiveRecord::Base.default_timezone = :utc
 ActiveRecord::Base.logger = Logger.new(STDERR)
 ActiveRecord::Base.logger.level = Logger::WARN
 ActiveRecord::Base.establish_connection(
   :adapter  => database_adapter,
-  :database => ':memory:'
+  :database => (database_adapter == "sqlite3" ? ':memory:' : 'include_date_scopes_test')
 )
 ActiveRecord::Base.connection.create_table(:posts, :force => true) do |t|
-  t.timestamp :show_at
+  t.datetime :show_at
   t.date :show_until
   t.timestamp :created_at
   t.timestamp :updated_at
@@ -45,7 +46,7 @@ RSpec.configure do |config|
     Post.delete_all
   end
 
-  config.before(:suite) { Timecop.freeze Time.local(2013,02,15,06,30) }
+  config.before(:suite) { Timecop.freeze Time.local(2013,02,15,18,30,47) } # next day as utc
 end
 
 def define_model_class(name = "Post", parent_class_name = "ActiveRecord::Base", &block)

data/spec/support/date_scope_examples.rb

@@ -1,259 +1,265 @@
-
 shared_examples "between date scope" do |name|
-  context 'with time argument' do
-    # Not working right now
-    # include_examples 'between time scope', name, 1.day
-  end
-
-  context 'with date argument' do
-    subject do
-      test_class.send("#{prefix}#{name}", *arguments).to_a
-    end
+  # agruments may be Date or Time values
+  # top_threshold and bottom_threshold should be Date values
 
-    let(:after_threshold_obj) { test_class.create! date_column => top_threshold.to_date - 1.day }
-    let(:at_top_threshold_obj) { test_class.create! date_column => top_threshold.to_date }
-    let(:at_bottom_threshold_obj) { test_class.create! date_column => bottom_threshold.to_date }
-    let(:before_threshold_obj) { test_class.create! date_column => bottom_threshold.to_date + 1.day }
+  subject { test_class.send("#{prefix}#{name}", *arguments).to_a }
 
-    it { should_not include after_threshold_obj }
-    it { should include at_top_threshold_obj }
-    it { should include at_bottom_threshold_obj }
-    it { should_not include before_threshold_obj }
+  before do
+    # puts "#{prefix}#{name}: #{arguments.to_s}"
+    # puts test_class.send("#{prefix}#{name}", *arguments).to_sql
   end
-end
 
-shared_examples "date scopes" do |date_column = :show_until, prefix = '' |
-  let(:test_class) { Post }
-  let(:prefix) { prefix }
-  let(:date_column) { date_column }
+  let(:before_threshold_obj) { test_class.create! date_column => top_threshold.to_date - 1.day }
+  let(:at_top_threshold_obj) { test_class.create! date_column => top_threshold.to_date }
+  let(:at_bottom_threshold_obj) { test_class.create! date_column => bottom_threshold.to_date }
+  let(:after_threshold_obj) { test_class.create! date_column => bottom_threshold.to_date + 1.day }
 
-  describe "date scopes" do
-    describe ":between" do
-      subject { test_class.send("#{prefix}between", 6.days.ago.to_date, 3.day.ago.to_date).to_a }
-
-      let(:after_threshold_obj) { test_class.create! date_column => 2.days.ago.to_date }
-      let(:at_top_threshold_obj) { test_class.create! date_column => 3.days.ago.to_date }
-      let(:at_bottom_threshold_obj) { test_class.create! date_column => 6.days.ago.to_date }
-      let(:before_threshold_obj) { test_class.create! date_column => 7.days.ago.to_date }
-
-      it { should_not include after_threshold_obj }
-      it { should include at_top_threshold_obj }
-      it { should include at_bottom_threshold_obj }
-      it { should_not include before_threshold_obj }
-    end
+  it { should_not include before_threshold_obj }
+  it { should include at_top_threshold_obj }
+  it { should include at_bottom_threshold_obj }
+  it { should_not include after_threshold_obj }
+end
 
-    describe ":after" do
-      subject { test_class.send("#{prefix}after", 3.days.ago.to_date).to_a }
+shared_examples "before date scope" do |name|
+  # agruments may be Date or Time values
+  # threshold should be a Date value
 
-      let(:after_threshold_obj) { test_class.create! date_column => 2.days.ago.to_date }
-      let(:on_threshold_obj) { test_class.create! date_column => 3.days.ago.to_date }
-      let(:before_threshold_obj) { test_class.create! date_column => 4.days.ago.to_date }
+  subject { test_class.send("#{prefix}#{name}", *arguments).to_a }
 
-      it { should include after_threshold_obj }
-      it { should_not include on_threshold_obj }
-      it { should_not include before_threshold_obj }
-    end
+  # threshold is most recent date NOT included in the interval
+  let(:before_top_threshold_obj) { test_class.create! date_column => threshold - 1.day }
+  let(:at_top_threshold_obj) { test_class.create! date_column => threshold }
 
-    describe ":before" do
-      subject { test_class.send("#{prefix}before", 3.days.ago.to_date).to_a }
+  before do
+    # puts "#{prefix}#{name}: #{arguments.to_s}"
+    # puts test_class.send("#{prefix}#{name}", *arguments).to_sql
+  end
 
-      let(:after_threshold_obj) { test_class.create! date_column => 4.days.ago.to_date }
-      let(:on_threshold_obj) { test_class.create! date_column => 3.days.ago.to_date }
-      let(:before_threshold_obj) { test_class.create! date_column => 2.days.ago.to_date }
+  it { should include before_top_threshold_obj }
+  it { should_not include at_top_threshold_obj }
+end
 
-      it { should include after_threshold_obj }
-      it { should_not include on_threshold_obj }
-      it { should_not include before_threshold_obj }
-    end
+shared_examples "after date scope" do |name|
+  subject { test_class.send("#{prefix}#{name}", *arguments).to_a }
 
-    describe ":on_or_after" do
-      subject { test_class.send("#{prefix}on_or_after", 3.days.ago.to_date).to_a }
+  # threshold is oldest date included in the interval
+  let(:before_top_threshold_obj) { test_class.create! date_column => threshold - 1.day }
+  let(:at_top_threshold_obj) { test_class.create! date_column => threshold }
 
-      let(:after_threshold_obj) { test_class.create! date_column => 2.days.ago.to_date }
-      let(:on_threshold_obj) { test_class.create! date_column => 3.days.ago.to_date }
-      let(:before_threshold_obj) { test_class.create! date_column => 4.days.ago.to_date }
+  before do
+    # puts "#{prefix}#{name}: #{arguments.to_s}"
+    # puts test_class.send("#{prefix}#{name}", *arguments).to_sql
+  end
 
-      it { should include after_threshold_obj }
-      it { should include on_threshold_obj }
-      it { should_not include before_threshold_obj }
-    end
+  it { should_not include before_top_threshold_obj }
+  it { should include at_top_threshold_obj }
+end
 
-    describe ":on_or_before" do
-      subject { test_class.send("#{prefix}on_or_before", 3.days.ago).to_a }
+shared_examples "date scopes" do |date_column = :show_until, prefix = '' |
+  let(:test_class) { Post }
+  let(:prefix) { prefix }
+  let(:date_column) { date_column }
 
-      let(:after_threshold_obj) { test_class.create! date_column => 4.days.ago.to_date }
-      let(:on_threshold_obj) { test_class.create! date_column => 3.days.ago.to_date }
-      let(:before_threshold_obj) { test_class.create! date_column => 2.days.ago.to_date }
+    [:to_date, :to_time].each do |postfix|
+      describe ":between" do
+        let(:top_threshold) { 6.days.ago.to_date }
+        let(:bottom_threshold) { 3.days.ago.to_date }
+        let(:arguments) { [6.days.ago.send(postfix), 3.day.ago.send(postfix)] }
+        include_examples 'between date scope','between'
+      end
+
+      describe ":before" do
+        let(:threshold) { 3.days.ago.to_date }
+        let(:arguments) { [ 3.days.ago.send(postfix) ] }
+        include_examples 'before date scope','before'
+      end
+
+      describe ":on_or_before" do
+        let(:threshold) { 2.days.ago.to_date }
+        let(:arguments) { [ 3.days.ago.send(postfix) ] }
+        include_examples 'before date scope','on_or_before'
+      end
+
+      describe ":after" do
+        let(:threshold) { 2.days.ago.to_date }
+        let(:arguments) { [ 3.days.ago.send(postfix) ] }
+        include_examples 'after date scope','after'
+      end
+
+      describe ":on_or_after" do
+        let(:threshold) { 3.days.ago.to_date }
+        let(:arguments) { [ 3.days.ago.send(postfix) ] }
+        include_examples 'after date scope','on_or_after'
+      end
 
-      it { should include after_threshold_obj }
-      it { should include on_threshold_obj }
-      it { should_not include before_threshold_obj }
     end
 
+  describe "date scopes" do
+
     describe ":today" do
-      let(:top_threshold) { Time.now.beginning_of_day }
-      let(:bottom_threshold) { Time.now.end_of_day }
+      let(:top_threshold) { Date.today }
+      let(:bottom_threshold) { Date.today }
       let(:arguments) { [] }
       include_examples 'between date scope','today'
     end
 
     describe ":yesterday" do
-      let(:top_threshold) { 1.day.ago.beginning_of_day }
-      let(:bottom_threshold) { 1.day.ago.end_of_day }
+      let(:top_threshold) { Date.yesterday }
+      let(:bottom_threshold) { Date.yesterday }
       let(:arguments) { [] }
       include_examples 'between date scope','yesterday'
     end
 
     describe ":tomorrow" do
-      let(:top_threshold) { 1.day.from_now.beginning_of_day }
-      let(:bottom_threshold) { 1.day.from_now.end_of_day }
+      let(:top_threshold) { Date.tomorrow }
+      let(:bottom_threshold) { Date.tomorrow }
       let(:arguments) { [] }
       include_examples 'between date scope','tomorrow'
     end
 
     describe ":next_day" do
-      let(:bottom_threshold) { 1.day.from_now }
-      let(:top_threshold) { Time.now }
+      let(:top_threshold) { Date.today }
+      let(:bottom_threshold) { Date.tomorrow }
       let(:arguments) { [] }
       include_examples 'between date scope','next_day'
     end
 
     describe ":next_week" do
-      let(:bottom_threshold) { 1.week.from_now }
-      let(:top_threshold) { Time.now }
+      let(:top_threshold) { Date.today }
+      let(:bottom_threshold) { Date.today + 1.week }
       let(:arguments) { [] }
       include_examples 'between date scope','next_week'
     end
 
     describe ":next_month" do
-      let(:bottom_threshold) { 1.month.from_now }
-      let(:top_threshold) { Time.now }
+      let(:top_threshold) { Date.today }
+      let(:bottom_threshold) { Date.today + 1.month }
       let(:arguments) { [] }
       include_examples 'between date scope','next_month'
     end
 
     describe ":next_year" do
-      let(:bottom_threshold) { 1.year.from_now }
-      let(:top_threshold) { Time.now }
+      let(:top_threshold) { Date.today }
+      let(:bottom_threshold) { Date.today + 1.year }
       let(:arguments) { [] }
       include_examples 'between date scope','next_year'
     end
 
     describe ":last_day" do
-      let(:top_threshold) { 1.day.ago }
-      let(:bottom_threshold) { Time.now }
+      let(:top_threshold) { Date.yesterday }
+      let(:bottom_threshold) { Date.today }
       let(:arguments) { [] }
       include_examples 'between date scope','last_day'
     end
 
     describe ":last_week" do
-      let(:top_threshold) { 1.week.ago }
-      let(:bottom_threshold) { Time.now }
+      let(:top_threshold) { Date.today - 1.week }
+      let(:bottom_threshold) { Date.today }
       let(:arguments) { [] }
       include_examples 'between date scope','last_week'
     end
 
     describe ":last_month" do
-      let(:top_threshold) { 1.month.ago }
-      let(:bottom_threshold) { Time.now }
+      let(:top_threshold) { Date.today - 1.month }
+      let(:bottom_threshold) { Date.today }
       let(:arguments) { [] }
       include_examples 'between date scope','last_month'
     end
 
     describe ":last_year" do
-      let(:top_threshold) { 1.year.ago }
-      let(:bottom_threshold) { Time.now }
+      let(:top_threshold) { Date.today - 1.year }
+      let(:bottom_threshold) { Date.today }
       let(:arguments) { [] }
       include_examples 'between date scope','last_year'
     end
 
     describe ":last_n_days" do
-      let(:top_threshold) { 3.days.ago }
-      let(:bottom_threshold) { Time.now }
+      let(:top_threshold) { Date.today - 3.days }
+      let(:bottom_threshold) { Date.today }
       let(:arguments) { [3] }
       include_examples 'between date scope','last_n_days'
     end
 
     describe ":last_n_weeks" do
-      let(:top_threshold) { 3.weeks.ago }
-      let(:bottom_threshold) { Time.now }
+      let(:top_threshold) { Date.today - 3.weeks }
+      let(:bottom_threshold) { Date.today }
       let(:arguments) { [3] }
       include_examples 'between date scope','last_n_weeks'
     end
 
     describe ":last_n_months" do
-      let(:top_threshold) { 3.months.ago }
-      let(:bottom_threshold) { Time.now }
+      let(:top_threshold) { Date.today - 3.months }
+      let(:bottom_threshold) { Date.today }
       let(:arguments) { [3] }
       include_examples 'between date scope','last_n_months'
     end
 
     describe ":last_n_years" do
-      let(:top_threshold) { 3.years.ago }
-      let(:bottom_threshold) { Time.now }
+      let(:top_threshold) { Date.today - 3.years }
+      let(:bottom_threshold) { Date.today }
       let(:arguments) { [3] }
       include_examples 'between date scope','last_n_years'
     end
 
     describe ":next_n_days" do
-      let(:top_threshold) { Time.now }
-      let(:bottom_threshold) { 3.days.from_now }
+      let(:top_threshold) { Date.today }
+      let(:bottom_threshold) { Date.today + 3.days }
       let(:arguments) { [3] }
       include_examples 'between date scope','next_n_days'
     end
 
     describe ":next_n_weeks" do
-      let(:top_threshold) { Time.now }
-      let(:bottom_threshold) { 3.weeks.from_now }
+      let(:top_threshold) { Date.today }
+      let(:bottom_threshold) { Date.today + 3.weeks }
       let(:arguments) { [3] }
       include_examples 'between date scope','next_n_weeks'
     end
 
     describe ":next_n_months" do
-      let(:top_threshold) { Time.now }
-      let(:bottom_threshold) { 3.months.from_now }
+      let(:top_threshold) { Date.today }
+      let(:bottom_threshold) { Date.today + 3.months }
       let(:arguments) { [3] }
       include_examples 'between date scope','next_n_months'
     end
 
     describe ":next_n_years" do
-      let(:top_threshold) { Time.now }
-      let(:bottom_threshold) { 3.years.from_now }
+      let(:top_threshold) { Date.today }
+      let(:bottom_threshold) { Date.today + 3.years }
       let(:arguments) { [3] }
       include_examples 'between date scope','next_n_years'
     end
 
     describe ":last_30_days" do
-      let(:top_threshold) { 30.days.ago }
-      let(:bottom_threshold) { Time.now }
+      let(:top_threshold) { Date.today - 30.days }
+      let(:bottom_threshold) { Date.today }
       let(:arguments) { [] }
       include_examples 'between date scope','last_30_days'
     end
 
     describe ":this_day" do
-      let(:top_threshold) { Time.now.beginning_of_day }
-      let(:bottom_threshold) { Time.now.end_of_day }
+      let(:top_threshold) { Date.today }
+      let(:bottom_threshold) { Date.today }
       let(:arguments) { [] }
       include_examples 'between date scope','this_day'
     end
 
     describe ":this_week" do
-      let(:top_threshold) { Time.now.beginning_of_week }
-      let(:bottom_threshold) { Time.now.end_of_week }
+      let(:top_threshold) { Date.today.beginning_of_week }
+      let(:bottom_threshold) { Date.today.end_of_week }
       let(:arguments) { [] }
       include_examples 'between date scope','this_week'
     end
 
     describe ":this_month" do
-      let(:top_threshold) { Time.now.beginning_of_month }
-      let(:bottom_threshold) { Time.now.end_of_month }
+      let(:top_threshold) { Date.today.beginning_of_month }
+      let(:bottom_threshold) { Date.today.end_of_month }
       let(:arguments) { [] }
       include_examples 'between date scope','this_month'
     end
 
     describe ":this_year" do
-      let(:top_threshold) { Time.now.beginning_of_year }
-      let(:bottom_threshold) { Time.now.end_of_year }
+      let(:top_threshold) { Date.today.beginning_of_year }
+      let(:bottom_threshold) { Date.today.end_of_year }
       let(:arguments) { [] }
       include_examples 'between date scope','this_year'
     end

data/spec/support/timestamp_scope_examples.rb

@@ -1,30 +1,56 @@
-
 shared_examples "between time scope" do |name, difference = 1.second|
     subject do
       test_class.send("#{prefix}#{name}", *arguments).to_a
     end
 
-    let(:after_threshold_obj) { test_class.create! date_column => top_threshold - difference }
-    let(:at_top_threshold_obj) { test_class.create! date_column => top_threshold }
-    let(:at_bottom_threshold_obj) { test_class.create! date_column => bottom_threshold }
-    let(:before_threshold_obj) { test_class.create! date_column => bottom_threshold + difference }
+    # In tests top_threshold and bottom_threshold should have time values,
+    # where the interval includes top_threshold but EXCLUDES bottom_threshold
+    let(:before_top_threshold_obj) { test_class.create! date_column => top_threshold.to_time - difference }
+    let(:at_top_threshold_obj) { test_class.create! date_column => top_threshold.to_time }
+    let(:before_bottom_threshold_obj) { test_class.create! date_column => bottom_threshold.to_time - difference }
+    let(:at_bottom_threshold_obj) { test_class.create! date_column => bottom_threshold.to_time }
+
+    before do
+      # puts "#{prefix}#{name}: #{arguments.to_s}"
+      # puts test_class.send("#{prefix}#{name}", *arguments).to_sql
+    end
 
-    it { should_not include after_threshold_obj }
+    it { should_not include before_top_threshold_obj }
     it { should include at_top_threshold_obj }
+    it { should include before_bottom_threshold_obj }
     it { should_not include at_bottom_threshold_obj }
-    it { should_not include before_threshold_obj }
 end
 
-shared_examples "open ended time scope (exclusive)" do |name|
+shared_examples "before time scope" do |name|
+  subject { test_class.send("#{prefix}#{name}", *arguments).to_a }
+
+  # threshold is NOT included in the interval
+  let(:before_top_threshold_obj) { test_class.create! date_column => threshold - 1.second }
+  let(:at_top_threshold_obj) { test_class.create! date_column => threshold }
+
+  before do
+    # puts "#{prefix}#{name}: #{arguments.to_s}"
+    # puts test_class.send("#{prefix}#{name}", *arguments).to_sql
+  end
+
+  it { should include before_top_threshold_obj }
+  it { should_not include at_top_threshold_obj }
+end
+
+shared_examples "after time scope" do |name|
   subject { test_class.send("#{prefix}#{name}", *arguments).to_a }
 
-  let(:after_threshold_obj) { test_class.create! date_column => threshold + 1.second }
-  let(:on_threshold_obj) { test_class.create! date_column => threshold }
-  let(:before_threshold_obj) { test_class.create! date_column => threshold - 1.second }
+  # threshold is included in the interval
+  let(:before_top_threshold_obj) { test_class.create! date_column => threshold - 1.second }
+  let(:at_top_threshold_obj) { test_class.create! date_column => threshold }
 
-  it { should include after_threshold_obj }
-  it { should_not include on_threshold_obj }
-  it { should_not include before_threshold_obj }
+  before do
+    # puts "#{prefix}#{name}: #{arguments.to_s}"
+    # puts test_class.send("#{prefix}#{name}", *arguments).to_sql
+  end
+
+  it { should_not include before_top_threshold_obj }
+  it { should include at_top_threshold_obj }
 end
 
 shared_examples "timestamp scopes" do |date_column = :created_at, prefix = '' |
@@ -32,7 +58,7 @@ shared_examples "timestamp scopes" do |date_column = :created_at, prefix = '' |
   let(:prefix) { prefix }
   let(:date_column) { date_column }
 
-  describe "timestamp scopes" do
+  describe "Time arguments" do
     describe ':between' do
       let(:top_threshold) { 5.minutes.ago }
       let(:bottom_threshold) { 5.minutes.from_now }
@@ -41,66 +67,133 @@ shared_examples "timestamp scopes" do |date_column = :created_at, prefix = '' |
     end
 
     describe ":after" do
-      let(:threshold) { 5.minutes.ago }
+      let(:threshold) { 5.minutes.ago + 1.second }
       let(:arguments) { [ 5.minutes.ago ] }
 
-      include_examples 'open ended time scope (exclusive)', 'after'
+      include_examples 'after time scope', 'after'
     end
 
     describe ":before" do
+      let(:threshold) { 5.minutes.ago }
+      let(:arguments) { [ 5.minutes.ago ] }
 
-      subject { test_class.send("#{prefix}before", 5.minutes.ago).to_a }
+      include_examples 'before time scope', 'before'
+    end
 
-      let(:after_threshold_obj) { test_class.create! date_column => 5.minutes.ago + 1.second }
-      let(:on_threshold_obj) { test_class.create! date_column => 5.minutes.ago }
-      let(:before_threshold_obj) { test_class.create! date_column => 5.minutes.ago - 1.second }
+    describe ":on" do
+      let(:top_threshold) { Date.today.midnight }
+      let(:bottom_threshold) { Date.tomorrow.midnight }
+      let(:arguments) { [ Time.now ] }
 
-      it { should_not include after_threshold_obj }
-      it { should_not include on_threshold_obj }
-      it { should include before_threshold_obj }
+      include_examples "between time scope", 'on'
     end
 
     describe ":on_or_after" do
-      subject { test_class.send("#{prefix}on_or_after", 5.minutes.ago).to_a }
+      let(:threshold) { 5.minutes.ago }
+      let(:arguments) { [ 5.minutes.ago ] }
 
-      let(:after_threshold_obj) { test_class.create! date_column => 5.minutes.ago + 1.second }
-      let(:on_threshold_obj) { test_class.create! date_column => 5.minutes.ago }
-      let(:before_threshold_obj) { test_class.create! date_column => 5.minutes.ago - 1.second }
+      include_examples 'after time scope', 'on_or_after'
+    end
+
+    describe ":on_or_after_date" do
+      let(:threshold) { Date.today.midnight }
+      let(:arguments) { [ Time.now ] }
 
-      it { should include after_threshold_obj }
-      it { should include on_threshold_obj }
-      it { should_not include before_threshold_obj }
+      include_examples 'after time scope', 'on_or_after_date'
     end
 
     describe ":on_or_before" do
-      subject { test_class.send("#{prefix}on_or_before", 5.minutes.ago).to_a }
+      let(:threshold) { 5.minutes.ago + 1.second }
+      let(:arguments) { [ 5.minutes.ago ] }
 
-      let(:after_threshold_obj) { test_class.create! date_column => 5.minutes.ago + 1.second }
-      let(:on_threshold_obj) { test_class.create! date_column => 5.minutes.ago }
-      let(:before_threshold_obj) { test_class.create! date_column => 5.minutes.ago - 1.second }
+      include_examples 'before time scope', 'on_or_before'
+    end
+
+    describe ":on_or_before_date" do
+      let(:threshold) { Date.tomorrow.midnight }
+      let(:arguments) { [ Time.now ] }
+
+      include_examples 'before time scope', 'on_or_before_date'
+    end
+  end
 
-      it { should_not include after_threshold_obj }
-      it { should include on_threshold_obj }
-      it { should include before_threshold_obj }
+  describe "Date arguments" do
+    describe ":between" do
+      let(:top_threshold) { Date.today.midnight }
+      let(:bottom_threshold) { Date.today.midnight + 1.day }
+      let(:arguments) { [Date.today, Date.today] }
+      include_examples "between time scope", 'between'
     end
 
+    describe ":on_or_before_date" do
+      let(:threshold) { Date.tomorrow.midnight }
+      let(:arguments) { [ Date.today ] }
+
+      include_examples 'before time scope', 'on_or_before_date'
+    end
+
+    describe ":on_or_before" do
+      let(:threshold) { Date.tomorrow.midnight }
+      let(:arguments) { [ Date.today ] }
+
+      include_examples 'before time scope', 'on_or_before'
+    end
+
+    describe ":before" do
+      let(:threshold) { Date.today.midnight }
+      let(:arguments) { [ Date.today ] }
+
+      include_examples 'before time scope', 'before'
+    end
+
+    describe ":on_or_after_date" do
+      let(:threshold) { Date.today.midnight }
+      let(:arguments) { [ Date.today ] }
+
+      include_examples 'after time scope', 'on_or_after_date'
+    end
+
+    describe ":on_or_after" do
+      let(:threshold) { Date.today.midnight }
+      let(:arguments) { [ Date.today ] }
+
+      include_examples 'after time scope', 'on_or_after'
+    end
+
+    describe ":after" do
+      let(:threshold) { Date.tomorrow.midnight }
+      let(:arguments) { [ Date.today ] }
+
+      include_examples 'after time scope', 'after'
+    end
+
+    describe ":on" do
+      let(:top_threshold) { Date.today.midnight }
+      let(:bottom_threshold) { Date.tomorrow.midnight }
+      let(:arguments) { [ Date.today ] }
+
+      include_examples "between time scope", 'on'
+    end
+  end
+
+  describe "implicit argument" do
     describe ":today" do
       let(:top_threshold) { Time.now.beginning_of_day }
-      let(:bottom_threshold) { Time.now.end_of_day }
+      let(:bottom_threshold) { Time.now.beginning_of_day + 1.day }
       let(:arguments) { [] }
       include_examples 'between time scope','today'
     end
 
     describe ":yesterday" do
       let(:top_threshold) { 1.day.ago.beginning_of_day }
-      let(:bottom_threshold) { 1.day.ago.end_of_day }
+      let(:bottom_threshold) { Time.now.beginning_of_day }
       let(:arguments) { [] }
       include_examples 'between time scope','yesterday'
     end
 
     describe ":tomorrow" do
       let(:top_threshold) { 1.day.from_now.beginning_of_day }
-      let(:bottom_threshold) { 1.day.from_now.end_of_day }
+      let(:bottom_threshold) { 2.day.from_now.beginning_of_day }
       let(:arguments) { [] }
       include_examples 'between time scope','tomorrow'
     end
@@ -149,98 +242,98 @@ shared_examples "timestamp scopes" do |date_column = :created_at, prefix = '' |
 
     describe ":last_minute" do
       let(:top_threshold) { 1.minute.ago }
-      let(:bottom_threshold) { Time.now }
+      let(:bottom_threshold) { Time.now + 1.second }
       let(:arguments) { [] }
       include_examples 'between time scope','last_minute'
     end
 
     describe ":last_hour" do
       let(:top_threshold) { 1.hour.ago }
-      let(:bottom_threshold) { Time.now }
+      let(:bottom_threshold) { Time.now + 1.second }
       let(:arguments) { [] }
       include_examples 'between time scope','last_hour'
     end
 
     describe ":last_24_hours" do
       let(:top_threshold) { 1.day.ago }
-      let(:bottom_threshold) { Time.now }
+      let(:bottom_threshold) { Time.now + 1.second }
       let(:arguments) { [] }
       include_examples 'between time scope','last_24_hours'
     end
 
     describe ":last_day" do
       let(:top_threshold) { 1.day.ago }
-      let(:bottom_threshold) { Time.now }
+      let(:bottom_threshold) { Time.now + 1.second }
       let(:arguments) { [] }
       include_examples 'between time scope','last_day'
     end
 
     describe ":last_week" do
       let(:top_threshold) { 1.week.ago }
-      let(:bottom_threshold) { Time.now }
+      let(:bottom_threshold) { Time.now + 1.second }
       let(:arguments) { [] }
       include_examples 'between time scope','last_week'
     end
 
     describe ":last_month" do
       let(:top_threshold) { 1.month.ago }
-      let(:bottom_threshold) { Time.now }
+      let(:bottom_threshold) { Time.now + 1.second }
       let(:arguments) { [] }
       include_examples 'between time scope','last_month'
     end
 
     describe ":last_year" do
       let(:top_threshold) { 1.year.ago }
-      let(:bottom_threshold) { Time.now }
+      let(:bottom_threshold) { Time.now + 1.second }
       let(:arguments) { [] }
       include_examples 'between time scope','last_year'
     end
 
     describe ":last_n_seconds" do
       let(:top_threshold) { 3.seconds.ago }
-      let(:bottom_threshold) { Time.now }
+      let(:bottom_threshold) { Time.now + 1.second }
       let(:arguments) { [3] }
       include_examples 'between time scope','last_n_seconds'
     end
 
     describe ":last_n_minutes" do
       let(:top_threshold) { 3.minutes.ago }
-      let(:bottom_threshold) { Time.now }
+      let(:bottom_threshold) { Time.now + 1.second }
       let(:arguments) { [3] }
       include_examples 'between time scope','last_n_minutes'
     end
 
     describe ":last_n_hours" do
       let(:top_threshold) { 3.hours.ago }
-      let(:bottom_threshold) { Time.now }
+      let(:bottom_threshold) { Time.now + 1.second }
       let(:arguments) { [3] }
       include_examples 'between time scope','last_n_hours'
     end
 
     describe ":last_n_days" do
       let(:top_threshold) { 3.days.ago }
-      let(:bottom_threshold) { Time.now }
+      let(:bottom_threshold) { Time.now + 1.second }
       let(:arguments) { [3] }
       include_examples 'between time scope','last_n_days'
     end
 
     describe ":last_n_weeks" do
       let(:top_threshold) { 3.weeks.ago }
-      let(:bottom_threshold) { Time.now }
+      let(:bottom_threshold) { Time.now + 1.second }
       let(:arguments) { [3] }
       include_examples 'between time scope','last_n_weeks'
     end
 
     describe ":last_n_months" do
       let(:top_threshold) { 3.months.ago }
-      let(:bottom_threshold) { Time.now }
+      let(:bottom_threshold) { Time.now + 1.second }
       let(:arguments) { [3] }
       include_examples 'between time scope','last_n_months'
     end
 
     describe ":last_n_years" do
       let(:top_threshold) { 3.years.ago }
-      let(:bottom_threshold) { Time.now }
+      let(:bottom_threshold) { Time.now + 1.second }
       let(:arguments) { [3] }
       include_examples 'between time scope','last_n_years'
     end
@@ -296,49 +389,49 @@ shared_examples "timestamp scopes" do |date_column = :created_at, prefix = '' |
 
     describe ":last_30_days" do
       let(:top_threshold) { 30.days.ago }
-      let(:bottom_threshold) { Time.now }
+      let(:bottom_threshold) { Time.now + 1.second }
       let(:arguments) { [] }
       include_examples 'between time scope','last_30_days'
     end
 
     describe ":this_minute" do
       let(:top_threshold) { Time.now.change(sec: 0) }
-      let(:bottom_threshold) { Time.now.change(sec: 59, usec: Rational(999999999, 1000)) }
+      let(:bottom_threshold) { Time.now.change(sec: 0) + 1.minute }
       let(:arguments) { [] }
       include_examples 'between time scope','this_minute'
     end
 
     describe ":this_hour" do
       let(:top_threshold) { Time.now.beginning_of_hour }
-      let(:bottom_threshold) { Time.now.end_of_hour }
+      let(:bottom_threshold) { Time.now.beginning_of_hour + 1.hour }
       let(:arguments) { [] }
       include_examples 'between time scope','this_hour'
     end
 
     describe ":this_day" do
       let(:top_threshold) { Time.now.beginning_of_day }
-      let(:bottom_threshold) { Time.now.end_of_day }
+      let(:bottom_threshold) { Time.now.beginning_of_day + 1.day }
       let(:arguments) { [] }
       include_examples 'between time scope','this_day'
     end
 
     describe ":this_week" do
       let(:top_threshold) { Time.now.beginning_of_week }
-      let(:bottom_threshold) { Time.now.end_of_week }
+      let(:bottom_threshold) { Time.now.beginning_of_week + 1.week }
       let(:arguments) { [] }
       include_examples 'between time scope','this_week'
     end
 
     describe ":this_month" do
       let(:top_threshold) { Time.now.beginning_of_month }
-      let(:bottom_threshold) { Time.now.end_of_month }
+      let(:bottom_threshold) { Time.now.beginning_of_month + 1.month }
       let(:arguments) { [] }
       include_examples 'between time scope','this_month'
     end
 
     describe ":this_year" do
       let(:top_threshold) { Time.now.beginning_of_year }
-      let(:bottom_threshold) { Time.now.end_of_year }
+      let(:bottom_threshold) { Time.now.beginning_of_year + 1.year }
       let(:arguments) { [] }
       include_examples 'between time scope','this_year'
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: include_date_scopes
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 1.0.0
 platform: ruby
 authors:
 - Sean Todd
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-15 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Include scopes for searching on a date column