fossil 0.5.40 → 0.5.41

data/VERSION

@@ -1 +1 @@
-0.5.40
+0.5.41

data/fossil.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fossil}
-  s.version = "0.5.40"
+  s.version = "0.5.41"
 
   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-16}
+  s.date = %q{2011-03-17}
   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/models/city_cost.rb

@@ -12,7 +12,7 @@ class CityCost < Sequel::Model(:'city cost')
     self.kid_time = rand(65535)
     self.kid_comm = rand(255)
     self.kid_mult = rand(255)
-    self.kid_user = rand(36**4).to_s(36)
+    self.kid_user = String.random_of_length(4)
     self.owner_kid_date = city_pair.kid_date
     self.owner_kid_time = city_pair.kid_time
     self.owner_kid_mult = city_pair.kid_mult

data/lib/models/city_pair.rb

@@ -12,7 +12,7 @@ class CityPair < Sequel::Model(:'city pair')
     self.kid_time = rand(65535)
     self.kid_comm = rand(255)
     self.kid_mult = rand(255)
-    self.kid_user = rand(36**4).to_s(36)
+    self.kid_user = String.random_of_length(4)
   end
   
   o_to_n :city_costs, :class=>:CityCost, :prefix=>'owner'

data/lib/models/flight_log_expense.rb

@@ -104,6 +104,10 @@ class FlightLogExpense < Sequel::Model(:'flight log expenses')
     arrival_airport == 0
   end
 
+  def type_string
+    is_departure_expense? ? "departure" : "arrival"
+  end
+
   def airport_fuel_lookup
     if !is_departure_expense? then
       ap_str = "ARRIVAL"
@@ -151,4 +155,29 @@ class FlightLogExpense < Sequel::Model(:'flight log expenses')
     end
     0.0
   end
+
+  def calculate_fuel_data
+    expense_type = expense_type_string
+    tl = trip_leg
+    vendor       = tl.send("#{expense_type}_fuel_vendor__company_2")
+    vendor       = tl.send("#{expense_type}_fuel_vendor__company_1") if !vendor or vendor == ""
+    vendor       = tl.send("#{expense_type}_fuel_vendor__vendor_id") if !vendor or vendor == ""
+    airport      = tl.send("#{expense_type}_icao_val")
+    fbo          = tl.send("#{expense_type}_fbo__name")
+    aircraft     = (tl.aircraft ? tl.tail_number : tl.aircraft_id)
+    leg_date     = (tl.dept_date_act_local and tl.dept_date_act_local != 0 ? tl.dept_date_act_local : tl.depart_date_local)
+
+    {
+      :leg_date      => leg_date,
+      :trip_number   => tl.trip_number,
+      :leg_number    => tl.leg_number,
+      :ac            => aircraft,
+      :airport       => airport,
+      :fbo           => fbo,
+      :vendor        => vendor,
+      :fuel_rate     => expense.fuel_rate,
+      :fuel_quantity => expense.quantity,
+      :fuel_cost     => expense.fuel_cost
+    }
+  end
 end

data/lib/models/trip_leg.rb

@@ -935,4 +935,45 @@ class TripLeg < Sequel::Model(:'trip legs')
   def total_fuel_purchased_quantity
     departure_fuel_purchased_quantity + arrival_fuel_purchased_quantity
   end
+
+
+  # Fuel Passdown Methods
+  class << self
+    def fuel_passdown_data start_date, end_date, fbo_keys
+      trip_legs = TripLeg.get_fuel_passdown_trip_legs( start_date, end_date )
+      fuel_data_by_fbo_keys( trip_legs, fbo_keys )
+    end
+
+    def get_fuel_passdown_trip_legs start_date, end_date
+      start_date = start_date.to_fos_days
+      end_date = end_date.to_fos_days
+      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).limit(10).all
+    end
+
+    def fuel_data_by_fbo_keys trip_legs, fbo_keys
+      data = Hash.new
+      trip_legs.each do |leg|
+        leg.fuel_expenses.each do |expense|
+
+          expense_type = expense_type_string( expense )
+          fbo_name = leg.send( "#{expense_type}_fbo__name" )
+          p fbo_name
+          if fbo_keys.include?(fbo_name) then # is this an fbo we are looking for?
+            expense_hash = calculate_expense( expense, leg )
+
+            if data.has_key?(fbo_name)
+              data[fbo_name].push(expense_hash)
+            else
+              data[fbo_name] = [expense_hash]
+            end
+          end
+        end
+      end
+      data
+    end
+    protected :fuel_data_by_fbo_keys
+  end
 end

data/lib/support/core_extensions.rb

@@ -1,5 +1,19 @@
 require 'json'
 
+class Array
+  def to_flat_file_row options = { :delimeter => ',', :enclosed_by => '' }
+    self.inject("") do |csv, item|
+      csv << "#{options[:enclosed_by]}#{item}#{options[:enclosed_by]}#{options[:delimeter]}"
+    end.chop
+  end
+end
+
+class String
+  def self.random_of_length length
+    length.times.inject("") {|str| str << (rand(26) + 97).chr }
+  end
+end
+
 class Integer
   def as_cost
     self/100.0

data/spec/core_extensions_spec.rb

@@ -62,4 +62,26 @@ describe Range do
     range = 1..1
     range.split_by_step(10).should == [1..1]
   end
+end
+
+describe Array do
+  describe "flat file conversions" do
+    before :all do
+      @array = ["one", "two","three"]
+    end
+
+    it "can do flat file string conversions with default values" do
+      @array.to_flat_file_row.should == "one,two,three"
+    end
+
+    it "can do flat file string conversions with options" do
+      @array.to_flat_file_row(:delimeter => '|', :enclosed_by => '"').should == %q{"one"|"two"|"three"}
+    end
+  end
+end
+
+describe String do
+  it "can generate a string of lower case characters of length" do
+    String.random_of_length(4).should match(/[a-z]{4}/)
+  end
 end

data/spec/models/city_pair_spec.rb

@@ -1,12 +1,12 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-RSpec::Matchers.define :have_valid_kid_keys do |expected|
+RSpec::Matchers.define :have_valid_kid_keys do
   match do |actual|
-    actual.kid_date.to_s.should =~ /\d{1,5}/
-    actual.kid_time.to_s.should =~ /\d{1,5}/
-    actual.kid_user.should =~ /\w{1,4}/
-    actual.kid_mult.to_s.should =~ /\d{1,3}/
-    actual.kid_comm.to_s.should =~ /\d{1,3}/
+    actual.kid_date.to_s.should =~ /\A\d+\Z/
+    actual.kid_time.to_s.should =~ /\A\d+\Z/
+    actual.kid_user.should =~ /\A\w{4}\Z/
+    actual.kid_mult.to_s.should =~ /\A\d+\Z/
+    actual.kid_comm.to_s.should =~ /\A\d+\Z/
   end
 end
 

data/spec/models/flight_log_expense_spec.rb

@@ -68,4 +68,9 @@ describe FlightLogExpense do
       end
     end
   end
+
+  it 'should give the type as a string' do
+    FlightLogExpense.new(:arrival_airport => 0).type_string.should == "departure"
+    FlightLogExpense.new(:arrival_airport => 1).type_string.should == "arrival"
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 40
-  version: 0.5.40
+  - 41
+  version: 0.5.41
 platform: ruby
 authors: 
 - Daniel Sudol
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-16 00:00:00 -07:00
+date: 2011-03-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency