fossil 0.4.17 → 0.4.18

data/VERSION

@@ -1 +1 @@
-0.4.17
+0.4.18

data/fossil.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fossil}
-  s.version = "0.4.17"
+  s.version = "0.4.18"
 
   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-08-05}
+  s.date = %q{2010-09-13}
   s.description = %q{Access FOS/betrieve db with this Sequel based orm wrapper}
   s.email = %q{plardin@xojet.com}
   s.files = [

data/lib/models/flight_log_expense.rb

@@ -2,6 +2,9 @@ class FlightLogExpense < Sequel::Model(:'flight log expenses')
 
     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'
+   
 #### BEGIN GENERATED SECTION ####
 	set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
 
@@ -89,4 +92,49 @@ class FlightLogExpense < Sequel::Model(:'flight log expenses')
 	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)
+  end
+
+  def airport_fuel_lookup vendor_id, type #ARRIVAL or DEPART
+    str = (type == "DEPART" ? "DEPT" : "ARR")
+    prefix = (type == "DEPART" ? "FUELER" : "FBO")
+    sql = <<-SQL
+    SELECT TOP 1 TL."TRIP NUMBER",TL."LEG NUMBER", TL."#{type} 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"))
+    AND   (TL."TRIP NUMBER" = ? AND TL."LEG NUMBER" = ?)
+    ORDER BY AF."EFFECTIVE DATE" DESC
+    SQL
+    return db.fetch(sql, trip_leg.trip_number, trip_leg.leg_number).first
+  end
+
+  def build_fuel_tier_hash airport_fuel # creates a hash table of the qty and fuel prices for each tier
+    h = Hash.new
+    (1..10).each do |n|
+      h[airport_fuel[:"qty #{n}"]] = airport_fuel[:"cost #{n}"]
+    end
+    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
+    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
+    end
+    0
+  end
 end

data/lib/models/trip_leg.rb

@@ -8,6 +8,8 @@ class TripLeg < Sequel::Model(:'trip legs')
   many_to_one :locked_by, :class=>:User, :key=>:'locked by - user id', :primary_key=>:'users initials'
   many_to_one :leg_rate_aircraft, :class=>:Aircraft, :key=>:'leg rate ac id', :primary_key=>:'aircraft id'
   many_to_one :authorizer_name, :class=>:Personnel, :key=>:authorization, :primary_key=>:employee_id
+  many_to_one :departure_fuel_vendor, :class=>:Vendor, :key=>:dep_fuel_vendor, :primary_key=>:vendor_id
+  many_to_one :arrival_fuel_vendor, :class=>:Vendor, :key=>:arr_fuel_vendor, :primary_key=>:vendor_id
 
   # Many to one associations with composite primary keys
   n_to_o :trip, :class=>:Trip, :prefix=>'trips'
@@ -702,6 +704,7 @@ class TripLeg < Sequel::Model(:'trip legs')
   column_view :land_time_act_gmt,   :time,  :actual_land_time_gmt
   column_view :delay_1_time,        :time,  :delay_1_duration
   column_view :delay_2_time,        :time,  :delay_2_duration
+  column_view :ron,                 :boolean
 
 
   # get pic or sic or purser for this trip leg. type should be :pic or :sic or :pur
@@ -814,70 +817,62 @@ class TripLeg < Sequel::Model(:'trip legs')
     ((nautical_miles*1.150777*10).to_i)/10.0
   end
 
-   # FUEL PASSDOWN STUFF
-  def method_missing(method, *args, &block)
-    if method.to_s =~ /^(dept_fuel|arr_fuel)/ then # looking for something like dept_fuel_quantity, dept_fuel_rate or arr_fuel_quantity, etc...
-      arr = method.to_s.split('_')
-      send(:get_fuel_value, arr[0], arr[2])
-    else
-      super(method, *args, &block)
-    end
+  # Datamart Methods
+  def arrival_ap_id
+    arrival_airport_id ? "#{arrival_ap_prefix}#{arrival_airport_id}" : ""
   end
 
-  def get_fuel_value type, item
-     set_fuel_values type unless instance_variable_get "@#{type}_fuel"
-     pow = instance_variable_get "@#{type}_fuel"
-     pow[item.to_sym]
+  def depart_ap_id
+    depart_airport_id ? "#{depart_ap_prefix}#{depart_airport_id}" : ""
   end
 
-  private
-  def set_fuel_values type
-    my_type = (type == "arr" ? "ARRIVAL" : "DEPART")
-    pow = instance_variable_set "@#{type}_fuel", {}
-    pow[:quantity], pow[:rate] = airport_fuel_quantity_and_rate(my_type)
-    pow[:cost] = pow[:rate] * pow[:quantity]
+  def arrival_fbo_is_primary
+    arrival_fbo__primary == 1 ? 'Yes' : 'No'
   end
 
-  def airport_fuel_quantity_and_rate type #ARRIVAL or DEPART
-    airport_fuel = airport_fuel_lookup type
-    (airport_fuel ? [airport_fuel[:quantity], fuel_cost_by_quantity(airport_fuel[:quantity], airport_fuel)]: [0,0])
+  def departure_fbo_is_primary
+    departure_fbo__primary == 1 ? 'Yes' : 'No'
   end
 
-  def airport_fuel_lookup type #ARRIVAL or DEPART
-    str = (type == "DEPART" ? "DEPT" : type)
-    sql = <<-SQL
-    SELECT TOP 1 TL."TRIP NUMBER",TL."LEG NUMBER", TL."#{str} DATE GMT", TL."#{type} AIRPORT ID",
-      FLE."VENDOR ID", FLE."QUANTITY",
-      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 inner join "FLIGHT LOG EXPENSES" AS FLE
-      ON
-       (FLE."TRIP LEG KID - DATE" = TL."KID - DATE" AND FLE."TRIP LEG KID - TIME" = TL."KID - TIME"
-      AND FLE."TRIP LEG KID - USER" = TL."KID - USER" AND FLE."TRIP LEG KID - MULT"=TL."KID - MULT"
-      AND FLE."TRIP LEG KID - COMM" = TL."KID - COMM" AND FLE."TYPE" = 1)
-    LEFT OUTER JOIN "AIRPORT FUEL" AS AF
-      ON (AF."VENDOR ID" = FLE."VENDOR ID" AND AF."AIRPORT ID" = TL."DEPART AIRPORT ID" AND AF."EFFECTIVE DATE" <= TL."#{str} DATE GMT")
-    AND   (TL."TRIP NUMBER" = ? AND TL."LEG NUMBER" = ?)
-    ORDER BY AF."EFFECTIVE DATE" DESC
-    SQL
-    return db.fetch(sql, trip_number, leg_number).first
+  def departure_airport_zipcode
+    departure_airport__city_state_zip and
+      departure_airport__city_state_zip.match(/(\d{5}-\d{4}$|\d{5})$/) and
+        $1
   end
 
-  def build_fuel_tier_hash airport_fuel # creates a hash table of the qty and fuel prices for each tier
-    h = Hash.new
-    (1..10).each do |n|
-      h[airport_fuel[:"qty #{n}"]] = airport_fuel[:"cost #{n}"]
-    end
-    h
+  def arrival_airport_zipcode
+    arrival_airport__city_state_zip and
+      arrival_airport__city_state_zip.match(/(\d{5}-\d{4}$|\d{5})$/) and
+        $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
 
-  def fuel_cost_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
-    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
+  def arrival_diff_in_minutes
+     (leg_status == "VERI" or leg_status == "FLOG") ? ((actual_arrival_date_time_local - planned_arrival_date_time_local)*1440).to_i : nil
+  end
+
+  def leg_class
+    my_class = case aircraft_type_id
+      when 'C750' then 'C750'
+      when 'CL30' then 'CL30'
+      # when 'Managed' then 'Managed'  #TODO There is no way to know if the plane is managed other than being given specific tail numbers
+      when 'PRM1' then 'Premier'
+      when 'BE35' then 'King Air'
+      else 'NA'
     end
-    0
+
+    my_class = 'NA' if (aircraft__owner_name =~ /xojet/i) == nil
+    my_class
+  end
+
+  def fuel_expenses
+    flight_log_expenses.find_all {|expense| expense.type == 1}
   end
 end

data/lib/sequel/model_patch.rb

@@ -8,11 +8,24 @@ class Sequel::Model
   # Passing in an array of attribute / method names, fills a hash with values from
   # the model. Can pass in attributes with __ like :passenger__name and the 'name'
   # value will be delegated to 'passenger' with the delegator being created on the fly.
+  # Can also pass in a hash of attributes, with the key being the key you want
+  # for the hash and the value being the value you want from the model. So you could
+  # pass in {:pax_name=>:passenger__name} and the hash returned will be {:pax_name=>'Bob'}
   def fill_hash(attributes)
-    attributes.inject({}) do |hash, attribute|
-      attribute_name = attribute.to_s.gsub('__','_').to_sym
-      generate_delegator(attribute) unless respond_to? attribute_name
-      hash[attribute_name] = send(attribute_name) if respond_to? attribute_name
+    if attributes.is_a? Array
+      attributes.inject({}) do |hash, attribute|
+        attribute_name = attribute.to_s.gsub('__', '_').to_sym
+        generate_delegator(attribute) unless respond_to? attribute_name
+        hash[attribute_name] = send(attribute_name) if respond_to? attribute_name
+        hash
+      end
+    elsif attributes.is_a? Hash 
+      hash = {}
+      attributes.each do |key, attribute|
+        attribute_name = attribute.to_s.gsub('__', '_').to_sym
+        generate_delegator(attribute) unless respond_to? attribute_name
+        hash[key] = send(attribute_name) if respond_to? attribute_name
+      end
       hash
     end
   end

data/spec/models/trip_leg_spec.rb

@@ -37,7 +37,7 @@ describe TripLeg do
     arr_date_act_gmt = Date.new(1900, 1, 2)
     arriv_time_act_gmt = 1420
     home_tz_gmt_offset = -70
-    tl = TripLeg.new(:arr_date_act_gmt => arr_date_act_gmt.to_fos_days, :arriv_time_act_gmt => arriv_time_act_gmt,
+    tl = TripLeg.new(:arrival_date_gmt => arr_date_act_gmt.to_fos_days, :arriv_time_act_gmt => arriv_time_act_gmt,
                      :home_tz_gmt_offset => home_tz_gmt_offset)
     tl.actual_arrival_date_time_base.should == DateTime.new(1900, 1, 2, 16, 40, 0)
   end
@@ -139,162 +139,187 @@ describe TripLeg do
     end
   end
 
-  describe "fuel passdown data columns" do
-
-    it "query fuel info from real trip leg actually works" do
-      set_fos_db([TripLeg,AirportFuel,FlightLogExpense])
-#      trip_leg = TripLeg.first(:trip_number=>67579,:leg_number=>3)
-      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
-#      p trip_leg.dept_fuel_quantity
-#      p trip_leg.dept_fuel_cost
-#      p trip_leg.dept_fuel_rate
-#      p trip_leg.arr_fuel_quantity
-#      p trip_leg.arr_fuel_cost
-#      p trip_leg.arr_fuel_rate
-    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}
-        @tl = TripLeg.new
-        mock(@tl).airport_fuel_lookup(is_a(String)).times(2) {hash_with_airport_fuel}
-      end
-
-      it "fuel quantity for leg with airport fuel" do
-        @tl.dept_fuel_quantity.should == 970
-        @tl.arr_fuel_quantity.should == 970
-      end
-
-      it "fuel rate for leg with airport fuel" do
-        @tl.dept_fuel_rate.should == 3.93
-        @tl.arr_fuel_rate.should == 3.93
-      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 == "3812.1"
-      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
-        mock(@tl).airport_fuel_lookup(is_a(String)).times(2) {hash_without_airport_fuel}
-      end
-
-      it "fuel quantity for leg without airport fuel" do
-        @tl.dept_fuel_quantity.should == 970
-        @tl.arr_fuel_quantity.should == 970
-      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
-      mock(@tl).airport_fuel_lookup(is_a(String)).times(2) {hash_without_any_data}
-    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
-      mock(tl).airport_fuel_lookup(is_a(String)).times(2) {fuel_data_hash}
-      tl.dept_fuel_cost.to_s.should == "3812.1"
-      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
-      mock(tl).airport_fuel_lookup(is_a(String)).times(2) {fuel_data_hash}
-      tl.dept_fuel_cost.should == 29200
-      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
-      mock(tl).airport_fuel_lookup(is_a(String)).times(2) {fuel_data_hash}
-      tl.dept_fuel_cost.should == 4103
-      tl.arr_fuel_cost.should == 4103
-    end
-  end
-
+## 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
 

data/spec/sequel/model_patch_spec.rb

@@ -5,11 +5,16 @@ describe "Sequel::Model extentions" do
 
   describe "fill_hash method" do
 
-    it "works with attributes" do
+    it "works with attributes as array" do
       Dude.first.should respond_to(:fill_hash)
       Dude.first.fill_hash([:'kid - date']).should == {:'kid - date'=>1}
     end
 
+    it "works with attributes as hash" do
+      Dude.first.should respond_to(:fill_hash)
+      Dude.first.fill_hash({:date=>:'kid - date'}).should == {:date=>1}
+    end
+
     it "works with methods" do
       Dude.column_alias :doo, :'kid - date'
       Dude.first.fill_hash([:doo]).should == {:doo=>1}

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 17
-  version: 0.4.17
+  - 18
+  version: 0.4.18
 platform: ruby
 authors: 
 - Patrick Lardin, Daniel Sudol
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-05 00:00:00 -07:00
+date: 2010-09-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency