fossil 0.3.30 → 0.3.31

data/VERSION

@@ -1 +1 @@
-0.3.30
+0.3.31

data/fossil.gemspec

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

data/lib/models/trip_leg.rb

@@ -627,12 +627,6 @@ class TripLeg < Sequel::Model(:'trip legs')
   # delegators
   delegate :lead_pax,           :to => :trip
   delegate :passenger_list,     :to => :trip
-  delegate :name,               :to => :arrival_airport,    :prefix=>true, :allow_nil=>true
-  delegate :name,               :to => :departure_airport,  :prefix=>true, :allow_nil=>true
-  delegate :city,               :to => :arrival_airport,    :prefix=>true, :allow_nil=>true
-  delegate :city,               :to => :departure_airport,  :prefix=>true, :allow_nil=>true
-  delegate :state_abbreviation, :to => :arrival_airport,    :prefix=>true, :allow_nil=>true
-  delegate :state_abbreviation, :to => :departure_airport,  :prefix=>true, :allow_nil=>true
 
   # Column views
   column_view   :dept_date_act_gmt,     :date,  :actual_departure_date_gmt
@@ -715,7 +709,9 @@ class TripLeg < Sequel::Model(:'trip legs')
   def sic_crew; pilot_crew(:sic); end
 
   def ebt_time
-    minutes_between = (planned_arrival_date_time_gmt - planned_departure_date_time_gmt)/60;
+    # subtracting the two datetimes yields a fraction of a day, so multiplying by minutes
+    # in day ( 1440 ) to get total minutes difference. assumes flights not more than 24 hours.
+    minutes_between = (planned_arrival_date_time_gmt - planned_departure_date_time_gmt) * 1440;
     Time.from_minutes(minutes_between)
   end
 
@@ -725,19 +721,19 @@ class TripLeg < Sequel::Model(:'trip legs')
   # icao's that you make are valid icao codes, but you can't search the airport based it, since these
   # airport rows don't have an icao code at all, they only have the prefix and airport_id. whacky.
   def departure_icao_val
-    departure_icao || depart_ap_prefix + depart_airport_id
+    departure_icao.blank? ? depart_ap_prefix + depart_airport_id : ''
   end
 
   # same comment as above
   def arrival_icao_val
-    arrival_icao || arrival_ap_prefix + arrival_airport_id
+    arrival_icao.blank? ? arrival_ap_prefix + arrival_airport_id : ''
   end
 
   def departure_icao_expanded
-    "#{departure_icao_val} #{departure_airport_name} #{departure_airport_city} ,#{departure_airport_state_abbreviation}"
+    "#{departure_icao_val} #{departure_airport__name} #{departure_airport__city} ,#{departure_airport__state_abbreviation}"
   end
-
+ 
   def arrival_icao_expanded
-    "#{arrival_icao_val} #{arrival_airport_name} #{arrival_airport_city} ,#{arrival_airport_state_abbreviation}"
+    "#{arrival_icao_val} #{arrival_airport__name} #{arrival_airport__city} ,#{arrival_airport__state_abbreviation}"
   end
 end

data/spec/models/trip_leg_spec.rb

@@ -5,6 +5,13 @@ describe TripLeg do
   before do
   end
 
+  it "ebt_time method produces correct Time with minutes" do
+    dept_date_act_gmt = Date.new(2000,1,1)
+    tl = TripLeg.new(:arrival_date_gmt=>dept_date_act_gmt.to_fos_days, :eta_gmt=>40,
+                     :dept_date_gmt=>dept_date_act_gmt.to_fos_days, :etd_gmt=>20)
+    tl.ebt_time.should == Time.from_minutes(20)
+  end
+
   it "actual take off date_time dates are after dept_date_act_gmt if take off time is less than depart time" do
     dept_date_act_gmt = Date.new(1900,1,1)
     tl = TripLeg.new(:dept_date_act_gmt=>dept_date_act_gmt.to_fos_days,:t_o_time_act_gmt=>20,:dept_time_act_gmt=>1420)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fossil
 version: !ruby/object:Gem::Version 
-  version: 0.3.30
+  version: 0.3.31
 platform: ruby
 authors: 
 - Patrick Lardin, Daniel Sudol
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-22 00:00:00 -07:00
+date: 2010-03-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency