by_star 2.2.1 → 3.0.0

data/spec/fixtures/shared/seeds.rb

@@ -1,26 +1,26 @@
-%w(2013-11-01
-   2013-11-30
-   2013-12-01
-   2013-12-05
-   2013-12-08
-   2013-12-16
-   2013-12-22
-   2013-12-25
-   2013-12-28
-   2013-12-31
-   2014-01-01
-   2014-01-01
-   2014-01-05
-   2014-01-10
-   2014-01-12
-   2014-01-20
-   2014-02-01
-   2014-02-15
-   2014-03-01
-   2014-03-15
-   2014-04-01
-   2014-04-15).map{|d| Time.zone.parse(d) + 17.hours }.each do |d|
-  Post.create!(:created_at => d, day_of_month: d.day)
-  Appointment.create!(:created_at => d, day_of_month: d.day)
-  Event.create!(:created_at => d, :start_time => d - 5.days, :end_time => d + 5.days, day_of_month: d.day)
-end
+%w(2013-11-01
+   2013-11-30
+   2013-12-01
+   2013-12-05
+   2013-12-08
+   2013-12-16
+   2013-12-22
+   2013-12-25
+   2013-12-28
+   2013-12-31
+   2014-01-01
+   2014-01-01
+   2014-01-05
+   2014-01-10
+   2014-01-12
+   2014-01-20
+   2014-02-01
+   2014-02-15
+   2014-03-01
+   2014-03-15
+   2014-04-01
+   2014-04-15).map{|d| Time.zone.parse(d) + 17.hours }.each_with_index do |d, index|
+  Post.create!(created_at: d, updated_at: d + index.days, day_of_month: d.day)
+  Appointment.create!(created_at: d, day_of_month: d.day)
+  Event.create!(created_at: d, start_time: d - 5.days, end_time: d + 5.days, day_of_month: d.day)
+end

data/spec/gemfiles/Gemfile.master

@@ -0,0 +1,6 @@
+source 'http://rubygems.org'
+
+gemspec path: '../../'
+
+gem 'activerecord', github: 'rails'
+gem 'mongoid',      github: 'mongoid'

data/spec/gemfiles/Gemfile.rails40

@@ -0,0 +1,7 @@
+source 'http://rubygems.org'
+
+gemspec path: '../../'
+
+gem 'activerecord', '~> 4.0.0'
+gem 'pg',           '~> 0.11'
+gem 'mongoid',      '~> 4.0.0'

data/spec/gemfiles/Gemfile.rails41

@@ -0,0 +1,7 @@
+source 'http://rubygems.org'
+
+gemspec path: '../../'
+
+gem 'activerecord', '~> 4.1.0'
+gem 'pg',           '~> 0.11'
+gem 'mongoid',      '~> 4.0.0'

data/spec/gemfiles/Gemfile.rails42

@@ -0,0 +1,7 @@
+source 'http://rubygems.org'
+
+gemspec path: '../../'
+
+gem 'mongoid',      '~> 4.0.0'
+gem 'pg',           '~> 0.15'
+gem 'activerecord', '~> 4.2.0'

data/spec/gemfiles/Gemfile.rails50

@@ -0,0 +1,10 @@
+source 'http://rubygems.org'
+
+gemspec path: '../../'
+
+gem 'activerecord', '~> 5.0.0'
+gem 'pg',           '~> 0.18'
+gem 'mongoid',      '~> 6.0'
+# Due to weird connection issues in 2.5.0
+# TODO: double check this for non 2.5.0 versions
+gem 'mongo', '~> 2.4.3'

data/spec/gemfiles/Gemfile.rails51

@@ -0,0 +1,10 @@
+source 'http://rubygems.org'
+
+gemspec path: '../../'
+
+gem 'activerecord', '~> 5.1.0'
+gem 'pg',           '~> 0.18'
+gem 'mongoid',      '~> 6.0'
+# Due to weird connection issues in 2.5.0
+# TODO: double check this for non 2.5.0 versions
+gem 'mongo', '~> 2.4.3'

data/spec/integration/active_record/active_record_spec.rb

@@ -1,53 +1,38 @@
-require 'spec_helper'
-Dir[File.dirname(__FILE__) + '/../shared/*.rb'].each {|file| require file }
-
-describe ActiveRecord do
-  before(:all) do
-    ActiveRecord::Base.default_timezone = :utc
-    # ActiveRecord::Base.logger = Logger.new(STDOUT)
-
-    db_config = YAML::load_file(File.dirname(__FILE__) + '/../../database.yml')
-    if db_config.has_key?('sqlite') && db_config['sqlite'].has_key?('database')
-      db_config['sqlite']['database'] = File.dirname(__FILE__) + '/../../tmp/' + db_config['sqlite']['database']
-    end
-
-    ActiveRecord::Base.configurations = db_config
-    ActiveRecord::Base.establish_connection(ENV['DB'] || 'sqlite')
-    load File.dirname(__FILE__) + '/../../fixtures/active_record/schema.rb'
-    load File.dirname(__FILE__) + '/../../fixtures/active_record/models.rb'
-    load File.dirname(__FILE__) + '/../../fixtures/shared/seeds.rb'
-
-    ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + '/../../tmp/activerecord.log')
-  end
-
-  it_behaves_like 'by day'
-  it_behaves_like 'by direction'
-  it_behaves_like 'by fortnight'
-  it_behaves_like 'by month'
-  it_behaves_like 'by calendar month'
-  it_behaves_like 'by quarter'
-  it_behaves_like 'by week'
-  it_behaves_like 'by weekend'
-  it_behaves_like 'by year'
-  it_behaves_like 'relative'
-  it_behaves_like 'offset parameter'
-  it_behaves_like 'scope parameter'
-
-  it 'should be able to order the result set' do
-    scope = Post.by_year(Time.zone.now.year, :order => 'created_at DESC')
-    scope.order_values.should == ['created_at DESC']
-  end
-
-  describe '#between_times' do
-    subject { Post.between_times(Time.parse('2014-01-01'), Time.parse('2014-01-06')) }
-    it { should be_a(ActiveRecord::Relation) }
-    its(:count) { should eq 3 }
-  end
-
-  describe '#between' do
-    subject { Post.between(Time.parse('2014-01-01'), Time.parse('2014-01-06')) }
-    it 'should be an alias of #between_times' do
-      subject.count.should eq 3
-    end
-  end
-end if testing_active_record?
+require 'spec_helper'
+Dir[File.dirname(__FILE__) + '/../shared/*.rb'].each {|file| require file }
+
+describe ActiveRecord do
+  before(:all) do
+    ActiveRecord::Base.default_timezone = :utc
+    # ActiveRecord::Base.logger = Logger.new(STDOUT)
+
+    db_config = YAML::load_file(File.dirname(__FILE__) + '/../../database.yml')
+    if db_config.has_key?('sqlite') && db_config['sqlite'].has_key?('database')
+      db_config['sqlite']['database'] = File.dirname(__FILE__) + '/../../tmp/' + db_config['sqlite']['database']
+    end
+
+    ActiveRecord::Base.configurations = db_config
+    ActiveRecord::Base.establish_connection(ENV['DB'].try(:to_sym) || :sqlite)
+    load File.dirname(__FILE__) + '/../../fixtures/active_record/schema.rb'
+    load File.dirname(__FILE__) + '/../../fixtures/active_record/models.rb'
+    load File.dirname(__FILE__) + '/../../fixtures/shared/seeds.rb'
+
+    ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + '/../../tmp/activerecord.log')
+  end
+
+  it_behaves_like 'between_times'
+  it_behaves_like 'offset parameter'
+  it_behaves_like 'order parameter'
+  it_behaves_like 'scope parameter'
+  it_behaves_like 'by day'
+  it_behaves_like 'by direction'
+  it_behaves_like 'by fortnight'
+  it_behaves_like 'by month'
+  it_behaves_like 'by calendar month'
+  it_behaves_like 'by quarter'
+  it_behaves_like 'by week'
+  it_behaves_like 'by cweek'
+  it_behaves_like 'by weekend'
+  it_behaves_like 'by year'
+  it_behaves_like 'relative'
+end if testing_active_record?

data/spec/integration/mongoid/mongoid_spec.rb

@@ -1,46 +1,37 @@
-require 'spec_helper'
-Dir[File.dirname(__FILE__) + '/../shared/*.rb'].each {|file| require file }
-
-describe 'Mongoid' do
-
-  before(:all) do
-    DATABASE_NAME = "mongoid_#{Process.pid}"
-    # Moped.logger = Logger.new(STDOUT)
-
-    Mongoid.configure do |config|
-      config.connect_to DATABASE_NAME
-    end
-
-    load File.dirname(__FILE__) + '/../../fixtures/mongoid/models.rb'
-    load File.dirname(__FILE__) + '/../../fixtures/shared/seeds.rb'
-  end
-
-  after(:all) do
-    Mongoid.purge!
-  end
-
-  it_behaves_like 'by day'
-  it_behaves_like 'by direction'
-  it_behaves_like 'by fortnight'
-  it_behaves_like 'by month'
-  it_behaves_like 'by calendar month'
-  it_behaves_like 'by quarter'
-  it_behaves_like 'by week'
-  it_behaves_like 'by weekend'
-  it_behaves_like 'by year'
-  it_behaves_like 'relative'
-  it_behaves_like 'offset parameter'
-  it_behaves_like 'scope parameter'
-
-  describe '#between_times' do
-    subject { Post.between_times(Time.parse('2014-01-01'), Time.parse('2014-01-06')) }
-    it { should be_a(Mongoid::Criteria) }
-    its(:count) { should eq 3 }
-  end
-
-  describe '#between' do
-    it 'should not override Mongoid between method' do
-      Post.between(created_at: Time.parse('2014-01-01')..Time.parse('2014-01-06')).count.should eq 3
-    end
-  end
-end if testing_mongoid?
+require 'spec_helper'
+Dir[File.dirname(__FILE__) + '/../shared/*.rb'].each {|file| require file }
+
+describe 'Mongoid' do
+
+  before(:all) do
+    DATABASE_NAME = "mongoid_#{Process.pid}"
+    # Moped.logger = Logger.new(STDOUT)
+
+    Mongoid.configure do |config|
+      config.connect_to DATABASE_NAME
+    end
+
+    load File.dirname(__FILE__) + '/../../fixtures/mongoid/models.rb'
+    load File.dirname(__FILE__) + '/../../fixtures/shared/seeds.rb'
+  end
+
+  after(:all) do
+    Mongoid.purge!
+  end
+
+  it_behaves_like 'between_times'
+  it_behaves_like 'offset parameter'
+  it_behaves_like 'order parameter'
+  it_behaves_like 'scope parameter'
+  it_behaves_like 'by day'
+  it_behaves_like 'by direction'
+  it_behaves_like 'by fortnight'
+  it_behaves_like 'by month'
+  it_behaves_like 'by calendar month'
+  it_behaves_like 'by quarter'
+  it_behaves_like 'by week'
+  it_behaves_like 'by cweek'
+  it_behaves_like 'by weekend'
+  it_behaves_like 'by year'
+  it_behaves_like 'relative'
+end if testing_mongoid?

data/spec/integration/shared/between_times.rb

@@ -0,0 +1,82 @@
+require 'spec_helper'
+
+shared_examples_for 'between_times' do
+
+  describe '#between_times' do
+    subject { Post.between_times(Time.zone.parse('2014-01-01'), Time.zone.parse('2014-01-06')) }
+
+    if testing_active_record?
+      it { is_expected.to be_a(ActiveRecord::Relation) }
+    else testing_mongoid?
+      it { is_expected.to be_a(Mongoid::Criteria) }
+    end
+
+    it { expect(subject.count).to eql(3) }
+
+    context 'one-sided query' do
+
+      context 'point query' do
+
+        context 'only start time' do
+          subject { Post.between_times(Time.zone.parse('2014-01-01'), nil) }
+          it { expect(subject.count).to eql(12) }
+        end
+
+        context 'only end time' do
+          subject { Post.between_times(nil, Time.zone.parse('2014-01-01')) }
+          it { expect(subject.count).to eql(10) }
+
+          context 'neither start nor end time' do
+            subject { Post.between_times(nil, nil) }
+            it { expect(subject.count).to eql(22) }
+          end
+        end
+      end
+
+      context 'timespan loose query' do
+
+        context 'only start time' do
+          subject { Event.between_times(Time.zone.parse('2014-01-01'), nil, strict: false) }
+          it { expect(subject.count).to eql(9) }
+        end
+
+        context 'only end time' do
+          subject { Event.between_times(nil, Time.zone.parse('2014-01-01'), strict: false) }
+          it { expect(subject.count).to eql(13) }
+
+          context 'neither start nor end time' do
+            subject { Event.between_times(nil, nil) }
+            it { expect(subject.count).to eql(22) }
+          end
+        end
+      end
+
+      context 'timespan strict query' do
+
+        context 'only start time' do
+          subject { Event.between_times(Time.zone.parse('2014-01-01'), nil) }
+          it { expect(subject.count).to eql(9) }
+        end
+
+        context 'only end time' do
+          subject { Event.between_times(nil, Time.zone.parse('2014-01-01')) }
+          it { expect(subject.count).to eql(13) }
+
+          context 'neither start nor end time' do
+            subject { Event.between_times(nil, nil) }
+            it { expect(subject.count).to eql(22) }
+          end
+        end
+      end
+    end
+  end
+
+  if testing_mongoid?
+    describe '#between' do
+      it 'should not override Mongoid between method' do
+        posts = Post.between(created_at: Time.zone.parse('2014-01-01')..Time.zone.parse('2014-01-06'))
+        expect(posts.count).to eql(3)
+      end
+    end
+  end
+end

data/spec/integration/shared/by_calendar_month.rb

@@ -1,55 +1,55 @@
-require 'spec_helper'
-
-shared_examples_for 'by calendar month' do
-
-  describe '#by_calendar_month' do
-
-    context 'point-in-time' do
-      subject { Post.by_calendar_month('Feb') }
-      its(:count){ should eq 3 }
-    end
-
-    context 'timespan' do
-      subject { Event.by_calendar_month(1) }
-      its(:count){ should eq 10 }
-    end
-
-    context 'timespan strict' do
-      subject { Event.by_calendar_month(Date.parse('2014-02-01'), strict: true) }
-      its(:count){ should eq 2 }
-    end
-
-    context 'with :year option' do
-
-      context 'point-in-time' do
-        subject { Post.by_calendar_month(12, year: 2013) }
-        its(:count){ should eq 12 }
-      end
-
-      context 'timespan' do
-        subject { Event.by_calendar_month('December', year: 2013) }
-        its(:count){ should eq 13 }
-      end
-
-      context 'timespan strict' do
-        subject { Event.by_calendar_month('Dec', year: 2013, strict: true) }
-        its(:count){ should eq 9 }
-      end
-    end
-
-    it 'should raise an error when given an invalid argument' do
-      ->{ Post.by_calendar_month(0) }.should raise_error(ByStar::ParseError, 'Month must be a number between 1 and 12 or a month name')
-      ->{ Post.by_calendar_month(13) }.should raise_error(ByStar::ParseError, 'Month must be a number between 1 and 12 or a month name')
-      ->{ Post.by_calendar_month('foobar') }.should raise_error(ByStar::ParseError, 'Month must be a number between 1 and 12 or a month name')
-    end
-
-    it 'should be able to use an alternative field' do
-      Event.by_calendar_month(:field => 'end_time').count.should eq 9
-    end
-
-    context ':start_day option' do
-      subject { Post.by_calendar_month(1, :start_day => :wednesday) }
-      its(:count){ should eq 7 }
-    end
-  end
-end
+require 'spec_helper'
+
+shared_examples_for 'by calendar month' do
+
+  describe '#by_calendar_month' do
+
+    context 'point-in-time' do
+      subject { Post.by_calendar_month('Feb') }
+      it { expect(subject.count).to eql(3) }
+    end
+
+    context 'timespan' do
+      subject { Event.by_calendar_month(1) }
+      it { expect(subject.count).to eql(10) }
+    end
+
+    context 'timespan strict' do
+      subject { Event.by_calendar_month(Date.parse('2014-02-01'), strict: true) }
+      it { expect(subject.count).to eql(2) }
+    end
+
+    context 'with :year option' do
+
+      context 'point-in-time' do
+        subject { Post.by_calendar_month(12, year: 2013) }
+        it { expect(subject.count).to eql(12) }
+      end
+
+      context 'timespan' do
+        subject { Event.by_calendar_month('December', year: 2013) }
+        it { expect(subject.count).to eql(13) }
+      end
+
+      context 'timespan strict' do
+        subject { Event.by_calendar_month('Dec', year: 2013, strict: true) }
+        it { expect(subject.count).to eql(9) }
+      end
+    end
+
+    it 'should raise an error when given an invalid argument' do
+      expect{ Post.by_calendar_month(0) }.to raise_error(ByStar::ParseError, 'Month must be a number between 1 and 12 or a month name')
+      expect{ Post.by_calendar_month(13) }.to raise_error(ByStar::ParseError, 'Month must be a number between 1 and 12 or a month name')
+      expect{ Post.by_calendar_month('foobar') }.to raise_error(ByStar::ParseError, 'Month must be a number between 1 and 12 or a month name')
+    end
+
+    it 'should be able to use an alternative field' do
+      expect(Event.by_calendar_month(field: 'end_time').count).to eql(9)
+    end
+
+    context ':start_day option' do
+      subject { Post.by_calendar_month(1, start_day: :wednesday) }
+      it{ expect(subject.count).to eql(7) }
+    end
+  end
+end