fossil 0.5.47 → 0.5.48

data/VERSION

@@ -1 +1 @@
-0.5.47
+0.5.48

data/fossil.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fossil}
-  s.version = "0.5.47"
+  s.version = "0.5.48"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Sudol", "Patrick Lardin"]
-  s.date = %q{2011-03-23}
+  s.date = %q{2011-04-01}
   s.description = %q{Access FOS/betrieve db with this Sequel based orm wrapper}
   s.email = %q{dansudol@yahoo.com}
   s.extra_rdoc_files = [

data/lib/dbr_models/trip_leg.rb

@@ -7,18 +7,20 @@
 # The other methods are special methods for datamart trip_leg summary table
 #
 class TripLeg
-  one_to_many :crew_legs, :class=>:CrewLeg, :key=>:trip_leg_id, :primary_key=>:id
-  one_to_many :flight_log_expenses, :class=>:FlightLogExpense, :key=>:trip_leg_id, :primary_key=>:id
-  many_to_one :trip, :class=>:Trip, :key=>:trips_id
-  many_to_one :arrival_fbo, :class=>:AirportFbo, :key=>:fbo_id
-  many_to_one :departure_fbo, :class=>:AirportFbo, :key=>:fueler_id
-  many_to_one :trip_requester, :class=>:Passenger, :key=>:requester_id
-  many_to_one :leg_requestor, :class=>:Passenger, :key=>:leg_req_id
-  many_to_one :departure_catering_comment,  :class=>:Comment,  :key=>:departure_catering_comment_id
-  many_to_one :arrival_catering_comment,    :class=>:Comment,  :key=>:arrival_catering_comment_id
-  many_to_one :departure_transport_comment, :class=>:Comment,  :key=>:departure_transport_comment_id
-  many_to_one :arrival_transport_comment,   :class=>:Comment,  :key=>:arrival_transport_comment_id
-  many_to_one :departure_general_comment,   :class=>:Comment,  :key=>:departure_general_comment_id
-  many_to_one :arrival_general_comment,     :class=>:Comment,  :key=>:arrival_general_comment_id
-  many_to_one :crew_transport_comment,      :class=>:Comment,  :key=>:crew_transport_comment_id
+  one_to_many :crew_legs,                   :class=>:CrewLeg,           :key=>:trip_leg_id,                     :primary_key=>:id
+  one_to_many :flight_log_expenses,         :class=>:FlightLogExpense,  :key=>:trip_leg_id,                     :primary_key=>:id
+  many_to_one :trip,                        :class=>:Trip,              :key=>:trips_id
+  many_to_one :arrival_fbo,                 :class=>:AirportFbo,        :key=>:fbo_id
+  many_to_one :departure_fbo,               :class=>:AirportFbo,        :key=>:fueler_id
+  many_to_one :trip_requester,              :class=>:Passenger,         :key=>:requester_id
+  many_to_one :leg_requestor,               :class=>:Passenger,         :key=>:leg_req_id
+  many_to_one :departure_catering_comment,  :class=>:Comment,           :key=>:departure_catering_comment_id
+  many_to_one :arrival_catering_comment,    :class=>:Comment,           :key=>:arrival_catering_comment_id
+  many_to_one :departure_transport_comment, :class=>:Comment,           :key=>:departure_transport_comment_id
+  many_to_one :arrival_transport_comment,   :class=>:Comment,           :key=>:arrival_transport_comment_id
+  many_to_one :departure_general_comment,   :class=>:Comment,           :key=>:departure_general_comment_id
+  many_to_one :arrival_general_comment,     :class=>:Comment,           :key=>:arrival_general_comment_id
+  many_to_one :crew_transport_comment,      :class=>:Comment,           :key=>:crew_transport_comment_id
+  many_to_one :arrival_airport,             :class=>:Airport,           :key=>:arrival_airport_id,              :primary_key => :airport_id
+  many_to_one :departure_airport,           :class=>:Airport,           :key=>:depart_airport_id,               :primary_key => :airport_id
 end

data/lib/models/flight_log_expense.rb

@@ -63,7 +63,7 @@ class FlightLogExpense < Sequel::Model(:'flight log expenses')
   column_alias :pay_method, :'pay method'
   column_alias :percent_markup, :'percent markup'
   column_alias :problem, :'problem'
-  column_alias :quantity, :'quantity'
+  column_alias :quantity, :'quantity', :type => :integer
   column_alias :quantity_tenths, :'quantity tenths'
   column_alias :receipt, :'receipt'
   column_alias :receipt_number, :'receipt number'
@@ -83,7 +83,7 @@ class FlightLogExpense < Sequel::Model(:'flight log expenses')
   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 :type, :'type', :type => :integer
   column_alias :unit, :'unit'
   column_alias :unit_cost, :'unit cost'
   column_alias :vendor_id, :'vendor id'

data/lib/models/trip_leg.rb

@@ -950,35 +950,25 @@ class TripLeg < Sequel::Model(:'trip legs')
       TripLeg.filter(:cancelled => 0, :status => [0,1,2]).
               filter(~{:'leg state' => 5}).
               filter({:'dept date act local' => start_date..end_date,
-                      :'depart date - local'   => start_date...end_date}.sql_or).all
-#          eager_graph(:flight_log_expenses => :vendor).
-#          eager_graph(:departure_fbo).
-#          eager_graph(:arrival_fbo).
-#          select_fields(:self => [:dept_date_act_local, :depart_date_local, :trip_number, :leg_number,
-#                                  :departure_icao, :depart_ap_prefix, :depart_airport_id, :arrival_icao,
-#                                  :arrival_airport_id, :arrival_ap_prefix, :aircraft_id],
-#                        :flight_log_expenses__vendor => [:company_2, :company_1, :vendor_id],
-#                        :flight_log_expenses => [:*],
-#                        :departure_fbo => [:name],
-#                        :arrival_fbo => [:name]).all
+                      :'depart date - local' => start_date..end_date}.sql_or).
+              order(:depart_date_local).all
     end
 
     def fuel_data_by_fbo_keys trip_legs, fbo_keys
-      data = Hash.new
+      data =  Hash.new { |hash, key| hash[key] = Array.new }
       trip_legs.each do |leg|
         leg.fuel_expenses.each do |expense|
 
           fbo_name = leg.send( "#{expense.type_string}_fbo__name" )
-
-          if fbo_keys.include?(fbo_name) then # is this an fbo we are looking for?
-            expense_hash = expense.fuel_passdown_hash
-
-            if data.has_key?(fbo_name)
-              data[fbo_name].push(expense_hash)
-            else
-              data[fbo_name] = [expense_hash]
+          match = false
+          fbo_keys.each do |key|
+            if fbo_name.index(key) == 0 # fbo name can have suffix like A, B, SOUTH, EAST, etc.
+              match = true
+              break
             end
           end
+          
+          data[fbo_name].push( expense.fuel_passdown_hash ) if match
         end
       end
       data

data/lib/support/core_extensions.rb

@@ -16,7 +16,7 @@ end
 
 class Integer
   def as_cost
-    self/100.0
+    self / 100.0
   end
 
   def in_hundredths

data/spec/models/flight_log_expense_spec.rb

@@ -8,7 +8,7 @@ describe FlightLogExpense do
       @fe = FlightLogExpense.new(:type => 1)
     end
 
-    describe 'fuel cost' do
+    describe '#fuel_cost' do
 
       it 'should not have a cost if it doesnt have a quantity' do
         @fe.quantity = 0
@@ -24,7 +24,7 @@ describe FlightLogExpense do
       end
     end
 
-    describe 'fuel rate' do
+    describe '#fuel_rate' do
 
       it 'should not have a rate if the airport fuel pricing cannnot be determined' do
         @fe.quantity = 100
@@ -35,7 +35,7 @@ describe FlightLogExpense do
 
       describe 'different fuel tiers' do
 
-        before :each do
+        before do
           airport_fuel = {
             :"qty 1"=>1,    :"cost 1"=>393,
             :"qty 2"=>1000, :"cost 2"=>373,
@@ -67,6 +67,62 @@ describe FlightLogExpense do
         end
       end
     end
+
+    describe '#fuel_passdown_hash' do
+
+      before :each do
+        atlantic_fbo  = AirportFbo.new( :name => "ATLANTIC AVIATION SERVIC" )
+        signature_fbo = AirportFbo.new( :name => "SIGNATURE FLIGHT SUPPORT" )
+
+        @trip_leg = TripLeg.new( :trip_number => 12345,           :leg_number => 1, :aircraft_id => "C750",
+                                 :departure_icao => "KSFO",       :arrival_icao => "KTEB",
+                                 :departure_fbo => signature_fbo, :arrival_fbo => atlantic_fbo,
+                                 :dept_date_act_local => 40123,   :depart_date_local => 40124 )
+
+        @vendor = Vendor.new( :company_2 => "Landmark Aviation", :company_1 => "Landmark", :vendor_id => "LMAR" )
+
+        stub(@fe).trip_leg { @trip_leg }
+        stub(@fe).vendor { @vendor }
+        stub(@fe).fuel_rate { 4.12 }
+        @fe.quantity = 1234
+        @fe.arrival_airport = 0
+
+        @expected = {
+          :leg_date      => 40123,
+          :trip_number   => 12345,
+          :leg_number    => 1,
+          :ac            => "C750",
+          :airport       => "KTEB",
+          :fbo           => "ATLANTIC AVIATION SERVIC",
+          :vendor        => "Landmark Aviation",
+          :fuel_rate     => 4.12,
+          :fuel_quantity => 1234,
+          :fuel_cost     => 5084.08
+        }
+      end
+
+      it 'should use arrival attributes if the expense is arrival' do
+        @fe.arrival_airport = 1
+        @fe.fuel_passdown_hash.should == @expected
+      end
+
+      it 'should use departure attributes if the expense is departure' do
+        @expected[:fbo] = "SIGNATURE FLIGHT SUPPORT"
+        @expected[:airport] = "KSFO"
+        @fe.fuel_passdown_hash.should == @expected
+      end
+
+      it 'should use vendor company_1 if company_2 is blank or nil' do
+        @vendor.company_2 = ""
+        @fe.fuel_passdown_hash[:vendor].should == "Landmark"
+      end
+
+      it 'should use vendor vendor_id if company_2 and company_1 are blank or nil' do
+        @vendor.company_2 = ""
+        @vendor.company_1 = ""
+        @fe.fuel_passdown_hash[:vendor].should == "LMAR"
+      end
+    end
   end
 
   it 'should give the type as a string' do

data/spec/models/trip_leg_spec.rb

@@ -5,7 +5,6 @@ describe TripLeg do
   describe "leg_status" do
     it "shows maint status" do
       trip_leg = TripLeg.new(:cancel_code=>0, :status=>21, :flight_time_actual=>0, :verify_date=>0)
-      trip_leg.status= 21
       trip_leg.leg_status.should == "MAINT"
     end
   end
@@ -353,7 +352,7 @@ describe TripLeg do
         @tl.total_fuel_cost.should == 200.0
       end
     end
-    
+
     describe 'arrival fuel quantity' do
 
       it 'should not have a quantity if there are no fuel flight log expenses' do
@@ -370,7 +369,7 @@ describe TripLeg do
 
       it 'should not have a quantity if the fuel flight log expense is not arrival' do
         fe = FlightLogExpense.new(:type => 1, :arrival_airport => 0)
-        fe.quantity = 300 
+        fe.quantity = 300
         stub(@tl).fuel_expenses { [fe] }
 
         @tl.arrival_fuel_purchased_quantity.should == 0
@@ -401,7 +400,7 @@ describe TripLeg do
         @tl.arrival_fuel_purchased_quantity.should == 700.0
       end
     end
-    
+
     describe 'departure fuel quantity' do
 
       it 'should not have a quantity if there are no fuel flight log expenses' do
@@ -418,7 +417,7 @@ describe TripLeg do
 
       it 'should not have a quantity if the fuel flight log expense is not departure' do
         fe = FlightLogExpense.new(:type => 1, :arrival_airport => 1)
-        fe.quantity = 300 
+        fe.quantity = 300
         stub(@tl).fuel_expenses { [fe] }
 
         @tl.departure_fuel_purchased_quantity.should == 0
@@ -449,7 +448,7 @@ describe TripLeg do
         @tl.departure_fuel_purchased_quantity.should == 700.0
       end
     end
-    
+
     describe 'total fuel quantities' do
       it 'should not have a total quantity if there are no fuel flight log expenses' do
         stub(@tl).departure_fuel_purchased_quantity { 0 }
@@ -480,4 +479,60 @@ describe TripLeg do
       end
     end
   end
+
+  describe 'Fuel Passdown' do
+    describe '#fuel_passdown_data' do
+      it 'should take start_date end_date and fbo_keys and return the fuel expense data trip legs in the range' do
+        start_date = Date.new
+        end_date = Date.new + 1.days
+        fbo_keys = ["ATLANTIC AVIATION SERVICE"]
+        trip_legs = []
+        fuel_data = {}
+        mock(TripLeg).get_fuel_passdown_trip_legs( start_date, end_date ) { trip_legs }
+        mock(TripLeg).fuel_data_by_fbo_keys( trip_legs, fbo_keys ) { fuel_data }
+
+        TripLeg.fuel_passdown_data(start_date, end_date, fbo_keys).should == fuel_data
+      end
+    end
+
+    describe '#fuel_data_by_fbo_keys' do
+      before do
+        @fuel_data_hash1 = {}
+        @fuel_data_hash2 = {}
+
+        atlantic_fbo  = AirportFbo.new( :name => "ATLANTIC AVIATION SERVIC" )
+        landmark_fbo  = AirportFbo.new( :name => "LANDMARK AVIATION" )
+        signature_fbo = AirportFbo.new( :name => "SIGNATURE FLIGHT SUPPORT" )
+        no_match_fbo  = AirportFbo.new( :name => "NOT MATCHING" )
+
+        flight_log_expense1 = FlightLogExpense.new( :arrival_airport => 0, :type => 1 )
+        stub( flight_log_expense1 ).fuel_passdown_hash { @fuel_data_hash1 }
+
+        flight_log_expense2 = FlightLogExpense.new( :arrival_airport => 1, :type => 1 )
+        stub( flight_log_expense2 ).fuel_passdown_hash { @fuel_data_hash2 }
+
+        flight_log_expense3 = FlightLogExpense.new( :arrival_airport => 0, :type => 1 )
+
+        leg1 = TripLeg.new( :departure_fbo => landmark_fbo, :arrival_fbo => atlantic_fbo )
+        stub( leg1 ).flight_log_expenses { [ flight_log_expense1 ] }
+
+        leg2 = TripLeg.new( :departure_fbo => landmark_fbo, :arrival_fbo => signature_fbo )
+        stub( leg2 ).flight_log_expenses { [ flight_log_expense2 ] }
+
+        leg3 = TripLeg.new( :departure_fbo => no_match_fbo, :arrival_fbo => no_match_fbo )
+        stub( leg3 ).flight_log_expenses { [ flight_log_expense3 ] }
+
+        @trip_legs = [ leg1, leg2, leg3 ]
+      end
+
+      it 'should return a hash of fuel data hashes grouped by fbo names' do
+        fbo_keys = [ "LANDMARK AVIATION", "SIGNATURE FLIGHT SUPPORT" ]
+        results = TripLeg.send( :fuel_data_by_fbo_keys, @trip_legs, fbo_keys )
+
+        results.should == { "LANDMARK AVIATION"        => [ @fuel_data_hash1 ],
+                            "SIGNATURE FLIGHT SUPPORT" => [ @fuel_data_hash2 ]
+                          }
+      end
+    end
+  end
 end

data/spec/temp_spec.rb

@@ -5,15 +5,27 @@ describe "FOS Licensing" do
   before :all do
 #    set_fos_db([TripLeg, FlightLogExpense, Vendor, AirportFbo])
 #    set_dbr_db([TripLeg, FlightLogExpense, Aircraft, Vendor, AirportFbo])
-    db = Sequel.fos_dbr(:username => 'datamart', :password => 'datap@ss', :adapter => 'mysql', :host => 'hrkdm', :database => 'dbr')
-    db.loggers=[Logger.new($stdout)]
-    [TripLeg, FlightLogExpense, Aircraft, Vendor, AirportFbo, AirportFuel].each { |m| m.db = db }
+#    db = Sequel.fos_dbr(:username => 'datamart', :password => 'datap@ss', :adapter => 'mysql', :host => 'hrkdm', :database => 'dbr')
+#    db.loggers=[Logger.new($stdout)]
+#    [TripLeg, FlightLogExpense, Aircraft, Vendor, AirportFbo, AirportFuel].each { |m| m.db = db }
   end
 
-  it "puts the lotion on the skin" do
-    legs = TripLeg.fuel_passdown_data(Date.parse('2011-02-06'), Date.parse('2011-02-06'), ["SIGNATURE FLIGHT SUPPORT"])
-    p "BLAH BLAH BLAH"
-    pp legs
+  it "pass a block to include?" do
+    fbos = ["ATLANTIC AVIATION SERVIC", "SIGNATURE FLIGHT SUPPORT", "LANDMARK AVIATION"]
+    search = "LANDMARK AVIATION EAST"
+
+    result = nil
+    fbos.each do |fbo|
+       result = fbo and break if search.match(/^#{fbo}.*/)
+    end
+
+    p result
+  end
+
+#  it "puts the lotion on the skin" do
+#    legs = TripLeg.fuel_passdown_data(Date.parse('2011-02-06'), Date.parse('2011-02-06'), ["SIGNATURE FLIGHT SUPPORT"])
+#    p "BLAH BLAH BLAH"
+#    pp legs
 
 #    l = TripLeg.filter(:'trip number' => 68562, :'leg number' => 1).eager_graph(:flight_log_expenses => :vendor).all.first
 #    p "BLAH BLAH BLAH BLAH"
@@ -23,7 +35,7 @@ describe "FOS Licensing" do
 #    tl = TripLeg.filter(:trip_number=>68562, :leg_number =>1).first
 #    tl = TripLeg.filter(:trip_number => 68562, :leg_number => 1).eager_graph(:fuel_expenses).select_fields(:self => [:trip_number, :leg_number], :fuel_expenses => [:type]).all
 #    tl = TripLeg.filter(:trip_number => 68562, :leg_number => 1).eager_graph(:aircraft).select_fields(:self => [:trip_number, :leg_number], :aircraft => [:tail_number]).all
-  end
+#  end
 
 #  it "gets the user licensing information" do
 #    print UserInformation.select(:users_initials, :mobile_access).sql

metadata

@@ -2,7 +2,7 @@
 name: fossil
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.47
+  version: 0.5.48
 platform: ruby
 authors: 
 - Daniel Sudol
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-23 00:00:00 -07:00
+date: 2011-04-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency