fossil 0.5.46 → 0.5.47

data/VERSION

@@ -1 +1 @@
-0.5.46
+0.5.47

data/fossil.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fossil}
-  s.version = "0.5.46"
+  s.version = "0.5.47"
 
   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-22}
+  s.date = %q{2011-03-23}
   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/flight_log_expense.rb

@@ -4,7 +4,7 @@ class FlightLogExpense < Sequel::Model(:'flight log expenses')
 
   #Many to one association with composite keys
   n_to_o :trip_leg, :class=>:TripLeg, :prefix=>'trip leg'
-  many_to_one :vendor, :class=>:Vendor, :key=>:vendor_id, :primary_key=>:'vendor id'
+  many_to_one :vendor, :class=>:Vendor, :key=>:'vendor id', :primary_key=>:'vendor id'
 
 #### BEGIN GENERATED SECTION ####
   set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
@@ -118,7 +118,6 @@ class FlightLogExpense < Sequel::Model(:'flight log expenses')
       act_str = "DEPT"
       prefix = "FUELER"
     end
-    use_leg = @trip_leg or trip_leg
 
     sql = <<-SQL
     SELECT TOP 1 TL."TRIP NUMBER",TL."LEG NUMBER", TL."#{ap_str} AIRPORT ID",
@@ -136,7 +135,7 @@ class FlightLogExpense < Sequel::Model(:'flight log expenses')
     AND   (TL."TRIP NUMBER" = ? AND TL."LEG NUMBER" = ?)
     ORDER BY AF."EFFECTIVE DATE" DESC
     SQL
-    return db.fetch(sql, use_leg.trip_number, use_leg.leg_number).first
+    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
@@ -157,26 +156,24 @@ class FlightLogExpense < Sequel::Model(:'flight log expenses')
     0.0
   end
 
-  # Passing in trip_leg to help out airport_fuel_lookup from having to eager graph
-  def fuel_passdown_hash the_trip_leg
+  def fuel_passdown_hash
     expense_type = type_string
-    @trip_leg    = the_trip_leg
-    vendor       = @trip_leg.send("#{expense_type}_fuel_vendor__company_2")
-    vendor       = @trip_leg.send("#{expense_type}_fuel_vendor__company_1") if !vendor or vendor == ""
-    vendor       = @trip_leg.send("#{expense_type}_fuel_vendor__vendor_id") if !vendor or vendor == ""
-    airport      = @trip_leg.send("#{expense_type}_icao_val")
-    fbo          = @trip_leg.send("#{expense_type}_fbo__name")
-    aircraft     = (@trip_leg.aircraft ? @trip_leg.tail_number : @trip_leg.aircraft_id)
-    leg_date     = (@trip_leg.dept_date_act_local and @trip_leg.dept_date_act_local != 0 ? @trip_leg.dept_date_act_local : @trip_leg.depart_date_local)
+    leg          = trip_leg
+    vendor_name  = vendor__company_2
+    vendor_name  = vendor__company_1 if !vendor_name or vendor_name == ""
+    vendor_name  = vendor__vendor_id if !vendor_name or vendor_name == ""
+    airport      = leg.send("#{expense_type}_icao_val")
+    fbo          = leg.send("#{expense_type}_fbo__name")
+    leg_date     = (leg.dept_date_act_local and leg.dept_date_act_local != 0 ? leg.dept_date_act_local : leg.depart_date_local)
 
     {
       :leg_date      => leg_date,
-      :trip_number   => @trip_leg.trip_number,
-      :leg_number    => @trip_leg.leg_number,
-      :ac            => aircraft,
+      :trip_number   => leg.trip_number,
+      :leg_number    => leg.leg_number,
+      :ac            => leg.aircraft_id,
       :airport       => airport,
       :fbo           => fbo,
-      :vendor        => vendor,
+      :vendor        => vendor_name,
       :fuel_rate     => fuel_rate,
       :fuel_quantity => quantity,
       :fuel_cost     => fuel_cost

data/lib/models/trip_leg.rb

@@ -951,6 +951,16 @@ class TripLeg < Sequel::Model(:'trip legs')
               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
     end
 
     def fuel_data_by_fbo_keys trip_legs, fbo_keys
@@ -961,7 +971,7 @@ class TripLeg < Sequel::Model(:'trip legs')
           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( leg )
+            expense_hash = expense.fuel_passdown_hash
 
             if data.has_key?(fbo_name)
               data[fbo_name].push(expense_hash)

data/lib/sequel/model_patch.rb

@@ -259,39 +259,44 @@ class Sequel::Model
       end
 
       method_view_name = method_name.to_s + "_view"
+      case type
+        when :boolean, :currency, :precision
+          inst_def method_view_name do
+            value = send(method_name)
+            value.to_s if value
+          end
 
-      # view methods for time type
-      if type == :time
-        inst_def method_view_name do
-          value = send(method_name)
-          value.strftime('%H:%M') if value
-        end
-      end
-      # view methods for date type
-      if type == :date
-        inst_def method_view_name do
-          value = send(method_name)
-          value.to_s if value
-        end
-        # extra view methods for date type
-        method_view_name = method_name.to_s + "_view_mdy"
-        # method that returns the column value as a Date in mdy format
-        inst_def method_view_name do
-          column_value = send(column_name)
-          return nil unless column_value
-          Date.from_fos_days(column_value).strftime('%m/%d/%Y')
-        end
-        method_view_name = method_name.to_s + "_view_mdy_ipc"
-        # method that returns the column value as a Date in mdy format
-        inst_def method_view_name do
-          column_value = send(column_name)
-          return nil unless column_value
-          date_str = Date.from_fos_days(column_value).strftime('%m/%d/%Y')
-          date_str.slice!(3) if date_str[3] == 48 # if the fourth char is 0 ( ascii value 48 ) remove it
-          date_str.slice!(0) if date_str[0] == 48 # if the first char is 0 ( ascii value 48 ) remove it
-          date_str
+        when :time
+          inst_def method_view_name do
+            value = send(method_name)
+            value.strftime('%H:%M') if value
+          end
+
+        when :date
+          inst_def method_view_name do
+            value = send(method_name)
+            value.to_s if value
+          end
+          
+          # extra view methods for date type
+          method_view_name = method_name.to_s + "_view_mdy"
+          # method that returns the column value as a Date in mdy format
+          inst_def method_view_name do
+            column_value = send(column_name)
+            return nil unless column_value
+            Date.from_fos_days(column_value).strftime('%m/%d/%Y')
+          end
+          method_view_name = method_name.to_s + "_view_mdy_ipc"
+          # method that returns the column value as a Date in mdy format
+          inst_def method_view_name do
+            column_value = send(column_name)
+            return nil unless column_value
+            date_str = Date.from_fos_days(column_value).strftime('%m/%d/%Y')
+            date_str.slice!(3) if date_str[3] == 48 # if the fourth char is 0 ( ascii value 48 ) remove it
+            date_str.slice!(0) if date_str[0] == 48 # if the first char is 0 ( ascii value 48 ) remove it
+            date_str
+          end
         end
-      end
     end
 
     def select_fields(table, * fields)

data/spec/sequel/model_patch_spec.rb

@@ -139,8 +139,11 @@ describe "Sequel::Model extentions" do
       @record.should respond_to(:time_col_time)
       @record.should respond_to(:time_col_time_view)
       @record.should respond_to(:price_currency)
+      @record.should respond_to(:price_currency_view)
       @record.should respond_to(:price_precision)
+      @record.should respond_to(:price_precision_view)
       @record.should respond_to(:paid_boolean)
+      @record.should respond_to(:paid_boolean_view)
       @record.should respond_to(:my_special_name)
     end
 

data/spec/temp_spec.rb

@@ -1,18 +1,23 @@
-require './spec_dbr/spec_helper'
+require_relative '../spec_dbr/spec_helper'
+#require 'spec_helper'
 
 describe "FOS Licensing" do
   before :all do
-#    set_fos_db([UserInformation, Aircraft])
-#    set_dbr_db([TripLeg, FlightLogExpense, Aircraft])
-    db = Sequel.mysql(:username => 'datamart', :password => 'datap@ss', :adapter => 'mysql', :host => 'hrkdm', :database => 'dbr')
+#    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.db = db
-    FlightLogExpense.db = db
+    [TripLeg, FlightLogExpense, Aircraft, Vendor, AirportFbo, AirportFuel].each { |m| m.db = db }
   end
 
   it "puts the lotion on the skin" do
-    p TripLeg.filter(:'trip number' => 68562, :'leg number' => 1).eager_graph(:fuel_expenses).first
+    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"
+#    p l.fuel_expenses.first.vendor
 #    p FlightLogExpense.where(:trip_leg_id => "SEMJ-3-17-39922-1258", :type => 1)
 
 #    tl = TripLeg.filter(:trip_number=>68562, :leg_number =>1).first

metadata

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