fossil 0.5.28 → 0.5.29

data/VERSION

@@ -1 +1 @@
-0.5.28
+0.5.29

data/fossil.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fossil}
-  s.version = "0.5.28"
+  s.version = "0.5.29"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Patrick Lardin, Daniel Sudol"]
-  s.date = %q{2011-02-08}
+  s.date = %q{2011-02-16}
   s.description = %q{Access FOS/betrieve db with this Sequel based orm wrapper}
   s.email = %q{plardin@xojet.com}
   s.extra_rdoc_files = [

data/lib/models/trip_leg.rb

@@ -672,10 +672,15 @@ class TripLeg < Sequel::Model(:'trip legs')
   column_view   :arrival_date_gmt,      :date,  :actual_arrival_date_gmt
   column_view   :arriv_time_act_gmt,    :time,  :actual_arrival_time_gmt
   # Fixed to check if actual fields are populated, on older records these fields are not populated so we can't use them.
-  # Jade Tucker 2/08/2011
+  # Updated to calculated actual times based on dept datetime and block time actual.
+  # Jade Tucker 2/11/2011
   def actual_arrival_date_time_gmt
-    date = (arr_date_act_gmt > 0 ? arr_date_act_gmt : arrival_date_gmt)
-    DateTime.from_fos_date_time(date, arriv_time_act_gmt)
+    if arr_date_act_gmt != 0 then
+      DateTime.from_fos_date_time(arr_date_act_gmt, arriv_time_act_gmt)
+    else
+      block_time_minutes = block_time_actual ? block_time_actual.minutes : 0
+      (actual_departure_date_time_gmt.to_time.utc + block_time_minutes).to_datetime 
+    end
   end
 
   def actual_land_date_time_gmt

data/lib/support/core_extensions.rb

@@ -18,7 +18,6 @@ class Float
   def in_hundredths
     return 0 if self == 0
     val = "#{self/60.0}.#{((100.0*(self.modulo(60.0)))/60.0).to_s.rjust(2, '0')}"
-    BigDecimal.mode(BigDecimal::ROUND_MODE, BigDecimal::ROUND_HALF_EVEN)
     BigDecimal.new(val, 2).round(2).to_f
   end
 end

data/spec/models/trip_leg_spec.rb

@@ -80,7 +80,7 @@ describe TripLeg do
 
 
   describe 'actual_land_date_time_gmt' do
-    it "actual_landing_date_time  dates are before arr_date_act_gmt if on time time is greater than landing time" do
+    it "actual_landing_date_time dates are before arr_date_act_gmt if on time time is greater than landing time" do
       tl = TripLeg.new(:arr_date_act_gmt=> Date.new(1900, 1, 2).to_fos_days,
                        :land_time_act_gmt=> 1420,
                        :arriv_time_act_gmt=> 20)
@@ -96,19 +96,32 @@ describe TripLeg do
   end
 
   describe 'actual_arrival_date_time_gmt' do
-    it "has the old 'arrival date - gmt' field set" do
-      tl = TripLeg.new(:arr_date_act_gmt=> 0, # old field not set
-                       :arrival_date_gmt=> 2, # should use this field instead
-                       :arriv_time_act_gmt=> 10)
-      tl.actual_arrival_date_time_gmt.should == DateTime.new(1900, 1, 2, 0, 10, 0)
+    it "doesn't have the new 'arr date act gmt' field set" do
+      tl = TripLeg.new(:arr_date_act_gmt=> 0, # new field not set
+                       :dept_date_act_gmt => 1, # should calculate arrival date based on departure datetime and block time
+                       :dept_time_act_gmt => 1340,
+                       :block_time_actual => 130,
+                       :arrival_date_gmt=> 2,
+                       :arriv_time_act_gmt=> 0)
+      tl.actual_arrival_date_time_gmt.should == DateTime.new(1900, 1, 2, 0, 30, 0)
     end
 
     it "has the new 'arr date act gmt' field set" do
-      tl = TripLeg.new(:arr_date_act_gmt=> 2,  # old field is set, so use this one
-                       :arrival_date_gmt=> 0,  # new field not set
-                       :arriv_time_act_gmt=> 10)
+      tl = TripLeg.new(:arr_date_act_gmt=> 2,  # new field is set, so use this one
+                       :arriv_time_act_gmt=> 10,
+                       :arrival_date_gmt=> 0)
       tl.actual_arrival_date_time_gmt.should == DateTime.new(1900, 1, 2, 0, 10, 0)
     end
+
+    it "doesnt have any actual fields set" do # occurs when trip leg has not been flown
+      tl = TripLeg.new(:arr_date_act_gmt => 0,
+                       :arriv_time_act_gmt => 0,
+                       :arrival_date_gmt => 2,
+                       :block_time_actual => 0,
+                       :dept_date_act_gmt => 0,
+                       :dept_time_act_gmt => 1440)
+      tl.actual_arrival_date_time_gmt.should == DateTime.parse("1900-01-01T00:00:00+00:00") # we expect an invalid date here, accurate reflection of the data
+    end
   end
 
   it "actual_arrival_date_time_base are correctly calculating the tz offset" do

data/spec/silly_spec.rb

@@ -11,7 +11,7 @@ require 'pp'
 #p TripLeg.select(:cancel_code).distinct(:cancel_code)
 #p TripLeg.filter{ cancel_code >1 }.count
 
-#p TripLeg.first(:trip_number=>85176,:leg_number=>2).fill_hash(
+#p TripLeg.first(:trip_number=>85176,:leg_number=>1).fill_hash(
 #    [:cancel_code,:verify_date,:status,:flight_time_actual]
 #)
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 28
-  version: 0.5.28
+  - 29
+  version: 0.5.29
 platform: ruby
 authors: 
 - Patrick Lardin, Daniel Sudol
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-08 00:00:00 -08:00
+date: 2011-02-16 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency