fossil 0.3.33 → 0.3.34

data/VERSION

@@ -1 +1 @@
-0.3.33
+0.3.34

data/fossil.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fossil}
-  s.version = "0.3.33"
+  s.version = "0.3.34"
 
   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-03}
+  s.date = %q{2010-04-04}
   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_leg.rb

@@ -718,13 +718,14 @@ class TripLeg < Sequel::Model(:'trip legs')
     status==1 and (deadhead==1 or pax_count==0) and [107, 115, 108, 104].include? leg_type_code
   end
 
+  # 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?
-    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)" : '' )
+    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)" : '' )
       end
-    end.compact.join(' , ')
+    end.compact.join(' / ')
   end
 
   #### aliases and special methods #####

data/spec/models/trip_leg_spec.rb

@@ -2,9 +2,6 @@ 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)
     tl = TripLeg.new(:arrival_date_gmt=>dept_date_act_gmt.to_fos_days, :eta_gmt=>40,
@@ -38,9 +35,9 @@ describe TripLeg do
 
   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)
+      @p1 = TripPassenger.new(:name=>"dan",  :departure_leg_number=>0, :arrival_leg_number=>0,  :lead_pax=>0)
+      @p2 = TripPassenger.new(:name=>"rob",  :departure_leg_number=>1, :arrival_leg_number=>1,  :lead_pax=>0)
+      @p3 = TripPassenger.new(:name=>"eric", :departure_leg_number=>1, :arrival_leg_number=>2,  :lead_pax=>1)
       @t = Trip.new(:trip_number=>100)
     end
 
@@ -55,16 +52,16 @@ describe TripLeg do
       tl.passenger_list.should == ''
     end
 
-    it "when leg has some in range" do
+    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.passenger_list.should == "rob (lead pax) , eric"
+      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.passenger_list.should == "eric"
+      tl.passenger_list.should == "eric (lead pax)"
     end
 
     it "when leg has none in range" do
@@ -72,5 +69,6 @@ describe TripLeg do
       tl = TripLeg.new(:trip_number=>100,:leg_number=>3, :trip=>@t)
       tl.passenger_list.should == ""
     end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fossil
 version: !ruby/object:Gem::Version 
-  version: 0.3.33
+  version: 0.3.34
 platform: ruby
 authors: 
 - Patrick Lardin, Daniel Sudol
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-03 00:00:00 -07:00
+date: 2010-04-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency