by_star 3.0.0 → 4.0.1

data/spec/gemfiles/Gemfile.rails42

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

data/spec/gemfiles/Gemfile.rails50

@@ -1,10 +1,7 @@
-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'
+source 'http://rubygems.org'
+
+gemspec path: '../../'
+
+gem 'activerecord', '~> 5.0.0'
+gem 'pg',           '~> 0.18'
+gem 'mongoid'

data/spec/gemfiles/Gemfile.rails51

@@ -1,10 +1,7 @@
-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'
+source 'http://rubygems.org'
+
+gemspec path: '../../'
+
+gem 'activerecord', '~> 5.1.0'
+gem 'pg',           '~> 0.18'
+gem 'mongoid'

data/spec/gemfiles/Gemfile.rails52

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

data/spec/gemfiles/Gemfile.rails60

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

data/spec/gemfiles/Gemfile.rails61

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

data/spec/integration/active_record/active_record_spec.rb

@@ -1,38 +1,41 @@
-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?
+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)
+    database_file = File.dirname(__FILE__) + '/../../database.yml'
+    parsed_config = ERB.new(File.read(database_file)).result
+    db_config = YAML.safe_load(parsed_config)
+    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 'between_dates'
+  it_behaves_like 'at_time'
+  it_behaves_like 'offset parameter'
+  it_behaves_like 'order parameter'
+  it_behaves_like 'index_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,37 +1,39 @@
-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?
+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 'between_dates'
+  it_behaves_like 'at_time'
+  it_behaves_like 'offset parameter'
+  it_behaves_like 'order parameter'
+  it_behaves_like 'index_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/at_time.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+shared_examples_for 'at_time' do
+
+  describe '#at_time' do
+
+    context 'point object' do
+
+      context 'exactly equal' do
+        subject { Post.at_time(Time.zone.parse('2013-12-28 17:00:00')) }
+        it { expect(subject.count).to eql(1) }
+      end
+
+      context 'not exactly equal' do
+        subject { Post.at_time(Time.zone.parse('2013-12-28 17:00:01')) }
+        it { expect(subject.count).to eql(0) }
+      end
+    end
+
+    context 'timespan object' do
+
+      context 'before start time' do
+        subject { Event.at_time(Time.zone.parse('2013-12-23 16:59:59')) }
+        it { expect(subject.count).to eql(2) }
+      end
+
+      context 'at start time' do
+        subject { Event.at_time(Time.zone.parse('2013-12-23 17:00:00')) }
+        it { expect(subject.count).to eql(3) }
+      end
+
+      context 'after start time' do
+        subject { Event.at_time(Time.zone.parse('2013-12-23 17:00:01')) }
+        it { expect(subject.count).to eql(3) }
+      end
+
+      context 'before end time' do
+        subject { Event.at_time(Time.zone.parse('2013-11-06 16:59:59')) }
+        it { expect(subject.count).to eql(1) }
+      end
+
+      context 'at end time' do
+        subject { Event.at_time(Time.zone.parse('2013-11-06 17:00:00')) }
+        it { expect(subject.count).to eql(0) }
+      end
+
+      context 'after end time' do
+        subject { Event.at_time(Time.zone.parse('2013-11-06 17:00:01')) }
+        it { expect(subject.count).to eql(0) }
+      end
+    end
+  end
+end

data/spec/integration/shared/between_dates.rb

@@ -0,0 +1,99 @@
+require 'spec_helper'
+
+shared_examples_for 'between_dates' do
+
+  describe '#between_dates' do
+    subject { Post.between_dates(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_dates(Time.zone.parse('2014-01-01'), nil) }
+          it { expect(subject.count).to eql(12) }
+        end
+
+        context 'only end time' do
+          subject { Post.between_dates(nil, Time.zone.parse('2014-01-01')) }
+          it { expect(subject.count).to eql(12) }
+
+          context 'neither start nor end time' do
+            subject { Post.between_dates(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_dates(Time.zone.parse('2014-01-01'), nil, strict: false) }
+          it { expect(subject.count).to eql(17) }
+        end
+
+        context 'only end time' do
+          subject { Event.between_dates(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_dates(nil, nil) }
+            it { expect(subject.count).to eql(30) }
+          end
+        end
+      end
+
+      context 'timespan strict query' do
+
+        context 'only start time' do
+          subject { Event.between_dates(Time.zone.parse('2014-01-01'), nil) }
+          it { expect(subject.count).to eql(17) }
+        end
+
+        context 'only end time' do
+          subject { Event.between_dates(nil, Time.zone.parse('2014-01-01')) }
+          it { expect(subject.count).to eql(13) }
+
+          context 'neither start nor end time' do
+            subject { Event.between_dates(nil, nil) }
+            it { expect(subject.count).to eql(30) }
+          end
+        end
+      end
+    end
+
+    context 'two-sided query' do
+      context 'DST starts (Sydney)', sydney: true do
+        context 'day before' do
+          subject { Event.between_dates(Date.parse('2020-04-04'), Date.parse('2020-04-04'), offset: 5.hours) }
+          it { expect(subject.count).to eql(3) }
+        end
+
+        context 'same day' do
+          subject { Event.between_dates(Date.parse('2020-04-05'), Date.parse('2020-04-05'), offset: 5.hours) }
+          it { expect(subject.count).to eql(1) }
+        end
+      end
+
+      context 'when DST ends (Sydney)', sydney: true do
+        context 'day before' do
+          subject { Event.between_dates(Date.parse('2020-10-03'), Date.parse('2020-10-03'), offset: 5.hours) }
+          it { expect(subject.count).to eql(1) }
+        end
+
+        context 'same day' do
+          subject { Event.between_dates(Date.parse('2020-10-04'), Date.parse('2020-10-04'), offset: 5.hours) }
+          it { expect(subject.count).to eql(3) }
+        end
+      end
+    end
+  end
+end

data/spec/integration/shared/between_times.rb

@@ -1,82 +1,99 @@
-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
+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(17) }
+        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(30) }
+          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(17) }
+        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(30) }
+          end
+        end
+      end
+    end
+
+    context 'two-sided query' do
+      context 'DST starts (Sydney)', sydney: true do
+        context 'day before' do
+          subject { Event.between_times(Date.parse('2020-04-04'), Date.parse('2020-04-04'), offset: 5.hours) }
+          it { expect(subject.count).to eql(3) }
+        end
+
+        context 'same day' do
+          subject { Event.between_times(Date.parse('2020-04-05'), Date.parse('2020-04-05'), offset: 5.hours) }
+          it { expect(subject.count).to eql(1) }
+        end
+      end
+
+      context 'when DST ends (Sydney)', sydney: true do
+        context 'day before' do
+          subject { Event.between_times(Date.parse('2020-10-03'), Date.parse('2020-10-03'), offset: 5.hours) }
+          it { expect(subject.count).to eql(1) }
+        end
+
+        context 'same day' do
+          subject { Event.between_times(Date.parse('2020-10-04'), Date.parse('2020-10-04'), offset: 5.hours) }
+          it { expect(subject.count).to eql(3) }
+        end
+      end
+    end
+  end
+end