include_date_scopes 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63855b44770da7082e79b4ad9b1d317aab8b02f2
-  data.tar.gz: 7ff4713ba792bdcc53e85472e9f3b141bf8b9937
+  metadata.gz: a07a72dd91cec5fcff6b701ced82fd96bde969af
+  data.tar.gz: 969b6a1e1f8264f25667668376f61c6c03626783
 SHA512:
-  metadata.gz: f8e1dc80bcbce8d9e59b2d550ef3f31c022437e3cb6b3b1e2f54a4a5f01e019664e4b7e873a76a4b53bc137a1e2fd3f947a972f50402416a763b3ddf8759cf03
-  data.tar.gz: abf3f8fb2c86393cb0291f3276234a8f32dbfe27ab7f909ea78918f37d8a9731493d76be19deb251546e5eaac1063924d3ba9826ddfe022167ee8d39c44ccd9c
+  metadata.gz: e8c8c48ee924d3bdbe7a608f890390e1a35279e78249ba726be9bdd5f06ae29e598fd05e3446fdff031268e4e8e4d43230e66fb91e559a47894ce6536f21dfb0
+  data.tar.gz: f17df27bbd23510e5a1614111742d9086a1ff335bf369b9cc56cc07885fee5ec3a9074815ad5f114d52d468fea5c7ef797a966d4fc2c9e0bbcbc7ea40c68ae18

data/Gemfile.lock

@@ -1,10 +1,9 @@
 PATH
   remote: .
   specs:
-    include_date_scopes (0.0.0)
+    include_date_scopes (0.9.5)
       activerecord (< 4)
       railties
-      squeel
 
 GEM
   remote: http://rubygems.org/
@@ -31,51 +30,17 @@ GEM
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     arel (3.0.3)
-    better_errors (1.1.0)
-      coderay (>= 1.0.0)
-      erubis (>= 2.6.6)
     builder (3.0.4)
-    bullet (4.8.0)
-      activesupport
-      uniform_notifier (>= 1.4.0)
-    coderay (1.1.0)
-    columnize (0.3.6)
-    daemons (1.1.9)
-    debugger (1.6.6)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.3.2)
-    debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.3.2)
     diff-lcs (1.2.5)
     erubis (2.7.0)
-    eventmachine (1.0.3)
-    ffi (1.9.3)
     hike (1.2.3)
     i18n (0.6.9)
-    interactive_editor (0.0.10)
-      spoon (>= 0.0.1)
     journey (1.0.4)
     json (1.8.1)
-    method_source (0.8.2)
     multi_json (1.9.2)
-    polyamorous (0.6.4)
-      activerecord (>= 3.0)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    pry-debugger (0.2.2)
-      debugger (~> 1.3)
-      pry (~> 0.9.10)
-    pry-doc (0.6.0)
-      pry (~> 0.9)
-      yard (~> 0.8)
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-mini-profiler (0.9.1)
-      rack (>= 1.1.3)
     rack-ssl (1.3.4)
       rack
     rack-test (0.6.2)
@@ -102,44 +67,22 @@ GEM
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    slop (3.5.0)
-    spoon (0.0.4)
-      ffi
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.9)
-    squeel (1.1.1)
-      activerecord (>= 3.0)
-      activesupport (>= 3.0)
-      polyamorous (~> 0.6.0)
-    thin (1.6.2)
-      daemons (>= 1.0.9)
-      eventmachine (>= 1.0.0)
-      rack (>= 1.0.0)
     thor (0.19.1)
     tilt (1.4.1)
     timecop (0.7.1)
     tzinfo (0.3.39)
-    uniform_notifier (1.4.0)
-    yard (0.8.7.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  better_errors
-  bullet
-  debugger
   include_date_scopes!
-  interactive_editor
-  pry
-  pry-debugger
-  pry-doc
-  rack-mini-profiler
   rspec-rails
   sqlite3
-  thin
   timecop

data/lib/include_date_scopes/define_timestamp_scopes.rb

@@ -9,7 +9,7 @@ module IncludeDateScopes
       define_singleton_method :"#{prefix}between" do |start_date_or_time, stop_date_or_time|
         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].lteq stop_time))
+        where(t[column_name].gt(start_time).and(t[column_name].lteq stop_time))
       end
 
       define_singleton_method :"#{prefix}on_or_before_date" do |date|

data/lib/include_date_scopes/version.rb

@@ -1,4 +1,4 @@
 
 module IncludeDateScopes
-  VERSION = '0.9.5'.freeze
+  VERSION = '0.9.6'.freeze
 end

data/spec/lib/date_scopes_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Post" do
+describe "Model" do
   describe 'default timestamp scopes' do
     before(:all) do
       define_model_class do

data/spec/spec_helper.rb

@@ -42,6 +42,8 @@ RSpec.configure do |config|
   config.after :each do
     Post.delete_all
   end
+
+  config.before(:suite) { Timecop.freeze Time.local(2013,02,15,06,30) }
 end
 
 def define_model_class(name = "Post", parent_class_name = "ActiveRecord::Base", &block)

data/spec/support/date_scope_examples.rb

@@ -22,14 +22,12 @@ shared_examples "between date scope" do |name|
   end
 end
 
-shared_examples "date scopes" do |date_column = :created_at, prefix = '' |
+shared_examples "date scopes" do |date_column = :show_until, prefix = '' |
   let(:test_class) { Post }
   let(:prefix) { prefix }
   let(:date_column) { date_column }
 
   describe "date scopes" do
-    before(:all) { Timecop.freeze Time.local(2013,02,15,06,30) }
-
     describe ":between" do
       subject { test_class.send("#{prefix}between", 6.days.ago.to_date, 3.day.ago.to_date) }
 

data/spec/support/timestamp_scope_examples.rb

@@ -10,7 +10,7 @@ shared_examples "between time scope" do |name, difference = 1.second|
     let(:before_threshold_obj) { test_class.create! date_column => bottom_threshold + difference }
 
     it { should_not include after_threshold_obj }
-    it { should include at_top_threshold_obj }
+    it { should_not include at_top_threshold_obj }
     it { should include at_bottom_threshold_obj }
     it { should_not include before_threshold_obj }
 end
@@ -33,8 +33,6 @@ shared_examples "timestamp scopes" do |date_column = :created_at, prefix = '' |
   let(:date_column) { date_column }
 
   describe "timestamp scopes" do
-    before(:all) { Timecop.freeze Time.local(2013,02,15,06,30) }
-
     describe ':between' do
       let(:top_threshold) { 5.minutes.ago }
       let(:bottom_threshold) { 5.minutes.from_now }
@@ -87,21 +85,21 @@ shared_examples "timestamp scopes" do |date_column = :created_at, prefix = '' |
     end
 
     describe ":today" do
-      let(:top_threshold) { Time.now.beginning_of_day }
+      let(:top_threshold) { Time.now.beginning_of_day - 1.second }
       let(:bottom_threshold) { Time.now.end_of_day }
       let(:arguments) { [] }
       include_examples 'between time scope','today'
     end
 
     describe ":yesterday" do
-      let(:top_threshold) { 1.day.ago.beginning_of_day }
+      let(:top_threshold) { 1.day.ago.beginning_of_day - 1.second }
       let(:bottom_threshold) { 1.day.ago.end_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(:top_threshold) { 1.day.from_now.beginning_of_day - 1.second }
       let(:bottom_threshold) { 1.day.from_now.end_of_day }
       let(:arguments) { [] }
       include_examples 'between time scope','tomorrow'
@@ -311,35 +309,35 @@ shared_examples "timestamp scopes" do |date_column = :created_at, prefix = '' |
     end
 
     describe ":this_hour" do
-      let(:top_threshold) { Time.now.beginning_of_hour }
+      let(:top_threshold) { Time.now.beginning_of_hour - 1.second }
       let(:bottom_threshold) { Time.now.end_of_hour }
       let(:arguments) { [] }
       include_examples 'between time scope','this_hour'
     end
 
     describe ":this_day" do
-      let(:top_threshold) { Time.now.beginning_of_day }
+      let(:top_threshold) { Time.now.beginning_of_day - 1.second }
       let(:bottom_threshold) { Time.now.end_of_day }
       let(:arguments) { [] }
       include_examples 'between time scope','this_day'
     end
 
     describe ":this_week" do
-      let(:top_threshold) { Time.now.beginning_of_week }
+      let(:top_threshold) { Time.now.beginning_of_week - 1.second }
       let(:bottom_threshold) { Time.now.end_of_week }
       let(:arguments) { [] }
       include_examples 'between time scope','this_week'
     end
 
     describe ":this_month" do
-      let(:top_threshold) { Time.now.beginning_of_month }
+      let(:top_threshold) { Time.now.beginning_of_month - 1.second }
       let(:bottom_threshold) { Time.now.end_of_month }
       let(:arguments) { [] }
       include_examples 'between time scope','this_month'
     end
 
     describe ":this_year" do
-      let(:top_threshold) { Time.now.beginning_of_year }
+      let(:top_threshold) { Time.now.beginning_of_year - 1.second }
       let(:bottom_threshold) { Time.now.end_of_year }
       let(:arguments) { [] }
       include_examples 'between time scope','this_year'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: include_date_scopes
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - Sean Todd
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-22 00:00:00.000000000 Z
+date: 2014-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord