include_date_scopes 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86cc1b291a6638f91647fd1276cf98a9fe9c6bf4
-  data.tar.gz: 9d57c0750142bd4d42b4f04c82a914a923d2f405
+  metadata.gz: 1f89eae9b3b4c9e7421d6cc58edb49f4df1adbd3
+  data.tar.gz: 8aea72a77966109927e0241171ae625aafa30bd2
 SHA512:
-  metadata.gz: ee9b89589d89186fd40c919a799ad2ae5bae563faa93b9341bf0558c162490b1f2369d9c7d2f905dafb7da9faeaa4f04ee14a8c1d3669ab8e2bdcae364038f1f
-  data.tar.gz: 9aa490f3b38bb340f28cf5fed6d5de762aac9dc0957b87c98ce851ea397c8a95012a5671807f087a9dd9c154a9f021a2149de8c6eb221b79c888853211d56d86
+  metadata.gz: 3d86c53be5dd357d526d02af98f379030c44b15139ba6960bd4fbefe77112cd5e8c8da78fb583ad2563bdfd52a324c53454b10184632730f74f0a1e67e8fbcff
+  data.tar.gz: 89c956fa3fd91af23ec584269b732f69a70919e19a26d2e15661ec10792491cf8b55a864707b97a07f2d174a672150ee285794813ae4c4b0042d888e929f230c

data/.gitignore

@@ -1,3 +1,4 @@
+*file.lock
 *.gem
 *.rbc
 .bundle

data/.travis.yml

@@ -0,0 +1,11 @@
+language: ruby
+
+rvm:
+  - "1.9.3"
+  - "2.0.0"
+  - "2.1.2"
+
+gemfile:
+  - gemfiles/ActiveRecord_3.2.gemfile
+  - gemfiles/ActiveRecord_4.0.gemfile
+  - gemfiles/ActiveRecord_4.1.gemfile

data/Appraisals

@@ -0,0 +1,11 @@
+appraise "ActiveRecord 4.1" do
+  gem "activerecord", '~>4.1.6'
+end
+
+appraise "ActiveRecord 4.0" do
+  gem "activerecord", '~>4.0.10'
+end
+
+appraise "ActiveRecord 3.2" do
+  gem "activerecord", '~>3.2.19'
+end

data/Gemfile

@@ -1,5 +1,6 @@
 source "http://rubygems.org"
 
+gem 'appraisal'
 gemspec
 
 # *************************************
@@ -7,7 +8,7 @@ gemspec
 # * If you have any local gems to include, create a new Gemfile at ~/.Gemfile
 # * This code will import anything in there.
 # *************************************
-if File.exists? File.join(Dir.home,'.Gemfile')
+if File.exist? File.join(Dir.home,'.Gemfile')
   eval File.read File.join(Dir.home,'.Gemfile')
 end
 

data/README.md

@@ -1,5 +1,6 @@
 include_date_scopes
 ===================
+[![Build Status](https://travis-ci.org/descentintomael/include_date_scopes.svg?branch=master)](https://travis-ci.org/descentintomael/include_date_scopes)
 
 An ActiveRecord module for automatically including a large list of commonly used date related scopes.
 

data/Rakefile

@@ -0,0 +1,8 @@
+require 'rubygems'
+require 'bundler/setup'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+desc 'Default: run the rspec examples'
+task :default => [:spec]

data/gemfiles/ActiveRecord_3.2.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "appraisal"
+gem "activerecord", "~>3.2.19"
+
+gemspec :path => "../"

data/gemfiles/ActiveRecord_4.0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "appraisal"
+gem "activerecord", "~>4.0.10"
+
+gemspec :path => "../"

data/gemfiles/ActiveRecord_4.1.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "appraisal"
+gem "activerecord", "~>4.1.6"
+
+gemspec :path => "../"

data/include_date_scopes.gemspec

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

data/lib/include_date_scopes/define_date_scopes.rb

@@ -11,7 +11,7 @@ module IncludeDateScopes
 
       {:on_or_before => :lteq, :before => :lt, :on_or_after => :gteq, :after => :gt, :on => :eq}.each do |label, op|
         define_singleton_method :"#{prefix}#{label}" do |date| 
-          where t[column_name].send op, date.to_date
+          where t[column_name].send op, date
         end
       end
 

data/lib/include_date_scopes/define_timestamp_scopes.rb

@@ -40,10 +40,6 @@ module IncludeDateScopes
         __send__(:"#{prefix}between", day.beginning_of_day, day.end_of_day)
       end
 
-      define_singleton_method :"#{prefix}day" do |day| 
-        __send__(:"#{prefix}on", day)
-      end
-
       define_singleton_method :"#{prefix}last_24_hours" do
         __send__(:"#{prefix}last_day")
       end
@@ -83,10 +79,9 @@ module IncludeDateScopes
 
     private
 
-      def time_object(time)
-        time.is_a?(Date) ? time.to_time + 1.day : time
-      end
-      
-   end
+    def time_object(time)
+      time.is_a?(Date) ? time.to_time + 1.day : time
+    end
+  end
 end
 

data/lib/include_date_scopes/version.rb

@@ -1,4 +1,4 @@
 
 module IncludeDateScopes
-  VERSION = '0.9.7'.freeze
+  VERSION = '0.9.8'.freeze
 end

data/spec/lib/date_scopes_spec.rb

@@ -55,6 +55,21 @@ describe "Model" do
     it_behaves_like 'date scopes', :show_at
   end
 
+  describe 'using a non-date argument' do
+    # This is due to a horrible design flaw in DelayedJobs.  That framework
+    # assumes that if a delayed object has the method 'before' defined that
+    # that method was defined as a callback for DJ.  Too bad its a common
+    # word that's also used by my framework.
+    it 'does not raise an error' do
+      define_model_class do
+        include_date_scopes_for :show_until
+      end
+      expect {
+        Post.before('abc')
+      }.to_not raise_error
+    end
+  end
+
   describe 'using column which does not exist yet' do
     it 'does not raise an error' do
       previous_stderr, $stderr = $stderr, StringIO.new

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ require 'rails/all'
 require 'active_record'
 require 'active_support'
 require 'include_date_scopes'
+require 'pry-byebug'
 
 if ActiveSupport::VERSION::MAJOR < 4
   require 'active_support/core_ext/logger'
@@ -35,6 +36,8 @@ end
 
 require "#{File.dirname(__FILE__)}/../lib/include_date_scopes/active_record"
 
+Timecop.safe_mode = false
+
 RSpec.configure do |config|
 
   config.mock_with :rspec

data/spec/support/date_scope_examples.rb

@@ -7,13 +7,13 @@ shared_examples "between date scope" do |name|
 
   context 'with date argument' do
     subject do
-      test_class.send "#{prefix}#{name}", *arguments
+      test_class.send("#{prefix}#{name}", *arguments).to_a
     end
 
-    let(:after_threshold_obj) { test_class.create! date_column => top_threshold.to_date - 1.second }
+    let(:after_threshold_obj) { test_class.create! date_column => top_threshold.to_date - 1.day }
     let(:at_top_threshold_obj) { test_class.create! date_column => top_threshold.to_date }
     let(:at_bottom_threshold_obj) { test_class.create! date_column => bottom_threshold.to_date }
-    let(:before_threshold_obj) { test_class.create! date_column => bottom_threshold.to_date + 1.second }
+    let(:before_threshold_obj) { test_class.create! date_column => bottom_threshold.to_date + 1.day }
 
     it { should_not include after_threshold_obj }
     it { should include at_top_threshold_obj }
@@ -29,7 +29,7 @@ shared_examples "date scopes" do |date_column = :show_until, prefix = '' |
 
   describe "date scopes" do
     describe ":between" do
-      subject { test_class.send("#{prefix}between", 6.days.ago.to_date, 3.day.ago.to_date) }
+      subject { test_class.send("#{prefix}between", 6.days.ago.to_date, 3.day.ago.to_date).to_a }
 
       let(:after_threshold_obj) { test_class.create! date_column => 2.days.ago.to_date }
       let(:at_top_threshold_obj) { test_class.create! date_column => 3.days.ago.to_date }
@@ -43,7 +43,7 @@ shared_examples "date scopes" do |date_column = :show_until, prefix = '' |
     end
 
     describe ":after" do
-      subject { test_class.send("#{prefix}after", 3.days.ago.to_date) }
+      subject { test_class.send("#{prefix}after", 3.days.ago.to_date).to_a }
 
       let(:after_threshold_obj) { test_class.create! date_column => 2.days.ago.to_date }
       let(:on_threshold_obj) { test_class.create! date_column => 3.days.ago.to_date }
@@ -55,7 +55,7 @@ shared_examples "date scopes" do |date_column = :show_until, prefix = '' |
     end
 
     describe ":before" do
-      subject { test_class.send("#{prefix}before", 3.days.ago.to_date) }
+      subject { test_class.send("#{prefix}before", 3.days.ago.to_date).to_a }
 
       let(:after_threshold_obj) { test_class.create! date_column => 4.days.ago.to_date }
       let(:on_threshold_obj) { test_class.create! date_column => 3.days.ago.to_date }
@@ -67,7 +67,7 @@ shared_examples "date scopes" do |date_column = :show_until, prefix = '' |
     end
 
     describe ":on_or_after" do
-      subject { test_class.send("#{prefix}on_or_after", 3.days.ago.to_date) }
+      subject { test_class.send("#{prefix}on_or_after", 3.days.ago.to_date).to_a }
 
       let(:after_threshold_obj) { test_class.create! date_column => 2.days.ago.to_date }
       let(:on_threshold_obj) { test_class.create! date_column => 3.days.ago.to_date }
@@ -79,7 +79,7 @@ shared_examples "date scopes" do |date_column = :show_until, prefix = '' |
     end
 
     describe ":on_or_before" do
-      subject { test_class.send("#{prefix}on_or_before", 3.days.ago) }
+      subject { test_class.send("#{prefix}on_or_before", 3.days.ago).to_a }
 
       let(:after_threshold_obj) { test_class.create! date_column => 4.days.ago.to_date }
       let(:on_threshold_obj) { test_class.create! date_column => 3.days.ago.to_date }

data/spec/support/timestamp_scope_examples.rb

@@ -1,7 +1,7 @@
 
 shared_examples "between time scope" do |name, difference = 1.second|
     subject do
-      test_class.send "#{prefix}#{name}", *arguments
+      test_class.send("#{prefix}#{name}", *arguments).to_a
     end
 
     let(:after_threshold_obj) { test_class.create! date_column => top_threshold - difference }
@@ -16,7 +16,7 @@ shared_examples "between time scope" do |name, difference = 1.second|
 end
 
 shared_examples "open ended time scope (exclusive)" do |name|
-  subject { test_class.send("#{prefix}#{name}", *arguments) }
+  subject { test_class.send("#{prefix}#{name}", *arguments).to_a }
 
   let(:after_threshold_obj) { test_class.create! date_column => threshold + 1.second }
   let(:on_threshold_obj) { test_class.create! date_column => threshold }
@@ -49,7 +49,7 @@ shared_examples "timestamp scopes" do |date_column = :created_at, prefix = '' |
 
     describe ":before" do
 
-      subject { test_class.send("#{prefix}before", 5.minutes.ago) }
+      subject { test_class.send("#{prefix}before", 5.minutes.ago).to_a }
 
       let(:after_threshold_obj) { test_class.create! date_column => 5.minutes.ago + 1.second }
       let(:on_threshold_obj) { test_class.create! date_column => 5.minutes.ago }
@@ -61,7 +61,7 @@ shared_examples "timestamp scopes" do |date_column = :created_at, prefix = '' |
     end
 
     describe ":on_or_after" do
-      subject { test_class.send("#{prefix}on_or_after", 5.minutes.ago) }
+      subject { test_class.send("#{prefix}on_or_after", 5.minutes.ago).to_a }
 
       let(:after_threshold_obj) { test_class.create! date_column => 5.minutes.ago + 1.second }
       let(:on_threshold_obj) { test_class.create! date_column => 5.minutes.ago }
@@ -73,7 +73,7 @@ shared_examples "timestamp scopes" do |date_column = :created_at, prefix = '' |
     end
 
     describe ":on_or_before" do
-      subject { test_class.send("#{prefix}on_or_before", 5.minutes.ago) }
+      subject { test_class.send("#{prefix}on_or_before", 5.minutes.ago).to_a }
 
       let(:after_threshold_obj) { test_class.create! date_column => 5.minutes.ago + 1.second }
       let(:on_threshold_obj) { test_class.create! date_column => 5.minutes.ago }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: include_date_scopes
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - Sean Todd
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-27 00:00:00.000000000 Z
+date: 2014-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -43,44 +43,44 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.2
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.9
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.1
 description: "Add in ActiveRelation scopes that are common across all models.  You
   can also \nadd in a prefix to those scopes so you can have multiple per model.  See
   README\nfor more info.\n"
@@ -93,12 +93,17 @@ files:
 - ".gitignore"
 - ".ruby-gemset"
 - ".ruby-version"
+- ".travis.yml"
+- Appraisals
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
+- Rakefile
+- gemfiles/ActiveRecord_3.2.gemfile
+- gemfiles/ActiveRecord_4.0.gemfile
+- gemfiles/ActiveRecord_4.1.gemfile
 - include_date_scopes.gemspec
 - lib/include_date_scopes.rb
 - lib/include_date_scopes/active_record.rb

data/Gemfile.lock

@@ -1,154 +0,0 @@
-PATH
-  remote: .
-  specs:
-    include_date_scopes (0.9.6)
-      activerecord (< 4)
-      railties
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionpack (3.2.17)
-      activemodel (= 3.2.17)
-      activesupport (= 3.2.17)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.17)
-      activesupport (= 3.2.17)
-      builder (~> 3.0.0)
-    activerecord (3.2.17)
-      activemodel (= 3.2.17)
-      activesupport (= 3.2.17)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.17)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    arel (3.0.3)
-    better_errors (2.0.0)
-      coderay (>= 1.0.0)
-      erubis (>= 2.6.6)
-      rack (>= 0.9.0)
-    binding_of_caller (0.7.2)
-      debug_inspector (>= 0.0.1)
-    builder (3.0.4)
-    bullet (4.13.2)
-      activesupport (>= 3.0.0)
-      uniform_notifier (>= 1.6.0)
-    byebug (3.4.2)
-      columnize (~> 0.8)
-      debugger-linecache (~> 1.2)
-      slop (~> 3.6)
-    celluloid (0.16.0)
-      timers (~> 4.0.0)
-    coderay (1.1.0)
-    columnize (0.8.9)
-    debug_inspector (0.0.2)
-    debugger-linecache (1.2.0)
-    diff-lcs (1.2.5)
-    erubis (2.7.0)
-    ffi (1.9.5)
-    formatador (0.2.5)
-    guard (2.6.1)
-      formatador (>= 0.2.4)
-      listen (~> 2.7)
-      lumberjack (~> 1.0)
-      pry (>= 0.9.12)
-      thor (>= 0.18.1)
-    guard-ctags-bundler (1.1.0)
-      guard (~> 2.0)
-    hike (1.2.3)
-    hitimes (1.2.2)
-    i18n (0.6.9)
-    interactive_editor (0.0.10)
-      spoon (>= 0.0.1)
-    journey (1.0.4)
-    json (1.8.1)
-    listen (2.7.11)
-      celluloid (>= 0.15.2)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    looksee (2.1.1)
-    lumberjack (1.0.9)
-    method_source (0.8.2)
-    multi_json (1.9.2)
-    pry (0.10.1)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (2.0.0)
-      byebug (~> 3.4)
-      pry (~> 0.10)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-mini-profiler (0.9.2)
-      rack (>= 1.1.3)
-    rack-ssl (1.3.4)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    railties (3.2.17)
-      actionpack (= 3.2.17)
-      activesupport (= 3.2.17)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.2.2)
-    rb-fsevent (0.9.4)
-    rb-inotify (0.9.5)
-      ffi (>= 0.5.0)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    rspec-rails (2.14.2)
-      actionpack (>= 3.0)
-      activemodel (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    slop (3.6.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)
-    thor (0.19.1)
-    tilt (1.4.1)
-    timecop (0.7.1)
-    timers (4.0.1)
-      hitimes
-    tzinfo (0.3.41)
-    uniform_notifier (1.6.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  better_errors
-  binding_of_caller
-  bullet
-  guard-ctags-bundler
-  include_date_scopes!
-  interactive_editor
-  looksee
-  pry
-  pry-byebug
-  rack-mini-profiler
-  rspec-rails
-  sqlite3
-  timecop