fossil 0.5.30 → 0.5.31

data/VERSION

@@ -1 +1 @@
-0.5.30
+0.5.31

data/fossil.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fossil}
-  s.version = "0.5.30"
+  s.version = "0.5.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{2011-03-08}
+  s.date = %q{2011-03-09}
   s.description = %q{Access FOS/betrieve db with this Sequel based orm wrapper}
   s.email = %q{plardin@xojet.com}
   s.extra_rdoc_files = [
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "fossil.gemspec",
+     "lib/dbr_models/flight_log_expense.rb",
      "lib/dbr_models/group_cost.rb",
      "lib/dbr_models/personnel.rb",
      "lib/dbr_models/quote.rb",
@@ -146,6 +147,7 @@ Gem::Specification.new do |s|
      "spec/helper_methods.rb",
      "spec/models/airport_fbo_spec.rb",
      "spec/models/code_spec.rb",
+     "spec/models/flight_log_expense_spec.rb",
      "spec/models/quote_spec.rb",
      "spec/models/trip_leg_spec.rb",
      "spec/models/trip_spec.rb",
@@ -184,6 +186,7 @@ Gem::Specification.new do |s|
      "spec/helper_classes.rb",
      "spec/models/code_spec.rb",
      "spec/models/trip_leg_spec.rb",
+     "spec/models/flight_log_expense_spec.rb",
      "spec/models/quote_spec.rb",
      "spec/models/vendor_document_spec.rb",
      "spec/models/trip_spec.rb",

data/lib/dbr_models/flight_log_expense.rb

@@ -0,0 +1,3 @@
+class FlightLogExpense
+  many_to_one :trip_leg, :class=>:TripLeg, :key=>:trip_leg_id
+end

data/lib/models/flight_log_expense.rb

@@ -1,120 +1,132 @@
 class FlightLogExpense < Sequel::Model(:'flight log expenses')
 
-    code_association :expense_type_value, :'type', :flight_log_expense_type
+  code_association :expense_type_value, :'type', :flight_log_expense_type
+
+  #Many to one association with composite keys
+  n_to_o :trip_leg, :class=>:TripLeg, :prefix=>'trip leg'
 
-    #Many to one association with composite keys
-    n_to_o :trip_leg, :class=>:TripLeg, :prefix=>'trip leg'
-   
 #### BEGIN GENERATED SECTION ####
-	set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
+  set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
 
-	column_alias :ac_curr_bill_amount, :'ac curr bill amount'
-	column_alias :ac_curr_cost, :'ac curr cost'
-	column_alias :ac_currency_type, :'ac currency type'
-	column_alias :ac_quantity, :'ac quantity'
-	column_alias :ac_quantity_tenths, :'ac quantity tenths'
-	column_alias :ac_unit, :'ac unit'
-	column_alias :account_number, :'account number'
-	column_alias :aircraft, :'aircraft'
-	column_alias :allow_0_cost, :'allow 0 cost'
-	column_alias :approved, :'approved'
-	column_alias :arrival_airport, :'arrival airport'
-	column_alias :auto_create, :'auto create'
-	column_alias :bill_amount, :'bill amount'
-	column_alias :billable, :'billable'
-	column_alias :comment_req, :'comment req'
-	column_alias :cost, :'cost'
-	column_alias :cost_center, :'cost center'
-	column_alias :cost_kid_comm, :'cost kid - comm'
-	column_alias :cost_kid_date, :'cost kid - date'
-	column_alias :cost_kid_mult, :'cost kid - mult'
-	column_alias :cost_kid_time, :'cost kid - time'
-	column_alias :cost_kid_user, :'cost kid - user'
-	column_alias :crew_id, :'crew id'
-	column_alias :currency_type, :'currency type'
-	column_alias :description, :'description'
-	column_alias :discount, :'discount'
-	column_alias :discount_date, :'discount date'
-	column_alias :estimated_cost, :'estimated cost'
-	column_alias :fet_tax, :'fet tax'
-	column_alias :fed_tax_rate, :'fed tax rate'
-	column_alias :image_name, :'image name'
-	column_alias :internal_1, :'internal 1'
-	column_alias :internal_6, :'internal 6'
-	column_alias :internal0, :'internal0'
-	column_alias :internal01, :'internal01'
-	column_alias :internal02, :'internal02'
-	column_alias :internal03, :'internal03'
-	column_alias :inv_received_date, :'inv received date'
-	column_alias :invoice, :'invoice'
-	column_alias :invoice_date, :'invoice date'
-	column_alias :invoice_paid, :'invoice paid'
-	column_alias :invoice_paid_date, :'invoice paid date'
-	column_alias :invoice_received, :'invoice received'
-	column_alias :invoiced, :'invoiced'
-	column_alias :kid_comm, :'kid - comm'
-	column_alias :kid_date, :'kid - date'
-	column_alias :kid_mult, :'kid - mult'
-	column_alias :kid_time, :'kid - time'
-	column_alias :kid_user, :'kid - user'
-	column_alias :leg_date, :'leg date'
-	column_alias :onecost_type_code, :'onecost type code'
-	column_alias :pay_method, :'pay method'
-	column_alias :percent_markup, :'percent markup'
-	column_alias :problem, :'problem'
-	column_alias :quantity, :'quantity'
-	column_alias :quantity_tenths, :'quantity tenths'
-	column_alias :receipt, :'receipt'
-	column_alias :receipt_number, :'receipt number'
-	column_alias :receipt_req, :'receipt req'
-	column_alias :reimburs, :'reimburs'
-	column_alias :serv_kid_comm, :'serv kid - comm'
-	column_alias :serv_kid_date, :'serv kid - date'
-	column_alias :serv_kid_mult, :'serv kid - mult'
-	column_alias :serv_kid_time, :'serv kid - time'
-	column_alias :serv_kid_user, :'serv kid - user'
-	column_alias :service_index, :'service index'
-	column_alias :tax, :'tax'
-	column_alias :taxable, :'taxable'
-	column_alias :total_cost_fixed, :'total cost fixed'
-	column_alias :trip_leg_kid_comm, :'trip leg kid - comm'
-	column_alias :trip_leg_kid_date, :'trip leg kid - date'
-	column_alias :trip_leg_kid_mult, :'trip leg kid - mult'
-	column_alias :trip_leg_kid_time, :'trip leg kid - time'
-	column_alias :trip_leg_kid_user, :'trip leg kid - user'
-	column_alias :type, :'type'
-	column_alias :unit, :'unit'
-	column_alias :unit_cost, :'unit cost'
-	column_alias :vendor_id, :'vendor id'
-	column_alias :vendor_req, :'vendor req'
-	column_alias :key0, :'key0'
-	column_alias :key1, :'key1'
-	column_alias :key2, :'key2'
+  column_alias :ac_curr_bill_amount, :'ac curr bill amount'
+  column_alias :ac_curr_cost, :'ac curr cost'
+  column_alias :ac_currency_type, :'ac currency type'
+  column_alias :ac_quantity, :'ac quantity'
+  column_alias :ac_quantity_tenths, :'ac quantity tenths'
+  column_alias :ac_unit, :'ac unit'
+  column_alias :account_number, :'account number'
+  column_alias :aircraft, :'aircraft'
+  column_alias :allow_0_cost, :'allow 0 cost'
+  column_alias :approved, :'approved'
+  column_alias :arrival_airport, :'arrival airport'
+  column_alias :auto_create, :'auto create'
+  column_alias :bill_amount, :'bill amount'
+  column_alias :billable, :'billable'
+  column_alias :comment_req, :'comment req'
+  column_alias :cost, :'cost'
+  column_alias :cost_center, :'cost center'
+  column_alias :cost_kid_comm, :'cost kid - comm'
+  column_alias :cost_kid_date, :'cost kid - date'
+  column_alias :cost_kid_mult, :'cost kid - mult'
+  column_alias :cost_kid_time, :'cost kid - time'
+  column_alias :cost_kid_user, :'cost kid - user'
+  column_alias :crew_id, :'crew id'
+  column_alias :currency_type, :'currency type'
+  column_alias :description, :'description'
+  column_alias :discount, :'discount'
+  column_alias :discount_date, :'discount date'
+  column_alias :estimated_cost, :'estimated cost'
+  column_alias :fet_tax, :'fet tax'
+  column_alias :fed_tax_rate, :'fed tax rate'
+  column_alias :image_name, :'image name'
+  column_alias :internal_1, :'internal 1'
+  column_alias :internal_6, :'internal 6'
+  column_alias :internal0, :'internal0'
+  column_alias :internal01, :'internal01'
+  column_alias :internal02, :'internal02'
+  column_alias :internal03, :'internal03'
+  column_alias :inv_received_date, :'inv received date'
+  column_alias :invoice, :'invoice'
+  column_alias :invoice_date, :'invoice date'
+  column_alias :invoice_paid, :'invoice paid'
+  column_alias :invoice_paid_date, :'invoice paid date'
+  column_alias :invoice_received, :'invoice received'
+  column_alias :invoiced, :'invoiced'
+  column_alias :kid_comm, :'kid - comm'
+  column_alias :kid_date, :'kid - date'
+  column_alias :kid_mult, :'kid - mult'
+  column_alias :kid_time, :'kid - time'
+  column_alias :kid_user, :'kid - user'
+  column_alias :leg_date, :'leg date'
+  column_alias :onecost_type_code, :'onecost type code'
+  column_alias :pay_method, :'pay method'
+  column_alias :percent_markup, :'percent markup'
+  column_alias :problem, :'problem'
+  column_alias :quantity, :'quantity'
+  column_alias :quantity_tenths, :'quantity tenths'
+  column_alias :receipt, :'receipt'
+  column_alias :receipt_number, :'receipt number'
+  column_alias :receipt_req, :'receipt req'
+  column_alias :reimburs, :'reimburs'
+  column_alias :serv_kid_comm, :'serv kid - comm'
+  column_alias :serv_kid_date, :'serv kid - date'
+  column_alias :serv_kid_mult, :'serv kid - mult'
+  column_alias :serv_kid_time, :'serv kid - time'
+  column_alias :serv_kid_user, :'serv kid - user'
+  column_alias :service_index, :'service index'
+  column_alias :tax, :'tax'
+  column_alias :taxable, :'taxable'
+  column_alias :total_cost_fixed, :'total cost fixed'
+  column_alias :trip_leg_kid_comm, :'trip leg kid - comm'
+  column_alias :trip_leg_kid_date, :'trip leg kid - date'
+  column_alias :trip_leg_kid_mult, :'trip leg kid - mult'
+  column_alias :trip_leg_kid_time, :'trip leg kid - time'
+  column_alias :trip_leg_kid_user, :'trip leg kid - user'
+  column_alias :type, :'type'
+  column_alias :unit, :'unit'
+  column_alias :unit_cost, :'unit cost'
+  column_alias :vendor_id, :'vendor id'
+  column_alias :vendor_req, :'vendor req'
+  column_alias :key0, :'key0'
+  column_alias :key1, :'key1'
+  column_alias :key2, :'key2'
 #### END GENERATED SECTION ####
 
-  def fuel_rate  # Takes a FlightLogExpense for fuel
-    return 0 if type != 1
-    my_type = (arrival_airport == 1 ? "ARRIVAL" : "DEPART")
-    airport_fuel = airport_fuel_lookup vendor_id, my_type
-    (airport_fuel ? fuel_rate_by_quantity(quantity, airport_fuel) : 0)
+  # For Fuel Flight Log expenses
+  def fuel_cost
+    qty = quantity.to_i # Don't want to do this but its treating this has string for some reason
+    return 0.0 if type.to_i != 1 or qty == 0
+    fuel_rate * qty.to_i
+  end
+
+  def is_departure_expense?
+    arrival_airport == 0
   end
 
-  def airport_fuel_lookup vendor_id, type #ARRIVAL or DEPART
-    str = (type == "DEPART" ? "DEPT" : "ARR")
-    prefix = (type == "DEPART" ? "FUELER" : "FBO")
+  def airport_fuel_lookup
+    if !is_departure_expense? then
+      ap_str = "ARRIVAL"
+      act_str = "ARR"
+      prefix = "FBO"
+    else
+      ap_str = "DEPART"
+      act_str = "DEPT"
+      prefix = "FUELER"
+    end
+
     sql = <<-SQL
-    SELECT TOP 1 TL."TRIP NUMBER",TL."LEG NUMBER", TL."#{type} AIRPORT ID",
+    SELECT TOP 1 TL."TRIP NUMBER",TL."LEG NUMBER", TL." #{ap_str}  AIRPORT ID",
       AF."COST 1", AF."QTY 1", AF."COST 2", AF."QTY 2", AF."COST 3", AF."QTY 3", AF."COST 4", AF."QTY 4",
       AF."COST 5", AF."QTY 5", AF."COST 6", AF."QTY 6", AF."COST 7", AF."QTY 7", AF."COST 8", AF."QTY 8",
       AF."COST 9", AF."QTY 9", AF."COST 10", AF."QTY 10", AF."EFFECTIVE DATE"
     FROM "TRIP LEGS" AS TL, "AIRPORT FUEL" AS AF
-      WHERE (AF."FBO KID - DATE" = TL."#{prefix} KID - DATE"
-      AND AF."FBO KID - TIME" = TL."#{prefix} KID - TIME"
-      AND AF."FBO KID - MULT" = TL."#{prefix} KID - MULT"
-      AND AF."FBO KID - COMM" = TL."#{prefix} KID - COMM"
-      AND AF."FBO KID - USER" = TL."#{prefix} KID - USER"
-      AND AF."VENDOR ID" = '#{vendor_id}'
-      AND (AF."EFFECTIVE DATE" <= TL."#{str} DATE ACT LOCAL" OR AF."EFFECTIVE DATE" <= TL."#{type} DATE - LOCAL"))
+      WHERE (AF."FBO KID - DATE" = TL." #{prefix}  KID - DATE"
+      AND AF."FBO KID - TIME" = TL." #{prefix}  KID - TIME"
+      AND AF."FBO KID - MULT" = TL." #{prefix}  KID - MULT"
+      AND AF."FBO KID - COMM" = TL." #{prefix}  KID - COMM"
+      AND AF."FBO KID - USER" = TL." #{prefix}  KID - USER"
+      AND AF."VENDOR ID" = ' #{vendor_id} '
+      AND (AF."EFFECTIVE DATE" <= TL." #{act_str}  DATE ACT LOCAL" OR AF."EFFECTIVE DATE" <= TL." #{ap_str}  DATE - LOCAL"))
     AND   (TL."TRIP NUMBER" = ? AND TL."LEG NUMBER" = ?)
     ORDER BY AF."EFFECTIVE DATE" DESC
     SQL
@@ -129,12 +141,13 @@ class FlightLogExpense < Sequel::Model(:'flight log expenses')
     h
   end
 
-  def fuel_rate_by_quantity qty, airport_fuel # gives the cost associated with the qty of fuel purchased
-    return 0 if qty == nil or qty == 0 or airport_fuel == nil
+  def fuel_rate
+    airport_fuel = airport_fuel_lookup
+    return 0.0 if airport_fuel.nil? or airport_fuel == {}
     h = build_fuel_tier_hash airport_fuel
     h.keys.sort.reverse.each do |key|
-       return (h[key] / 100.0) if (qty and key) and qty >= key
+      return (h[key] / 100.0) if quantity.to_i >= key
     end
-    0
+    0.0
   end
 end

data/lib/models/trip_leg.rb

@@ -879,10 +879,6 @@ class TripLeg < Sequel::Model(:'trip legs')
         $1
   end
 
-  def fuel_expense
-    flight_log_expenses.find{|expense| expense.type == 1}
-  end
-
   def departure_diff_in_minutes
      (leg_status == "VERI" or leg_status == "FLOG") ? ((actual_departure_date_time_local - planned_departure_date_time_local)*1440).to_i : nil
   end
@@ -905,7 +901,28 @@ class TripLeg < Sequel::Model(:'trip legs')
     my_class
   end
 
+  # Fuel Expense Stuff
   def fuel_expenses
-    flight_log_expenses.find_all {|expense| expense.type == 1}
+    flight_log_expenses.find_all { |expense| expense.type == 1 }
+  end
+
+  def departure_fuel_expenses
+    fuel_expenses.select { |expense| expense.arrival_airport == 0 }
+  end
+
+  def arrival_fuel_expenses
+    fuel_expenses.select { |expense| expense.arrival_airport == 1 }
+  end
+
+  def departure_fuel_cost
+    departure_fuel_expenses.inject(0) { |sum, e| sum + e.fuel_cost }
+  end
+  
+  def arrival_fuel_cost
+    arrival_fuel_expenses.inject(0) { |sum, e| sum + e.fuel_cost }
+  end
+  
+  def total_fuel_cost
+    arrival_fuel_cost + departure_fuel_cost
   end
 end

data/spec/models/flight_log_expense_spec.rb

@@ -0,0 +1,71 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe FlightLogExpense do
+
+  describe 'fuel expense' do
+
+    before :each do
+      @fe = FlightLogExpense.new(:type => 1)
+    end
+
+    describe 'fuel cost' do
+
+      it 'should not have a cost if it doesnt have a quantity' do
+        @fe.quantity = 0
+
+        @fe.fuel_cost.should == 0.0
+      end
+
+      it 'should calculate cost based on quantity and rate' do
+        @fe.quantity = 100
+        stub(@fe).fuel_rate { 4.0 }
+
+        @fe.fuel_cost.should == 400.0
+      end
+    end
+
+    describe 'fuel rate' do
+
+      it 'should not have a rate if the airport fuel pricing cannnot be determined' do
+        @fe.quantity = 100
+        stub(@fe).airport_fuel_lookup { {} }
+
+        @fe.fuel_rate.should == 0.0
+      end
+
+      describe 'different fuel tiers' do
+
+        before :each do
+          airport_fuel = {
+            :"qty 1"=>1,    :"cost 1"=>393,
+            :"qty 2"=>1000, :"cost 2"=>373,
+            :"qty 3"=>2000, :"cost 3"=>362,
+            :"qty 4"=>0,    :"cost 4"=>0,
+            :"qty 5"=>0,    :"cost 5"=>0,
+            :"qty 6"=>0,    :"cost 6"=>0,
+            :"qty 7"=>0,    :"cost 7"=>0,
+            :"qty 8"=>0,    :"cost 8"=>0,
+            :"qty 9"=>0,    :"cost 9"=>0,
+            :"qty 10"=>0,   :"cost 10"=>0
+          }
+          stub(@fe).airport_fuel_lookup { airport_fuel }
+        end
+
+        it 'find rate for quantity at lowest tier' do
+          @fe.quantity = 100
+          @fe.fuel_rate.should == 3.93
+        end
+
+        it 'find rate for quantity at middle tier' do
+          @fe.quantity = 1001
+          @fe.fuel_rate.should == 3.73
+        end
+
+        it 'find rate for quantity at highest tier' do
+          @fe.quantity = 2002
+          @fe.fuel_rate.should == 3.62
+        end
+      end
+    end
+  end
+end

data/spec/models/trip_leg_spec.rb

@@ -89,7 +89,7 @@ describe TripLeg do
 
     it "actual landing date_time dates are the same as arr_date_act_gmt if on time time is NOT greater than landing time" do
       tl = TripLeg.new(:arr_date_act_gmt=> Date.new(1900, 1, 2).to_fos_days,
-                       :land_time_act_gmt=> 20, 
+                       :land_time_act_gmt=> 20,
                        :arriv_time_act_gmt=> 40)
       tl.actual_land_date_time_gmt.should == DateTime.new(1900, 1, 2, 0, 20, 0)
     end
@@ -107,7 +107,7 @@ describe TripLeg do
     end
 
     it "has the new 'arr date act gmt' field set" do
-      tl = TripLeg.new(:arr_date_act_gmt=> 2,  # new field is set, so use this one
+      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)
@@ -126,7 +126,7 @@ describe TripLeg do
 
   it "actual_arrival_date_time_base are correctly calculating the tz offset" do
     # this makes an actual_arrival_date_time_gmt date of: 1900-01-02 23:40:00
-    arr_date_act_gmt, arriv_time_act_gmt = Date.new(1900, 1, 2).to_fos_days , 1420
+    arr_date_act_gmt, arriv_time_act_gmt = Date.new(1900, 1, 2).to_fos_days, 1420
     home_tz_gmt_offset = -70
     # home_tz_gmt_offset should make actual_arrival_date_time_base of: 1900-01-02 16:40:00
     tl = TripLeg.new(:arr_date_act_gmt => arr_date_act_gmt,
@@ -138,7 +138,7 @@ describe TripLeg do
 
   it "actual_departure_date_time_base are correctly calculating the tz offset" do
     # this makes an actual_arrival_date_time_gmt date of: 1900-01-02 23:40:00
-    dept_date_act_gmt, dept_time_act_gmt = Date.new(1900, 1, 2).to_fos_days , 1420
+    dept_date_act_gmt, dept_time_act_gmt = Date.new(1900, 1, 2).to_fos_days, 1420
     home_tz_gmt_offset = -70
     # home_tz_gmt_offset should make actual_arrival_date_time_base of: 1900-01-02 16:40:00
     tl = TripLeg.new(:dept_date_act_gmt => dept_date_act_gmt,
@@ -229,188 +229,135 @@ describe TripLeg do
     end
   end
 
+  describe 'fuel expenses' do
 
-## NEED TO REMOVE, TESTS SHOULD BE IN FlightLogExpense spec
-#  describe "fuel passdown data columns" do
-#
-#    it "query fuel info from real trip leg actually works" do
-#      set_fos_db([TripLeg,AirportFuel,AirportFbo,FlightLogExpense])
-##      trip_leg = TripLeg.first(:trip_number=>67579,:leg_number=>3)
-#      trip_leg = TripLeg.first(:trip_number=>79203,:leg_number=>1)
-##      trip_leg = TripLeg.select(:'trip legs__trip_number').
-##          filter(:trip_number=>67579,:leg_number=>3).
-##          inner_join(:flight_log_expense,)
-##          first
-##      p trip_leg.trip_number
-#      trip_leg.dept_fuel_quantity.should == 433
-#      trip_leg.dept_fuel_cost.should == 1437.56
-#      trip_leg.dept_fuel_rate.should == 3.32
-#      trip_leg.arr_fuel_quantity.should == 0
-#      trip_leg.arr_fuel_cost.should == 0
-#      trip_leg.arr_fuel_rate.should == 0
-#    end
-#
-#    describe "with airport fuel data" do
-#      before :each do
-#        #expect the method airport_fuel_lookup to be called and return a prepopulated hash
-#        hash_with_airport_fuel = {:"qty 1"=>1,    :"cost 1"=>393,
-#                                  :"qty 2"=>1000, :"cost 2"=>373,
-#                                  :"qty 3"=>2000, :"cost 3"=>362,
-#                                  :"qty 4"=>0,    :"cost 4"=>0,
-#                                  :"qty 5"=>0,    :"cost 5"=>0,
-#                                  :"qty 6"=>0,    :"cost 6"=>0,
-#                                  :"qty 7"=>0,    :"cost 7"=>0,
-#                                  :"qty 8"=>0,    :"cost 8"=>0,
-#                                  :"qty 9"=>0,    :"cost 9"=>0,
-#                                  :"qty 10"=>0,   :"cost 10"=>0,
-#                                  :quantity=>970}
-#        fe = FlightLogExpense.new(:type => 1,:arrival_airport => 0, :quantity => 970)
-#        @tl = TripLeg.new
-#        mock(@tl).airport_fuel_lookup(is_a(String)) {hash_with_airport_fuel}
-#        stub(@tl).fuel_expense {fe}
-#      end
-#
-#      it "fuel quantity for leg with airport fuel" do
-#        @tl.dept_fuel_quantity.should == 970
-#        @tl.arr_fuel_quantity.should == 0
-#      end
-#
-#      it "fuel rate for leg with airport fuel" do
-#        @tl.dept_fuel_rate.should == 3.93
-#        @tl.arr_fuel_rate.should == 0
-#      end
-#
-#      it "fuel cost for leg with airport fuel" do
-#        @tl.dept_fuel_cost.to_s.should == "3812.1"
-#        @tl.arr_fuel_cost.to_s.should == "0"
-#      end
-#    end
-#
-#    describe "without airport fuel data" do
-#      before :each do
-#        #expect the method airport_fuel_lookup to be called and return a prepopulated hash
-#        hash_without_airport_fuel = {:quantity=>970}
-#        @tl = TripLeg.new
-#        fe = FlightLogExpense.new(:type => 1,:arrival_airport => 0, :quantity => 970)
-#        mock(@tl).airport_fuel_lookup(is_a(String)) {hash_without_airport_fuel}
-#        stub(@tl).fuel_expense {fe}
-#      end
-#
-#      it "fuel quantity for leg without airport fuel" do
-#        @tl.dept_fuel_quantity.should == 970
-#        @tl.arr_fuel_quantity.should == 0
-#      end
-#
-#      it "fuel rate for leg without airport fuel" do
-#        @tl.dept_fuel_rate.should == 0
-#        @tl.arr_fuel_rate.should == 0
-#      end
-#
-#      it "fuel cost for leg without airport fuel" do
-#        @tl.dept_fuel_cost.should == 0
-#        @tl.arr_fuel_cost.should == 0
-#      end
-#    end
-#  end
-#
-#  describe "without any data at all" do
-#    before :each do
-##      hash_without_any_data = nil
-#      @tl = TripLeg.new
-#      fe = nil
-##      mock(@tl).airport_fuel_lookup(is_a(String)) {hash_without_any_data}
-#      stub(@tl).fuel_expense {fe}
-#    end
-#
-#    it "fuel quantity for leg without any data" do
-#      @tl.dept_fuel_quantity.should == 0
-#      @tl.arr_fuel_quantity.should == 0
-#    end
-#
-#    it "fuel rate for leg without any data" do
-#      @tl.dept_fuel_rate.should == 0
-#      @tl.arr_fuel_rate.should == 0
-#    end
-#
-#    it "fuel cost for leg without any data" do
-#      @tl.dept_fuel_cost.should == 0
-#      @tl.arr_fuel_cost.should == 0
-#    end
-#  end
-
-#  # FUEL PASSDOWN SPECS
-#  describe "different tier pricing selection" do
-#    it "has fuel qty <= second lowest tier" do
-#      fuel_data_hash = {  :"qty 1"=>1,    :"cost 1"=>393,
-#                          :"qty 2"=>1000, :"cost 2"=>373,
-#                          :"qty 3"=>2000, :"cost 3"=>362,
-#                          :"qty 4"=>0,    :"cost 4"=>0,
-#                          :"qty 5"=>0,    :"cost 5"=>0,
-#                          :"qty 6"=>0,    :"cost 6"=>0,
-#                          :"qty 7"=>0,    :"cost 7"=>0,
-#                          :"qty 8"=>0,    :"cost 8"=>0,
-#                          :"qty 9"=>0,    :"cost 9"=>0,
-#                          :"qty 10"=>0,   :"cost 10"=>0,
-#                          :quantity=>970}
-#      tl = TripLeg.new
-#      fe = FlightLogExpense.new(:type => 1,:arrival_airport => 0, :quantity => 970)
-#      mock(tl).airport_fuel_lookup(is_a(String)).times(2) {fuel_data_hash}
-#      stub(tl).fuel_expense {fe}
-#      tl.dept_fuel_cost.to_s.should == "3812.1"
-#
-#      fe.arrival_airport = 1
-#      stub(tl).fuel_expense {fe}
-#      tl.arr_fuel_cost.to_s.should == "3812.1"
-#    end
-#
-#    it "has fuel qty >= highest tier" do
-#      fuel_data_hash = {  :"qty 1"=>1,    :"cost 1"=>393,
-#                          :"qty 2"=>1000, :"cost 2"=>373,
-#                          :"qty 3"=>2000, :"cost 3"=>362,
-#                          :"qty 4"=>3000,    :"cost 4"=>352,
-#                          :"qty 5"=>4000,    :"cost 5"=>342,
-#                          :"qty 6"=>5000,    :"cost 6"=>332,
-#                          :"qty 7"=>6000,    :"cost 7"=>322,
-#                          :"qty 8"=>7000,    :"cost 8"=>312,
-#                          :"qty 9"=>8000,    :"cost 9"=>302,
-#                          :"qty 10"=>9000,   :"cost 10"=>292,
-#                          :quantity=>10000}
-#      tl = TripLeg.new
-#      fe = FlightLogExpense.new(:type => 1,:arrival_airport => 0, :quantity=>10000)
-#      mock(tl).airport_fuel_lookup(is_a(String)).times(2) {fuel_data_hash}
-#      stub(tl).fuel_expense {fe}
-#
-#      tl.dept_fuel_cost.should == 29200
-#
-#      fe.arrival_airport = 1
-#      stub(tl).fuel_expense {fe}
-#      tl.arr_fuel_cost.should == 29200
-#    end
-#
-#    it "has fuel qty in the middle of fuel tiers" do
-#      fuel_data_hash = {  :"qty 1"=>1,    :"cost 1"=>393,
-#                          :"qty 2"=>1000, :"cost 2"=>373,
-#                          :"qty 3"=>2000, :"cost 3"=>362,
-#                          :"qty 4"=>0,    :"cost 4"=>0,
-#                          :"qty 5"=>0,    :"cost 5"=>0,
-#                          :"qty 6"=>0,    :"cost 6"=>0,
-#                          :"qty 7"=>0,    :"cost 7"=>0,
-#                          :"qty 8"=>0,    :"cost 8"=>0,
-#                          :"qty 9"=>0,    :"cost 9"=>0,
-#                          :"qty 10"=>0,   :"cost 10"=>0,
-#                          :quantity=>1100}
-#      tl = TripLeg.new
-#      fe = FlightLogExpense.new(:type => 1,:arrival_airport => 0, :quantity=>1100)
-#      mock(tl).airport_fuel_lookup(is_a(String)).times(2) {fuel_data_hash}
-#      stub(tl).fuel_expense {fe}
-#
-#      tl.dept_fuel_cost.should == 4103
-#
-#      fe.arrival_airport = 1
-#      stub(tl).fuel_expense {fe}
-#      tl.arr_fuel_cost.should == 4103
-#    end
-#  end
-# END FUEL PASSDOWN RELATED TESTS #### 
-end
+    before :each do
+      @tl = TripLeg.new
+    end
+
+    describe 'arrival fuel costs' do
+
+      it 'should not have a cost if there are no fuel flight log expenses' do
+        @tl.arrival_fuel_cost.should == 0.0
+      end
+
+      it 'should have a cost if there is an arrival fuel flight log expense' do
+        fe = FlightLogExpense.new(:type => 1, :arrival_airport => 1)
+        stub(fe).fuel_cost { 300.0 }
+        stub(@tl).fuel_expenses { [fe] }
+
+        @tl.arrival_fuel_cost.should == 300.0
+      end
+
+      it 'should not have a cost if the fuel flight log expense is not arrival' do
+        fe = FlightLogExpense.new(:type => 1, :arrival_airport => 0)
+        stub(fe).fuel_cost { 300.0 }
+        stub(@tl).fuel_expenses { [fe] }
+
+        @tl.arrival_fuel_cost.should == 0.0
+      end
+
+      it 'should total the costs if there are more than one fuel flight log expenses' do
+        fles = []
+        (1..4).each do |n|
+          fe = FlightLogExpense.new(:type => 1, :arrival_airport => 1)
+          stub(fe).fuel_cost { n * 100 }
+          fles << fe
+        end
+        stub(@tl).fuel_expenses { fles }
+
+        @tl.arrival_fuel_cost.should == 1000.0
+      end
+
+      it 'should total the costs but only for fuel expenses that are arrival, ignoring departures' do
+        fles = []
+        (1..4).each do |n|
+          arrival = (n > 2 ? 1 : 0)
+          fe = FlightLogExpense.new(:type => 1, :arrival_airport => arrival)
+          stub(fe).fuel_cost { n * 100 }
+          fles << fe
+        end
+        stub(@tl).fuel_expenses { fles }
+
+        @tl.arrival_fuel_cost.should == 700.0
+      end
+    end
+
+    describe 'departure fuel costs' do
+      it 'should not have a cost if there are no fuel flight log expenses' do
+        @tl.departure_fuel_cost.should == 0.0
+      end
+
+      it 'should have a cost if there is a departure fuel flight log expense' do
+        fe = FlightLogExpense.new(:type => 1, :arrival_airport => 0)
+        stub(fe).fuel_cost { 300.0 }
+        stub(@tl).fuel_expenses { [fe] }
+
+        @tl.departure_fuel_cost.should == 300.0
+      end
+
+      it 'should not have a cost if the fuel flight log expense is not departure' do
+        fe = FlightLogExpense.new(:type => 1, :arrival_airport => 1)
+        stub(fe).fuel_cost { 300.0 }
+        stub(@tl).fuel_expenses { [fe] }
+
+        @tl.departure_fuel_cost.should == 0.0
+      end
+
+      it 'should total the costs if there are more than one fuel flight log expenses' do
+        fles = []
+        (1..4).each do |n|
+          fe = FlightLogExpense.new(:type => 1, :arrival_airport => 0)
+          stub(fe).fuel_cost { n * 100 }
+          fles << fe
+        end
+        stub(@tl).fuel_expenses { fles }
+
+        @tl.departure_fuel_cost.should == 1000.0
+      end
+
+      it 'should total the costs but only for fuel expenses that are arrival, ignoring departures' do
+        fles = []
+        (1..4).each do |n|
+          arrival = (n <= 2 ? 1 : 0)
+          fe = FlightLogExpense.new(:type => 1, :arrival_airport => arrival)
+          stub(fe).fuel_cost { n * 100 }
+          fles << fe
+        end
+        stub(@tl).fuel_expenses { fles }
+
+        @tl.departure_fuel_cost.should == 700.0
+      end
+    end
+
+    describe 'total fuel costs' do
+      it 'should not have a total cost if there are no fuel flight log expenses' do
+        stub(@tl).departure_fuel_cost { 0.0 }
+        stub(@tl).arrival_fuel_cost { 0.0 }
+
+        @tl.total_fuel_cost.should == 0.0
+      end
 
+      it 'should have a total cost if there are departure fuel expense costs' do
+        stub(@tl).departure_fuel_cost { 100.0 }
+        stub(@tl).arrival_fuel_cost { 0.0 }
+
+        @tl.total_fuel_cost.should == 100.0
+      end
+
+      it 'should have a total cost if there are arrival fuel expense costs' do
+        stub(@tl).departure_fuel_cost { 0.0 }
+        stub(@tl).arrival_fuel_cost { 100.0 }
+
+        @tl.total_fuel_cost.should == 100.0
+      end
+
+      it 'should have a total cost if there are both arrival and departure fuel expense costs' do
+        stub(@tl).departure_fuel_cost { 100.0 }
+        stub(@tl).arrival_fuel_cost { 100.0 }
+
+        @tl.total_fuel_cost.should == 200.0
+      end
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 30
-  version: 0.5.30
+  - 31
+  version: 0.5.31
 platform: ruby
 authors: 
 - Patrick Lardin, Daniel Sudol
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-08 00:00:00 -08:00
+date: 2011-03-09 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,6 +71,7 @@ files:
 - Rakefile
 - VERSION
 - fossil.gemspec
+- lib/dbr_models/flight_log_expense.rb
 - lib/dbr_models/group_cost.rb
 - lib/dbr_models/personnel.rb
 - lib/dbr_models/quote.rb
@@ -197,6 +198,7 @@ files:
 - spec/helper_methods.rb
 - spec/models/airport_fbo_spec.rb
 - spec/models/code_spec.rb
+- spec/models/flight_log_expense_spec.rb
 - spec/models/quote_spec.rb
 - spec/models/trip_leg_spec.rb
 - spec/models/trip_spec.rb
@@ -262,6 +264,7 @@ test_files:
 - spec/helper_classes.rb
 - spec/models/code_spec.rb
 - spec/models/trip_leg_spec.rb
+- spec/models/flight_log_expense_spec.rb
 - spec/models/quote_spec.rb
 - spec/models/vendor_document_spec.rb
 - spec/models/trip_spec.rb