fossil 0.4.22 → 0.4.23

data/VERSION

@@ -1 +1 @@
-0.4.22
+0.4.23

data/fossil.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fossil}
-  s.version = "0.4.22"
+  s.version = "0.4.23"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Patrick Lardin, Daniel Sudol"]

data/lib/models/trip_leg.rb

@@ -45,17 +45,15 @@ class TripLeg < Sequel::Model(:'trip legs')
 
   many_to_one :departure_airport, :class=>:Airport, :key=>nil, :dataset=>
     proc {
-      if !arrival_icao.blank?
-        Airport.filter(:'icao'=> arrival_icao)
-      elsif !arrival_airport_id.blank? and !arrival_ap_prefix.blank?
-        Airport.filter(:'airport id prefix'.like("%#{arrival_ap_prefix}"), :'airport id'.like("%#{arrival_airport_id}"))
+      if !departure_icao.blank?
+        Airport.filter(:'icao'=> departure_icao)
+      elsif !depart_airport_id.blank? and !depart_ap_prefix.blank?
+        Airport.filter(:'airport id prefix'.like("%#{depart_ap_prefix}"), :'airport id'.like("%#{depart_airport_id}"))
       else
         Airport.filter(:'icao'=>'FAKE').limit(1)
       end
     }
 
-  many_to_one :departure_airport, :class=>:Airport, :key=>:departure_icao, :primary_key=>:icao #:key=>nil, :dataset=>proc{ ref_method = self[:'depart-icao/iata/id']; case ref_method; when 1 then Airport.filter(:'icao'=>self[:'departure icao']); when 2 then Airport.filter(:'iata'=>self[:'departure iata']); else Airport.filter(:'airport id prefix'.like("%#{self[:'depart a/p prefix']}"), :'airport id'.like("%#{self[:'depart airport id']}")); end }
-
   many_to_one :departure_fuel_vendor, :class=>:Vendor, :key=>:dep_fuel_vendor, :primary_key=>:'vendor id'
   many_to_one :arrival_fuel_vendor, :class=>:Vendor, :key=>:arr_fuel_vendor, :primary_key=>:'vendor id'
 

data/spec/models/trip_leg_spec.rb

@@ -7,16 +7,6 @@ describe TripLeg do
       set_fos_db([Airport])
     end
 
-    it "when there is no arrival_icao" do
-      trip_leg = TripLeg.new(:arrival_icao=>'')
-      trip_leg.arrival_airport.should == nil
-    end
-
-    it "when there is no arrival_ap_prefix or arrival_airport_id" do
-      trip_leg = TripLeg.new(:arrival_icao=>'', :arrival_ap_prefix=>'', :arrival_airport_id=>'')
-      trip_leg.arrival_airport.should == nil
-    end
-
     it "when there is an arrival_icao" do
       trip_leg = TripLeg.new(:arrival_icao=>'KSFO')
       trip_leg.arrival_airport.should_not == nil
@@ -26,13 +16,11 @@ describe TripLeg do
       trip_leg = TripLeg.new(:arrival_icao=>'', :arrival_ap_prefix=>'K', :arrival_airport_id=>'SFO')
       trip_leg.arrival_airport.should_not == nil
     end
-  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,
-                     :dept_date_gmt=>dept_date_act_gmt.to_fos_days, :etd_gmt=>20)
-    tl.ebt_time.should == Time.from_minutes(20)
+    it "when there is no arrival_ap_prefix or arrival_airport_id" do
+      trip_leg = TripLeg.new(:arrival_icao=>'', :arrival_ap_prefix=>'', :arrival_airport_id=>'')
+      trip_leg.arrival_airport.should == nil
+    end
   end
 
   describe "departure_airport assoc works" do
@@ -40,25 +28,27 @@ describe TripLeg do
       set_fos_db([Airport])
     end
 
-    it "when there is no arrival_icao" do
-      trip_leg = TripLeg.new(:arrival_icao=>'')
-      trip_leg.arrival_airport.should == nil
+    it "when there is an departure_icao" do
+      trip_leg = TripLeg.new(:departure_icao=>'KSFO')
+      trip_leg.departure_airport.should_not == nil
     end
 
-    it "when there is no arrival_ap_prefix or arrival_airport_id" do
-      trip_leg = TripLeg.new(:arrival_icao=>'', :arrival_ap_prefix=>'', :arrival_airport_id=>'')
-      trip_leg.arrival_airport.should == nil
+    it "when there is no departure_icao but there is depart_ap_prefix and depart_airport_id" do
+      trip_leg = TripLeg.new(:departure_icao=>'', :depart_ap_prefix=>'K', :depart_airport_id=>'SFO')
+      trip_leg.departure_airport.should_not == nil
     end
 
-    it "when there is an arrival_icao" do
-      trip_leg = TripLeg.new(:arrival_icao=>'KSFO')
-      trip_leg.arrival_airport.should_not == nil
+    it "when there is no departure_icao or arrival_ap_prefix or arrival_airport_id" do
+      trip_leg = TripLeg.new(:departure_icao=>'', :depart_ap_prefix=>'', :depart_airport_id=>'')
+      trip_leg.departure_airport.should == nil
     end
+  end
 
-    it "when there is no arrival_icao but there is arrival_ap_prefix and arrival_airport_id" do
-      trip_leg = TripLeg.new(:arrival_icao=>'', :arrival_ap_prefix=>'K', :arrival_airport_id=>'SFO')
-      trip_leg.arrival_airport.should_not == nil
-    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,
+                     :dept_date_gmt=>dept_date_act_gmt.to_fos_days, :etd_gmt=>20)
+    tl.ebt_time.should == Time.from_minutes(20)
   end
 
   it "ebt_time method produces correct Time with minutes" do
@@ -122,14 +112,14 @@ 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,  :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)
+      @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
 
     it "when leg has no passengers" do
-      mock(@t).passengers {[]}
+      mock(@t).passengers { [] }
       tl = TripLeg.new(:trip_number=>100, :leg_number=>1, :trip=>@t)
       tl.passenger_list.should == ''
     end
@@ -140,19 +130,19 @@ describe TripLeg do
 ##    end
 
     it "when leg has some in range ( and put lead pax name first )" do
-      stub(@t).passengers {[@p1, @p2, @p3]}
+      stub(@t).passengers { [@p1, @p2, @p3] }
       tl = TripLeg.new(:trip_number=>100, :leg_number=>1, :verify_date=>0, :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]}
+      stub(@t).passengers { [@p1, @p2, @p3] }
       tl = TripLeg.new(:trip_number=>100, :leg_number=>2, :verify_date=>0, :trip=>@t)
       tl.passenger_list.should == "eric (lead pax)"
     end
 
     it "when leg has none in range" do
-      stub(@t).passengers {[@p1, @p2, @p3]}
+      stub(@t).passengers { [@p1, @p2, @p3] }
       tl = TripLeg.new(:trip_number=>100, :leg_number=>3, :verify_date=>0, :trip=>@t)
       tl.passenger_list.should == ""
     end
@@ -167,8 +157,8 @@ describe TripLeg do
 
   describe 'crew brief fields' do
     before :all do
-      set_fos_db([TripLeg,Comment])
-      @trip_leg = TripLeg.first(:trip_number=>50885,:leg_number=>1)
+      set_fos_db([TripLeg, Comment])
+      @trip_leg = TripLeg.first(:trip_number=>50885, :leg_number=>1)
 #      @trip_leg = TripLeg.first(:trip_number=>76478,:leg_number=>1)
 #      @trip_leg = TripLeg.first(~:fueler_comment=>0,~:catering_comment=>0,~:limo_comment=>0)
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 22
-  version: 0.4.22
+  - 23
+  version: 0.4.23
 platform: ruby
 authors: 
 - Patrick Lardin, Daniel Sudol