fossil 0.5.26 → 0.5.27

data/VERSION

@@ -1 +1 @@
-0.5.26
+0.5.27

data/fossil.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fossil}
-  s.version = "0.5.26"
+  s.version = "0.5.27"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Patrick Lardin, Daniel Sudol"]
-  s.date = %q{2011-01-26}
+  s.date = %q{2011-02-08}
   s.description = %q{Access FOS/betrieve db with this Sequel based orm wrapper}
   s.email = %q{plardin@xojet.com}
   s.extra_rdoc_files = [
@@ -136,13 +136,12 @@ Gem::Specification.new do |s|
      "lib/sequel/serializer/serializer.rb",
      "lib/sequel/serializer/xml_serializer.rb",
      "lib/sequel/sqlite_pervasive_adapter.rb",
-     "lib/support/date_extentions.rb",
+     "lib/support/core_extensions.rb",
      "lib/support/delegate_method.rb",
-     "lib/support/hash_extentions.rb",
      "lib/support/number_helper.rb",
      "spec/be_model_with_values_matcher.rb",
      "spec/be_model_with_values_matcher_spec.rb",
-     "spec/hash_extentions_spec.rb",
+     "spec/core_extensions_spec.rb",
      "spec/helper_classes.rb",
      "spec/helper_methods.rb",
      "spec/models/airport_fbo_spec.rb",
@@ -167,7 +166,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Sequel orm wrapper to FOS}
   s.test_files = [
-    "spec/hash_extentions_spec.rb",
+    "spec/core_extensions_spec.rb",
      "spec/spec_helper.rb",
      "spec/helper_methods.rb",
      "spec/be_model_with_values_matcher_spec.rb",

data/lib/models/trip_leg.rb

@@ -671,12 +671,18 @@ class TripLeg < Sequel::Model(:'trip legs')
 
   column_view   :arrival_date_gmt,      :date,  :actual_arrival_date_gmt
   column_view   :arriv_time_act_gmt,    :time,  :actual_arrival_time_gmt
-  column_def_datetime :actual_arrival_date_time_gmt, :'arrival date gmt', :'arriv time act gmt'
+  # Fixed to check if actual fields are populated, on older records these fields are not populated so we can't use them.
+  # Jade Tucker 2/08/2011
+  def actual_arrival_date_time_gmt
+    date = (arr_date_act_gmt > 0 ? arr_date_act_gmt : arrival_date_gmt)
+    DateTime.from_fos_date_time(date, arriv_time_act_gmt)
+  end
 
   def actual_land_date_time_gmt
     time = land_time_act_gmt
     time -= 60*24 if land_time_act_gmt > arriv_time_act_gmt
-    DateTime.from_fos_date_time(arrival_date_gmt, time)
+    date = (arr_date_act_gmt > 0 ? arr_date_act_gmt : arrival_date_gmt)
+    DateTime.from_fos_date_time(date, time)
   end
 
   column_view   :dept_date_act_local,   :date,  :actual_departure_date_local
@@ -709,14 +715,14 @@ class TripLeg < Sequel::Model(:'trip legs')
   column_view   :depart_time_act_home,  :time,  :actual_departure_time_base
   column_def_datetime :actual_departure_date_time_base_old, :'dept date act home', :'depart time act home'
   def actual_departure_date_time_base
-    (actual_departure_date_time_gmt.to_time + (home_tz_gmt_offset/10).hours).to_datetime
+    (actual_departure_date_time_gmt.to_time.utc + (home_tz_gmt_offset/10).hours).to_datetime
   end
 
   column_view   :arr_date_act_home,     :date,  :actual_arrival_date_base
   column_view   :arrival_time_act_hom,  :time,  :actual_arrival_time_base
   column_def_datetime :actual_arrival_date_time_base_old,   :'arr date act home', :'arrival time act hom'
   def actual_arrival_date_time_base
-    (actual_arrival_date_time_gmt.to_time + (home_tz_gmt_offset/10).hours).to_datetime
+    (actual_arrival_date_time_gmt.to_time.utc + (home_tz_gmt_offset/10).hours).to_datetime
   end
 
   column_view :ete,                 :time
@@ -729,7 +735,6 @@ class TripLeg < Sequel::Model(:'trip legs')
   column_view :delay_2_time,        :time,  :delay_2_duration
   column_view :ron,                 :boolean
 
-
   # get pic or sic or purser for this trip leg. type should be :pic or :sic or :pur
   def pilot_code(type)
     crew_leg = pilot_crew(type)

data/lib/sequel/fos_dates.rb

@@ -1,5 +1,7 @@
+require 'date'
+
 class Date
-  FOS_JD_OFFSET_DAYS = Date.parse('1899-12-31').jd
+  FOS_JD_OFFSET_DAYS = Date.parse('1899-12-31').jd unless defined?(FOS_JD_OFFSET_DAYS)
 
   def self.from_fos_days(days)
     self.jd(FOS_JD_OFFSET_DAYS + days)
@@ -122,4 +124,9 @@ class DateTime
   def long_view
     self.strftime('%B %d, %Y %H:%M')
   end
+
+  # Converts self to a Ruby Date object; time portion is discarded
+  def to_date
+    ::Date.new(year, month, day)
+  end unless method_defined?(:to_date)
 end

data/lib/support/{hash_extentions.rb → core_extensions.rb}

@@ -1,4 +1,42 @@
 require 'json'
+
+class Integer
+  def as_cost
+    self/100.0
+  end
+
+  def in_hundredths
+    self.to_f.in_hundredths
+  end
+end
+
+class Float
+  def as_cost
+    self/100.0
+  end
+
+  def in_hundredths
+    return 0 if self == 0
+    val = "#{self/60.0}.#{((100.0*(self.modulo(60.0)))/60.0).to_s.rjust(2, '0')}"
+    BigDecimal.mode(BigDecimal::ROUND_MODE, BigDecimal::ROUND_HALF_EVEN)
+    BigDecimal.new(val, 2).round(2).to_f
+  end
+end
+
+class Range
+  def split_by_step(step)
+    current_min = min
+    arr = []
+    while (current_min + step) <= max
+      current_max = current_min + step
+      arr << (current_min..current_max)
+      current_min = (current_max + 1)
+    end
+    arr << (current_min..max) unless current_min > max
+    arr
+  end
+end
+
 class Hash
   XML_TYPE_NAMES =
       {
@@ -69,4 +107,30 @@ class Hash
     end
     self
   end
+
+  def diff(other)
+    self.keys.inject({}) do |memo, key|
+      unless self[key] == other[key]
+        memo[key] = other[key]
+      end
+      memo
+    end
+  end
+end
+
+class Numeric
+  def minutes
+    self * 60
+  end
+  alias :minute :minutes
+
+  def hours
+    self * 3600
+  end
+  alias :hour :hours
+
+  def days
+    self * 24.hours
+  end
+  alias :day :days
 end

data/spec/core_extensions_spec.rb

@@ -0,0 +1,59 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe Hash do
+  it "limit_to_keys should limit keys in hash" do
+    h = {:bro1=>'me',:bro2=>'rob',:bro3=>'eric'}
+    h.limit_to_keys([:bro1,:bro2]).should == {:bro1=>'me',:bro2=>'rob'}
+    h.should == {:bro1=>'me',:bro2=>'rob',:bro3=>'eric'}
+  end
+
+  it "limit_to_keys! should destructively limit keys in hash" do
+    h = {:bro1=>'me',:bro2=>'rob',:bro3=>'eric'}
+    h.limit_to_keys!([:bro1,:bro2]).should == {:bro1=>'me',:bro2=>'rob'}
+    h.should == {:bro1=>'me',:bro2=>'rob'}
+  end
+
+  it "soft deletes" do
+    h = {:dan=>1,:eric=>2}
+    h.soft_delete(:dan).should == {:eric=>2}
+  end
+end
+
+describe Integer do
+  it "should return the number divided by 100 as a float" do
+    i = 1000043
+    i.as_cost.should == 10000.43
+  end
+
+  it "should return the number in hundredths" do
+    i = 10343
+    i.in_hundredths.should == 172.38
+  end
+end
+
+describe Float do
+  it "should return the number divided by 100" do
+    i = 1000043.0
+    i.as_cost.should == 10000.430
+  end
+
+  it "should return the number in hundredths" do
+    i = 10343.56
+    i.in_hundredths.should == 172.39
+  end
+end
+
+describe Range do
+  it "method split_by_step creates ranges out of original range by step" do
+    range = 0..30
+    range.split_by_step(10).should == [0..10,11..21,22..30]
+    range = 1..101
+    range.split_by_step(25).should == [1..26,27..52,53..78,79..101]
+    range = 0..20
+    range.split_by_step(20).should == [0..20]
+    range = 1..2
+    range.split_by_step(3).should == [1..2]
+    range = 1..1
+    range.split_by_step(10).should == [1..1]
+  end
+end

data/spec/models/trip_leg_spec.rb

@@ -78,32 +78,58 @@ describe TripLeg do
     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)
+
+  describe 'actual_land_date_time_gmt' do
+    it "actual_landing_date_time  dates are before arr_date_act_gmt if on time time is greater than landing time" do
+      tl = TripLeg.new(:arr_date_act_gmt=> Date.new(1900, 1, 2).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
+      tl = TripLeg.new(:arr_date_act_gmt=> Date.new(1900, 1, 2).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
   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)
+  describe 'actual_arrival_date_time_gmt' do
+    it "has the old 'arrival date - gmt' field set" do
+      tl = TripLeg.new(:arr_date_act_gmt=> 0, # old field not set
+                       :arrival_date_gmt=> 2, # should use this field instead
+                       :arriv_time_act_gmt=> 10)
+      tl.actual_arrival_date_time_gmt.should == DateTime.new(1900, 1, 2, 0, 10, 0)
+    end
+
+    it "has the new 'arr date act gmt' field set" do
+      tl = TripLeg.new(:arr_date_act_gmt=> 2,  # old field is set, so use this one
+                       :arrival_date_gmt=> 0,  # new field not set
+                       :arriv_time_act_gmt=> 10)
+      tl.actual_arrival_date_time_gmt.should == DateTime.new(1900, 1, 2, 0, 10, 0)
+    end
   end
 
-  it "actual arrival date_time base are correctly calculating the tz offset" do
-    arr_date_act_gmt = Date.new(1900, 1, 2)
-    arriv_time_act_gmt = 1420
+  it "actual_arrival_date_time_base are correctly calculating the tz offset" do
+    # this makes an actual_arrival_date_time_gmt date of: 1900-01-02 23:40:00
+    arr_date_act_gmt, arriv_time_act_gmt = Date.new(1900, 1, 2).to_fos_days , 1420
     home_tz_gmt_offset = -70
-    tl = TripLeg.new(:arrival_date_gmt => arr_date_act_gmt.to_fos_days, :arriv_time_act_gmt => arriv_time_act_gmt,
+    # home_tz_gmt_offset should make actual_arrival_date_time_base of: 1900-01-02 16:40:00
+    tl = TripLeg.new(:arr_date_act_gmt => arr_date_act_gmt,
+                     :arriv_time_act_gmt => arriv_time_act_gmt,
                      :home_tz_gmt_offset => home_tz_gmt_offset)
     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
+
+  it "actual_departure_date_time_base are correctly calculating the tz offset" do
+    # this makes an actual_arrival_date_time_gmt date of: 1900-01-02 23:40:00
+    dept_date_act_gmt, dept_time_act_gmt = Date.new(1900, 1, 2).to_fos_days , 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 should make actual_arrival_date_time_base of: 1900-01-02 16:40:00
+    tl = TripLeg.new(:dept_date_act_gmt => dept_date_act_gmt,
+                     :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
@@ -190,7 +216,7 @@ describe TripLeg do
     end
   end
 
-#
+
 ## NEED TO REMOVE, TESTS SHOULD BE IN FlightLogExpense spec
 #  describe "fuel passdown data columns" do
 #

data/spec/sequel/core_patch_spec.rb

@@ -2,37 +2,37 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Sequel do
 
-#  describe "has method 'fos' that" do
-#    before :each do
-#      @db = Sequel.fos('fos')
-#    end
-#
-#    it "instantiates a fos/pervasive db from an odbc name" do
-#      @db.should_not be nil
-#    end
-#
-#    it "actually works to see a fos table" do
-#      TripLeg.db=@db
-#      TripLeg.first.should_not be nil
-#    end
-#  end
-
-  describe "has method 'fos_dbr' that" do
+  describe "has method 'fos' that" do
     before :each do
-      hash = {:host=>"localhost", :user=>'root', :password=>'', :database=>'test'}
-      @db = Sequel.fos_dbr(hash)
+      @db = Sequel.fos('fos')
     end
 
-    it "instantiates dbr/mysql db from hash of params name" do
+    it "instantiates a fos/pervasive db from an odbc name" do
       @db.should_not be nil
     end
 
-    it "actually loaded the dbr files" do
-      [Trip,Quote].each{|model| model.db=@db}
-      Trip.eager_graph(:quote).sql.should =~ /(`quote`.`id` = `trips`.`quote_id`)/
+    it "actually works to see a fos table" do
+      TripLeg.db=@db
+      TripLeg.first.should_not be nil
     end
   end
 
+#  describe "has method 'fos_dbr' that" do
+#    before :each do
+#      hash = {:host=>"localhost", :user=>'root', :password=>'', :database=>'test'}
+#      @db = Sequel.fos_dbr(hash)
+#    end
+#
+#    it "instantiates dbr/mysql db from hash of params name" do
+#      @db.should_not be nil
+#    end
+#
+#    it "actually loaded the dbr files" do
+#      [Trip,Quote].each{|model| model.db=@db}
+#      Trip.eager_graph(:quote).sql.should =~ /(`quote`.`id` = `trips`.`quote_id`)/
+#    end
+#  end
+
 #  it "set_db method finds sets db on all Sequel models" do
 #    db = Sequel.fos('fos')
 #    Sequel.set_db db

data/spec/silly_spec.rb

@@ -1,4 +1,4 @@
-require 'fossil'
+require_relative '../lib/fossil'
 require 'logger'
 require 'pp'
 
@@ -7,13 +7,26 @@ require 'pp'
 
 DB = Sequel.fos('fosprod', :loggers=>[Logger.new($stdout)])
 #DB = Sequel.fos('flyos', :loggers=>[Logger.new($stdout)])
-#CrewDuty.db = DB
+TripLeg.db = DB
+#p TripLeg.filter(:eta_gmt=>0).count
+#p TripLeg.filter(:arriv_time_act_gmt=>0).count
+t = TripLeg.first(:trip_number=>83106,:leg_number=>1)
+#p t.actual_departure_date_time_gmt.to_time
+#p t.actual_departure_date_time_gmt.to_time.utc
+#pp t.fill_hash(
+#  [:actual_departure_date_time_gmt,
+#   :actual_arrival_date_time_gmt,
+#   :actual_departure_date_time_base,
+#   :actual_arrival_date_time_base
+#  ]
+#)
 
 #date = Date.today - 1
+#p date
 #pp CrewDuty.find_crew_duty_in_time_range(date, date).collect{|v| [v.duty_start_time.to_s, v.duty_end_time.to_s, v.amended, v.amended_date, v.verified_date] }
-
-[CrewDuty].each{|m| m.db=DB}
-p CrewDuty.count
+#[CrewDuty].each{|m| m.db=DB}
+#c = CrewDuty.filter(:kid_user=>'DEMO').first
+#c.update(:risk=>2)
 #[Personnel,ACQualification,Code].each{|m| m.db=DB}
 #p ACQualification.first
 #p Personnel.first(:employee_id=>'COXD').ac_qualifications.find{|ac| ac.aircraft_type_id='C750'}
@@ -38,7 +51,12 @@ p CrewDuty.count
 #p AirportFbo.filter(:icao=>'KSFO').count
 #DB.execute('Update "trip legs" set "lunch comment" = \'hi\' where "trip number" = 83100 and "leg number" = 3')
 #DB.execute('Update "trip legs" set "pax count" = 4 where "trip number" = 62 and "leg number" = 1 ')
-#tl = TripLeg.filter(:trip_number=>62,:leg_number=>1).first#eager_graph(:arrival_fbo).all.first
+#tl = TripLeg.filter(:trip_number=>69012,:leg_number=>1).first#eager_graph(:arrival_fbo).all.first
+#p tl.actual_arrival_date_time_gmt
+#date = TripLeg.filter(:arr_date_act_gmt=>0).filter{:verify_date >0}.order(:kid_date).last.kid_date # :arrival_date_gmt
+#p Date.from_fos_days(date).to_s
+#p TripLeg.filter(:arr_date_act_gmt=>0).count # :arrival_date_gmt
+#p TripLeg.count # :arrival_date_gmt
 #p tl.fos_id
 #p tl.pax_count
 #tl2 = TripLeg.filter(tl.pk_hash.soft_delete(:'kid - user')).filter(:kid_user.like("%#{tl.kid_user}%")).first

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 26
-  version: 0.5.26
+  - 27
+  version: 0.5.27
 platform: ruby
 authors: 
 - Patrick Lardin, Daniel Sudol
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-26 00:00:00 -08:00
+date: 2011-02-08 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -187,13 +187,12 @@ files:
 - lib/sequel/serializer/serializer.rb
 - lib/sequel/serializer/xml_serializer.rb
 - lib/sequel/sqlite_pervasive_adapter.rb
-- lib/support/date_extentions.rb
+- lib/support/core_extensions.rb
 - lib/support/delegate_method.rb
-- lib/support/hash_extentions.rb
 - lib/support/number_helper.rb
 - spec/be_model_with_values_matcher.rb
 - spec/be_model_with_values_matcher_spec.rb
-- spec/hash_extentions_spec.rb
+- spec/core_extensions_spec.rb
 - spec/helper_classes.rb
 - spec/helper_methods.rb
 - spec/models/airport_fbo_spec.rb
@@ -245,7 +244,7 @@ signing_key:
 specification_version: 3
 summary: Sequel orm wrapper to FOS
 test_files: 
-- spec/hash_extentions_spec.rb
+- spec/core_extensions_spec.rb
 - spec/spec_helper.rb
 - spec/helper_methods.rb
 - spec/be_model_with_values_matcher_spec.rb

data/lib/support/date_extentions.rb

@@ -1,26 +0,0 @@
-require 'date'
-
-class DateTime
-  # Converts self to a Ruby Date object; time portion is discarded
-  def to_date
-    ::Date.new(year, month, day)
-  end unless method_defined?(:to_date)
-end
-
-
-class Numeric
-  def minutes
-    self * 60
-  end
-  alias :minute :minutes
-
-  def hours
-    self * 3600
-  end
-  alias :hour :hours
-
-  def days
-    self * 24.hours
-  end
-  alias :day :days
-end

data/spec/hash_extentions_spec.rb

@@ -1,20 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-describe "hash extentions" do
-  it "limit_to_keys should limit keys in hash" do
-    h = {:bro1=>'me',:bro2=>'rob',:bro3=>'eric'}
-    h.limit_to_keys([:bro1,:bro2]).should == {:bro1=>'me',:bro2=>'rob'}
-    h.should == {:bro1=>'me',:bro2=>'rob',:bro3=>'eric'}
-  end
-
-  it "limit_to_keys! should destructively limit keys in hash" do
-    h = {:bro1=>'me',:bro2=>'rob',:bro3=>'eric'}
-    h.limit_to_keys!([:bro1,:bro2]).should == {:bro1=>'me',:bro2=>'rob'}
-    h.should == {:bro1=>'me',:bro2=>'rob'}
-  end
-
-  it "soft deletes" do
-    h = {:dan=>1,:eric=>2}
-    h.soft_delete(:dan).should == {:eric=>2}
-  end
-end