include_date_scopes 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 021ad778ab98e5426f71ce97ed4b1f775a7ed7b6
-  data.tar.gz: 88b07877a83621f0e3635ecd6c5f56444dd2945f
+  metadata.gz: f330e8d591d974672921057798ad12d098f90a02
+  data.tar.gz: d8783be1a2fe911084a59a83cdbee7f1bea3e1b9
 SHA512:
-  metadata.gz: fb4eba3ef62ae0fd8ed4c7f6b38f3cd3687a731ef9d9f5bdf31dc52819d48a1811358dfd0fe724d7022712b5bc8fe73ce52f1114f1136d0b85fd51cf7b69629b
-  data.tar.gz: 275795d84b9139079aa45329190b8996ed812075856b82fbee4256fa28178c81974ca299f22b9e73e92a83d5dcbd557acb271e0d35ebef6eb5385293e107d7ef
+  metadata.gz: 56588927b8a6f4a1c1d56d174fbbe0cd50a40b8105faebbe4dae6479a3cde5b09bf48e1cb6204bd39584c1518e85ac6086b0f56cc9f99af65410347c22de57d5
+  data.tar.gz: 1e166a0ced92168dc5524ce2bcdf78f80b79cc25c574a77eb2c51ab24c14c4b11b20e7131a11b1db9ea218ca05ad8cf948b339b892e35a48fb47cdc94a216746

data/.ruby-version

@@ -1 +1 @@
-2.1.1
+2.1.2

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+0.9.2
+-----
+Added a bunch of last_n and next_n scopes.  Also fixed a bug in the Date column
+scopes introduced in 0.9.1
+
 0.9.1
 -----
 Removed the Squeel dependency

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    include_date_scopes (0.9.1)
+    include_date_scopes (0.9.2)
       activerecord (< 4)
       railties
 
@@ -30,49 +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)
-    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)
@@ -99,40 +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)
-    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/include_date_scopes.gemspec

@@ -4,7 +4,7 @@ require "include_date_scopes/version"
 Gem::Specification.new do |s|
   s.name        = 'include_date_scopes'
   s.version     = IncludeDateScopes::VERSION.dup
-  s.authors     = ['Sean Todd']
+  s.authors     = ['Sean Todd', 'Katharina Peter']
   s.email       = ['iphone.reply@gmail.com']
   s.homepage    = 'http://github.com/descentintomael/include_date_scopes'
   s.summary     = 'Include scopes for searching on a date column'

data/lib/include_date_scopes/date_scopes.rb

@@ -21,20 +21,29 @@
 #   include_date_scopes_for :net_payment_settlement_date, true   # prepend field name -- ex: Payment.net_payment_settlement_date_on(date)
 #
 #
+require_relative 'define_timestamp_scopes'
+require_relative 'define_date_scopes'
+require_relative 'define_common_scopes'
 
 module IncludeDateScopes
   module DateScopes
     extend ActiveSupport::Concern
     module ClassMethods
+      include IncludeDateScopes::DefineTimestampScopes
+      include IncludeDateScopes::DefineDateScopes
+      include IncludeDateScopes::DefineCommonScopes
+
       def include_date_scopes
         include_date_scopes_for :created_at
       end
 
-      def include_date_scopes_for(column, prepend_name = false)
+      def include_date_scopes_for(column,
+                                  prepend_name = false,
+                                  column_type = column_type_for(column))
         return unless self.table_exists?
-        if self.columns_hash[column.to_s].type == :datetime
+        if column_type == :datetime
           define_timestamp_scopes_for column, prepend_name
-        elsif self.columns_hash[column.to_s].type == :date
+        elsif column_type == :date
           define_date_scopes_for column, prepend_name
         end
       end
@@ -43,206 +52,8 @@ module IncludeDateScopes
         include_date_scopes_for column, true
       end
 
-      protected
-
-      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(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( t[column_name].lt date.to_date.tomorrow.midnight.gmtime )
-        end
-
-        define_singleton_method :"#{prefix}on_or_before" do |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.is_a?(Date) ? time.to_time : time))
-        end
-
-        define_singleton_method :"#{prefix}on_or_after_date" do |time|
-          where(t[column_name].gteq time.to_date.midnight.gmtime )
-        end
-
-        define_singleton_method :"#{prefix}on_or_after" do |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(t[column_name].gt (time.is_a?(Date) ? time.to_time + 1.day : time ))
-        end
-
-        define_singleton_method :"#{prefix}on" do |day| 
-          __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}after", 24.hours.ago)
-        end
-
-        define_singleton_method :"#{prefix}last_hour" do
-          __send__(:"#{prefix}after", 1.hour.ago)
-        end
-
-        define_singleton_method :"#{prefix}last_n_seconds" do |count|
-          __send__(:"#{prefix}on_or_after", count.seconds.ago)
-        end
-
-        define_singleton_method :"#{prefix}last_n_minutes" do |count|
-          __send__(:"#{prefix}on_or_after", count.minutes.ago)
-        end
-
-        define_singleton_method :"#{prefix}last_n_hours" do |count|
-          __send__(:"#{prefix}on_or_after", count.hours.ago)
-        end
-
-        define_singleton_method :"#{prefix}next_n_seconds" do |count|
-          __send__(:"#{prefix}on_or_before", count.seconds.from_now)
-        end
-
-        define_singleton_method :"#{prefix}next_n_minutes" do |count|
-          __send__(:"#{prefix}on_or_before", count.minutes.from_now)
-        end
-
-        define_singleton_method :"#{prefix}next_n_hours" do |count|
-          __send__(:"#{prefix}on_or_before", count.hours.from_now)
-        end
-
-        define_singleton_method :"#{prefix}this_minute" do
-          __send__(:"#{prefix}between", Time.now.change(sec: 0), Time.now.change(sec: 59, usec: Rational(999999999, 1000)))
-        end
-
-        define_singleton_method :"#{prefix}this_hour" do
-          __send__(:"#{prefix}between", 1.hour.ago.end_of_hour, Time.now.end_of_hour)
-        end
-
-        define_singleton_method :"#{prefix}this_week" do
-          __send__(:"#{prefix}between", 1.week.ago.end_of_week, Time.now.end_of_week)
-        end
-
-        define_singleton_method :"#{prefix}this_month" do
-          __send__(:"#{prefix}between", 1.month.ago.end_of_month, Time.now.end_of_month)
-        end
-
-        define_singleton_method :"#{prefix}this_year" do
-          __send__(:"#{prefix}between", 1.year.ago.end_of_year, Time.now.end_of_year)
-        end
-
-        define_common_scopes t, prefix, column_name
-      end
-
-      def define_date_scopes_for(column_name, prepend_name = false)
-        prefix = prepend_name ? "#{column_name}_" : ""
-        t = self.arel_table
-
-        define_singleton_method :"#{prefix}between" do |start_date, stop_date|
-          where(t[column_name].gteq(start_date).and(t[column_name].lteq stop_date))
-        end
-
-        define_singleton_method :"#{prefix}on_or_before" do |date| 
-          where( t[column_name].lteq date )
-        end
-
-        define_singleton_method :"#{prefix}before" do |date| 
-          where(t[column_name].lt date)
-        end
-
-        define_singleton_method :"#{prefix}on_or_after" do |date|
-          where(t[column_name].gteq date)
-        end
-
-        define_singleton_method :"#{prefix}after" do |date| 
-          where(t[column_name].gt date)
-        end
-
-        define_singleton_method :"#{prefix}on" do |date|
-          where(t[column_name].eq date)
-        end
-
-        define_singleton_method :"#{prefix}this_week" do
-          __send__(:"#{prefix}between", Date.today.beginning_of_week, Date.today.end_of_week)
-        end
-
-        define_singleton_method :"#{prefix}this_month" do
-          __send__(:"#{prefix}between", Date.today.beginning_of_month, Date.today.end_of_month)
-        end
-
-        define_singleton_method :"#{prefix}this_year" do
-          __send__(:"#{prefix}between", Date.today.beginning_of_year, Date.today.end_of_year)
-        end
-
-        define_common_scopes t, prefix, column_name
-      end
-
-      def define_common_scopes(arel, prefix, column_name)
-        t = arel
-
-        define_singleton_method :"#{prefix}day" do |day|
-          __send__(:"#{prefix}on", day)
-        end
-
-        define_singleton_method :"#{prefix}today" do
-          __send__(:"#{prefix}on", Date.today)
-        end
-
-        define_singleton_method :"#{prefix}yesterday" do
-          __send__(:"#{prefix}on", Date.yesterday)
-        end
-
-        define_singleton_method :"#{prefix}last_week" do
-          __send__(:"#{prefix}after", 1.week.ago)
-        end
-
-        define_singleton_method :"#{prefix}last_month" do
-          __send__(:"#{prefix}after", 1.month.ago)
-        end
-
-        define_singleton_method :"#{prefix}last_year" do
-          __send__(:"#{prefix}after", 1.year.ago)
-        end
-
-        define_singleton_method :"#{prefix}last_n_days" do |count|
-          __send__(:"#{prefix}on_or_after", count.days.ago)
-        end
-
-        define_singleton_method :"#{prefix}last_n_months" do |count|
-          __send__(:"#{prefix}on_or_after", count.months.ago)
-        end
-
-        define_singleton_method :"#{prefix}last_n_years" do |count|
-          __send__(:"#{prefix}on_or_after", count.years.ago)
-        end
-
-        define_singleton_method :"#{prefix}next_n_days" do |count|
-          __send__(:"#{prefix}on_or_before", count.days.from_now)
-        end
-
-        define_singleton_method :"#{prefix}next_n_months" do |count|
-          __send__(:"#{prefix}on_or_before", count.months.from_now)
-        end
-
-        define_singleton_method :"#{prefix}next_n_years" do |count|
-          __send__(:"#{prefix}on_or_before", count.years.from_now)
-        end
-
-        define_singleton_method :"#{prefix}last_30days" do
-          __send__(:"#{prefix}after", 30.days.ago)
-        end
-
-        define_singleton_method :"#{prefix}most_recent" do
-          order("#{column_name} desc")
-        end
+      def column_type_for(column)
+        self.columns_hash[column.to_s].type
       end
     end
   end

data/lib/include_date_scopes/define_common_scopes.rb

@@ -0,0 +1,45 @@
+
+module IncludeDateScopes
+  module DefineCommonScopes
+    def define_common_scopes(prefix, column_name)
+      define_singleton_method :"#{prefix}day" do |day|
+        __send__(:"#{prefix}on", day)
+      end
+
+      define_singleton_method :"#{prefix}today" do
+        __send__(:"#{prefix}on", Date.today)
+      end
+
+      define_singleton_method :"#{prefix}yesterday" do
+        __send__(:"#{prefix}on", Date.yesterday)
+      end
+
+      define_singleton_method :"#{prefix}tomorrow" do
+        __send__(:"#{prefix}on", Date.tomorrow)
+      end
+
+      [:day, :week, :month, :year].each do |time_unit|
+        define_singleton_method :"#{prefix}next_#{time_unit}" do
+          __send__(:"#{prefix}between", Time.now, 1.send(time_unit).from_now)
+        end
+        define_singleton_method :"#{prefix}last_#{time_unit}" do
+          __send__(:"#{prefix}between", 1.send(time_unit).ago, Time.now)
+        end
+        define_singleton_method :"#{prefix}next_n_#{time_unit}s" do |count|
+          __send__(:"#{prefix}between", Time.now, count.send(time_unit).from_now)
+        end
+        define_singleton_method :"#{prefix}last_n_#{time_unit}s" do |count|
+          __send__(:"#{prefix}between", count.send(time_unit).ago, Time.now)
+        end
+      end
+
+      define_singleton_method :"#{prefix}last_30_days" do
+        __send__(:"#{prefix}last_n_days", 30)
+      end
+
+      define_singleton_method :"#{prefix}most_recent" do
+        order("#{column_name} desc")
+      end
+    end
+  end
+end

data/lib/include_date_scopes/define_date_scopes.rb

@@ -0,0 +1,31 @@
+
+module IncludeDateScopes
+  module DefineDateScopes
+    def define_date_scopes_for(column_name, prepend_name = false)
+      prefix = prepend_name ? "#{column_name}_" : ""
+      t = self.arel_table
+
+      define_singleton_method :"#{prefix}between" do |start_date, stop_date|
+        where(t[column_name].gteq(start_date.to_date).and(t[column_name].lteq(stop_date.to_date)))
+      end
+
+      {: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
+        end
+      end
+
+      define_singleton_method :"#{prefix}this_day" do
+        __send__(:"#{prefix}today")
+      end
+
+      [:week, :month, :year].each do |time_unit|
+        define_singleton_method :"#{prefix}this_#{time_unit}" do
+          __send__(:"#{prefix}between", Date.today.send(:"beginning_of_#{time_unit}"), Date.today.send(:"end_of_#{time_unit}"))
+        end
+      end
+
+      define_common_scopes prefix, column_name
+    end
+  end
+end