blind_date 0.0.2 → 1.0.0

data/VERSION

@@ -1 +1 @@
-0.0.2
+1.0.0

data/blind_date.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{blind_date}
-  s.version = "0.0.2"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ari Epstein"]
-  s.date = %q{2010-06-14}
+  s.date = %q{2010-11-12}
   s.description = %q{Allows you to utilize date calculation functionality of DBMS with a uniform API}
   s.email = %q{aepstein607@gmail.com}
   s.extra_rdoc_files = [

data/lib/blind_date/active_record/base.rb

@@ -2,6 +2,32 @@ module BlindDate
   module ActiveRecord
     module Base
       module ClassMethods
+        def date_add( date, interval, unit = 'DAY' )
+          blind_date_add :date, date, interval, unit
+        end
+
+        def date_sub( date, interval, unit = 'DAY' )
+          blind_date_sub :date, date, interval, unit
+        end
+
+        def datetime_add( date, interval, unit = 'SECOND' )
+          blind_date_add :datetime, date, interval, unit
+        end
+
+        def datetime_sub( date, interval, unit = 'SECOND' )
+          blind_date_sub :datetime, date, interval, unit
+        end
+
+        def time_add( date, interval, unit = 'SECOND' )
+          blind_date_add :time, date, interval, unit
+        end
+
+        def time_sub( date, interval, unit = 'SECOND' )
+          blind_date_sub :time, date, interval, unit
+        end
+
+        protected
+
         # Generates an sql fragement representing the sum of a date and a duration
         # == Usage
         #
@@ -17,35 +43,48 @@ module BlindDate
         # => sqlite: DATETIME( "models"."starts_at", '-' || "models"."duration" || ' DAY' )
         #
         # == Options
+        # * +style+ = - Style of time calculation (applicable only in sqlite)
         # * +date+ - Date subject to calculation, can be date, time, datetime, symbolized column, or string sql fragment
         # * +interval+ - Duration to be added/subtracted, can be duration, number, symbolized column, or string sql fragment
         # * +unit+ - Unit of time for duration, defaults to :seconds, and is ignored if using duration for interval
         # * +diff+ - If true, will subtract duration from date, otherwise will add (default is false)
-        def date_add( date, interval, unit = 'SECOND', diff = false)
+        def blind_date_add( style, date, interval, unit = 'SECOND', diff = false)
           if date.is_a? Symbol
             date = "#{connection.quote_table_name(table_name)}.#{connection.quote_column_name(date.to_s)}"
           elsif date.acts_like?(:time) || date.acts_like?(:date)
             date = connection.quote date
           end
           interval = "#{connection.quote_table_name(table_name)}.#{connection.quote_column_name(interval.to_s)}" if interval.is_a? Symbol
-          connection.class.date_add date, interval, unit, diff
+          connection.class.date_add style, date, interval, unit, diff
         end
 
         # Generates a SQL fragment representing subtraction of a duration from a date
-        # Similar to date_add( date, interval, unit, +true+ )
-        def date_sub( date, interval, unit = 'SECOND' )
-          date_add date, interval, unit, true
+        # Similar to date_add( style, date, interval, unit, +true+ )
+        def blind_date_sub( style, date, interval, unit = 'SECOND' )
+          blind_date_add style, date, interval, unit, true
         end
 
       end
 
       module InstanceMethods
-        def date_add( date, interval, unit = 'SECOND', diff = false)
-          self.class.date_add( date, interval, unit, diff )
+        def date_add( date, interval, unit = 'DAY')
+          self.class.date_add( date, interval, unit )
         end
-        def date_sub( date, interval, unit = 'SECOND' )
+        def date_sub( date, interval, unit = 'DAY' )
           self.class.date_sub( date, interval, unit )
         end
+        def datetime_add( date, interval, unit = 'SECOND' )
+          self.class.datetime_add( date, interval, unit )
+        end
+        def datetime_sub( date, interval, unit = 'SECOND' )
+          self.class.datetime_sub( date, interval, unit )
+        end
+        def time_add( date, interval, unit = 'SECOND' )
+          self.class.time_add( date, interval, unit )
+        end
+        def time_sub( date, interval, unit = 'SECOND' )
+          self.class.time_sub( date, interval, unit )
+        end
       end
 
       def self.included(receiver)

data/lib/blind_date/active_record/connection_adapters/abstract_adapter.rb

@@ -5,16 +5,16 @@ module BlindDate
         module ClassMethods
 
           # Performs arithmetic on string is an SQL-escaped date/time/datetime or returns a date/time/datetime
-          def date_add(date, interval, unit = 'SECOND', diff = false )
+          def date_add( style, date, interval, unit = 'SECOND', diff = false )
             case interval
             when ActiveSupport::Duration
               interval.parts.inject( date ) do |memo, span|
-                date_add_sql_without_operator memo, span.last, span.first.to_s.singularize.upcase, diff
+                date_add_sql_without_operator style, memo, span.last, span.first.to_s.singularize.upcase, diff
               end
             when String
-              date_add_sql date, interval, unit.to_s.singularize.upcase, ( diff ? '-' : '+' )
+              date_add_sql style, date, interval, unit.to_s.singularize.upcase, ( diff ? '-' : '+' )
             when Numeric
-              date_add_sql_without_operator date, interval, unit.to_s.singularize.upcase, diff
+              date_add_sql_without_operator style, date, interval, unit.to_s.singularize.upcase, diff
             else
               raise ArgumentError
             end
@@ -30,25 +30,25 @@ module BlindDate
           private
 
           # Adds appropriate operator before calling adapter-specific method
-          def date_add_sql_without_operator( sql, interval, unit, diff )
+          def date_add_sql_without_operator( style, sql, interval, unit, diff )
             if diff
-              date_add_sql sql, interval.abs, unit, ( interval < 0 ? '+' : '-' )
+              date_add_sql style, sql, interval.abs, unit, ( interval < 0 ? '+' : '-' )
             else
-              date_add_sql sql, interval.abs, unit, ( interval < 0 ? '-' : '+' )
+              date_add_sql style, sql, interval.abs, unit, ( interval < 0 ? '-' : '+' )
             end
           end
 
           # Will attempt to load the correct behavior if this is not already provided
-          def date_add_sql( sql, interval, unit, operator )
+          def date_add_sql( style, sql, interval, unit, operator )
             require "blind_date/active_record/connection_adapters/#{adapter_name}_adapter"
-            date_add_sql( sql, interval, unit, operator )
+            date_add_sql( style, sql, interval, unit, operator )
           end
 
         end
 
         module InstanceMethods
-          def date_add_sql( sql, interval, unit, operator )
-            self.class.date_add_sql( sql, interval, unit, operator )
+          def date_add_sql( style, sql, interval, unit, operator )
+            self.class.date_add_sql( style, sql, interval, unit, operator )
           end
         end
 

data/lib/blind_date/active_record/connection_adapters/mysql_adapter.rb

@@ -3,7 +3,7 @@ module BlindDate
     module ConnectionAdapters
       module MysqlAdapter
         module ClassMethods
-          def date_add_sql( sql, interval, unit, operator )
+          def date_add_sql( style, sql, interval, unit, operator )
             "( #{sql} #{operator} INTERVAL #{interval} #{unit} )"
           end
         end

data/lib/blind_date/active_record/connection_adapters/postgresql_adapter.rb

@@ -3,7 +3,7 @@ module BlindDate
     module ConnectionAdapters
       module PostgresqlAdapter
         module ClassMethods
-          def date_add_sql( sql, interval, unit, operator )
+          def date_add_sql( style, sql, interval, unit, operator )
             case interval
             when Numeric
               "( #{sql} #{operator} '#{interval} #{unit}' )"

data/lib/blind_date/active_record/connection_adapters/sqlite_adapter.rb

@@ -3,14 +3,19 @@ module BlindDate
     module ConnectionAdapters
       module SQLiteAdapter
         module ClassMethods
-          def date_add_sql( sql, interval, unit, operator )
+          def date_add_sql( style, sql, interval, unit, operator )
+            date_function = case style
+              when :date then 'DATE'
+              when :datetime then 'DATETIME'
+              when :time then 'TIME'
+            end
             case interval
-            when Numeric
-              "DATETIME( #{sql}, '#{operator}#{interval} #{unit}' )"
-            when String
-              "DATETIME( #{sql}, '#{operator}' || #{interval} || ' #{unit}' )"
-            else
-              raise ArgumentError
+              when Numeric
+                "#{date_function}( #{sql}, '#{operator}#{interval} #{unit}' )"
+              when String
+                "#{date_function}( #{sql}, '#{operator}' || #{interval} || ' #{unit}' )"
+              else
+                raise ArgumentError
             end
           end
         end

data/spec/blind_date_spec.rb

@@ -6,65 +6,65 @@ describe "BlindDate" do
     @future = Activity.create( :starts_at => @activity.starts_at + 60.seconds, :duration => 60 )
   end
 
-  it "should produce valid date_add output" do
-    matches = matches_for Activity.date_add( @activity.starts_at, 60.seconds )
+  it "should produce valid datetime_add output" do
+    matches = matches_for Activity.datetime_add( @activity.starts_at, 60.seconds )
     matches.size.should eql 1
     matches.should include @future
   end
 
-  it "should produce valid date_add output with plain sql string" do
+  it "should produce valid datetime_add output with plain sql string" do
     matches = Activity.find( :all, :conditions => [ "#{@activity.connection.quote(@future.starts_at)} = " +
-      Activity.date_add( 'activities.starts_at', 60.seconds ) ] )
+      Activity.datetime_add( 'activities.starts_at', 60.seconds ) ] )
     matches.size.should eql 1
     matches.should include @activity
   end
 
-  it "should produce valid date_add output with multipart date" do
+  it "should produce valid datetime_add output with multipart date" do
     other_activity = Activity.create( :starts_at => @activity.starts_at + 2.months + 10.seconds )
     matches = Activity.find( :all, :conditions => [ "#{@activity.connection.quote(other_activity.starts_at)} = " +
-      Activity.date_add( :starts_at, 2.months + 10.seconds ) ])
+      Activity.datetime_add( :starts_at, 2.months + 10.seconds ) ])
     matches.size.should eql 1
     matches.should include @activity
   end
 
-  it "should produce valid date_add output with a symbol string" do
+  it "should produce valid datetime_add output with a symbol string" do
     matches = Activity.find( :all, :conditions => [ "#{@activity.connection.quote(@future.starts_at)} = " +
-      Activity.date_add( :starts_at, 60.seconds ) ] )
+      Activity.datetime_add( :starts_at, 60.seconds ) ] )
     matches.size.should eql 1
     matches.should include @activity
   end
 
   it "should default to seconds with an integer interval" do
     matches = Activity.find( :all, :conditions => [ "#{@activity.connection.quote(@future.starts_at)} = " +
-      Activity.date_add( :starts_at, 60 ) ] )
+      Activity.datetime_add( :starts_at, 60 ) ] )
     matches.size.should eql 1
     matches.should include @activity
   end
 
   it "should accept sql fragment, unit, operator for interval" do
     matches = Activity.find( :all, :conditions => [ "#{@activity.connection.quote(@activity.starts_at + @activity.duration.seconds)} = " +
-      Activity.date_add( :starts_at, 'activities.duration' ) ] )
+      Activity.datetime_add( :starts_at, 'activities.duration' ) ] )
     matches.size.should eql 1
     matches.should include @activity
   end
 
   it "should accept a symbol for the interval" do
     matches = Activity.find( :all, :conditions => [ "#{@activity.connection.quote(@activity.starts_at + @activity.duration.seconds)} = " +
-      Activity.date_add( :starts_at, :duration ) ] )
+      Activity.datetime_add( :starts_at, :duration ) ] )
     matches.size.should eql 1
     matches.should include @activity
   end
 
   it "should accept an alternative unit for a specified interval" do
     matches = Activity.find( :all, :conditions => [ "#{@activity.connection.quote(@activity.starts_at + @activity.duration.seconds)} = " +
-      Activity.date_add( :starts_at, 1, :minutes ) ] )
+      Activity.datetime_add( :starts_at, 1, :minutes ) ] )
     matches.size.should eql 1
     matches.should include @activity
   end
 
   it "should calculate a difference with the sub method" do
     matches = Activity.find( :all, :conditions => [ "#{@activity.connection.quote @activity.starts_at} = " +
-      Activity.date_sub( 'activities.starts_at', 1, :minutes ) ] )
+      Activity.datetime_sub( 'activities.starts_at', 1, :minutes ) ] )
     matches.size.should eql 1
     matches.should include @future
   end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: blind_date
 version: !ruby/object:Gem::Version 
-  hash: 27
   prerelease: false
   segments: 
+  - 1
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  version: 1.0.0
 platform: ruby
 authors: 
 - Ari Epstein
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-14 00:00:00 -04:00
+date: 2010-11-12 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 1
         - 2
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 2
         - 3
@@ -91,7 +88,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -100,7 +96,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"