fossil 0.4.26 → 0.5.0

data/lib/sequel/metaprogramming.rb

@@ -1,8 +1,27 @@
-module Sequel
-  module Metaprogramming
-    # Defines an class method within a class
-    def inst_def name, &blk
-      instance_eval { define_method name, &blk }
-    end
+# why the lucky stiff's helper for making metaclasses
+# easily available and usable
+class Object
+  # The hidden singleton lurks behind everyone
+  def metaclass; class << self; self; end; end
+  def meta_eval &blk; metaclass.class_eval &blk; end
+
+  # Adds methods to a metaclass
+  def meta_def name, &blk
+    meta_eval { define_method name, &blk }
+  end
+
+  def inst_def name, &blk
+    define_method name, &blk
+  end
+
+  # Defines an instance method within a class
+  def class_def name, &blk
+    class_eval { define_method name, &blk }
+  end
+
+  # Defines an class method within a class
+  def inst_def name, &blk
+    instance_eval { define_method name, &blk }
   end
 end
+

data/lib/sequel/model_patch.rb

@@ -135,7 +135,7 @@ class Sequel::Model
       inst_def datetime_column_name do
         days = send(:[], date_column) || 0     # nil defaults to 0 days
         minutes = send(:[], time_column) || 0  # nil defaults to 0 minutes
-        DateTime.from_fos_date_time(days, minutes) # returns utc time
+        DateTime.from_fos_date_time(days, minutes) # returns utc datetime
       end
     end
 
@@ -250,14 +250,14 @@ class Sequel::Model
         inst_def method_view_name do
           column_value = send(column_name)
           return nil unless column_value
-          Date.from_fos_days(column_value).to_s(:mdy)
+          Date.from_fos_days(column_value).strftime('%m/%d/%Y')
         end
         method_view_name = method_name.to_s + "_view_mdy_ipc"
         # method that returns the column value as a Date in mdy format
         inst_def method_view_name do
           column_value = send(column_name)
           return nil unless column_value
-          date_str = Date.from_fos_days(column_value).to_s(:mdy)
+          date_str = Date.from_fos_days(column_value).strftime('%m/%d/%Y')
           date_str.slice!(3) if date_str[3] == 48 # if the fourth char is 0 ( ascii value 48 ) remove it
           date_str.slice!(0) if date_str[0] == 48 # if the first char is 0 ( ascii value 48 ) remove it
           date_str

data/lib/sequel/pervasive_adapter.rb

@@ -96,7 +96,7 @@ module Sequel
         when :date then
           Date.from_fos_days(v.to_i)
         when :time then
-          Date.from_fos_days(0).to_time.utc + v.to_i.minutes
+          DateTime.from_fos_date_time(0,v.to_i)
         else
           v = v.unpack('A*')[0] if v.is_a? String
           super(v)

data/lib/sequel/serializer/json_serializer.rb

@@ -1,7 +1,7 @@
 module Sequel
   module Serialization
     def self.included(base)
-      base.cattr_accessor :include_root_in_json, :instance_writer => false
+#      base.cattr_accessor :include_root_in_json, :instance_writer => false
       base.extend ClassMethods
     end
 
@@ -72,11 +72,12 @@ module Sequel
     #                   {"comments": [{"body": "Don't think too hard"}],
     #                    "title": "So I was thinking"}]}
     def to_json(options = {})
-      if include_root_in_json
-        "{#{self.class.json_class_name}: #{JsonSerializer.new(self, options).to_s}}"
-      else
-        JsonSerializer.new(self, options).to_s
-      end
+
+#      if include_root_in_json
+#        "{#{self.class.json_class_name}: #{JsonSerializer.new(self, options).to_s}}"
+#      else
+      JsonSerializer.new(self, options).to_s
+#      end
     end
 
     # special to_fos_json .. adds the only=> [] option by default, because we are using
@@ -88,10 +89,10 @@ module Sequel
       to_json(options)
     end
 
-    def from_json(json)
-      self.attributes = ActiveSupport::JSON.decode(json)
-      self
-    end
+#    def from_json(json)
+#      self.attributes = ActiveSupport::JSON.decode(json)
+#      self
+#    end
 
     class JsonSerializer < Sequel::Serialization::Serializer #:nodoc:
       def serialize
@@ -107,26 +108,18 @@ module Sequel
   end
 end
 
-module ActiveSupport #:nodoc:
-  module CoreExtensions #:nodoc:
-    module Array #:nodoc:
-      module Conversions
-        def to_fos_json(options = {})
-          to_json({:only=>[]}.merge(options))
-        end
-      end
+class Array #:nodoc:
+  def to_fos_json(options = {})
+    if first.is_a? Sequel::Model
+      collect{ |model| model.fill_hash(options[:methods]) }.to_json
+    else
+      to_json
     end
   end
 end
 
-module ActiveSupport #:nodoc:
-  module CoreExtensions #:nodoc:
-    module Hash #:nodoc:
-      module Conversions
-        def to_fos_json(options = {})
-          to_json({:only=>[]}.merge(options))
-        end
-      end
-    end
+class Hash #:nodoc:
+  def to_fos_json(options = {})
+    to_json({:only=>[]}.merge(options))
   end
 end

data/lib/sequel/serializer/serializer.rb

@@ -1,4 +1,4 @@
-#require 'active_support/json'
+require 'builder'
 
 module Sequel
   module Serialization
@@ -67,16 +67,16 @@ module Sequel
       end
 
       def serializable_record
-        returning(serializable_record = {}) do
-          serializable_names.each { |name| serializable_record[name] = @record.send(name) }
-          add_includes do |association, records, opts|
-            if records.is_a?(Enumerable)
-              serializable_record[association] = records.collect { |r| self.class.new(r, opts).serializable_record }
-            else
-              serializable_record[association] = self.class.new(records, opts).serializable_record
-            end
+        serializable_record = {}
+        serializable_names.each { |name| serializable_record[name] = @record.send(name) }
+        add_includes do |association, records, opts|
+          if records.is_a?(Enumerable)
+            serializable_record[association] = records.collect { |r| self.class.new(r, opts).serializable_record }
+          else
+            serializable_record[association] = self.class.new(records, opts).serializable_record
           end
         end
+        serializable_record
       end
 
       def serialize

data/lib/sequel/serializer/xml_serializer.rb

@@ -229,7 +229,6 @@ module Sequel #:nodoc:
     end
 
     def add_tag(attribute)
-#      p "add_tag #{attribute} attribute.name=#{attribute.name} options=#{options}  options[:skip_types]=#{options[:skip_types]}"
       builder.tag!(
         reformat_name(attribute.name),
         attribute.value.to_s,
@@ -285,14 +284,9 @@ module Sequel #:nodoc:
         options[:procs] = procs
         add_procs
         yield builder if block_given?
-#        strip_associations if options[:flatten]
       end
     end
 
-#    def strip_associations
-#      p @tag_names
-#    end
-
     class Attribute #:nodoc:
       attr_reader :name, :value, :type
 
@@ -369,26 +363,121 @@ module Sequel #:nodoc:
   end
 end
 
-module ActiveSupport #:nodoc:
-  module CoreExtensions #:nodoc:
-    module Array #:nodoc:
-      module Conversions
-        def to_fos_xml(options = {})
-          to_xml({:skip_instruct=>true, :skip_types=>true, :dasherize=>false, :only=>[]}.merge(options))
-        end
-      end
+class Array
+  # Returns a string that represents this array in XML by sending +to_xml+
+  # to each element. Active Record collections delegate their representation
+  # in XML to this method.
+  #
+  # All elements are expected to respond to +to_xml+, if any of them does
+  # not an exception is raised.
+  #
+  # The root node reflects the class name of the first element in plural
+  # if all elements belong to the same type and that's not Hash:
+  #
+  #   customer.projects.to_xml
+  #
+  #   <?xml version="1.0" encoding="UTF-8"?>
+  #   <projects type="array">
+  #     <project>
+  #       <amount type="decimal">20000.0</amount>
+  #       <customer-id type="integer">1567</customer-id>
+  #       <deal-date type="date">2008-04-09</deal-date>
+  #       ...
+  #     </project>
+  #     <project>
+  #       <amount type="decimal">57230.0</amount>
+  #       <customer-id type="integer">1567</customer-id>
+  #       <deal-date type="date">2008-04-15</deal-date>
+  #       ...
+  #     </project>
+  #   </projects>
+  #
+  # Otherwise the root element is "records":
+  #
+  #   [{:foo => 1, :bar => 2}, {:baz => 3}].to_xml
+  #
+  #   <?xml version="1.0" encoding="UTF-8"?>
+  #   <records type="array">
+  #     <record>
+  #       <bar type="integer">2</bar>
+  #       <foo type="integer">1</foo>
+  #     </record>
+  #     <record>
+  #       <baz type="integer">3</baz>
+  #     </record>
+  #   </records>
+  #
+  # If the collection is empty the root element is "nil-classes" by default:
+  #
+  #   [].to_xml
+  #
+  #   <?xml version="1.0" encoding="UTF-8"?>
+  #   <nil-classes type="array"/>
+  #
+  # To ensure a meaningful root element use the <tt>:root</tt> option:
+  #
+  #   customer_with_no_projects.projects.to_xml(:root => "projects")
+  #
+  #   <?xml version="1.0" encoding="UTF-8"?>
+  #   <projects type="array"/>
+  #
+  # By default root children have as node name the one of the root
+  # singularized. You can change it with the <tt>:children</tt> option.
+  #
+  # The +options+ hash is passed downwards:
+  #
+  #   Message.all.to_xml(:skip_types => true)
+  #
+  #   <?xml version="1.0" encoding="UTF-8"?>
+  #   <messages>
+  #     <message>
+  #       <created-at>2008-03-07T09:58:18+01:00</created-at>
+  #       <id>1</id>
+  #       <name>1</name>
+  #       <updated-at>2008-03-07T09:58:18+01:00</updated-at>
+  #       <user-id>1</user-id>
+  #     </message>
+  #   </messages>
+  #
+  def to_xml(options = {})
+    raise "Not all elements respond to to_xml" unless all? { |e| e.respond_to? :to_xml }
+    require 'builder' unless defined?(Builder)
+
+    options = options.dup
+    options[:root]     ||= all? { |e| e.is_a?(first.class) && first.class.to_s != "Hash" } ? first.class.name.underscore.pluralize.tr('/', '_') : "records"
+    options[:children] ||= options[:root].singularize
+    options[:indent]   ||= 2
+    options[:builder]  ||= Builder::XmlMarkup.new(:indent => options[:indent])
+
+    root     = options.delete(:root).to_s
+    children = options.delete(:children)
+
+    if !options.has_key?(:dasherize) || options[:dasherize]
+      root = root.dasherize
+    end
+
+    options[:builder].instruct! unless options.delete(:skip_instruct)
+
+    opts = options.merge({ :root => children })
+
+    xml = options[:builder]
+    if empty?
+      xml.tag!(root, options[:skip_types] ? {} : {:type => "array"})
+    else
+      xml.tag!(root, options[:skip_types] ? {} : {:type => "array"}) {
+        yield xml if block_given?
+        each { |e| e.to_xml(opts.merge({ :skip_instruct => true })) }
+      }
     end
   end
+
+  def to_fos_xml(options = {})
+    to_xml({:skip_instruct=>true, :skip_types=>true, :dasherize=>false, :only=>[]}.merge(options))
+  end
 end
 
-module ActiveSupport #:nodoc:
-  module CoreExtensions #:nodoc:
-    module Hash #:nodoc:
-      module Conversions
-        def to_fos_xml(options = {})
-          to_xml({:skip_instruct=>true, :skip_types=>true, :dasherize=>false, :only=>[]}.merge(options))
-        end
-      end
-    end
+class Hash
+  def to_fos_xml(options = {})
+    to_xml({:skip_instruct=>true, :skip_types=>true, :dasherize=>false, :only=>[]}.merge(options))
   end
 end

data/spec/helper_methods.rb

@@ -40,12 +40,12 @@ module HelperMethods
     response.body.should == "xml"
   end
 
-  def equal_xml(other)
-    simple_matcher("xml #{other} not equal") do |actual|
-      actual.gsub(/\s/,'').should == other.gsub(/\s/,'')
-    end
-  end
-
+#  def equal_xml(other)
+#    simple_matcher("xml #{other} not equal") do |actual|
+#      actual.gsub(/\s/,'').should == other.gsub(/\s/,'')
+#    end
+#  end
+#
   def stub_save_for_model(model)
     stub.instance_of(model)._refresh(anything) {}
     stub.instance_of(model)._update(anything) {}

data/spec/models/trip_leg_spec.rb

@@ -2,85 +2,85 @@ 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 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
-
-    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
-    before :all do
-      set_fos_db([Airport])
-    end
-
-    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 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 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 "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
-    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)
-  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)
-  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)
-  end
+#  describe "arrival_airport assoc works" do
+#    before :all do
+#      set_fos_db([Airport])
+#    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
+#
+#    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
+#    before :all do
+#      set_fos_db([Airport])
+#    end
+#
+#    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 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 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 "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
+#    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)
+#  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)
+#  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)
+#  end
 
   it "actual arrival date_time base are correctly calculating the tz offset" do
     arr_date_act_gmt = Date.new(1900, 1, 2)
@@ -91,102 +91,102 @@ describe TripLeg do
     tl.actual_arrival_date_time_base.should == DateTime.new(1900, 1, 2, 16, 40, 0)
   end
 
-  it "actual departure date_time base are correctly calculating the tz offset" do
-    dept_date_act_gmt = Date.new(1900, 1, 2)
-    dept_time_act_gmt = 1420
-    home_tz_gmt_offset = -70
-    tl = TripLeg.new(:dept_date_act_gmt => dept_date_act_gmt.to_fos_days, :dept_time_act_gmt => dept_time_act_gmt,
-                     :home_tz_gmt_offset=>home_tz_gmt_offset)
-    tl.actual_departure_date_time_base.should == DateTime.new(1900, 1, 2, 16, 40, 0)
-  end
-
-  it "should properly convert nautical miles to statute miles with 1 significant digit" do
-    tl = TripLeg.new(:nautical_miles => 285)
-    tl.custom_statute_miles.should == 327.9
-  end
-
-  it "should properly handle nautical miles to statute miles when nautical_miles is nil" do
-    tl = TripLeg.new(:nautical_miles => nil)
-    tl.custom_statute_miles.should == 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, :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 { [] }
-      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 ( and put lead pax name first )" do
-      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] }
-      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] }
-      tl = TripLeg.new(:trip_number=>100, :leg_number=>3, :verify_date=>0, :trip=>@t)
-      tl.passenger_list.should == ""
-    end
-
-  end
-
-  it "method total_trip_statute_miles returns a value" do
-    @t = Trip.new(:total_statute_miles=>100)
-    tl = TripLeg.new(:trip_number=>100, :leg_number=>3, :trip=>@t)
-    tl.total_trip_statute_miles.should == 10.0
-  end
-
-  describe 'crew brief fields' do
-    before :all do
-      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
-
-    it "catering departure value" do
-      @trip_leg.catering_departure.should == 1
-    end
-
-    it "departure fbo comment value" do
-      @trip_leg.departure_fbo_comment_value.comment.should == "3028 Peacekeeper Way\r\nSacramento, CA 95652"
-    end
-
-    it "arrival fbo comment value" do
-      @trip_leg.arrival_fbo_comment_value.comment.should == "Auto-selected FBO not preferred"
-    end
-
-    it "catering comment value" do
-      @trip_leg.departure_catering_comment__comment.should == "Catering: Standard drinks and snacks for all live legs"
-    end
-
-    it "limo comment value" do
-      @trip_leg.arrival_transport_comment__comment.should == "Transportation: Passenger arranged for all live legs"
-    end
-
-    it "crew fbo comment value" do
-      @trip_leg.crew_fbo_comment_value.should == nil
-    end
-  end
+#  it "actual departure date_time base are correctly calculating the tz offset" do
+#    dept_date_act_gmt = Date.new(1900, 1, 2)
+#    dept_time_act_gmt = 1420
+#    home_tz_gmt_offset = -70
+#    tl = TripLeg.new(:dept_date_act_gmt => dept_date_act_gmt.to_fos_days, :dept_time_act_gmt => dept_time_act_gmt,
+#                     :home_tz_gmt_offset=>home_tz_gmt_offset)
+#    tl.actual_departure_date_time_base.should == DateTime.new(1900, 1, 2, 16, 40, 0)
+#  end
+#
+#  it "should properly convert nautical miles to statute miles with 1 significant digit" do
+#    tl = TripLeg.new(:nautical_miles => 285)
+#    tl.custom_statute_miles.should == 327.9
+#  end
+#
+#  it "should properly handle nautical miles to statute miles when nautical_miles is nil" do
+#    tl = TripLeg.new(:nautical_miles => nil)
+#    tl.custom_statute_miles.should == 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, :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 { [] }
+#      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 ( and put lead pax name first )" do
+#      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] }
+#      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] }
+#      tl = TripLeg.new(:trip_number=>100, :leg_number=>3, :verify_date=>0, :trip=>@t)
+#      tl.passenger_list.should == ""
+#    end
+#
+#  end
+#
+#  it "method total_trip_statute_miles returns a value" do
+#    @t = Trip.new(:total_statute_miles=>100)
+#    tl = TripLeg.new(:trip_number=>100, :leg_number=>3, :trip=>@t)
+#    tl.total_trip_statute_miles.should == 10.0
+#  end
+#
+#  describe 'crew brief fields' do
+#    before :all do
+#      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
+#
+#    it "catering departure value" do
+#      @trip_leg.catering_departure.should == 1
+#    end
+#
+#    it "departure fbo comment value" do
+#      @trip_leg.departure_fbo_comment_value.comment.should == "3028 Peacekeeper Way\r\nSacramento, CA 95652"
+#    end
+#
+#    it "arrival fbo comment value" do
+#      @trip_leg.arrival_fbo_comment_value.comment.should == "Auto-selected FBO not preferred"
+#    end
+#
+#    it "catering comment value" do
+#      @trip_leg.departure_catering_comment__comment.should == "Catering: Standard drinks and snacks for all live legs"
+#    end
+#
+#    it "limo comment value" do
+#      @trip_leg.arrival_transport_comment__comment.should == "Transportation: Passenger arranged for all live legs"
+#    end
+#
+#    it "crew fbo comment value" do
+#      @trip_leg.crew_fbo_comment_value.should == nil
+#    end
+#  end
 
 ## NEED TO REMOVE, TESTS SHOULD BE IN FlightLogExpense spec
 #  describe "fuel passdown data columns" do