fossil 0.3.27 → 0.3.28

data/VERSION

@@ -1 +1 @@
-0.3.27
+0.3.28

data/fossil.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fossil}
-  s.version = "0.3.27"
+  s.version = "0.3.28"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Patrick Lardin, Daniel Sudol"]

data/lib/models/trip_leg.rb

@@ -711,7 +711,7 @@ class TripLeg < Sequel::Model(:'trip legs')
 
   def ebt_time
     minutes_between = (planned_arrival_date_time_gmt - planned_departure_date_time_gmt)/60;
-    Time.from_fos_time(minutes_between)
+    Time.from_minutes(minutes_between)
   end
 
   #### aliases and special methods #####

data/lib/sequel/fos_dates.rb

@@ -13,59 +13,42 @@ end
 
 module TimeFunctions
 
-  def self.included(klass)
-    klass.send(:include,TimeFunctions::InstanceMethods)
-    klass.send(:extend,TimeFunctions::ClassMethods)
+  def as_minutes
+    hour*60 + min
   end
 
-  module InstanceMethods
-    def as_minutes
-      hour*60 + min
-    end
-
-    def in_hundredths
-      return 0 if hour + min == 0
-      minutes = hour*60 + min
-      val = "#{minutes/60}.#{((100*(minutes.modulo(60)))/60).to_s.rjust(2, '0')}"
-      BigDecimal.new(val, 2).round(1).to_s
-    end
-
-    # xos is rounding XOJET STYLE, which is a funky copy of how ipc did it
-    def in_hundredths_rounded_xos
-      return 0 if hour + min == 0
-      # It was determined that "ODD" increments of .05 (ie .15, .35, .55, .75, .95) of an hour (ie. 9,21,33,45,57 minutes) rounded UP whereas even increments of .05 rounded DOWN - sn
-      minutes = as_minutes
-      (minutes/60.0 + ([9, 21, 33, 45, 57].include?( min ) ? 0.001 : -0.001)).round(2)
-    end
-
-    # xos is rounding XOJET STYLE, which is a funky copy of how ipc did it
-    def in_tenths_rounded_xos
-      return 0 if hour + min == 0
-      # It was determined that "ODD" increments of .05 (ie .15, .35, .55, .75, .95) of an hour (ie. 9,21,33,45,57 minutes) rounded UP whereas even increments of .05 rounded DOWN - sn
-      minutes = as_minutes
-      (minutes/60.0 + ([9, 21, 33, 45, 57].include?( min ) ? 0.01 : -0.01)).round(1)
-    end
-
-    def hm
-      to_s(:hm)
-    end
+  def in_hundredths
+    return 0 if hour + min == 0
+    minutes = hour*60 + min
+    val = "#{minutes/60}.#{((100*(minutes.modulo(60)))/60).to_s.rjust(2, '0')}"
+    BigDecimal.new(val, 2).round(1).to_s
   end
 
-  module ClassMethods
-    # creates utc time from days and minutes
-    def from_fos_date_time(days, minutes)
-      from_fos_time(days*1440 + minutes)
-    end
+  # xos is rounding XOJET STYLE, which is a funky copy of how ipc did it
+  def in_hundredths_rounded_xos
+    return 0 if hour + min == 0
+    # It was determined that "ODD" increments of .05 (ie .15, .35, .55, .75, .95) of an hour (ie. 9,21,33,45,57 minutes) rounded UP whereas even increments of .05 rounded DOWN - sn
+    minutes = as_minutes
+    (minutes/60.0 + ([9, 21, 33, 45, 57].include?( min ) ? 0.001 : -0.001)).round(2)
+  end
+
+  # xos is rounding XOJET STYLE, which is a funky copy of how ipc did it
+  def in_tenths_rounded_xos
+    return 0 if hour + min == 0
+    # It was determined that "ODD" increments of .05 (ie .15, .35, .55, .75, .95) of an hour (ie. 9,21,33,45,57 minutes) rounded UP whereas even increments of .05 rounded DOWN - sn
+    minutes = as_minutes
+    (minutes/60.0 + ([9, 21, 33, 45, 57].include?( min ) ? 0.01 : -0.01)).round(1)
+  end
 
-    # creates utc time from minutes
-    def from_fos_time(minutes)
-      DateTime.new(1899, 12, 31).advance(:minutes=>minutes)
-    end
+  def hm
+    to_s(:hm)
   end
+
 end
 
 class Time
   include TimeFunctions
+
   DATE_FORMATS[:hm] = "%H:%M"
 
   alias :original_to_s :to_s
@@ -75,17 +58,24 @@ class Time
     self.original_to_s(args)
   end
 
-  # overriding default behavior from module TimeFunctions
-  # to ensure that if you want to convert the DateTime that this function returns,
-  # you can convert is safely to a Time class. To do this the Date part must be
-  # at least (1901,12,14), so I am rounding to (1902,1,1), and calling that
-  # the beginning date for a time with no hours, mins and seconds.
+  # using a date of 2000,1,1 is arbitrary
   def self.from_fos_time(minutes)
-   return DateTime.new(1902,1,1) if minutes == 0
-   DateTime.new(1899, 12, 31).advance(:minutes=>minutes)
+    minutes = 0 unless minutes
+    Time.utc(2000, 1, 1) + minutes.minutes
+  end
+
+  class << self
+    alias from_minutes from_fos_time 
   end
 end
 
 class DateTime
   include TimeFunctions
+
+  # creates utc time from days and minutes
+  def self.from_fos_date_time(days, minutes)
+    days = 0 unless days
+    minutes = 0 unless minutes
+    Date.from_fos_days(days).to_datetime.advance(:minutes=>minutes)
+  end
 end

data/lib/sequel/model_patch.rb

@@ -103,7 +103,7 @@ class Sequel::Model
       inst_def datetime_column_name do
         days = send(:[], date_column) || 0     # nil defaults to 0 days
         minutes = send(:[], time_column) || 0  # nil defaults to 0 minutes
-        Time.from_fos_date_time(days, minutes) # returns utc time
+        DateTime.from_fos_date_time(days, minutes) # returns utc time
       end
     end
 
@@ -189,9 +189,11 @@ class Sequel::Model
         column_value = send(column_name)
         case type
           when :date
-            Date.from_fos_days(column_value) if column_value
+            Date.from_fos_days(column_value) 
+#            Date.from_fos_days(column_value) if column_value
           when :time
-            Time.utc(0) + column_value.minutes if column_value
+            Time.from_fos_time(column_value)
+#            Time.utc(2000,1,1) + column_value.minutes if column_value
           when :currency
             number_to_currency( (column_value || 0).to_f/100, :unit=>'', :precision=>2)
           when :precision

data/spec/sequel/fos_dates_spec.rb

@@ -4,7 +4,6 @@ describe "fos_dates" do
 
   it "Time and DateTime have proper class methods included from TimeFunctions" do
     Time.should respond_to(:from_fos_time)
-    DateTime.should respond_to(:from_fos_time)
   end
 
   it "Time and DateTime have proper class methods included from TimeFunctions" do
@@ -17,11 +16,11 @@ describe "fos_dates" do
   end
 
   it "converts fos time number of 0 to a DateTime of (1902,1,1)" do
-    Time.from_fos_time(0).should == DateTime.new(1902,1,1,0,0,0)
+    Time.from_fos_time(0).should == DateTime.new(2000,1,1,0,0,0).to_time
   end
 
   it "converts fos time number to a Ruby DateTime" do
-    Time.from_fos_time(100).should == DateTime.new(1899,12,31,1,40,0)
+    Time.from_fos_time(100).should == DateTime.new(2000,1,1,1,40,0).to_time
   end
 
   it "converts a Ruby Time to hundredths" do

data/spec/sequel/model_patch_spec.rb

@@ -265,7 +265,7 @@ describe "Sequel::Model extentions" do
 
     it "datetime can handle nil date or time" do
       add_test_table_data({:date_col => nil, :time_col => nil})
-      TestTable.first.datetime_col.should == DateTime.new(1902,1,1,0,0,0)
+      TestTable.first.datetime_col.should == DateTime.new(1899,12,31,0,0,0)
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fossil
 version: !ruby/object:Gem::Version 
-  version: 0.3.27
+  version: 0.3.28
 platform: ruby
 authors: 
 - Patrick Lardin, Daniel Sudol