fossil 0.3.44 → 0.3.45

data/VERSION

@@ -1 +1 @@
-0.3.44
+0.3.45

data/fossil.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fossil}
-  s.version = "0.3.44"
+  s.version = "0.3.45"
 
   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-04-23}
+  s.date = %q{2010-04-25}
   s.description = %q{Access FOS/betrieve db with this Sequel based orm wrapper}
   s.email = %q{plardin@xojet.com}
   s.files = [
@@ -132,6 +132,7 @@ Gem::Specification.new do |s|
      "spec/helper_classes.rb",
      "spec/helper_methods.rb",
      "spec/models/code_spec.rb",
+     "spec/models/quote.rb",
      "spec/models/trip_leg_spec.rb",
      "spec/models/trip_spec.rb",
      "spec/models/vendor_document_spec.rb",
@@ -164,6 +165,7 @@ Gem::Specification.new do |s|
      "spec/models/code_spec.rb",
      "spec/models/trip_leg_spec.rb",
      "spec/models/vendor_document_spec.rb",
+     "spec/models/quote.rb",
      "spec/models/trip_spec.rb",
      "spec/be_model_with_values_matcher.rb"
   ]

data/lib/fossil.rb

@@ -1,22 +1,17 @@
 require 'rubygems'
 
-#begin
+begin
   gem 'sequel', '=3.10.0'
   require('sequel')
-#rescue LoadError => e
-  warn 'To use Fossil you need the sequel gem:'
-  warn '$ sudo gem install sequel -v=3.10.0'
-#  exit(1)
-#end
-#
+rescue LoadError => e
+  raise("To use Fossil you need the sequel gem:\n '$ sudo gem install sequel -v=3.10.0'")
+end
+
 begin
   gem 'activesupport', '=2.3.5'
   require('active_support')
 rescue LoadError => e
-  p e
-  warn 'To use Fossil you need the active_support gem:'
-  warn '$ sudo gem install active_support -v=2.3.5'
-  exit(1)
+  raise "To use Fossil you need the active_support gem: '$ sudo gem install active_support -v=2.3.5'"
 end
 
 dir = File.dirname(__FILE__)

data/lib/models/ac_qualification.rb

@@ -1,7 +1,7 @@
 class ACQualification < Sequel::Model(:'a/c qualification')
 
-#### BEGIN GENERATED SECTION ####
-	set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
+  #### BEGIN GENERATED SECTION ####
+  set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
 
 	column_alias :aircraft_type_id, :'aircraft type id'
 	column_alias :alert_date, :'alert date'

data/lib/models/aircraft.rb

@@ -1,6 +1,7 @@
 class Aircraft < Sequel::Model(:'aircraft')
   # NOTE - Count of instances as of 06/01/2009 => 83
-    
+  set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
+
   # One to many to one associations with atomic primary keys
   one_to_many :trips, :class=>:Trip, :key=>:'aircraft id', :primary_key=>:'aircraft id'
   one_to_many :trip_legs, :class=>:TripLeg, :key=>:'aircraft id', :primary_key=>:'aircraft id'
@@ -8,10 +9,9 @@ class Aircraft < Sequel::Model(:'aircraft')
   code_association :company_code_value,   :company_code,   :company
   code_association :base_code_value,      :base_code,      :location
 
-#### BEGIN GENERATED SECTION ####
-	set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
+  #### BEGIN GENERATED SECTION ####
 
-	column_alias :ac_110v, :'ac 110v'
+  column_alias :ac_110v, :'ac 110v'
 	column_alias :ac_833_mhz, :'ac 833 mhz'
 	column_alias :ac_aed_med, :'ac aed med'
 	column_alias :ac_afis, :'ac afis'

data/lib/models/aircraft_cost.rb

@@ -1,7 +1,7 @@
 class AircraftCost < Sequel::Model(:'aircraft costs')
+  set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
 
-#### BEGIN GENERATED SECTION ####
-	set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
+  #### BEGIN GENERATED SECTION ####
 
 	column_alias :aircraft_id, :'aircraft id'
 	column_alias :buy_sell, :'buy sell'

data/lib/models/airport.rb

@@ -1,20 +1,21 @@
 class Airport < Sequel::Model(:'airport')
   # NOTE - Count of instances as of 06/01/2009 => 28304
-  
+  set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
+
   # Associations
-  #~ one_to_many :trip_leg_arrivals, :class=>:TripLeg, :key=>nil, :dataset=>proc{TripLeg.filter(:'arrival-icao/iata/id'=>1, :'arrival icao'=>self[:'icao']).union(TripLeg.filter(:'arrival-icao/iata/id'=>2, :'arrival iata'=>self[:'iata'])).union(TripLeg.filter(:'arrival-icao/iata/id'=>3, :'arrival a/p prefix'.like("%#{self[:'airport id prefix']}"), :'arrival airport id'.like("%#{self[:'airport id']}")))} 
-  one_to_many :trip_leg_arrivals, :class=>:TripLeg, :key=>nil, :dataset=>proc{TripLeg.filter(:'arrival-icao/iata/id'=>1, :'arrival icao'=>self[:'icao']).union(TripLeg.filter(:'arrival-icao/iata/id'=>2, :'arrival iata'=>self[:'iata'])).union(TripLeg.filter(:'arrival a/p prefix'.like("%#{self[:'airport id prefix']}"), :'arrival airport id'.like("%#{self[:'airport id']}"), :'arrival-icao/iata/id'=>3))} 
-  #~ one_to_many :trip_leg_departures, :class=>:TripLeg, :key=>nil, :dataset=>proc{TripLeg.filter(:'depart-icao/iata/id'=>1, :'departure icao'=>self[:'icao']).union(TripLeg.filter(:'depart-icao/iata/id'=>2, :'departure iata'=>self[:'iata'])).union(TripLeg.filter(:'depart-icao/iata/id'=>3, :'depart a/p prefix'.like("%#{self[:'airport id prefix']}"), :'depart airport id'.like("%#{self[:'airport id']}")))} 
+  #~ one_to_many :trip_leg_arrivals, :class=>:TripLeg, :key=>nil, :dataset=>proc{TripLeg.filter(:'arrival-icao/iata/id'=>1, :'arrival icao'=>self[:'icao']).union(TripLeg.filter(:'arrival-icao/iata/id'=>2, :'arrival iata'=>self[:'iata'])).union(TripLeg.filter(:'arrival-icao/iata/id'=>3, :'arrival a/p prefix'.like("%#{self[:'airport id prefix']}"), :'arrival airport id'.like("%#{self[:'airport id']}")))}
+  one_to_many :trip_leg_arrivals, :class=>:TripLeg, :key=>self.primary_key,  :dataset=>proc{TripLeg.filter(:'arrival-icao/iata/id'=>1, :'arrival icao'=>self[:'icao']).union(TripLeg.filter(:'arrival-icao/iata/id'=>2, :'arrival iata'=>self[:'iata'])).union(TripLeg.filter(:'arrival a/p prefix'.like("%#{self[:'airport id prefix']}"), :'arrival airport id'.like("%#{self[:'airport id']}"), :'arrival-icao/iata/id'=>3))}
+#  one_to_many :trip_leg_arrivals, :class=>:TripLeg, :key=>nil, :dataset=>proc{TripLeg.filter(:'arrival-icao/iata/id'=>1, :'arrival icao'=>self[:'icao']).union(TripLeg.filter(:'arrival-icao/iata/id'=>2, :'arrival iata'=>self[:'iata'])).union(TripLeg.filter(:'arrival a/p prefix'.like("%#{self[:'airport id prefix']}"), :'arrival airport id'.like("%#{self[:'airport id']}"), :'arrival-icao/iata/id'=>3))}
+  #~ one_to_many :trip_leg_departures, :class=>:TripLeg, :key=>nil, :dataset=>proc{TripLeg.filter(:'depart-icao/iata/id'=>1, :'departure icao'=>self[:'icao']).union(TripLeg.filter(:'depart-icao/iata/id'=>2, :'departure iata'=>self[:'iata'])).union(TripLeg.filter(:'depart-icao/iata/id'=>3, :'depart a/p prefix'.like("%#{self[:'airport id prefix']}"), :'depart airport id'.like("%#{self[:'airport id']}")))}
 
-  one_to_many :airport_fbos, :class=>:AirportFbo, :key=>nil, :dataset=>proc{ 
-     map = Airport.filter(:iata=>iata).graph( AirportFbo, {:'airport kid - date'=>:kid_date, :'airport kid - time'=>:kid_time,:'airport kid - user'=>:kid_user,:'airport kid - mult'=>:kid_mult,:'airport kid - comm'=>:kid_comm}, :table_alias=>:fbo);
+  one_to_many :airport_fbos, :class=>:AirportFbo, :key=>self.primary_key, :dataset=>proc{
+    map = Airport.filter(:iata=>iata).graph( AirportFbo, {:'airport kid - date'=>:kid_date, :'airport kid - time'=>:kid_time,:'airport kid - user'=>:kid_user,:'airport kid - mult'=>:kid_mult,:'airport kid - comm'=>:kid_comm}, :table_alias=>:fbo);
      result = map.inject([]){|array, hash| array<<hash[:fbo];array};
      def result.all; self; end;
      result;
-  } 
-  
-#### BEGIN GENERATED SECTION ####
-	set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
+  }
+
+  #### BEGIN GENERATED SECTION ####
 
 	column_alias :acn_pcn, :'acn pcn'
 	column_alias :acn_pcn_old, :'acn pcn old'

data/lib/models/airport_fbo.rb

@@ -1,12 +1,12 @@
 class AirportFbo < Sequel::Model(:"airport fbos")
   # NOTE - Count of instances as of 06/01/2009 => 717298
-  
+  set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
+
   o_to_n :trip_legs, :class=>:TripLeg, :prefix=>'fbo'
   o_to_n :fueled_trip_legs, :class=>:TripLeg, :prefix=>'fueler'
   o_to_n :airport_fuels, :class=>:AirportFuel, :prefix=>'fbo'
 
 #### BEGIN GENERATED SECTION ####
-	set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
 
 	column_alias :aftn_sita, :'aftn/sita'
 	column_alias :addr_2, :'addr 2'

data/lib/models/airport_fuel.rb

@@ -1,21 +1,21 @@
 class AirportFuel < Sequel::Model(:'airport fuel')
-# NOTE - Count of instances as of 06/01/2009 => 328246
+  # NOTE - Count of instances as of 06/01/2009 => 328246
+  set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
 
   # Many to one associations with atomic primary keys
   many_to_one :vendor, :class=>:Vendor, :key=>:'vendor id', :primary_key=>:'vendor id'
 
   # Many to one associations with atomic primary keys
-  n_to_o :airport_fbo, :class=>:AirportFbo, :prefix=>'fbo' 
-  
+  n_to_o :airport_fbo, :class=>:AirportFbo, :prefix=>'fbo'
+
   # Column views
   column_view :kid_date, :date, :creation_date
   column_view :kid_time, :time, :creation_time
   column_def_datetime :creation_datetime, :'kid - date', :'kid - time'
   column_view :effective_date, :date, :effective_from
   column_view :exp_date, :date, :effective_to
-  
+
 #### BEGIN GENERATED SECTION ####
-	set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
 
 	column_alias :airport_id, :'airport id'
 	column_alias :airport_id_prefix, :'airport id prefix'

data/lib/models/code.rb

@@ -1,6 +1,7 @@
 class Code < Sequel::Model(:'codes')
   # NOTE - Count of instances as of 06/01/2009 => 1557
-  
+	set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
+
   # Returns all the codes that belong to the given code group name
   def Code.get_codes(code_group_name)
     filter(:name=>code_group_name).collect(&:description)
@@ -11,7 +12,7 @@ class Code < Sequel::Model(:'codes')
   end
 
 #### BEGIN GENERATED SECTION ####
-	set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
+
 
 	column_alias :acct_num, :'acct num'
 	column_alias :ap_cost_type, :'ap cost type'

data/lib/models/crew_activity.rb

@@ -1,8 +1,8 @@
 class CrewActivity < Sequel::Model(:'crew activity')
-# NOTE - Count of instances as of 06/01/2009 => 6239
-  
-#### BEGIN GENERATED SECTION ####
-	set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
+  # NOTE - Count of instances as of 06/01/2009 => 6239
+  set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
+
+  #### BEGIN GENERATED SECTION ####
 
 	column_alias :act_begin_date_gmt, :'act begin date gmt'
 	column_alias :act_begin_date_home, :'act begin date home'

data/lib/models/crew_leg.rb

@@ -1,4 +1,6 @@
 class CrewLeg < Sequel::Model(:'crew legs')
+	set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
+
   # NOTE - Count of instances as of 06/01/2009 => 60947
 
   # Many to one associations with composite primary keys
@@ -10,9 +12,7 @@ class CrewLeg < Sequel::Model(:'crew legs')
 
   delegate :employee_name, :to => :crew_name, :allow_nil => true 
 
-#### BEGIN GENERATED SECTION ####
-	set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
-
+  #### BEGIN GENERATED SECTION ####
 	column_alias :acm, :'acm'
 	column_alias :acm_fixed, :'acm fixed'
 	column_alias :appr_cat2, :'appr cat2'

data/lib/models/crew_trip.rb

@@ -1,9 +1,10 @@
 class CrewTrip < Sequel::Model(:'crew trips')
+  set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
+
   # Associations
   n_to_o :trip, :class=>:Trip, :prefix=>'trip'
 
 #### BEGIN GENERATED SECTION ####
-	set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
 
 	column_alias :all_legs, :'all legs'
 	column_alias :arrival_ap_count, :'arrival a/p count'

data/lib/models/group_cost.rb

@@ -1,9 +1,10 @@
 class GroupCost < Sequel::Model(:'group cost')
+  set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
+
   # One to many associations through composite keys
   o_to_n :costs, :class=>:OneCost, :prefix=>'group'
 
 #### BEGIN GENERATED SECTION ####
-	set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
 
 	column_alias :description, :'description'
 	column_alias :group_type, :'group type'

data/lib/models/one_cost.rb

@@ -1,9 +1,10 @@
 class OneCost < Sequel::Model(:'one cost')
+  set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
+
   # Code associations
   code_association :cost_type_value, :cost_type, :airport_cost
 
 #### BEGIN GENERATED SECTION ####
-	set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
 
 	column_alias :ac_type_lookup, :'ac type lookup'
 	column_alias :account_number, :'account number'

data/lib/models/passenger.rb

@@ -1,5 +1,6 @@
 class Passenger < Sequel::Model(:'passengers')
   # NOTE - Count of instances as of 06/01/2009 => 24917
+	set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
   
   # Many to one associations with composite primary keys
   n_to_o :additional_cost, :class=>:CostGroup, :prefix=>'addlcost'
@@ -22,7 +23,7 @@ class Passenger < Sequel::Model(:'passengers')
   column_view :birthday,    :date
 
 #### BEGIN GENERATED SECTION ####
-	set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
+
 
 	column_alias :ar_balance, :'ar balance'
 	column_alias :addlcost_kid_comm, :'addlcost kid - comm'

data/lib/models/quote.rb

@@ -1,4 +1,6 @@
 class Quote < Sequel::Model(:'quotes - original')
+	set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
+  
   # Many to one associations through composite keys
   n_to_o :trip, :class=>:Trip, :prefix=>'trip'
   n_to_o :requester, :class=>:Passenger, :prefix=>'pax'
@@ -18,7 +20,7 @@ class Quote < Sequel::Model(:'quotes - original')
   many_to_one :quote_history_comment, :class=>:Comment, :key=>nil, :dataset=>proc{Comment.filter( :kid_date=>kid_date, :kid_time=>kid_time, :kid_user=>kid_user, :kid_mult=>kid_mult, :kid_comm=>history_comment )}
   
   # One to many asociations with custom treatment
-  one_to_many :all_comments, :class=>:Comment, :dataset=>proc{Comment.filter( :kid_date=>kid_date, :kid_time=>kid_time, :kid_user=>kid_user, :kid_mult=>kid_mult, :kid_comm=>(kid_comm*10)..(kid_comm*10+9))}
+  one_to_many :all_comments, :key=>self.primary_key, :class=>:Comment, :dataset=>proc{Comment.filter( :kid_date=>kid_date, :kid_time=>kid_time, :kid_user=>kid_user, :kid_mult=>kid_mult, :kid_comm=>(kid_comm*10)..(kid_comm*10+9))}
 
   # Code associations
   code_association :purpose,          :trip_purpose,   :purpose
@@ -34,7 +36,7 @@ class Quote < Sequel::Model(:'quotes - original')
   column_def_datetime :quoted_date_time_gmt, :'kid - date', :'kid - time'
 
 #### BEGIN GENERATED SECTION ####
-	set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
+
 
 	column_alias :ac_cost_total, :'a/c cost total'
 	column_alias :ac_base_code, :'ac base code'

data/lib/models/quote_leg.rb

@@ -1,4 +1,5 @@
 class QuoteLeg < Sequel::Model(:'quote legs original')
+	set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
 
   many_to_one :leg_time, :class=>:LegTime, :key=>nil, :dataset=> proc {LegTime.filter(:'trip_number'=> trip_number, :leg_number=> leg_number)}
   n_to_o :quote, :class=>:Quote, :prefix => "quotes"
@@ -10,7 +11,6 @@ class QuoteLeg < Sequel::Model(:'quote legs original')
   code_association :regulation_code,   :regulation,        :certification
 
   #### BEGIN GENERATED SECTION ####
-	set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
 
 	column_alias :ac_cost_fixed, :'a/c cost fixed'
 	column_alias :ac_log_ac_hrs, :'a/c log a/c hrs'

data/lib/models/trip.rb

@@ -1,6 +1,7 @@
 class Trip < Sequel::Model(:'trips')
   # NOTE - Count of instances as of 06/01/2009 => 32927
-  
+	set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
+
   # Many to one associations with atomic primary keys
   many_to_one :aircraft, :class=>:Aircraft, :key=>:'aircraft id', :primary_key=>:'aircraft id'
   many_to_one :aircraft_type, :class=>:AircraftType, :key=>:'aircraft type id', :primary_key=>:'aircraft type id'
@@ -36,8 +37,8 @@ class Trip < Sequel::Model(:'trips')
   end
   
   # One to many associations with composite primary key (reverse lookup)
-  one_to_many :trip_passengers, :class=>:TripPassenger, :key=>nil, :dataset=>proc{TripPassenger.filter( :trip_kid_date=>self.kid_date, :trip_kid_time=>self.kid_time,:trip_kid_user=>self.kid_user,:trip_kid_comm=>self.kid_comm,:trip_kid_mult=>self.kid_mult)}
-  one_to_many :all_comments, :class=>:Comment, :dataset=>proc{Comment.filter( :kid_date=>kid_date, :kid_time=>kid_time, :kid_user=>kid_user, :kid_mult=>kid_mult, :kid_comm=>(kid_comm*10)..(kid_comm*10+9))}
+  one_to_many :trip_passengers, :class=>:TripPassenger, :key=>self.primary_key, :dataset=>proc{TripPassenger.filter( :trip_kid_date=>self.kid_date, :trip_kid_time=>self.kid_time,:trip_kid_user=>self.kid_user,:trip_kid_comm=>self.kid_comm,:trip_kid_mult=>self.kid_mult)}
+  one_to_many :all_comments, :class=>:Comment, :key=>self.primary_key, :dataset=>proc{Comment.filter( :kid_date=>kid_date, :kid_time=>kid_time, :kid_user=>kid_user, :kid_mult=>kid_mult, :kid_comm=>(kid_comm*10)..(kid_comm*10+9))}
  
   # Code associations
   code_association :department_value, :'department code', :department
@@ -56,7 +57,6 @@ class Trip < Sequel::Model(:'trips')
   column_view :kid_date, :date, :scheduled_date
 
 #### BEGIN GENERATED SECTION ####
-	set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
 
 	column_alias :ac_owner_code, :'ac owner code'
 	column_alias :ac_rest_type, :'ac rest type'

data/lib/models/trip_leg.rb

@@ -1,5 +1,6 @@
 class TripLeg < Sequel::Model(:'trip legs')
   # NOTE - Count of instances as of 06/01/2009 => 70630
+  set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
 
   # Many to one associations with atomic primary keys
   many_to_one :aircraft, :class=>:Aircraft, :key=>:'aircraft id', :primary_key=>:'aircraft id'
@@ -67,7 +68,6 @@ class TripLeg < Sequel::Model(:'trip legs')
 
 
 #### BEGIN GENERATED SECTION ####
-	set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
 
 	column_alias :ac_cost_fixed, :'a/c cost fixed'
 	column_alias :ac_log_ac_hrs, :'a/c log a/c hrs'
@@ -722,7 +722,7 @@ class TripLeg < Sequel::Model(:'trip legs')
 
   # sort on lead_pax value to lead pax = 1 is first and the lead_pax values of 0 are all after
   def passenger_list
-    return '' if trip__passengers.empty? or is_deadhead?
+    return '' if trip__passengers.blank? or is_deadhead?
     trip__passengers.sort_by{|tp| -tp.lead_pax}.collect do |tp|
       if (leg_number >= tp.departure_leg_number and leg_number <= tp.arrival_leg_number)
         tp.name + (tp.lead_pax==1 ? " (lead pax)" : '' )

data/lib/models/trip_passenger.rb

@@ -1,11 +1,12 @@
 class TripPassenger < Sequel::Model(:'trip passengers')
+	set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
+
   # Many to one relationships
   n_to_o :passenger, :class=>:Passenger, :prefix=>'pax'
   n_to_o :trip, :class=>:Trip, :prefix=>'trip'
 
 
 #### BEGIN GENERATED SECTION ####
-	set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
 
 	column_alias :apis_pax_num, :'apis pax num'
 	column_alias :additional_cost, :'additional cost'

data/lib/models/user_information.rb

@@ -1,9 +1,10 @@
 class User < Sequel::Model(:'user information')
+  set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
+
   # Associations
   one_to_many :locked_trip, :class=>:Trip, :key=>:'users initials', :primary_key=>:'locked by - user id'
 
 #### BEGIN GENERATED SECTION ####
-	set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
 
 	column_alias :ap_costs_fees, :'a/p costs && fees'
 	column_alias :ac_access_trip_list, :'ac access trip list'

data/lib/models/vendor_document.rb

@@ -1,4 +1,6 @@
 class VendorDocument < Sequel::Model(:'vendor documents')
+  set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
+
   # helper accessors for creating vendor document
   # filename_prefix helps set up the path to the document
   attr_accessor :doc_type_value, :file_name_prefix, :doc_type, :file_name
@@ -58,7 +60,6 @@ class VendorDocument < Sequel::Model(:'vendor documents')
 
 
   #### BEGIN GENERATED SECTION ####
-  set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
 
   column_alias :acct_number, :'acct number'
   column_alias :billed, :'billed'

data/lib/sequel/model_patch.rb

@@ -63,8 +63,9 @@ class Sequel::Model
       class_name = options[:class]
       prefix = options[:prefix]
       case assoc_type
-      when :one_to_many
-        key = primary_key
+      when :one_to_many                 
+        key = options[:key] || primary_key
+        primary_key = options[:primary_key] || key
         graph_conditions = { :"#{prefix} kid - date" => :'kid - date', :"#{prefix} kid - time" => :'kid - time', :"#{prefix} kid - user" => :'kid - user', :"#{prefix} kid - mult" => :'kid - mult', :"#{prefix} kid - comm" => :'kid - comm' }
         dataset_filter = proc { class_name.to_s.constantize.filter( :"#{prefix} kid - date"=>self[:'kid - date'], :"#{prefix} kid - time"=>self[:'kid - time'], :"#{prefix} kid - user"=>self[:'kid - user'], :"#{prefix} kid - mult"=>self[:'kid - mult'], :"#{prefix} kid - comm"=>self[:'kid - comm']) }
       when :many_to_one
@@ -73,7 +74,7 @@ class Sequel::Model
         dataset_filter = proc { class_name.to_s.constantize.filter( :"kid - date"=>self[:"#{prefix} kid - date"], :"kid - time"=>self[:"#{prefix} kid - time"], :"kid - user"=>self[:"#{prefix} kid - user"], :"kid - mult"=>self[:"#{prefix} kid - mult"], :"kid - comm"=>self[:"#{prefix} kid - comm"]) }
       end
       graph_conditions.merge!(options[:graph_only_conditions]) if options[:graph_only_conditions]
-      send(assoc_type, assoc_name, :key=> key, :class => class_name, :dataset=> dataset_filter, :graph_only_conditions=>graph_conditions)
+      send(assoc_type, assoc_name, :key=> key, :primary_key=>primary_key, :class => class_name, :dataset=> dataset_filter, :graph_only_conditions=>graph_conditions)
     end
 
     # for creating an association to the 'Codes' table

data/spec/models/quote.rb

@@ -0,0 +1,11 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe "quote associations" do
+  it "produces one costs" do
+    set_fos_db([Quote, QuoteLeg, GroupCost, OneCost])
+    @april_3_2009 = Date.parse('03/04/2009')
+    @confirmation_number = "33167"
+    @quote = Quote.filter( :confirmation_number=> @confirmation_number ).first
+    @quote.group_cost__costs.size.should == 2
+  end
+end

data/spec/models/trip_leg_spec.rb

@@ -34,21 +34,21 @@ describe TripLeg do
   end
 
   it "actual arrival date_time base are correctly calculating the tz offset" do
-    arr_date_act_gmt = Date.new(1900,1,2)
+    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,
                      :home_tz_gmt_offset => home_tz_gmt_offset)
-    tl.actual_arrival_date_time_base.should == DateTime.new(1900,1,2,16,40,0)
+    tl.actual_arrival_date_time_base.should == DateTime.new(1900, 1, 2, 16, 40, 0)
   end
 
   it "actual departure date_time base are correctly calculating the tz offset" do
-    dept_date_act_gmt = Date.new(1900,1,2)
+    dept_date_act_gmt = Date.new(1900, 1, 2)
     dept_time_act_gmt = 1420
     home_tz_gmt_offset = -70
     tl = TripLeg.new(:dept_date_act_gmt => dept_date_act_gmt.to_fos_days, :dept_time_act_gmt => dept_time_act_gmt,
                      :home_tz_gmt_offset=>home_tz_gmt_offset)
-    tl.actual_departure_date_time_base.should == DateTime.new(1900,1,2,16,40,0)
+    tl.actual_departure_date_time_base.should == DateTime.new(1900, 1, 2, 16, 40, 0)
   end
 
   it "should properly convert nautical miles to statute miles with 1 significant digit" do
@@ -71,30 +71,30 @@ describe TripLeg do
 
     it "when leg has no passengers" do
       mock(@t).passengers {[]}
-      tl = TripLeg.new(:trip_number=>100,:leg_number=>1, :trip=>@t)
+      tl = TripLeg.new(:trip_number=>100, :leg_number=>1, :trip=>@t)
       tl.passenger_list.should == ''
     end
 
-    it "when leg has no pax/deadhead" do
-      tl = TripLeg.new(:trip_number=>100,:leg_number=>1, :trip=>@t, :status=>1,:deadhead=>1)
-      tl.passenger_list.should == ''
-    end
+#    it "when leg has no pax/deadhead" do
+#      tl = TripLeg.new(:trip_number=>100,:leg_number=>1, :trip=>@t, :status=>1,:deadhead=>1)
+#      tl.passenger_list.should == ''
+#    end
 
     it "when leg has some in range ( and put lead pax name first )" do
       stub(@t).passengers {[@p1, @p2, @p3]}
-      tl = TripLeg.new(:trip_number=>100,:leg_number=>1, :trip=>@t)
+      tl = TripLeg.new(:trip_number=>100, :leg_number=>1, :trip=>@t)
       tl.passenger_list.should == "eric (lead pax) : rob"
     end
 
     it "when leg has 1 in range" do
       stub(@t).passengers {[@p1, @p2, @p3]}
-      tl = TripLeg.new(:trip_number=>100,:leg_number=>2, :trip=>@t)
+      tl = TripLeg.new(:trip_number=>100, :leg_number=>2, :trip=>@t)
       tl.passenger_list.should == "eric (lead pax)"
     end
 
     it "when leg has none in range" do
       stub(@t).passengers {[@p1, @p2, @p3]}
-      tl = TripLeg.new(:trip_number=>100,:leg_number=>3, :trip=>@t)
+      tl = TripLeg.new(:trip_number=>100, :leg_number=>3, :trip=>@t)
       tl.passenger_list.should == ""
     end
 
@@ -102,7 +102,8 @@ describe TripLeg do
 
   it "method total_trip_statute_miles returns a value" do
     @t = Trip.new(:total_statute_miles=>100)
-    tl = TripLeg.new(:trip_number=>100,:leg_number=>3, :trip=>@t)
+    tl = TripLeg.new(:trip_number=>100, :leg_number=>3, :trip=>@t)
     tl.total_trip_statute_miles.should == 10.0
   end
+
 end

data/spec/sequel/model_patch_spec.rb

@@ -328,6 +328,29 @@ describe "Sequel::Model extentions" do
 
     end
 
+    describe "work with real fos data" do
+      before :all do
+        set_fos_db([TripLeg, Trip, TripPassenger, CrewLeg, Aircraft, Code])
+        @trip_leg = TripLeg.first(:trip_number=>67506, :leg_number=>4)
+      end
+
+      it "many_to_one aircraft" do
+        @trip_leg.aircraft__tail_number.should == "N779XJ"
+      end
+
+      it "o_to_n crew_legs association works" do
+        [@trip_leg.pic,@trip_leg.sic].should == ['FORS','ALEB']
+      end
+
+      it "n_to_o trip association works" do
+        @trip_leg.trip.departure_date_gmt.should == 39873
+      end
+
+      it "trip to passenger_list association works" do
+        @trip_leg.passenger_list.should == "Mendelson, Victor (lead pax) : Mendelson, Laurans : Irwin, Thomas"
+      end
+    end
+
   end
 
 end

data/spec/spec_helper.rb

@@ -7,7 +7,7 @@ unless defined?(DB_DEMO)
   DB_DEMO = Sequel.odbc('demodata')#, :loggers=>[Logger.new($stdout)])
   DB_DEMO.extend(Sequel::Pervasive::DatabaseMethods)
                                                   
-  DB_FOS = Sequel.odbc('fos')#, :loggers=>[Logger.new($stdout)])
+  DB_FOS = Sequel.odbc('fos', :loggers=>[Logger.new($stdout)])
   DB_FOS.extend(Sequel::Pervasive::DatabaseMethods)
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fossil
 version: !ruby/object:Gem::Version 
-  version: 0.3.44
+  version: 0.3.45
 platform: ruby
 authors: 
 - Patrick Lardin, Daniel Sudol
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-23 00:00:00 -07:00
+date: 2010-04-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -170,6 +170,7 @@ files:
 - spec/helper_classes.rb
 - spec/helper_methods.rb
 - spec/models/code_spec.rb
+- spec/models/quote.rb
 - spec/models/trip_leg_spec.rb
 - spec/models/trip_spec.rb
 - spec/models/vendor_document_spec.rb
@@ -224,5 +225,6 @@ test_files:
 - spec/models/code_spec.rb
 - spec/models/trip_leg_spec.rb
 - spec/models/vendor_document_spec.rb
+- spec/models/quote.rb
 - spec/models/trip_spec.rb
 - spec/be_model_with_values_matcher.rb