fossil 0.4.20 → 0.4.22

data/VERSION

@@ -1 +1 @@
-0.4.20
+0.4.22

data/fossil.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fossil}
-  s.version = "0.4.20"
+  s.version = "0.4.22"
 
   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

@@ -36,14 +36,32 @@ class TripLeg < Sequel::Model(:'trip legs')
     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}"))
       else
+        Airport.filter(:'icao'=>'FAKE').limit(1)
+      end
+    }
+
+  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}"))
+      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'
+
   many_to_one :alternate_arrival_airport, :class=>:Airport, :key=>nil, :dataset=>proc{ Airport.filter(:'airport id prefix'.like("%#{self[:'arr alt prefix']}"), :'airport id'.like( "%#{self[:'arr alt id']}"))}
   many_to_one :alternate_departure_airport, :class=>:Airport, :key=>nil, :dataset=>proc{ Airport.filter(:'airport id prefix'.like("%#{self[:'dep alt prefix']}"), :'airport id'.like( "%#{self[:'dep alt id']}"))}
+
   many_to_one :departure_fbo_comment_value, :class=>:Comment, :key=>nil, :dataset=>proc { Comment.filter( :"kid - date"=>self[:"kid - date"], :"kid - time"=>self[:"kid - time"], :"kid - user"=>self[:"kid - user"], :"kid - mult"=>self[:"kid - mult"], :"kid - comm"=>43) }
   many_to_one :arrival_fbo_comment_value, :class=>:Comment, :key=>nil, :dataset=>proc { Comment.filter( :"kid - date"=>self[:"kid - date"], :"kid - time"=>self[:"kid - time"], :"kid - user"=>self[:"kid - user"], :"kid - mult"=>self[:"kid - mult"], :"kid - comm"=>34) }
   many_to_one :departure_catering_comment, :class=>:Comment, :key=>nil, :dataset=>proc { Comment.filter( :"kid - date"=>self[:"kid - date"], :"kid - time"=>self[:"kid - time"], :"kid - user"=>self[:"kid - user"], :"kid - mult"=>self[:"kid - mult"], :"kid - comm"=>37) }

data/spec/models/trip_leg_spec.rb

@@ -2,6 +2,65 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe TripLeg do
 
+  describe "arrival_airport assoc works" do
+    before :all 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
+    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
+  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
+
+  describe "departure_airport assoc works" do
+    before :all 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
+    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
+  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,

metadata

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