include_date_scopes 0.9.8 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f89eae9b3b4c9e7421d6cc58edb49f4df1adbd3
-  data.tar.gz: 8aea72a77966109927e0241171ae625aafa30bd2
+  metadata.gz: cc5fb55e3cee51dc62e328c214250470e036e233
+  data.tar.gz: 67e4dfba26a4d5f5657ebb6a7034d9288a2e61de
 SHA512:
-  metadata.gz: 3d86c53be5dd357d526d02af98f379030c44b15139ba6960bd4fbefe77112cd5e8c8da78fb583ad2563bdfd52a324c53454b10184632730f74f0a1e67e8fbcff
-  data.tar.gz: 89c956fa3fd91af23ec584269b732f69a70919e19a26d2e15661ec10792491cf8b55a864707b97a07f2d174a672150ee285794813ae4c4b0042d888e929f230c
+  metadata.gz: 36d1795e13fc032fe64b76021e418c1d844f88860643f6eb3e7778ef36eb28e8907a53974d8d2b58968dbe8349dbe0e5ef6e980b998f7abfb3f6134f5536766f
+  data.tar.gz: adaaa58c900d48536e13c3ba5884141e5e434e0e0f220c054150dfcb9f6d3feeceea2d7f1edc278dcdeef0ddcf2060bef0ef71d36fc78d56ad6feee7036ae6ca

data/Gemfile

@@ -8,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.exist? File.join(Dir.home,'.Gemfile')
-  eval File.read File.join(Dir.home,'.Gemfile')
-end
+# if File.exist? File.join(Dir.home,'.Gemfile')
+#   eval File.read File.join(Dir.home,'.Gemfile')
+# end
 

data/lib/include_date_scopes/define_timestamp_scopes.rb

@@ -17,11 +17,11 @@ module IncludeDateScopes
       end
 
       define_singleton_method :"#{prefix}on_or_before" do |time| 
-        where(t[column_name].lteq time_object(time))
+        where(t[column_name].lteq (time.is_a?(Date) ? time.to_time : time))
       end
 
       define_singleton_method :"#{prefix}before" do |time| 
-        where(t[column_name].lt time_object(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|
@@ -29,7 +29,7 @@ module IncludeDateScopes
       end
 
       define_singleton_method :"#{prefix}on_or_after" do |time|
-        where(t[column_name].gteq time_object(time))
+        where(t[column_name].gteq (time.is_a?(Date) ? time.to_time + 1.day : time ))
       end
 
       define_singleton_method :"#{prefix}after" do |time|
@@ -76,12 +76,6 @@ module IncludeDateScopes
 
       define_common_scopes prefix, column_name
     end
-
-    private
-
-    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.8'.freeze
+  VERSION = '0.9.9'.freeze
 end

data/spec/spec_helper.rb

@@ -4,7 +4,6 @@ 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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: include_date_scopes
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors:
 - Sean Todd
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-02 00:00:00.000000000 Z
+date: 2014-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord