by_star 2.2.1 → 3.0.0

data/spec/integration/shared/scope_parameter.rb

@@ -1,72 +1,73 @@
-require 'spec_helper'
-
-shared_examples_for 'scope parameter' do
-
-  describe 'scope' do
-    it 'should memoize the scope variable' do
-      Event.instance_variable_get(:@by_star_scope).should be_nil
-      Post.instance_variable_get(:@by_star_scope).should be_nil
-      Appointment.instance_variable_get(:@by_star_scope).should be_a Proc
-    end
-
-    context 'between_times with default scope' do
-      subject { Appointment.between_times(Date.parse('2013-12-01'), Date.parse('2014-02-01')) }
-      its(:count) { should eq 3 }
-    end
-
-    context 'between_times with scope override as a query criteria' do
-      subject { Appointment.between_times(Date.parse('2013-12-01'), Date.parse('2014-02-01'), scope: Appointment.unscoped) }
-      its(:count) { should eq 14 }
-    end
-
-    context 'between_times with scope override as a Lambda' do
-      subject { Appointment.between_times(Date.parse('2013-12-01'), Date.parse('2014-02-01'), scope: ->{ unscoped }) }
-      its(:count) { should eq 14 }
-    end
-
-    context 'between_times with scope override as a Lambda' do
-      subject { Appointment.between_times(Date.parse('2013-12-01'), Date.parse('2014-02-01'), scope: ->(x){ unscoped }) }
-      it{ ->{subject}.should raise_error }
-    end
-
-    context 'between_times with scope override as a Proc with arguments' do
-      subject { Appointment.between_times(Date.parse('2013-12-01'), Date.parse('2014-02-01'), scope: Proc.new{ unscoped }) }
-      its(:count) { should eq 14 }
-    end
-
-    context 'between_times with scope override as a Proc with arguments' do
-      subject { Appointment.between_times(Date.parse('2013-12-01'), Date.parse('2014-02-01'), scope: Proc.new{|x,y| unscoped }) }
-      it{ ->{subject}.should raise_error }
-    end
-
-    context 'by_month with default scope' do
-      subject { Appointment.by_month(Date.parse('2014-01-01')) }
-      its(:count) { should eq 2 }
-    end
-
-    context 'by_month with scope override as a query criteria' do
-      subject { Appointment.by_month(Date.parse('2014-01-01'), scope: Appointment.unscoped) }
-      its(:count) { should eq 6 }
-    end
-
-    context 'by_month with scope override as a Lambda' do
-      subject { Appointment.by_month(Date.parse('2014-01-01'), scope: ->{ unscoped }) }
-      its(:count) { should eq 6 }
-    end
-
-    context 'by_month with scope override as a Lambda with arguments' do
-      subject { Appointment.by_month(Date.parse('2014-01-01'), scope: ->(x){ unscoped }) }
-      it{ ->{subject}.should raise_error }
-    end
-
-    context 'by_month with scope override as a Proc' do
-      subject { Appointment.by_month(Date.parse('2014-01-01'), scope: Proc.new{ unscoped }) }
-      its(:count) { should eq 6 }
-    end
-
-    context 'by_month with scope override as a Proc with arguments' do
-      subject { Appointment.by_month(Date.parse('2014-01-01'), scope: Proc.new{|x| unscoped }) }
-      it{ ->{subject}.should raise_error }
-    end
-  end
-end
+require 'spec_helper'
+
+shared_examples_for 'scope parameter' do
+
+  describe ':scope' do
+
+    it 'should memoize the scope variable' do
+      expect(Event.instance_variable_get(:@by_star_scope)).to be_nil
+      expect(Post.instance_variable_get(:@by_star_scope)).to be_nil
+      expect(Appointment.instance_variable_get(:@by_star_scope)).to be_a Proc
+    end
+
+    context 'between_times with default scope' do
+      subject { Appointment.between_times(Date.parse('2013-12-01'), Date.parse('2014-02-01')) }
+      it { expect(subject.count).to eql(3) }
+    end
+
+    context 'between_times with scope override as a query criteria' do
+      subject { Appointment.between_times(Date.parse('2013-12-01')..Date.parse('2014-02-01'), scope: Appointment.unscoped) }
+      it { expect(subject.count).to eql(14) }
+    end
+
+    context 'between_times with scope override as a Lambda' do
+      subject { Appointment.between_times([Date.parse('2013-12-01'), Date.parse('2014-02-01')], scope: ->{ unscoped }) }
+      it { expect(subject.count).to eql(14) }
+    end
+
+    context 'between_times with scope override as a Lambda' do
+      subject { Appointment.between_times(Date.parse('2013-12-01')..Date.parse('2014-02-01'), scope: ->(x){ unscoped }) }
+      it{ expect{ subject }.to raise_error(RuntimeError, 'ByStar :scope Proc requires :scope_args to be specified.') }
+    end
+
+    context 'between_times with scope override as a Proc with arguments' do
+      subject { Appointment.between_times(Date.parse('2013-12-01'), Date.parse('2014-02-01'), scope: Proc.new{ unscoped }) }
+      it { expect(subject.count).to eql(14) }
+    end
+
+    context 'between_times with scope override as a Proc with arguments' do
+      subject { Appointment.between_times([Date.parse('2013-12-01'), Date.parse('2014-02-01')], scope: Proc.new{|x,y| unscoped }) }
+      it{ expect{ subject }.to raise_error(RuntimeError, 'ByStar :scope Proc requires :scope_args to be specified.') }
+    end
+
+    context 'by_month with default scope' do
+      subject { Appointment.by_month(Date.parse('2014-01-01')) }
+      it { expect(subject.count).to eql(2) }
+    end
+
+    context 'by_month with scope override as a query criteria' do
+      subject { Appointment.by_month(Date.parse('2014-01-01'), scope: Appointment.unscoped) }
+      it { expect(subject.count).to eql(6) }
+    end
+
+    context 'by_month with scope override as a Lambda' do
+      subject { Appointment.by_month(Date.parse('2014-01-01'), scope: ->{ unscoped }) }
+      it { expect(subject.count).to eql(6) }
+    end
+
+    context 'by_month with scope override as a Lambda with arguments' do
+      subject { Appointment.by_month(Date.parse('2014-01-01'), scope: ->(x){ unscoped }) }
+      it{ expect{ subject }.to raise_error(RuntimeError, 'ByStar :scope Proc requires :scope_args to be specified.') }
+    end
+
+    context 'by_month with scope override as a Proc' do
+      subject { Appointment.by_month(Date.parse('2014-01-01'), scope: Proc.new{ unscoped }) }
+      it { expect(subject.count).to eql(6) }
+    end
+
+    context 'by_month with scope override as a Proc with arguments' do
+      subject { Appointment.by_month(Date.parse('2014-01-01'), scope: Proc.new{|x| unscoped }) }
+      it{ expect{ subject }.to raise_error(RuntimeError, 'ByStar :scope Proc requires :scope_args to be specified.') }
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,29 +1,29 @@
-require 'rubygems'
-require 'bundler'
-Bundler.setup
-require 'fileutils'
-require 'logger'
-
-FileUtils.mkdir_p(File.dirname(__FILE__) + "/tmp")
-$:.unshift(File.join(File.dirname(__FILE__), "../lib"))
-
-require 'active_record'
-require 'mongoid'
-require 'chronic'
-require 'timecop'
-require 'by_star'
-
-# Specs should pass regardless of timezone
-Time.zone = %w(Asia/Tokyo America/New_York Australia/Sydney UTC).sample
-puts "Running specs in #{Time.zone} timezone..."
-
-# Set Rails time to 2014-01-01 00:00:00
-Timecop.travel(Time.zone.local(2014))
-
-def testing_mongoid?
-  ENV['DB'] == 'mongodb' || ENV['DB'].nil?
-end
-
-def testing_active_record?
-  ENV['DB'] != 'mongodb'
-end
+require 'rubygems'
+require 'bundler'
+Bundler.setup
+require 'fileutils'
+require 'logger'
+
+FileUtils.mkdir_p(File.dirname(__FILE__) + "/tmp")
+$:.unshift(File.join(File.dirname(__FILE__), "../lib"))
+
+require 'active_record'
+require 'mongoid'
+require 'chronic'
+require 'timecop'
+require 'by_star'
+
+# Specs should pass regardless of timezone
+Time.zone = %w(Asia/Tokyo America/New_York Australia/Sydney UTC).sample
+puts "Running specs in #{Time.zone} timezone..."
+
+# Set Rails time to 2014-01-01 00:00:00
+Timecop.travel(Time.zone.local(2014))
+
+def testing_mongoid?
+  ENV['DB'] == 'mongodb'
+end
+
+def testing_active_record?
+  !testing_mongoid?
+end

data/spec/unit/kernel_date_spec.rb

@@ -1,60 +1,113 @@
-require 'spec_helper'
-
-describe Date do
-
-  describe '#in_time_zone' do
-
-    subject { Date.new }
-
-    before do
-      stub_const('Date', Class.new)
-      Date.any_instance.stub(:to_time_in_current_zone)
-    end
-
-    context 'when #in_time_zone is already defined' do
-      before do
-        Date.any_instance.should_receive(:in_time_zone)
-      end
-
-      context 'when ByStar::Kernel::Date included' do
-        before do
-          ::Date.__send__(:include, ByStar::Kernel::Date)
-        end
-
-        it 'should not be aliased to #to_time_in_current_zone' do
-          subject.should_not_receive(:to_time_in_current_zone)
-          subject.in_time_zone
-        end
-      end
-
-      context 'when ByStar::Kernel::Date not included' do
-
-        it 'should not be aliased to #to_time_in_current_zone' do
-          subject.should_not_receive(:to_time_in_current_zone)
-          subject.in_time_zone
-        end
-      end
-    end
-
-    context 'when #in_time_zone is not defined' do
-
-      context 'when ByStar::Kernel::Date included' do
-        before do
-          ::Date.__send__(:include, ByStar::Kernel::Date)
-        end
-
-        it 'should be aliased to #to_time_in_current_zone' do
-          subject.should_receive(:to_time_in_current_zone)
-          subject.in_time_zone
-        end
-      end
-
-      context 'when ByStar::Kernel::Date not included' do
-
-        it 'should raise NoMethodError' do
-          ->{ subject.in_time_zone }.should raise_error(NoMethodError)
-        end
-      end
-    end
-  end
-end
+require 'spec_helper'
+
+describe Date do
+
+  describe '#in_time_zone' do
+
+    subject { Date.new }
+
+    before do
+      stub_const('Date', Class.new)
+      allow_any_instance_of(Date).to receive(:to_time_in_current_zone)
+    end
+
+    context 'when #in_time_zone is already defined' do
+      before do
+        expect_any_instance_of(Date).to receive(:in_time_zone)
+      end
+
+      context 'when ByStar::Kernel::Date included' do
+        before do
+          ::Date.__send__(:include, ByStar::Kernel::Date)
+        end
+
+        it 'should not be aliased to #to_time_in_current_zone' do
+          expect(subject).not_to receive(:to_time_in_current_zone)
+          subject.in_time_zone
+        end
+      end
+
+      context 'when ByStar::Kernel::Date not included' do
+
+        it 'should not be aliased to #to_time_in_current_zone' do
+          expect(subject).not_to receive(:to_time_in_current_zone)
+          subject.in_time_zone
+        end
+      end
+    end
+
+    context 'when #in_time_zone is not defined' do
+
+      context 'when ByStar::Kernel::Date included' do
+        before do
+          ::Date.__send__(:include, ByStar::Kernel::Date)
+        end
+
+        it 'should be aliased to #to_time_in_current_zone' do
+          expect(subject).to receive(:to_time_in_current_zone)
+          subject.in_time_zone
+        end
+      end
+
+      context 'when ByStar::Kernel::Date not included' do
+
+        it 'should raise NoMethodError' do
+          expect{ subject.in_time_zone }.to raise_error(NoMethodError)
+        end
+      end
+    end
+  end
+
+  describe 'weekend' do
+
+    (0..6).each do |n|
+      context "Monday plus #{n} days" do
+        subject { Date.parse('2014-01-06') + n.days }
+        it { expect(subject.beginning_of_weekend).to eq Date.parse('2014-01-11') }
+        it { expect(subject.end_of_weekend).to eq Date.parse('2014-01-12') }
+      end
+    end
+  end
+
+  describe 'fortnight' do
+
+    context 'first day of year' do
+      subject { Date.parse '2014-01-01' }
+      it { expect(subject.beginning_of_fortnight).to eq Date.parse('2014-01-01') }
+      it { expect(subject.end_of_fortnight).to eq Date.parse('2014-01-14') }
+    end
+
+    context 'second fortnight of year' do
+      subject { Date.parse '2014-01-16' }
+      it { expect(subject.beginning_of_fortnight).to eq Date.parse('2014-01-15') }
+      it { expect(subject.end_of_fortnight).to eq Date.parse('2014-01-28') }
+    end
+
+    context 'middle of year' do
+      subject { Date.parse '2014-06-13' }
+      it { expect(subject.beginning_of_fortnight).to eq Date.parse('2014-06-04') }
+      it { expect(subject.end_of_fortnight).to eq Date.parse('2014-06-17') }
+    end
+
+    context 'last day of year' do
+      subject { Date.parse '2014-12-31' }
+      it { expect(subject.beginning_of_fortnight).to eq Date.parse('2014-12-31') }
+      it { expect(subject.end_of_fortnight).to eq Date.parse('2015-01-13') }
+    end
+  end
+
+  describe 'calendar_month' do
+
+    subject { Date.parse '2014-01-01' }
+
+    context 'week begins Monday' do
+      it { expect(subject.beginning_of_calendar_month).to eq Date.parse('2013-12-30') }
+      it { expect(subject.end_of_calendar_month).to eq Date.parse('2014-02-02') }
+    end
+
+    context 'week begins Sunday' do
+      it { expect(subject.beginning_of_calendar_month(:sunday)).to eq Date.parse('2013-12-29') }
+      it { expect(subject.end_of_calendar_month(:sunday)).to eq Date.parse('2014-02-01') }
+    end
+  end
+end

data/spec/unit/kernel_time_spec.rb

@@ -1,57 +1,57 @@
-require 'spec_helper'
-
-describe Time do
-
-  describe 'weekend' do
-
-    (0..6).each do |n|
-      context "Monday plus #{n} days" do
-        subject { Time.zone.parse('2014-01-06') + n.days }
-        its(:beginning_of_weekend){ should eq Time.zone.parse('2014-01-10 15:00') }
-        its(:end_of_weekend){ should eq Time.zone.parse('2014-01-13 02:00').end_of_hour }
-      end
-    end
-  end
-
-  describe 'fortnight' do
-
-    context 'first day of year' do
-      subject { Time.zone.parse '2014-01-01' }
-      its(:beginning_of_fortnight){ should eq Time.zone.parse('2014-01-01') }
-      its(:end_of_fortnight){ should eq Time.zone.parse('2014-01-14').end_of_day }
-    end
-
-    context 'second fortnight of year' do
-      subject { Time.zone.parse '2014-01-16' }
-      its(:beginning_of_fortnight){ should eq Time.zone.parse('2014-01-15') }
-      its(:end_of_fortnight){ should eq Time.zone.parse('2014-01-28').end_of_day }
-    end
-
-    context 'middle of year' do
-      subject { Time.zone.parse '2014-06-13' }
-      its(:beginning_of_fortnight){ should eq Time.zone.parse('2014-06-04') }
-      its(:end_of_fortnight){ should eq Time.zone.parse('2014-06-17').end_of_day }
-    end
-
-    context 'last day of year' do
-      subject { Time.zone.parse '2014-12-31' }
-      its(:beginning_of_fortnight){ should eq Time.zone.parse('2014-12-31') }
-      its(:end_of_fortnight){ should eq Time.zone.parse('2015-01-13').end_of_day }
-    end
-  end
-
-  describe 'calendar_month' do
-
-    subject { Time.zone.parse '2014-01-01' }
-
-    context 'week begins Monday' do
-      its(:beginning_of_calendar_month){ should eq Time.zone.parse('2013-12-30') }
-      its(:end_of_calendar_month){ should eq Time.zone.parse('2014-02-02').end_of_day }
-    end
-
-    context 'week begins Sunday' do
-      it { subject.beginning_of_calendar_month(:sunday).should eq Time.zone.parse('2013-12-29') }
-      it { subject.end_of_calendar_month(:sunday).should eq Time.zone.parse('2014-02-01').end_of_day }
-    end
-  end
-end
+require 'spec_helper'
+
+describe Time do
+
+  describe 'weekend' do
+
+    (0..6).each do |n|
+      context "Monday plus #{n} days" do
+        subject { Time.zone.parse('2014-01-06') + n.days }
+        it { expect(subject.beginning_of_weekend).to eq Time.zone.parse('2014-01-11') }
+        it { expect(subject.end_of_weekend).to eq Time.zone.parse('2014-01-12').end_of_day }
+      end
+    end
+  end
+
+  describe 'fortnight' do
+
+    context 'first day of year' do
+      subject { Time.zone.parse '2014-01-01' }
+      it { expect(subject.beginning_of_fortnight).to eq Time.zone.parse('2014-01-01') }
+      it { expect(subject.end_of_fortnight).to eq Time.zone.parse('2014-01-14').end_of_day }
+    end
+
+    context 'second fortnight of year' do
+      subject { Time.zone.parse '2014-01-16' }
+      it { expect(subject.beginning_of_fortnight).to eq Time.zone.parse('2014-01-15') }
+      it { expect(subject.end_of_fortnight).to eq Time.zone.parse('2014-01-28').end_of_day }
+    end
+
+    context 'middle of year' do
+      subject { Time.zone.parse '2014-06-13' }
+      it { expect(subject.beginning_of_fortnight).to eq Time.zone.parse('2014-06-04') }
+      it { expect(subject.end_of_fortnight).to eq Time.zone.parse('2014-06-17').end_of_day }
+    end
+
+    context 'last day of year' do
+      subject { Time.zone.parse '2014-12-31' }
+      it { expect(subject.beginning_of_fortnight).to eq Time.zone.parse('2014-12-31') }
+      it { expect(subject.end_of_fortnight).to eq Time.zone.parse('2015-01-13').end_of_day }
+    end
+  end
+
+  describe 'calendar_month' do
+
+    subject { Time.zone.parse '2014-01-01' }
+
+    context 'week begins Monday' do
+      it { expect(subject.beginning_of_calendar_month).to eq Time.zone.parse('2013-12-30') }
+      it { expect(subject.end_of_calendar_month).to eq Time.zone.parse('2014-02-02').end_of_day }
+    end
+
+    context 'week begins Sunday' do
+      it { expect(subject.beginning_of_calendar_month(:sunday)).to eq Time.zone.parse('2013-12-29') }
+      it { expect(subject.end_of_calendar_month(:sunday)).to eq Time.zone.parse('2014-02-01').end_of_day }
+    end
+  end
+end