blind_date 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/blind_date.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{blind_date}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ari Epstein"]
-  s.date = %q{2009-11-25}
+  s.date = %q{2010-06-14}
   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 = [
@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/aepstein/blind_date}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{DBMS-indepedent methods to query dates in ActiveRecord}
   s.test_files = [
     "spec/blind_date_spec.rb",
@@ -49,7 +49,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_runtime_dependency(%q<activerecord>, [">= 2.3.4"])
     else

data/lib/blind_date/active_record/base.rb

@@ -1,42 +1,58 @@
 module BlindDate
   module ActiveRecord
     module Base
+      module ClassMethods
+        # Generates an sql fragement representing the sum of a date and a duration
+        # == Usage
+        #
+        # Model.date_add DateTime.now, 10.days
+        # => sqlite: DATETIME( '2009-11-25 12:01:01', '+10 DAY' )
+        # => mysql: ('2009-11-25 12:01:01' + 10 DAY)
+        # => pgsql: (TIMESTAMP '2009-11-25 12:01:01' + '10 DAY')
+        # Model.date_add 'models.starts_at', 10.days
+        # => sqlite: DATETIME( models.starts_at, '+10 DAY' )
+        # Model.date_add :starts_at, :duration, :days
+        # => sqlite: DATETIME( "models"."starts_at", '+' || "models"."duration" || ' DAY' )
+        # Model.date_add :starts_at, :duration, :days, true
+        # => sqlite: DATETIME( "models"."starts_at", '-' || "models"."duration" || ' DAY' )
+        #
+        # == Options
+        # * +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)
+          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
+        end
 
-      # Generates an sql fragement representing the sum of a date and a duration
-      # == Usage
-      #
-      # Model.date_add DateTime.now, 10.days
-      # => sqlite: DATETIME( '2009-11-25 12:01:01', '+10 DAY' )
-      # => mysql: ('2009-11-25 12:01:01' + 10 DAY)
-      # => pgsql: (TIMESTAMP '2009-11-25 12:01:01' + '10 DAY')
-      # Model.date_add 'models.starts_at', 10.days
-      # => sqlite: DATETIME( models.starts_at, '+10 DAY' )
-      # Model.date_add :starts_at, :duration, :days
-      # => sqlite: DATETIME( "models"."starts_at", '+' || "models"."duration" || ' DAY' )
-      # Model.date_add :starts_at, :duration, :days, true
-      # => sqlite: DATETIME( "models"."starts_at", '-' || "models"."duration" || ' DAY' )
-      #
-      # == Options
-      # * +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)
-        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
+        # 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
         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
+
       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
+      module InstanceMethods
+        def date_add( date, interval, unit = 'SECOND', diff = false)
+          self.class.date_add( date, interval, unit, diff )
+        end
+        def date_sub( date, interval, unit = 'SECOND' )
+          self.class.date_sub( date, interval, unit )
+        end
       end
 
+      def self.included(receiver)
+        receiver.extend         ClassMethods
+        receiver.send :include, InstanceMethods
+
+      end
     end
   end
 end

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

@@ -1,56 +1,63 @@
 module BlindDate
   module ActiveRecord
     module ConnectionAdapters
-
-      # Includes extended behaviors
-      # Each DBMS-specific module must implement the private methods or raise NotImplemented
-      # for each private method
       module AbstractAdapter
-
-        # 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 )
-          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
+        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 )
+            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
+              end
+            when String
+              date_add_sql date, interval, unit.to_s.singularize.upcase, ( diff ? '-' : '+' )
+            when Numeric
+              date_add_sql_without_operator date, interval, unit.to_s.singularize.upcase, diff
+            else
+              raise ArgumentError
             end
-          when String
-            date_add_sql date, interval, unit.to_s.singularize.upcase, ( diff ? '-' : '+' )
-          when Numeric
-            date_add_sql_without_operator date, interval, unit.to_s.singularize.upcase, diff
-          else
-            raise ArgumentError
           end
-        end
 
-        # Returns name of adapter suitable for loading related classes
-        # Should have same output as instance method of same name
-        # TODO: Kludgy: maybe upstream could provide a class method?
-        def adapter_name
-          to_s.underscore[ /\/([^\/]+)_adapter$/, 1 ].gsub( '_', '' )
-        end
+          # Returns name of adapter suitable for loading related classes
+          # Should have same output as instance method of same name
+          # TODO: Kludgy: maybe upstream could provide a class method?
+          def adapter_name
+            to_s.underscore[ /\/([^\/]+)_adapter$/, 1 ].gsub( '_', '' )
+          end
+
+          private
 
-        private
+          # Adds appropriate operator before calling adapter-specific method
+          def date_add_sql_without_operator( sql, interval, unit, diff )
+            if diff
+              date_add_sql sql, interval.abs, unit, ( interval < 0 ? '+' : '-' )
+            else
+              date_add_sql sql, interval.abs, unit, ( interval < 0 ? '-' : '+' )
+            end
+          end
 
-        # Adds appropriate operator before calling adapter-specific method
-        def date_add_sql_without_operator( sql, interval, unit, diff )
-          if diff
-            date_add_sql sql, interval.abs, unit, ( interval < 0 ? '+' : '-' )
-          else
-            date_add_sql sql, interval.abs, unit, ( interval < 0 ? '-' : '+' )
+          # Will attempt to load the correct behavior if this is not already provided
+          def date_add_sql( sql, interval, unit, operator )
+            require "blind_date/active_record/connection_adapters/#{adapter_name}_adapter"
+            date_add_sql( sql, interval, unit, operator )
           end
+
         end
 
-        # Will attempt to load the correct behavior if this is not already provided
-        def date_add_sql( sql, interval, unit, operator )
-          require "blind_date/active_record/connection_adapters/#{adapter_name}_adapter"
-          date_add_sql( sql, interval, unit, operator )
+        module InstanceMethods
+          def date_add_sql( sql, interval, unit, operator )
+            self.class.date_add_sql( sql, interval, unit, operator )
+          end
         end
 
+        def self.included(receiver)
+          receiver.extend         ClassMethods
+          receiver.send :include, InstanceMethods
+        end
       end
     end
   end
 end
 
-ActiveRecord::ConnectionAdapters::AbstractAdapter.extend BlindDate::ActiveRecord::ConnectionAdapters::AbstractAdapter
-

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

@@ -2,15 +2,24 @@ module BlindDate
   module ActiveRecord
     module ConnectionAdapters
       module MysqlAdapter
+        module ClassMethods
+          def date_add_sql( sql, interval, unit, operator )
+            "( #{sql} #{operator} INTERVAL #{interval} #{unit} )"
+          end
+        end
+
+        module InstanceMethods
 
-        def date_add_sql( sql, interval, unit, operator )
-          "( #{sql} #{operator} INTERVAL #{interval} #{unit} )"
         end
 
+        def self.included(receiver)
+          receiver.extend         ClassMethods
+          receiver.send :include, InstanceMethods
+        end
       end
     end
   end
 end
 
-ActiveRecord::ConnectionAdapters::MysqlAdapter.extend BlindDate::ActiveRecord::ConnectionAdapters::MysqlAdapter
+ActiveRecord::ConnectionAdapters::MysqlAdapter.send :include, BlindDate::ActiveRecord::ConnectionAdapters::MysqlAdapter
 

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

@@ -2,22 +2,31 @@ module BlindDate
   module ActiveRecord
     module ConnectionAdapters
       module PostgresqlAdapter
-
-        def date_add_sql( sql, interval, unit, operator )
-          case interval
-          when Numeric
-            "( #{sql} #{operator} '#{interval} #{unit}' )"
-          when String
-            "( #{sql} #{operator} #{interval} || ' #{unit}')"
-          else
-            raise ArgumentError
+        module ClassMethods
+          def date_add_sql( sql, interval, unit, operator )
+            case interval
+            when Numeric
+              "( #{sql} #{operator} '#{interval} #{unit}' )"
+            when String
+              "( #{sql} #{operator} #{interval} || ' #{unit}')"
+            else
+              raise ArgumentError
+            end
           end
         end
 
+        module InstanceMethods
+
+        end
+
+        def self.included(receiver)
+          receiver.extend         ClassMethods
+          receiver.send :include, InstanceMethods
+        end
       end
     end
   end
 end
 
-ActiveRecord::ConnectionAdapters::MysqlAdapter.send :include, BlindDate::ActiveRecord::ConnectionAdapters::MysqlAdapter
+ActiveRecord::ConnectionAdapters::PostgresqlAdapter.send :include, BlindDate::ActiveRecord::ConnectionAdapters::PostgresqlAdapter
 

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

@@ -2,22 +2,31 @@ module BlindDate
   module ActiveRecord
     module ConnectionAdapters
       module SQLiteAdapter
-
-        def date_add_sql( sql, interval, unit, operator )
-          case interval
-          when Numeric
-            "DATETIME( #{sql}, '#{operator}#{interval} #{unit}' )"
-          when String
-            "DATETIME( #{sql}, '#{operator}' || #{interval} || ' #{unit}' )"
-          else
-            raise ArgumentError
+        module ClassMethods
+          def date_add_sql( sql, interval, unit, operator )
+            case interval
+            when Numeric
+              "DATETIME( #{sql}, '#{operator}#{interval} #{unit}' )"
+            when String
+              "DATETIME( #{sql}, '#{operator}' || #{interval} || ' #{unit}' )"
+            else
+              raise ArgumentError
+            end
           end
         end
 
+        module InstanceMethods
+
+        end
+
+        def self.included(receiver)
+          receiver.extend         ClassMethods
+          receiver.send :include, InstanceMethods
+        end
       end
     end
   end
 end
 
-ActiveRecord::ConnectionAdapters::SQLiteAdapter.extend BlindDate::ActiveRecord::ConnectionAdapters::SQLiteAdapter
+ActiveRecord::ConnectionAdapters::SQLiteAdapter.send :include, BlindDate::ActiveRecord::ConnectionAdapters::SQLiteAdapter
 

data/lib/blind_date.rb

@@ -1,6 +1,6 @@
 require 'blind_date/active_record/base'
 require 'blind_date/active_record/connection_adapters/abstract_adapter'
 
-ActiveRecord::Base.extend BlindDate::ActiveRecord::Base
-ActiveRecord::ConnectionAdapters::AbstractAdapter.extend BlindDate::ActiveRecord::ConnectionAdapters::AbstractAdapter
+ActiveRecord::Base.send :include, BlindDate::ActiveRecord::Base
+ActiveRecord::ConnectionAdapters::AbstractAdapter.send :include, BlindDate::ActiveRecord::ConnectionAdapters::AbstractAdapter
 

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: blind_date
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  hash: 27
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Ari Epstein
@@ -9,29 +15,41 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-25 00:00:00 -05:00
+date: 2010-06-14 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 2
+        - 3
+        - 4
         version: 2.3.4
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: Allows you to utilize date calculation functionality of DBMS with a uniform API
 email: aepstein607@gmail.com
 executables: []
@@ -69,21 +87,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: DBMS-indepedent methods to query dates in ActiveRecord