fossil 0.3.33 → 0.3.34
Sign up to get free protection for your applications and to get access to all the features.
- data/VERSION +1 -1
- data/fossil.gemspec +2 -2
- data/lib/models/trip_leg.rb +5 -4
- data/spec/models/trip_leg_spec.rb +7 -9
- metadata +2 -2
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.3.
|
1
|
+
0.3.34
|
data/fossil.gemspec
CHANGED
@@ -5,11 +5,11 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = %q{fossil}
|
8
|
-
s.version = "0.3.
|
8
|
+
s.version = "0.3.34"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["Patrick Lardin, Daniel Sudol"]
|
12
|
-
s.date = %q{2010-04-
|
12
|
+
s.date = %q{2010-04-04}
|
13
13
|
s.description = %q{Access FOS/betrieve db with this Sequel based orm wrapper}
|
14
14
|
s.email = %q{plardin@xojet.com}
|
15
15
|
s.files = [
|
data/lib/models/trip_leg.rb
CHANGED
@@ -718,13 +718,14 @@ class TripLeg < Sequel::Model(:'trip legs')
|
|
718
718
|
status==1 and (deadhead==1 or pax_count==0) and [107, 115, 108, 104].include? leg_type_code
|
719
719
|
end
|
720
720
|
|
721
|
+
# sort on lead_pax value to lead pax = 1 is first and the lead_pax values of 0 are all after
|
721
722
|
def passenger_list
|
722
723
|
return '' if trip__passengers.empty? or is_deadhead?
|
723
|
-
trip__passengers.collect do |
|
724
|
-
if (leg_number >=
|
725
|
-
|
724
|
+
trip__passengers.sort_by{|tp| -tp.lead_pax}.collect do |tp|
|
725
|
+
if (leg_number >= tp.departure_leg_number and leg_number <= tp.arrival_leg_number)
|
726
|
+
tp.name + (tp.lead_pax==1 ? " (lead pax)" : '' )
|
726
727
|
end
|
727
|
-
end.compact.join('
|
728
|
+
end.compact.join(' / ')
|
728
729
|
end
|
729
730
|
|
730
731
|
#### aliases and special methods #####
|
@@ -2,9 +2,6 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
|
|
2
2
|
|
3
3
|
describe TripLeg do
|
4
4
|
|
5
|
-
before do
|
6
|
-
end
|
7
|
-
|
8
5
|
it "ebt_time method produces correct Time with minutes" do
|
9
6
|
dept_date_act_gmt = Date.new(2000, 1, 1)
|
10
7
|
tl = TripLeg.new(:arrival_date_gmt=>dept_date_act_gmt.to_fos_days, :eta_gmt=>40,
|
@@ -38,9 +35,9 @@ describe TripLeg do
|
|
38
35
|
|
39
36
|
describe "should find correct passenger list" do
|
40
37
|
before :each do
|
41
|
-
@p1 = TripPassenger.new(:name=>"dan",
|
42
|
-
@p2 = TripPassenger.new(:name=>"rob",
|
43
|
-
@p3 = TripPassenger.new(:name=>"eric", :departure_leg_number=>1, :arrival_leg_number=>2)
|
38
|
+
@p1 = TripPassenger.new(:name=>"dan", :departure_leg_number=>0, :arrival_leg_number=>0, :lead_pax=>0)
|
39
|
+
@p2 = TripPassenger.new(:name=>"rob", :departure_leg_number=>1, :arrival_leg_number=>1, :lead_pax=>0)
|
40
|
+
@p3 = TripPassenger.new(:name=>"eric", :departure_leg_number=>1, :arrival_leg_number=>2, :lead_pax=>1)
|
44
41
|
@t = Trip.new(:trip_number=>100)
|
45
42
|
end
|
46
43
|
|
@@ -55,16 +52,16 @@ describe TripLeg do
|
|
55
52
|
tl.passenger_list.should == ''
|
56
53
|
end
|
57
54
|
|
58
|
-
it "when leg has some in range" do
|
55
|
+
it "when leg has some in range ( and put lead pax name first )" do
|
59
56
|
stub(@t).passengers {[@p1, @p2, @p3]}
|
60
57
|
tl = TripLeg.new(:trip_number=>100,:leg_number=>1, :trip=>@t)
|
61
|
-
tl.passenger_list.should == "
|
58
|
+
tl.passenger_list.should == "eric (lead pax) / rob"
|
62
59
|
end
|
63
60
|
|
64
61
|
it "when leg has 1 in range" do
|
65
62
|
stub(@t).passengers {[@p1, @p2, @p3]}
|
66
63
|
tl = TripLeg.new(:trip_number=>100,:leg_number=>2, :trip=>@t)
|
67
|
-
tl.passenger_list.should == "eric"
|
64
|
+
tl.passenger_list.should == "eric (lead pax)"
|
68
65
|
end
|
69
66
|
|
70
67
|
it "when leg has none in range" do
|
@@ -72,5 +69,6 @@ describe TripLeg do
|
|
72
69
|
tl = TripLeg.new(:trip_number=>100,:leg_number=>3, :trip=>@t)
|
73
70
|
tl.passenger_list.should == ""
|
74
71
|
end
|
72
|
+
|
75
73
|
end
|
76
74
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: fossil
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.3.
|
4
|
+
version: 0.3.34
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Patrick Lardin, Daniel Sudol
|
@@ -9,7 +9,7 @@ autorequire:
|
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
11
|
|
12
|
-
date: 2010-04-
|
12
|
+
date: 2010-04-04 00:00:00 -07:00
|
13
13
|
default_executable:
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|