include_date_scopes 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0f891fa15dbec344fb06873f3a5642f41a5bd03
-  data.tar.gz: 31ab327e5716822e217f2ad00d009d284da1fd9d
+  metadata.gz: cee42ed898449ecf0d0043d481554367f1f336cf
+  data.tar.gz: 9d9fcc175ec25d960018d25f3418a444bda5b8af
 SHA512:
-  metadata.gz: f6dd984249e0aaa39f190487989c6ae63d0a4ac9a06d365507fe7428fa1b54546476e2c0a21becbde6fb2a053f25b81754fbee7657538b978f332ba4cbfb0b6b
-  data.tar.gz: ccc4476d4f40a75005b0ca3b67f711eceab8c694e03b559ddeb1ca6e4c8e2f3085447c3b832a3b5b4c46eab8aebb9109613d5ba1c50d7cb87c010a681e118170
+  metadata.gz: 253e111483d596a0527aec9622fa935adb190e20f06c8a20decb4bcafe67e45190863ac3b052e31d8921f3ac1f0bd94e3d50757516f8b6a54e6415e8392f0b80
+  data.tar.gz: 2968b9a43364d6bba30018bff43cb43178e8a40149af7176308d627ab11580e0ffba36772bb2b9779a650dda3e76ade1326ae3e78ec7b8c146d0b454517afec1

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+0.9.1
+-----
+Removed the Squeel dependency
+
+0.9.0
+-----
+Initial working version

data/CONTRIBUTING.md

@@ -0,0 +1,10 @@
+Contributing to include_date_scopes:
+
+1. Fork the [official repository](https://github.com/descentintomael/include_date_scopes/tree/master).
+2. Make your changes in a topic branch.
+3. Send a pull request.
+
+Notes:
+
+* Contributions without tests won't be accepted.
+* Please don't update the Gem version.

data/Gemfile.lock

@@ -1,10 +1,9 @@
 PATH
   remote: .
   specs:
-    include_date_scopes (0.0.0)
+    include_date_scopes (0.9.0)
       activerecord (< 4)
       railties
-      squeel
 
 GEM
   remote: http://rubygems.org/
@@ -59,8 +58,6 @@ GEM
     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)
@@ -111,10 +108,6 @@ GEM
       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)

data/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2014 Sean Todd
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -1,4 +1,31 @@
 include_date_scopes
 ===================
 
-Module for mixing in date related scopes to ActiveRecord models
+An ActiveRecord module for automatically including a large list of commonly used date related scopes.
+
+Usage
+-----
+
+To use in a model on the standard `created_at` column, put the `include_date_scopes` call in your class:
+```ruby
+class Post < ActiveRecord::Base
+  include_date_scopes
+end
+```
+Now you can call scopes like `Post.after(1.week.ago)` or `Post.yesterday`.
+
+If you wish to use this on another column, use `include_dates_scopes_for`:
+```ruby
+class Post < ActiveRecord::Base
+  include_date_scopes_for :show_at
+end
+```
+Now all of the provided scopes will work with the `show_at` column.
+
+If you want to include multiple sets of date scopes, you can use named date scopes:
+```ruby
+class Post < ActiveRecord::Base
+  include_named_date_scopes_for :updated_at
+end
+```
+Now the scopes will all be prepended with `updated_at_`.  So `Post.yesterday` would become `Post.updated_at_yesterday`.

data/include_date_scopes.gemspec

@@ -19,7 +19,6 @@ DESCRIPTION
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "squeel"
   s.add_dependency "activerecord", '< 4'
   s.add_dependency "railties"
   s.add_development_dependency "rspec-rails"

data/lib/include_date_scopes/date_scopes.rb

@@ -21,7 +21,6 @@
 #   include_date_scopes_for :net_payment_settlement_date, true   # prepend field name -- ex: Payment.net_payment_settlement_date_on(date)
 #
 #
-require 'squeel'
 
 module IncludeDateScopes
   module DateScopes
@@ -48,35 +47,36 @@ module IncludeDateScopes
 
       def define_timestamp_scopes_for(column_name, prepend_name = false)
         prefix = prepend_name ? "#{column_name}_" : ""
+        t = self.arel_table
 
         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{(__send__(column_name).gte start_time) & (__send__(column_name).lt stop_time)}
+          where(t[column_name].gteq(start_time).and(t[column_name].lt stop_time))
         end
 
         define_singleton_method :"#{prefix}on_or_before_date" do |date|
-          where{ __send__(column_name).lt date.to_date.tomorrow.midnight.gmtime }
+          where( t[column_name].lt date.to_date.tomorrow.midnight.gmtime )
         end
 
         define_singleton_method :"#{prefix}on_or_before" do |time| 
-          where{__send__(column_name).lte (time.is_a?(Date) ? time.to_time : time)}
+          where(t[column_name].lte (time.is_a?(Date) ? time.to_time : time))
         end
 
         define_singleton_method :"#{prefix}before" do |time| 
-          where{__send__(column_name).lt (time.is_a?(Date) ? time.to_time : time)}
+          where(t[column_name].lt (time.is_a?(Date) ? time.to_time : time))
         end
 
         define_singleton_method :"#{prefix}on_or_after_date" do |time|
-          where{__send__(column_name).gte time.to_date.midnight.gmtime }
+          where(t[column_name].gteq time.to_date.midnight.gmtime )
         end
 
         define_singleton_method :"#{prefix}on_or_after" do |time|
-          where{__send__(column_name).gte (time.is_a?(Date) ? time.to_time + 1.day : time )}
+          where(t[column_name].gteq (time.is_a?(Date) ? time.to_time + 1.day : time ))
         end
 
         define_singleton_method :"#{prefix}after" do |time|
-          where{__send__(column_name).gt (time.is_a?(Date) ? time.to_time + 1.day : time )}
+          where(t[column_name].gt (time.is_a?(Date) ? time.to_time + 1.day : time ))
         end
 
         define_singleton_method :"#{prefix}on" do |day| 
@@ -129,27 +129,27 @@ module IncludeDateScopes
         prefix = prepend_name ? "#{column_name}_" : ""
 
         define_singleton_method :"#{prefix}between" do |start_date, stop_date|
-          where{(__send__(column_name).gte start_date) & (__send__(column_name).lte stop_date)}
+          where(t[column_name].gteq(start_date).and(t[column_name].lte stop_date))
         end
 
         define_singleton_method :"#{prefix}on_or_before" do |date| 
-          where{ __send__(column_name).lte date }
+          where( t[column_name].lte date )
         end
 
         define_singleton_method :"#{prefix}before" do |date| 
-          where{__send__(column_name).lt date}
+          where(t[column_name].lt date)
         end
 
         define_singleton_method :"#{prefix}on_or_after" do |date|
-          where{__send__(column_name).gte date}
+          where(t[column_name].gteq date)
         end
 
         define_singleton_method :"#{prefix}after" do |date| 
-          where{__send__(column_name).gt date}
+          where(t[column_name].gt date)
         end
 
         define_singleton_method :"#{prefix}on" do |date|
-          where{__send__(column_name).eq date}
+          where(t[column_name].eq date)
         end
 
         define_singleton_method :"#{prefix}day" do |day|

data/lib/include_date_scopes/version.rb

@@ -1,4 +1,4 @@
 
 module IncludeDateScopes
-  VERSION = '0.9.0'.freeze
+  VERSION = '0.9.1'.freeze
 end

data/spec/lib/date_scopes_spec.rb

@@ -20,4 +20,192 @@ describe "Post" do
 
     it_behaves_like "with basic date scopes", :updated_at
   end
+
+  describe 'date scopes with name prepended' do
+    before(:all) do
+      define_model_class do
+        include_named_date_scopes_for :show_at
+      end
+    end
+
+    before(:all) { Timecop.freeze Time.local(2013,02,15,06,30) }
+
+    let!(:last_month_obj) { Post.create! :show_at => 1.month.ago }
+    let!(:last_week_obj) { Post.create! :show_at => 1.week.ago }
+    let!(:yesterday_obj) { Post.create! :show_at => 24.hours.ago }
+    let!(:hour_ago_obj) { Post.create! :show_at => 1.hour.ago }
+    let!(:five_minute_ago_obj) { Post.create! :show_at => 5.minutes.ago }
+    let!(:after_midnight_ago_obj) { Post.create! :show_at => Date.today.midnight + 5.minutes }
+    let!(:before_midnight_ago_obj) { Post.create! :show_at => Date.today.midnight - 5.minutes }
+
+    describe ":between" do
+      context "with DateTime" do
+        subject { Post.show_at_between(2.hours.ago, 1.minute.ago) }
+
+        it { should_not include last_week_obj }
+        it { should_not include yesterday_obj }
+        it { should include hour_ago_obj }
+        it { should include five_minute_ago_obj }
+      end
+      context "with Date" do
+        subject { Post.show_at_between(2.days.ago.to_date, Date.today) }
+
+        it { should_not include last_week_obj }
+        it { should include yesterday_obj }
+        it { should include hour_ago_obj }
+        it { should include five_minute_ago_obj }
+      end
+    end
+
+    describe ":after" do
+      context "with DateTime" do
+        subject { Post.show_at_after(2.hours.ago) }
+
+        it { should_not include last_week_obj }
+        it { should_not include yesterday_obj }
+        it { should include hour_ago_obj }
+        it { should include five_minute_ago_obj }
+      end
+      context "with Date" do
+        subject { Post.show_at_after(2.days.ago.to_date) }
+
+        it { should_not include last_week_obj }
+        it { should include yesterday_obj }
+        it { should include hour_ago_obj }
+        it { should include five_minute_ago_obj }
+      end
+    end
+
+    describe ":on_or_after_date" do
+      context "with DateTime" do
+        subject { Post.show_at_on_or_after_date(2.hours.ago) }
+
+        it { should_not include last_week_obj }
+        it { should_not include yesterday_obj }
+        it { should include hour_ago_obj }
+        it { should include five_minute_ago_obj }
+      end
+      context "with Date" do
+        subject { Post.show_at_on_or_after_date(2.days.ago.to_date) }
+
+        it { should_not include last_week_obj }
+        it { should include yesterday_obj }
+        it { should include hour_ago_obj }
+        it { should include five_minute_ago_obj }
+      end
+    end
+
+    describe ":before" do
+      context "with DateTime" do
+        subject { Post.show_at_before(2.hours.ago) }
+
+        it { should include last_week_obj }
+        it { should include yesterday_obj }
+        it { should_not include hour_ago_obj }
+        it { should_not include five_minute_ago_obj }
+      end
+      context "with Date" do
+        subject { Post.show_at_before(Date.today) }
+
+        it { should include last_week_obj }
+        it { should include yesterday_obj }
+        it { should_not include hour_ago_obj }
+        it { should_not include five_minute_ago_obj }
+      end
+    end
+
+    describe ":on_or_before_date" do
+      context "with DateTime" do
+        subject { Post.show_at_on_or_before_date(25.hours.ago) }
+
+        it { should include last_week_obj }
+        it { should include yesterday_obj }
+        it { should_not include hour_ago_obj }
+        it { should_not include five_minute_ago_obj }
+      end
+      context "with Date" do
+        subject { Post.show_at_on_or_before_date(Date.yesterday) }
+
+        it { should include last_week_obj }
+        it { should include yesterday_obj }
+        it { should_not include hour_ago_obj }
+        it { should_not include five_minute_ago_obj }
+      end
+    end
+
+    describe ":today" do
+      subject { Post.show_at_today }
+
+      it { should_not include last_week_obj }
+      it { should_not include yesterday_obj }
+      it { should include hour_ago_obj }
+      it { should include five_minute_ago_obj }
+    end
+
+    describe ":yesterday" do
+      subject { Post.show_at_yesterday }
+
+      it { should_not include last_week_obj }
+      it { should include yesterday_obj }
+      it { should_not include hour_ago_obj }
+      it { should_not include five_minute_ago_obj }
+    end
+
+    describe ":last_24_hours" do
+      subject { Post.show_at_last_24_hours }
+
+      it { should_not include last_week_obj }
+      it { should_not include yesterday_obj }
+      it { should include hour_ago_obj }
+      it { should include five_minute_ago_obj }
+    end
+
+    describe ":last_hour" do
+      subject { Post.show_at_last_hour }
+
+      it { should_not include last_week_obj }
+      it { should_not include yesterday_obj }
+      it { should_not include hour_ago_obj } # should not because this is exclusive
+      it { should include five_minute_ago_obj }
+    end
+
+    describe ":last_week" do
+      subject { Post.show_at_last_week }
+
+      it { should_not include last_week_obj }
+      it { should include yesterday_obj }
+      it { should include hour_ago_obj }
+      it { should include five_minute_ago_obj }
+    end
+
+    describe ":last_30_days" do
+      subject { Post.show_at_last_30days }
+
+      it { should_not include last_month_obj }
+      it { should include last_week_obj }
+      it { should include yesterday_obj }
+      it { should include hour_ago_obj }
+      it { should include five_minute_ago_obj }
+    end
+
+    describe ":this_week" do
+      subject { Post.show_at_this_week }
+
+      it { should_not include last_week_obj }
+      it { should include yesterday_obj }
+      it { should include hour_ago_obj }
+      it { should include five_minute_ago_obj }
+      it { should include before_midnight_ago_obj }
+    end
+
+    describe ":this_month" do
+      subject { Post.show_at_this_month }
+
+      it { should_not include last_month_obj }
+      it { should include last_week_obj }
+      it { should include yesterday_obj }
+      it { should include hour_ago_obj }
+      it { should include five_minute_ago_obj }
+    end
+  end
 end

data/spec/support/date_scope_examples.rb

@@ -2,8 +2,9 @@
 shared_examples "with basic date scopes" do |date_column = :created_at |
   let!(:test_class) { Post }
   describe "date scopes" do
-    before(:each) { Timecop.freeze Time.local(2013,02,01,06,30) }
+    before(:all) { Timecop.freeze Time.local(2013,02,15,06,30) }
 
+    let!(:last_month_obj) { test_class.create! date_column.to_sym => 1.month.ago }
     let!(:last_week_obj) { test_class.create! date_column.to_sym => 1.week.ago }
     let!(:yesterday_obj) { test_class.create! date_column.to_sym => 24.hours.ago }
     let!(:hour_ago_obj) { test_class.create! date_column.to_sym => 1.hour.ago }
@@ -13,7 +14,7 @@ shared_examples "with basic date scopes" do |date_column = :created_at |
 
     describe ":between" do
       context "with DateTime" do
-        subject {test_class.between(2.hours.ago, 1.minute.ago).all}  
+        subject { test_class.between(2.hours.ago, 1.minute.ago) }
 
         it { should_not include last_week_obj }
         it { should_not include yesterday_obj }
@@ -21,7 +22,7 @@ shared_examples "with basic date scopes" do |date_column = :created_at |
         it { should include five_minute_ago_obj }
       end
       context "with Date" do
-        subject {test_class.between(2.days.ago.to_date, Date.today).all}  
+        subject { test_class.between(2.days.ago.to_date, Date.today) }
 
         it { should_not include last_week_obj }
         it { should include yesterday_obj }
@@ -32,7 +33,7 @@ shared_examples "with basic date scopes" do |date_column = :created_at |
 
     describe ":after" do
       context "with DateTime" do
-        subject {test_class.after(2.hours.ago).all}
+        subject { test_class.after(2.hours.ago) }
 
         it { should_not include last_week_obj }
         it { should_not include yesterday_obj }
@@ -40,7 +41,7 @@ shared_examples "with basic date scopes" do |date_column = :created_at |
         it { should include five_minute_ago_obj }
       end
       context "with Date" do
-        subject {test_class.after(2.days.ago.to_date).all}  
+        subject { test_class.after(2.days.ago.to_date) }
 
         it { should_not include last_week_obj }
         it { should include yesterday_obj }
@@ -51,7 +52,7 @@ shared_examples "with basic date scopes" do |date_column = :created_at |
 
     describe ":on_or_after_date" do
       context "with DateTime" do
-        subject {test_class.on_or_after_date(2.hours.ago).all}
+        subject { test_class.on_or_after_date(2.hours.ago) }
 
         it { should_not include last_week_obj }
         it { should_not include yesterday_obj }
@@ -59,7 +60,7 @@ shared_examples "with basic date scopes" do |date_column = :created_at |
         it { should include five_minute_ago_obj }
       end
       context "with Date" do
-        subject {test_class.on_or_after_date(2.days.ago.to_date).all}
+        subject { test_class.on_or_after_date(2.days.ago.to_date) }
 
         it { should_not include last_week_obj }
         it { should include yesterday_obj }
@@ -70,7 +71,7 @@ shared_examples "with basic date scopes" do |date_column = :created_at |
 
     describe ":before" do
       context "with DateTime" do
-        subject {test_class.before(2.hours.ago).all}  
+        subject { test_class.before(2.hours.ago) }
 
         it { should include last_week_obj }
         it { should include yesterday_obj }
@@ -78,7 +79,7 @@ shared_examples "with basic date scopes" do |date_column = :created_at |
         it { should_not include five_minute_ago_obj }
       end
       context "with Date" do
-        subject {test_class.before(Date.today).all}  
+        subject { test_class.before(Date.today) }
 
         it { should include last_week_obj }
         it { should include yesterday_obj }
@@ -89,7 +90,7 @@ shared_examples "with basic date scopes" do |date_column = :created_at |
 
     describe ":on_or_before_date" do
       context "with DateTime" do
-        subject {test_class.on_or_before_date(25.hours.ago).all}  
+        subject { test_class.on_or_before_date(25.hours.ago) }
 
         it { should include last_week_obj }
         it { should include yesterday_obj }
@@ -97,7 +98,7 @@ shared_examples "with basic date scopes" do |date_column = :created_at |
         it { should_not include five_minute_ago_obj }
       end
       context "with Date" do
-        subject {test_class.on_or_before_date(Date.yesterday).all}  
+        subject { test_class.on_or_before_date(Date.yesterday) }
 
         it { should include last_week_obj }
         it { should include yesterday_obj }
@@ -107,7 +108,7 @@ shared_examples "with basic date scopes" do |date_column = :created_at |
     end
 
     describe ":today" do
-      subject {test_class.today.all}  
+      subject { test_class.today }
 
       it { should_not include last_week_obj }
       it { should_not include yesterday_obj }
@@ -116,13 +117,70 @@ shared_examples "with basic date scopes" do |date_column = :created_at |
     end
 
     describe ":yesterday" do
-      subject {test_class.yesterday.all}  
+      subject { test_class.yesterday }
 
       it { should_not include last_week_obj }
       it { should include yesterday_obj }
       it { should_not include hour_ago_obj }
       it { should_not include five_minute_ago_obj }
     end
+
+    describe ":last_24_hours" do
+      subject { test_class.last_24_hours }
+
+      it { should_not include last_week_obj }
+      it { should_not include yesterday_obj }
+      it { should include hour_ago_obj }
+      it { should include five_minute_ago_obj }
+    end
+
+    describe ":last_hour" do
+      subject { test_class.last_hour }
+
+      it { should_not include last_week_obj }
+      it { should_not include yesterday_obj }
+      it { should_not include hour_ago_obj } # should not because this is exclusive
+      it { should include five_minute_ago_obj }
+    end
+
+    describe ":last_week" do
+      subject { test_class.last_week }
+
+      it { should_not include last_week_obj }
+      it { should include yesterday_obj }
+      it { should include hour_ago_obj }
+      it { should include five_minute_ago_obj }
+    end
+
+    describe ":last_30_days" do
+      subject { test_class.last_30days }
+
+      it { should_not include last_month_obj }
+      it { should include last_week_obj }
+      it { should include yesterday_obj }
+      it { should include hour_ago_obj }
+      it { should include five_minute_ago_obj }
+    end
+
+    describe ":this_week" do
+      subject { test_class.this_week }
+
+      it { should_not include last_week_obj }
+      it { should include yesterday_obj }
+      it { should include hour_ago_obj }
+      it { should include five_minute_ago_obj }
+      it { should include before_midnight_ago_obj }
+    end
+
+    describe ":this_month" do
+      subject { test_class.this_month }
+
+      it { should_not include last_month_obj }
+      it { should include last_week_obj }
+      it { should include yesterday_obj }
+      it { should include hour_ago_obj }
+      it { should include five_minute_ago_obj }
+    end
   end
 end
 

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: include_date_scopes
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Sean Todd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-11 00:00:00.000000000 Z
+date: 2014-04-16 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: squeel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -106,8 +92,11 @@ files:
 - ".gitignore"
 - ".ruby-gemset"
 - ".ruby-version"
+- CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - README.md
 - include_date_scopes.gemspec
 - lib/include_date_scopes.rb