fossil 0.3.32 → 0.3.33

data/VERSION

@@ -1 +1 @@
-0.3.32
+0.3.33

data/fossil.gemspec

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

data/lib/models/trip.rb

@@ -40,16 +40,16 @@ class Trip < Sequel::Model(:'trips')
   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))}
  
   # Code associations
-  code_association :department, :'department code', :department
-  code_association :company, :'company code', :company
-  code_association :division, :'division code', :division
-  code_association :purpose, :'purpose code', :purpose
+  code_association :department_value, :'department code', :department
+  code_association :company_value, :'company code', :company
+  code_association :division_value, :'division code', :division
+  code_association :purpose_value, :'purpose code', :purpose
   code_association :trip_type_value, :'trip type code', :trip_type
-  code_association :rate_type, :'rate type code', :aircraft_rate
-  code_association :base, :'base code', :location
+  code_association :rate_type_value, :'rate type code', :aircraft_rate
+  code_association :base_value, :'base code', :location
   code_association :cancellation_code, :'cancel code', :cancellation_code
   code_association :passenger_rate, :'pax rate', :passenger_rate
-  code_association :approval_code, :'approval_code', :trip_approval
+  code_association :approval_value, :'approval_code', :trip_approval
   code_association :special_qualification, :'specialqualification', :special_qualification
 
 #### BEGIN GENERATED SECTION ####
@@ -267,10 +267,4 @@ class Trip < Sequel::Model(:'trips')
 	column_alias :reserved_3, :'reserved 3'
 #### END GENERATED SECTION ####
 
-  def passenger_list
-    return '' unless passengers
-    pax_list = passengers.collect{|v| (v.lead_pax==1 ? "Lead Pax " : '' ) + v.name}.uniq
-    pax_list ? pax_list.join(" : ") : ''
-  end
-
 end

data/lib/models/trip_leg.rb

@@ -626,7 +626,6 @@ class TripLeg < Sequel::Model(:'trip legs')
 
   # delegators
   delegate :lead_pax,           :to => :trip
-  delegate :passenger_list,     :to => :trip
 
   # Column views
   column_view   :dept_date_act_gmt,     :date,  :actual_departure_date_gmt
@@ -715,6 +714,19 @@ class TripLeg < Sequel::Model(:'trip legs')
     Time.from_minutes(minutes_between)
   end
 
+  def is_deadhead?
+    status==1 and (deadhead==1 or pax_count==0) and [107, 115, 108, 104].include? leg_type_code
+  end
+
+  def passenger_list
+    return '' if trip__passengers.empty? or is_deadhead?
+    trip__passengers.collect do |p|
+      if (leg_number >= p.departure_leg_number and leg_number <= p.arrival_leg_number)
+        p.name + (p.lead_pax==1 ? " (lead pax)" : '' )
+      end
+    end.compact.join(' , ')
+  end
+
   #### aliases and special methods #####
   # This method guarantees an icao for a view that needs one. If there is an icao, use it, otherwise make
   # it from the prefix and airport_id .. which works as an icao, but beware, because these put together

data/spec/models/trip_leg_spec.rb

@@ -1,39 +1,76 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe TripLeg do
-  
+
   before do
   end
 
   it "ebt_time method produces correct Time with minutes" do
-    dept_date_act_gmt = Date.new(2000,1,1)
+    dept_date_act_gmt = Date.new(2000, 1, 1)
     tl = TripLeg.new(:arrival_date_gmt=>dept_date_act_gmt.to_fos_days, :eta_gmt=>40,
                      :dept_date_gmt=>dept_date_act_gmt.to_fos_days, :etd_gmt=>20)
     tl.ebt_time.should == Time.from_minutes(20)
   end
 
   it "actual take off date_time dates are after dept_date_act_gmt if take off time is less than depart time" do
-    dept_date_act_gmt = Date.new(1900,1,1)
-    tl = TripLeg.new(:dept_date_act_gmt=>dept_date_act_gmt.to_fos_days,:t_o_time_act_gmt=>20,:dept_time_act_gmt=>1420)
-    tl.actual_takeoff_date_time_gmt.should == DateTime.new(1900,1,2,0,20,0)
+    dept_date_act_gmt = Date.new(1900, 1, 1)
+    tl = TripLeg.new(:dept_date_act_gmt=>dept_date_act_gmt.to_fos_days, :t_o_time_act_gmt=>20, :dept_time_act_gmt=>1420)
+    tl.actual_takeoff_date_time_gmt.should == DateTime.new(1900, 1, 2, 0, 20, 0)
   end
 
- it "actual take off date_time dates are the same as dept_date_act_gmt if take off time is not less than depart time" do
-    dept_date_act_gmt = Date.new(1900,1,1)
-    tl = TripLeg.new(:dept_date_act_gmt=>dept_date_act_gmt.to_fos_days,:t_o_time_act_gmt=>40,:dept_time_act_gmt=>20)
-    tl.actual_takeoff_date_time_gmt.should == DateTime.new(1900,1,1,0,40,0)
- end
+  it "actual take off date_time dates are the same as dept_date_act_gmt if take off time is not less than depart time" do
+    dept_date_act_gmt = Date.new(1900, 1, 1)
+    tl = TripLeg.new(:dept_date_act_gmt=>dept_date_act_gmt.to_fos_days, :t_o_time_act_gmt=>40, :dept_time_act_gmt=>20)
+    tl.actual_takeoff_date_time_gmt.should == DateTime.new(1900, 1, 1, 0, 40, 0)
+  end
 
   it "actual landing date_time dates are before arr_date_act_gmt if on time time is greater than landing time" do
-    arr_date_act_gmt = Date.new(1900,1,2)
-    tl = TripLeg.new(:arrival_date_gmt=>arr_date_act_gmt.to_fos_days,:land_time_act_gmt=>1420,:arriv_time_act_gmt=>20)
-    tl.actual_land_date_time_gmt.should == DateTime.new(1900,1,1,23,40,0)
+    arr_date_act_gmt = Date.new(1900, 1, 2)
+    tl = TripLeg.new(:arrival_date_gmt=>arr_date_act_gmt.to_fos_days, :land_time_act_gmt=>1420, :arriv_time_act_gmt=>20)
+    tl.actual_land_date_time_gmt.should == DateTime.new(1900, 1, 1, 23, 40, 0)
   end
 
   it "actual landing date_time dates are the same as arr_date_act_gmt if on time time is not greater than landing time" do
-    arr_date_act_gmt = Date.new(1900,1,2)
-    tl = TripLeg.new(:arrival_date_gmt=>arr_date_act_gmt.to_fos_days,:land_time_act_gmt=>20,:arriv_time_act_gmt=>40)
-    tl.actual_land_date_time_gmt.should == DateTime.new(1900,1,2,0,20,0)
+    arr_date_act_gmt = Date.new(1900, 1, 2)
+    tl = TripLeg.new(:arrival_date_gmt=>arr_date_act_gmt.to_fos_days, :land_time_act_gmt=>20, :arriv_time_act_gmt=>40)
+    tl.actual_land_date_time_gmt.should == DateTime.new(1900, 1, 2, 0, 20, 0)
   end
 
+  describe "should find correct passenger list" do
+    before :each do
+      @p1 = TripPassenger.new(:name=>"dan", :departure_leg_number=>0, :arrival_leg_number=>0)
+      @p2 = TripPassenger.new(:name=>"rob", :lead_pax=>1, :departure_leg_number=>1, :arrival_leg_number=>1)
+      @p3 = TripPassenger.new(:name=>"eric", :departure_leg_number=>1, :arrival_leg_number=>2)
+      @t = Trip.new(:trip_number=>100)
+    end
+
+    it "when leg has no passengers" do
+      mock(@t).passengers {[]}
+      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 some in range" do
+      stub(@t).passengers {[@p1, @p2, @p3]}
+      tl = TripLeg.new(:trip_number=>100,:leg_number=>1, :trip=>@t)
+      tl.passenger_list.should == "rob (lead pax) , eric"
+    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.passenger_list.should == "eric"
+    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.passenger_list.should == ""
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -4,10 +4,10 @@ require 'rr'
 require 'pp'
 
 unless defined?(DB_DEMO)
-  DB_DEMO = Sequel.odbc('demodatadev')#, :loggers=>[Logger.new($stdout)])
+  DB_DEMO = Sequel.odbc('demodata')#, :loggers=>[Logger.new($stdout)])
   DB_DEMO.extend(Sequel::Pervasive::DatabaseMethods)
                                                   
-  DB_FOS = Sequel.odbc('fosdev')#, :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.32
+  version: 0.3.33
 platform: ruby
 authors: 
 - Patrick Lardin, Daniel Sudol
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-01 00:00:00 -07:00
+date: 2010-04-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency