zoneless_time 0.2 → 0.3

data/lib/active_record/zoneless_time_support.rb

@@ -11,12 +11,9 @@ module ActiveRecord
           else
             super ZonelessTime::TimeWithoutZone.at(val)
           end
+          send sym, true
         end
       end
-
-      if time_zone_aware_attributes
-        require 'zoneless_time/warning'
-      end
     end
   end
 end

data/lib/zoneless_time/date_extension.rb

@@ -0,0 +1,10 @@
+module ZonelessTime
+  module DateExtension
+    module InstanceMethods
+      # Dates don't have a timezone, so just accept the call blindly
+      def without_zone
+        self
+      end
+    end
+  end
+end

data/lib/zoneless_time/railtie.rb

@@ -4,8 +4,12 @@ require 'rails'
 module ZonelessTime
   class Railtie < Rails::Railtie
     initializer 'zoneless_time.configure_rails_initialization' do
-      ActiveSupport::TimeWithZone.send :include, EqualityWithZonelessTime
+      ActiveSupport::TimeWithZone.send :include, ZonelessTime::TimeExtension::InstanceMethods
       ActiveRecord::Base.send :extend, ActiveRecord::ZonelessTimeSupport
+
+      if config.time_zone_aware_attributes
+        require 'zoneless_time/warning'
+      end
     end
   end
 end

data/lib/zoneless_time/time_extension.rb

@@ -0,0 +1,17 @@
+module ZonelessTime
+  module TimeExtension
+    module InstanceMethods
+      def ==(other)
+        if other.is_a? self.class
+          self.without_zone.matches? other
+        else
+          super(other)
+        end
+      end
+
+      def without_zone
+        ZonelessTime::TimeWithoutZone.at(self)
+      end
+    end
+  end
+end

data/lib/zoneless_time/time_without_zone.rb

@@ -5,6 +5,35 @@ module ZonelessTime
     RFC2822_DAY_NAME = Time::RFC2822_DAY_NAME
     RFC2822_MONTH_NAME = Time::RFC2822_MONTH_NAME
 
+    def xmlschema
+      to_time.xmlschema.gsub(/\+.*\Z/, '')
+    end
+
+    def <=>(other)
+      to_i <=> other.to_i
+    end
+
+    def >(other)
+      to_i > other.to_i
+    end
+
+    def <(other)
+      to_i < other.to_i
+    end
+
+    def +(amount)
+      (to_time + amount).without_zone
+    end
+
+    def -(amount)
+      result = if amount.is_a? Fixnum
+        to_time - amount
+      else
+        to_time - amount.to_time
+      end
+      (result.is_a? Time) ? result.without_zone : result
+    end
+
     def initialize(year,month,day,hour,min,sec,usec=0)
       @date = Date.new(year,month,day)
       @hour = hour
@@ -26,6 +55,10 @@ module ZonelessTime
       date.wday
     end
 
+    def seconds_since_midnight
+      ((60 * hour) + min) * 60 + sec
+    end
+
     def to_s(type=nil)
       if type == :db
         "#{year}-#{two_char month}-#{two_char day} #{two_char hour}:#{two_char min}:#{two_char sec}"
@@ -38,14 +71,38 @@ module ZonelessTime
       to_s
     end
 
+    def to_i
+      to_time.to_i
+    end
+
+    def without_zone
+      dup
+    end
+
+    def in_time_zone(*args)
+      dup
+    end
+
+    def local
+      dup
+    end
+
+    def strftime(*args)
+      to_time.strftime *args
+    end
+
     def matches?(other)
      [:year, :month, :day, :hour, :min, :sec].all? { |sym| other.send(sym) == self.send(sym) }
     end
 
-    def time
+    def to_time
       Time.local(year, month, day, hour, min, sec, usec)
     end
 
+    def to_date
+      Date.new(year, month, day)
+    end
+
     def ==(other)
       matches? other
     end

data/lib/zoneless_time.rb

@@ -3,8 +3,10 @@ end
 
 require 'active_record/zoneless_time_support'
 require 'zoneless_time/time_without_zone'
-require 'zoneless_time/equality_with_zoneless_time'
+require 'zoneless_time/time_extension'
+require 'zoneless_time/date_extension'
 
-Time.send :include, ZonelessTime::EqualityWithZonelessTime
+Time.send :include, ZonelessTime::TimeExtension::InstanceMethods
+Date.send :include, ZonelessTime::DateExtension::InstanceMethods
 
 require 'zoneless_time/railtie' if defined? Rails

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: zoneless_time
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
-  - 2
-  version: "0.2"
+  - 3
+  version: "0.3"
 platform: ruby
 authors: 
 - Shaun Mangelsdorf
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-22 00:00:00 Z
+date: 2011-08-10 00:00:00 Z
 dependencies: []
 
 description: 
@@ -28,8 +28,9 @@ extra_rdoc_files:
 files: 
 - lib/active_record/zoneless_time_support.rb
 - lib/zoneless_time.rb
-- lib/zoneless_time/equality_with_zoneless_time.rb
+- lib/zoneless_time/date_extension.rb
 - lib/zoneless_time/railtie.rb
+- lib/zoneless_time/time_extension.rb
 - lib/zoneless_time/time_without_zone.rb
 - lib/zoneless_time/warning.rb
 - README

data/lib/zoneless_time/equality_with_zoneless_time.rb

@@ -1,11 +0,0 @@
-module ZonelessTime
-  module EqualityWithZonelessTime
-    def ==(other)
-      if other.is_a? self.class
-        ZonelessTime::TimeWithoutZone.at(self).matches? other
-      else
-        super(other)
-      end
-    end
-  end
-end