time_crisis 0.3.2 → 0.3.5

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :build: 
 :minor: 3
-:patch: 2
+:patch: 5
 :major: 0

data/lib/time_crisis.rb

@@ -4,6 +4,7 @@ require 'time_crisis/datetime'
 require 'time_crisis/tzinfo'
 require 'time_crisis/support'
 require 'time_crisis/conversions'
+require 'time_crisis/to_json'
 require 'time_crisis/date_range'
 require 'time_crisis/named_months'
 require 'time_crisis/meteorological_seasons'
@@ -16,6 +17,12 @@ require 'time_crisis/holiday'
 ::TimeCrisis::Time.zone ||= ::Time.now.zone
 
 # not sure about making this a default behavior
-TCTime = TimeCrisis::Time
-TCDate = TimeCrisis::Date
-TCDateTime = TimeCrisis::DateTime
+def TCTime
+  TimeCrisis::Time
+end
+def TCDate
+  TimeCrisis::Date
+end
+def TCDateTime
+  TimeCrisis::DateTime
+end

data/lib/time_crisis/conversions.rb

@@ -6,6 +6,10 @@ class ::Date
   def to_tc_datetime
     TimeCrisis::DateTime.civil(year, month, day, 0, 0, 0, 0)
   end
+  
+  def to_tc_time(form = :local)
+    ::TimeCrisis::Time.send(form, year, month, day)
+  end
 end
 
 class ::Time
@@ -16,6 +20,10 @@ class ::Time
   def to_tc_datetime
     TimeCrisis::DateTime.civil(year, month, day, hour, min, sec, 0, utc_offset)
   end
+  
+  def to_tc_time
+    TimeCrisis::Time.at(self.to_f)
+  end
 end
 
 class ::DateTime
@@ -26,6 +34,10 @@ class ::DateTime
   def to_tc_datetime
     TimeCrisis::DateTime.civil(year, month, day, hour, min, sec, 0, (offset * 86400).to_i)
   end
+  
+  def to_tc_time
+    TimeCrisis::Time.at(self.to_f)
+  end
 end
 
 class ::String

data/lib/time_crisis/support/ext/date/conversions.rb

@@ -32,8 +32,9 @@ module TimeCrisis
       self
     end
 
-    def to_tc_datetime
-      ::TimeCrisis::DateTime.civil(year, month, day, 0, 0, 0, 0)
+    def to_tc_datetime(form = :local)
+      offset = form == :local ? (Time.zone.now.utc_offset rescue Time.now.utc_offset) : 0
+      ::TimeCrisis::DateTime.civil(year, month, day, 0, 0, 0, 0, offset)
     end
     
     def to_tc_time(form = :local)

data/lib/time_crisis/support/ext/date_time/conversions.rb

@@ -33,15 +33,15 @@ module TimeCrisis
     end
 
     def to_datetime
-      ::DateTime.civil(year, month, day, hour, minute, second, Rational(offset, 86400))
+      ::DateTime.civil(year, month, day, hour, min, second, Rational(offset, 86400))
     end
 
     def to_time
-      ::Time.at(self.to_i)
+      ::Time.at(self.to_f)
     end
     
     def to_tc_time
-      ::TimeCrisis::Time.at(self.to_i)
+      ::TimeCrisis::Time.at(self.to_f)
     end
 
     def xmlschema
@@ -60,7 +60,7 @@ module TimeCrisis
 
     def seconds_since_unix_epoch
       seconds_per_day = 86_400
-      (self - ::TimeCrisis::DateTime.civil(1970)) * seconds_per_day
+      (self.utc - ::TimeCrisis::DateTime.civil(1970, 1, 1)) * seconds_per_day
     end
   end
 end

data/lib/time_crisis/support/ext/date_time/zones.rb

@@ -1,5 +1,7 @@
-class DateTime
-  def in_time_zone(zone = ::TimeCrisis::Time.zone)
-    TimeCrisis::TimeWithZone.new(utc? ? self : getutc, ::TimeCrisis::Time.__send__(:get_zone, zone))
+module TimeCrisis
+  class DateTime
+    def in_time_zone(zone = ::TimeCrisis::Time.zone)
+      TimeCrisis::TimeWithZone.new(utc? ? self : getutc, ::TimeCrisis::Time.__send__(:get_zone, zone))
+    end
   end
 end

data/lib/time_crisis/support/ext/time/calculations.rb

@@ -8,7 +8,7 @@ module TimeCrisis
 
     class << self
       def ===(other)
-        other.is_a?(::Time)
+        other.is_a?(::Time) || other.is_a?(::TimeCrisis::Time)
       end
 
       def days_in_month(month, year = now.year)
@@ -186,11 +186,6 @@ module TimeCrisis
     def tomorrow
       advance(:days => 1)
     end
-    
-    if instance_methods.include?('plus_without_duration')
-      undef_method :+
-      alias_method :+, :plus_without_duration
-    end
 
     def plus_with_duration(other) #:nodoc:
       if TimeCrisis::Duration === other
@@ -201,11 +196,6 @@ module TimeCrisis
     end
     alias_method :plus_without_duration, :+
     alias_method :+, :plus_with_duration
-    
-    if instance_methods.include?('minus_without_duration')
-      undef_method :-
-      alias_method :-, :minus_without_duration
-    end
 
     def minus_with_duration(other) #:nodoc:
       if TimeCrisis::Duration === other
@@ -223,11 +213,6 @@ module TimeCrisis
     end
     alias_method :minus_without_coercion, :-
     alias_method :-, :minus_with_coercion
-    
-    if instance_methods.include?('compare_without_coercion')
-      undef_method :<=>
-      alias_method :<=>, :compare_without_coercion
-    end
 
     def compare_with_coercion(other)
       other = other.comparable_time if other.respond_to?(:comparable_time)

data/lib/time_crisis/support/ext/time/conversions.rb

@@ -10,11 +10,6 @@ module TimeCrisis
       :long         => "%B %d, %Y %H:%M",
       :rfc822       => lambda { |time| time.strftime("%a, %d %b %Y %H:%M:%S #{time.formatted_offset(false)}") }
     }
-    
-    if instance_methods.include?('to_default_s')
-      undef_method :to_s
-      alias_method :to_s, :to_default_s
-    end
 
     def to_formatted_s(format = :default)
       if formatter = DATE_FORMATS[format]
@@ -29,11 +24,6 @@ module TimeCrisis
     def formatted_offset(colon = true, alternate_utc_string = nil)
       utc? && alternate_utc_string || TimeCrisis::TimeZone.seconds_to_utc_offset(utc_offset, colon)
     end
-    
-    if instance_methods.include?('default_inspect')
-      undef_method :inspect
-      alias_method :inspect, :default_inspect
-    end
 
     def readable_inspect
       "#<TimeCrisis::Time #{self.to_s(:rfc822)}>"
@@ -46,7 +36,7 @@ module TimeCrisis
     end
 
     def to_time
-      ::Time.at(self.to_i)
+      ::Time.at(self.to_f)
     end
 
     def to_datetime

data/lib/time_crisis/support/ext/time/marshal_with_utc_flag.rb

@@ -2,11 +2,6 @@ if RUBY_VERSION < '1.9'
   module TimeCrisis
     class Time
       class << self
-        if respond_to?(:_original_load)
-          undef_method :_load
-          alias_method :_load, :_original_load
-        end
-        
         alias_method :_original_load, :_load
         def _load(marshaled_time)
           time = _original_load(marshaled_time)
@@ -15,11 +10,6 @@ if RUBY_VERSION < '1.9'
         end
       end
       
-      if respond_to?(:_original_dump)
-        undef_method :_dump
-        alias_method :_dump, :_original_dump
-      end
-
       alias_method :_original_dump, :_dump
       def _dump(*args)
         obj = frozen? ? dup : self

data/lib/time_crisis/support/ext/time/zones.rb

@@ -6,11 +6,11 @@ module TimeCrisis
       attr_accessor :zone_default
 
       def zone
-        Thread.current[:time_zone] || zone_default
+        Thread.current[:tc_time_zone] || zone_default
       end
 
       def zone=(time_zone)
-        Thread.current[:time_zone] = get_zone(time_zone)
+        Thread.current[:tc_time_zone] = get_zone(time_zone)
       end
 
       def use_zone(time_zone)

data/lib/time_crisis/time.rb

@@ -1,4 +1,65 @@
 module TimeCrisis
-  class Time < ::Time
+  Time = ::Time.dup
+end
+
+if defined?(::ActiveSupport)
+  module TimeCrisis
+    class Time
+      #======================================================================>
+      # try to get back original versions of methods
+      
+      if instance_methods.include?('plus_without_duration')
+        alias :+ :plus_without_duration
+        undef :plus_without_duration
+        undef :plus_with_duration
+      end
+      
+      if instance_methods.include?('minus_without_duration')
+        alias :- :minus_without_duration
+        undef :minus_without_duration
+        undef :minus_with_duration
+      end
+      
+      if instance_methods.include?('minus_without_coercion')
+        undef :minus_without_coercion
+        undef :minus_with_coercion
+      end
+      
+      if instance_methods.include?('compare_without_coercion')
+        alias :<=> :compare_without_coercion
+        undef :compare_without_coercion
+        undef :compare_with_coercion
+      end
+      
+      if instance_methods.include?('default_inspect')
+        alias :inspect :default_inspect
+        undef :default_inspect
+        undef :readable_inspect
+      end
+      
+      class << self
+        if respond_to?(:_original_load)
+          alias :_load :_original_load
+          undef :_original_load
+        end
+        
+        if respond_to?(:_original_dump)
+          alias :_dump :_original_dump
+          undef :_original_dump
+        end
+      end
+      
+      #======================================================================>
+      
+      class << self
+        [
+          :zone_default, :zone_default=, :zone, :zone=,
+          :use_zone, :current, :get_zone
+        ].each {|method| undef_method(method) if respond_to?(method)}
+      end
+      
+      undef :in_time_zone if instance_methods.include?('in_time_zone')
+      
+    end
   end
 end

data/lib/time_crisis/to_json.rb

@@ -0,0 +1,19 @@
+module TimeCrisis
+  class Date
+    def to_json(options = nil)
+      %("#{strftime("%Y-%m-%d")}")
+    end
+  end
+
+  class DateTime
+    def to_json(options = nil)
+      xmlschema.inspect
+    end
+  end
+
+  class Time
+    def to_json(options = nil)
+      xmlschema.inspect
+    end
+  end
+end

data/time_crisis.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{time_crisis}
-  s.version = "0.3.2"
+  s.version = "0.3.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Travis Tilley"]
@@ -53,6 +53,7 @@ Gem::Specification.new do |s|
      "lib/time_crisis/support/time_with_zone.rb",
      "lib/time_crisis/support/values/time_zone.rb",
      "lib/time_crisis/time.rb",
+     "lib/time_crisis/to_json.rb",
      "lib/time_crisis/tzinfo.rb",
      "lib/time_crisis/tzinfo/LICENSE",
      "lib/time_crisis/tzinfo/data_timezone.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: time_crisis
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.5
 platform: ruby
 authors: 
 - Travis Tilley
@@ -59,6 +59,7 @@ files:
 - lib/time_crisis/support/time_with_zone.rb
 - lib/time_crisis/support/values/time_zone.rb
 - lib/time_crisis/time.rb
+- lib/time_crisis/to_json.rb
 - lib/time_crisis/tzinfo.rb
 - lib/time_crisis/tzinfo/LICENSE
 - lib/time_crisis/tzinfo/data_timezone.rb