by_star 2.2.0.rc1 → 2.2.0

data/spec/integration/shared/by_direction.rb

@@ -6,18 +6,38 @@ shared_examples_for 'by direction' do
 
     context 'point-in-time' do
       subject { Post.before(Date.parse '2014-01-05') }
-      its(:count){ should eq 3 }
+      its(:count){ should eq 12 }
     end
 
     context 'timespan' do
       subject { Event.before(Time.parse '2014-01-05') }
-      its(:count){ should eq 4 }
+      its(:count){ should eq 13 }
     end
 
     context 'timespan strict' do
       subject { Event.before('2014-01-05', strict: true) }
+      its(:count){ should eq 13 }
+    end
+
+    context 'alternative field' do
+      subject { Event.before('2014-01-05', field: 'created_at') }
+      its(:count){ should eq 12 }
+    end
+
+    context 'with default scope' do
+      subject { Appointment.before('2014-01-05', field: 'created_at') }
       its(:count){ should eq 4 }
     end
+
+    context 'with scope as a query criteria' do
+      subject { Post.before('2014-01-05', field: 'created_at', scope: Post.where(day_of_month: 5)) }
+      its(:count){ should eq 1 }
+    end
+
+    context 'with scope as a proc' do
+      subject { Post.before('2014-01-05', field: 'created_at', scope: ->{ where(day_of_month: 5) }) }
+      its(:count){ should eq 1 }
+    end
   end
 
   describe '#after' do
@@ -36,6 +56,26 @@ shared_examples_for 'by direction' do
       subject { Event.after('2014-01-05', strict: true) }
       its(:count){ should eq 9 }
     end
+
+    context 'alternative field' do
+      subject { Event.after('2014-01-05', field: 'created_at') }
+      its(:count){ should eq 10 }
+    end
+
+    context 'with default scope' do
+      subject { Appointment.after('2014-01-05', field: 'created_at') }
+      its(:count){ should eq 3 }
+    end
+
+    context 'with scope as a query criteria' do
+      subject { Post.after('2014-01-05', field: 'created_at', scope: Post.where(day_of_month: 5)) }
+      its(:count){ should eq 1 }
+    end
+
+    context 'with scope as a proc' do
+      subject { Post.after('2014-01-05', field: 'created_at', scope: ->{ where(day_of_month: 5) }) }
+      its(:count){ should eq 1 }
+    end
   end
 
   describe '#previous and #next' do
@@ -51,5 +91,24 @@ shared_examples_for 'by direction' do
       it{ subject.previous.start_time.should eq Time.zone.parse('2013-12-31 17:00:00') }
       it{ subject.next.start_time.should eq Time.zone.parse('2014-01-07 17:00:00') }
     end
+
+    context 'with default scope' do
+      subject { Appointment.where(created_at: Time.zone.parse('2014-01-05 17:00:00')).first }
+      it{ subject.previous.created_at.should eq Time.zone.parse('2014-01-01 17:00:00') }
+      it{ subject.next.created_at.should eq Time.zone.parse('2014-02-01 17:00:00') }
+    end
+
+    context 'with scope as a query criteria' do
+      subject { Post.where(created_at: Time.zone.parse('2014-01-05 17:00:00')).first }
+      it{ subject.previous({ scope: Post.where(day_of_month: 5) }).created_at.should eq Time.zone.parse('2013-12-05 17:00:00')  }
+      it{ subject.next({ scope: Post.where(day_of_month: 1) }).created_at.should eq Time.zone.parse('2014-02-01 17:00:00')  }
+    end
+
+    context 'with scope as a proc' do
+      subject { Post.where(created_at: Time.zone.parse('2014-01-05 17:00:00')).first }
+      it{ subject.previous({ scope: Proc.new{ where(day_of_month: 5) } }).created_at.should eq Time.zone.parse('2013-12-05 17:00:00') }
+      it{ subject.next({ scope: ->{ where(day_of_month: 1) } }).created_at.should eq Time.zone.parse('2014-02-01 17:00:00') }
+      it{ subject.next({ scope: ->(klass){ klass.where(day_of_month: 1) } }).created_at.should eq Time.zone.parse('2014-02-01 17:00:00') }
+    end
   end
 end

data/spec/integration/shared/by_fortnight.rb

@@ -11,7 +11,7 @@ shared_examples_for 'by fortnight' do
 
     context 'timespan' do
       subject { Event.by_fortnight(0) }
-      its(:count){ should eq 6 }
+      its(:count){ should eq 7 }
     end
 
     context 'timespan strict' do
@@ -28,7 +28,7 @@ shared_examples_for 'by fortnight' do
 
       context 'timespan' do
         subject { Event.by_fortnight(26, year: 2013) }
-        its(:count){ should eq 6 }
+        its(:count){ should eq 7 }
       end
 
       context 'timespan strict' do
@@ -42,7 +42,7 @@ shared_examples_for 'by fortnight' do
     end
 
     it 'should be able to use an alternative field' do
-      Event.by_fortnight(:field => 'end_time').count.should eq 6
+      Event.by_fortnight(:field => 'end_time').count.should eq 5
     end
   end
 end

data/spec/integration/shared/by_month.rb

@@ -11,7 +11,7 @@ shared_examples_for 'by month' do
 
     context 'timespan' do
       subject { Event.by_month(1) }
-      its(:count){ should eq 8 }
+      its(:count){ should eq 9 }
     end
 
     context 'timespan strict' do
@@ -23,17 +23,17 @@ shared_examples_for 'by month' do
 
       context 'point-in-time' do
         subject { Post.by_month(12, year: 2013) }
-        its(:count){ should eq 1 }
+        its(:count){ should eq 8 }
       end
 
       context 'timespan' do
         subject { Event.by_month('December', year: 2013) }
-        its(:count){ should eq 4 }
+        its(:count){ should eq 12 }
       end
 
       context 'timespan strict' do
         subject { Event.by_month('Dec', year: 2013, strict: true) }
-        its(:count){ should eq 0 }
+        its(:count){ should eq 4 }
       end
     end
 

data/spec/integration/shared/by_quarter.rb

@@ -11,7 +11,7 @@ shared_examples_for 'by quarter' do
 
     context 'timespan' do
       subject { Event.by_quarter(1) }
-      its(:count){ should eq 12 }
+      its(:count){ should eq 13 }
     end
 
     context 'timespan strict' do
@@ -23,17 +23,17 @@ shared_examples_for 'by quarter' do
 
       context 'point-in-time' do
         subject { Post.by_quarter(4, year: 2013) }
-        its(:count){ should eq 1 }
+        its(:count){ should eq 10 }
       end
 
       context 'timespan' do
         subject { Event.by_quarter(4, year: 2013) }
-        its(:count){ should eq 4 }
+        its(:count){ should eq 13 }
       end
 
       context 'timespan strict' do
         subject { Event.by_quarter(4, year: 2013, strict: true) }
-        its(:count){ should eq 0 }
+        its(:count){ should eq 8 }
       end
     end
 

data/spec/integration/shared/by_week.rb

@@ -11,7 +11,7 @@ shared_examples_for 'by week' do
 
     context 'timespan' do
       subject { Event.by_week(0) }
-      its(:count){ should eq 5 }
+      its(:count){ should eq 7 }
     end
 
     context 'timespan strict' do
@@ -28,7 +28,7 @@ shared_examples_for 'by week' do
 
       context 'timespan' do
         subject { Event.by_week(52, year: 2013) }
-        its(:count){ should eq 5 }
+        its(:count){ should eq 7 }
       end
 
       context 'timespan strict' do
@@ -43,7 +43,7 @@ shared_examples_for 'by week' do
     end
 
     it 'should be able to use an alternative field' do
-      Event.by_week(:field => 'end_time').count.should eq 5
+      Event.by_week(:field => 'end_time').count.should eq 3
     end
 
     context ':start_day option' do

data/spec/integration/shared/by_weekend.rb

@@ -43,7 +43,7 @@ shared_examples_for 'by weekend' do
     end
 
     it 'should be able to use an alternative field' do
-      Event.by_weekend(:field => 'end_time').count.should eq 5
+      Event.by_weekend(:field => 'end_time').count.should eq 1
     end
   end
 end

data/spec/integration/shared/by_year.rb

@@ -11,7 +11,7 @@ shared_examples_for 'by year' do
 
     context 'timespan' do
       subject { Event.by_year(13) }
-      its(:count){ should eq 4 }
+      its(:count){ should eq 13 }
     end
 
     context 'timespan strict' do
@@ -23,26 +23,26 @@ shared_examples_for 'by year' do
 
       context 'point-in-time' do
         subject { Post.by_year(year: 2013) }
-        its(:count){ should eq 1 }
+        its(:count){ should eq 10 }
       end
 
       context 'timespan' do
         subject { Event.by_year(year: 2014) }
-        its(:count){ should eq 13 }
+        its(:count){ should eq 14 }
       end
 
       context 'timespan strict' do
         subject { Event.by_year(year: 2013, strict: true) }
-        its(:count){ should eq 0 }
+        its(:count){ should eq 8 }
       end
     end
 
     it 'should be able to use an alternative field' do
-      Event.by_year(:field => 'end_time').count.should eq 13
+      Event.by_year(:field => 'end_time').count.should eq 14
     end
 
     it 'can use a 2-digit year' do
-      Post.by_year(13).count.should eq 1
+      Post.by_year(13).count.should eq 10
     end
   end
 end

data/spec/integration/shared/offset_parameter.rb

@@ -8,19 +8,19 @@ shared_examples_for 'offset parameter' do
       Post.instance_variable_get(:@by_star_offset).should be_nil
     end
 
-    context 'between_times with model offset' do
+    context 'between_times with default offset' do
       subject { Event.between_times(Time.parse('2014-01-01'), Time.parse('2014-01-10')) }
-      its(:count) { should eq 6 }
+      its(:count) { should eq 7 }
     end
 
     context 'between_times with offset override' do
       subject { Event.between_times(Time.parse('2014-01-01'), Time.parse('2014-01-10'), offset: 16.hours) }
-      its(:count) { should eq 6 }
+      its(:count) { should eq 7 }
     end
 
-    context 'by_day with model offset' do
+    context 'by_day with default offset' do
       subject { Event.by_day(Time.parse('2014-01-01')) }
-      its(:count) { should eq 4 }
+      its(:count) { should eq 5 }
     end
 
     context 'by_day with offset override' do

data/spec/integration/shared/relative.rb

@@ -0,0 +1,174 @@
+require 'spec_helper'
+
+shared_examples_for 'relative' do
+
+  describe '#past_day' do
+    context 'point-in-time' do
+      subject { Post.past_day }
+      its(:count){ should eq 1 }
+    end
+
+    context 'timespan' do
+      subject { Event.past_day }
+      its(:count){ should eq 5 }
+    end
+
+    context 'timespan strict' do
+      subject { Event.past_day(strict: true) }
+      its(:count){ should eq 0 }
+    end
+  end
+
+  describe '#past_week' do
+    context 'point-in-time' do
+      subject { Post.past_week }
+      its(:count){ should eq 3 }
+    end
+
+    context 'timespan' do
+      subject { Event.past_week }
+      its(:count){ should eq 7 }
+    end
+
+    context 'timespan strict' do
+      subject { Event.past_week(strict: true) }
+      its(:count){ should eq 0 }
+    end
+  end
+
+  describe '#past_fortnight' do
+    context 'point-in-time' do
+      subject { Post.past_fortnight }
+      its(:count){ should eq 4 }
+    end
+
+    context 'timespan' do
+      subject { Event.past_fortnight }
+      its(:count){ should eq 8 }
+    end
+
+    context 'timespan strict' do
+      subject { Event.past_fortnight(strict: true) }
+      its(:count){ should eq 1 }
+    end
+  end
+
+  describe '#past_month' do
+    context 'point-in-time' do
+      subject { Post.past_month }
+      its(:count){ should eq 8 }
+    end
+
+    context 'timespan' do
+      subject { Event.past_month }
+      its(:count){ should eq 12 }
+    end
+
+    context 'timespan strict' do
+      subject { Event.past_month(strict: true) }
+      its(:count){ should eq 4 }
+    end
+  end
+
+  describe '#past_year' do
+    context 'point-in-time' do
+      subject { Post.past_year }
+      its(:count){ should eq 10 }
+    end
+
+    context 'timespan' do
+      subject { Event.past_year }
+      its(:count){ should eq 13 }
+    end
+
+    context 'timespan strict' do
+      subject { Event.past_year(strict: true) }
+      its(:count){ should eq 8 }
+    end
+  end
+
+  describe '#next_day' do
+    context 'point-in-time' do
+      subject { Post.next_day }
+      its(:count){ should eq 2 }
+    end
+
+    context 'timespan' do
+      subject { Event.next_day }
+      its(:count){ should eq 5 }
+    end
+
+    context 'timespan strict' do
+      subject { Event.next_day(strict: true) }
+      its(:count){ should eq 0 }
+    end
+  end
+
+  describe '#next_week' do
+    context 'point-in-time' do
+      subject { Post.next_week }
+      its(:count){ should eq 3 }
+    end
+
+    context 'timespan' do
+      subject { Event.next_week }
+      its(:count){ should eq 7 }
+    end
+
+    context 'timespan strict' do
+      subject { Event.next_week(strict: true) }
+      its(:count){ should eq 0 }
+    end
+  end
+
+  describe '#next_fortnight' do
+    context 'point-in-time' do
+      subject { Post.next_fortnight }
+      its(:count){ should eq 5 }
+    end
+
+    context 'timespan' do
+      subject { Event.next_fortnight }
+      its(:count){ should eq 7 }
+    end
+
+    context 'timespan strict' do
+      subject { Event.next_fortnight(strict: true) }
+      its(:count){ should eq 0 }
+    end
+  end
+
+  describe '#next_month' do
+    context 'point-in-time' do
+      subject { Post.next_month }
+      its(:count){ should eq 6 }
+    end
+
+    context 'timespan' do
+      subject { Event.next_month }
+      its(:count){ should eq 9 }
+    end
+
+    context 'timespan strict' do
+      subject { Event.next_month(strict: true) }
+      its(:count){ should eq 3 }
+    end
+  end
+
+  describe '#next_year' do
+    context 'point-in-time' do
+      subject { Post.next_year }
+      its(:count){ should eq 12 }
+    end
+
+    context 'timespan' do
+      subject { Event.next_year }
+      its(:count){ should eq 14 }
+    end
+
+    context 'timespan strict' do
+      subject { Event.next_year(strict: true) }
+      its(:count){ should eq 9 }
+    end
+  end
+end