fossil 0.4.26 → 0.5.0

data/Rakefile

@@ -10,7 +10,7 @@
      gemspec.email = "plardin@xojet.com"  
      gemspec.homepage = ""
      gemspec.add_dependency('sequel', '= 3.13.0')
-     gemspec.add_dependency('activesupport', '= 2.3.5')
+#     gemspec.add_dependency('activesupport', '= 2.3.5')
      gemspec.add_development_dependency('rspec')
      gemspec.authors = ["Patrick Lardin, Daniel Sudol"]
    end

data/VERSION

@@ -1 +1 @@
-0.4.26
+0.5.0

data/fossil.gemspec

@@ -1,21 +1,23 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{fossil}
-  s.version = "0.4.26"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Patrick Lardin, Daniel Sudol"]
-  s.date = %q{2010-09-27}
+  s.date = %q{2010-10-04}
   s.description = %q{Access FOS/betrieve db with this Sequel based orm wrapper}
   s.email = %q{plardin@xojet.com}
   s.files = [
     "Rakefile",
      "VERSION",
      "fossil.gemspec",
+     "lib/date_extentions.rb",
+     "lib/delegate_method.rb",
      "lib/fos_schema/FOS_SCHEMA_3.8.22.r3.csv",
      "lib/fos_schema/FOS_SCHEMA_3.8.27.r1.csv",
      "lib/fos_schema/FOS_SCHEMA_3.9.0.csv",
@@ -146,13 +148,12 @@ Gem::Specification.new do |s|
      "spec/sequel/serializer/json_serializer_spec.rb",
      "spec/sequel/serializer/xml_serializer_spec.rb",
      "spec/sequel/spec_helper_tables.rb",
-     "spec/spec.opts",
      "spec/spec_helper.rb"
   ]
   s.homepage = %q{}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Sequel orm wrapper to FOS}
   s.test_files = [
     "spec/hash_extentions_spec.rb",
@@ -180,19 +181,15 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sequel>, ["= 3.13.0"])
-      s.add_runtime_dependency(%q<activesupport>, ["= 2.3.5"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
     else
       s.add_dependency(%q<sequel>, ["= 3.13.0"])
-      s.add_dependency(%q<activesupport>, ["= 2.3.5"])
       s.add_dependency(%q<rspec>, [">= 0"])
     end
   else
     s.add_dependency(%q<sequel>, ["= 3.13.0"])
-    s.add_dependency(%q<activesupport>, ["= 2.3.5"])
     s.add_dependency(%q<rspec>, [">= 0"])
   end
 end
-

data/lib/date_extentions.rb

@@ -0,0 +1,26 @@
+p 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/lib/delegate_method.rb

@@ -0,0 +1,84 @@
+class Module
+  #  Patching delegate to take default value as option, which means that instead of
+  #  returning nil in any situation it will return the default value. So if the
+  #  object you delegate to does not exist or the method on that object does not exist
+  #  or the method returns nil then the default value is returned.
+  #  Note that if you use a default value then the allow nil is automatically set to false,
+  #  since you will always return the default if there is nil value
+  #
+  #  class Invoice < Struct.new(:client)
+  #    delegate :name, :to => :client, :default => 'Dano'
+  #  end
+  #
+  #  Example 1:
+  #  invoice = Invoice.new(nil) # no client
+  #  invoice.client_name    # => "Dano"
+  #
+  #  Example 2:
+  #  Client = Struct.new(:address) # client does not have attribute called name
+  #  john_doe = Client.new("1 park avenue")
+  #  invoice = Invoice.new(john_doe)
+  #  invoice.client_name    # => "Dano"
+  #
+  #  Example 3:
+  #  Client = Struct.new(:name, :address)
+  #  john_doe = Client.new(nil, "1 park avenue") # client name is nil
+  #  invoice = Invoice.new(john_doe)
+  #  invoice.client_name    # => "Dano"
+  #
+  #
+  def delegate(*methods)
+    options = methods.pop
+
+    unless options.is_a?(Hash) && to = options[:to]
+      raise ArgumentError, "Delegation needs a target. Supply an options hash with a :to key as the last argument (e.g. delegate :hello, :to => :greeter)."
+    end
+
+    if options[:prefix] == true && options[:to].to_s =~ /^[^a-z_]/
+      raise ArgumentError, "Can only automatically set the delegation prefix when delegating to a method."
+    end
+
+    prefix = options[:prefix] && "#{options[:prefix] == true ? to : options[:prefix]}_"
+
+    default = options[:default]
+
+    allow_nil = (options[:allow_nil] || default) && "#{to} && "
+
+    methods.each do |method|
+
+      writer(method, to, prefix) if options[:writer]
+
+      module_eval(<<-EOS, "(__DELEGATION__)", 1)
+          def #{prefix}#{method}(*args, &block)                                   # def customer_name(*args, &block)
+            val = #{allow_nil}#{to}.__send__(#{method.inspect}, *args, &block)    #   val = client && client.__send__(:name, *args, &block)
+            return "#{default}" if val.nil? and #{!default.blank?}                #   return default if val.nil? and !default.blank?
+            val                                                                   #   val
+          end                                                                     # end
+      EOS
+    end
+  end
+
+  #####################################################################
+  #  writer :tail_number, :aircraft
+  #
+  #  creates a method like this:
+  #
+  #  def tail_number=(tail_number)
+  #    self.aircraft = Aircraft.find_by_tail_number(tail_number)
+  #  end
+  #
+  #  in this case the setter_attribute is the same as the attribute name
+  #  but in a case like this:
+  #
+  #  setter :pic_xojet_id, :pilot, :pic_pilot
+  #
+  #  you are saying set the attribue pic_pilot to a pilot
+  #
+  def writer(setter_attribute, model, prefix)
+    define_method "#{prefix}#{setter_attribute.to_s}=" do |value|
+      found_model = model.to_s.capitalize.constantize.find(:first, :conditions=> {setter_attribute => value})
+      self.send("#{model.to_s}=", found_model)
+    end
+  end
+
+end

data/lib/fossil.rb

@@ -7,21 +7,24 @@ rescue LoadError => e
   raise("To use Fossil you need the sequel gem:\n '$ sudo gem install sequel -v=3.13.0'")
 end
 
-begin
-  gem 'activesupport', '=2.3.5'
-  require('active_support')
-rescue LoadError => e
-   p e.message
-  raise "To use Fossil you need the active_support gem: '$ sudo gem install active_support -v=2.3.5'"
-end
+#begin
+#  gem 'activesupport', '=2.3.5'
+#  require('active_support')
+#rescue LoadError => e
+#   p e.message
+#  raise "To use Fossil you need the active_support gem: '$ sudo gem install active_support -v=2.3.5'"
+#end
 
 dir = File.dirname(__FILE__)
 files = [File.join(dir,'number_helper.rb')] +
         [File.join(dir,'hash_extentions.rb')] +
+        [File.join(dir,'date_extentions.rb')] +
+        [File.join(dir,'delegate_method.rb')] +
         [File.join(dir,'sequel','serializer','serializer.rb')] +
         Dir.glob(File.join(dir,'sequel','*.rb')) +
         Dir.glob(File.join(dir,'models','*.rb'))
 
+Sequel.extension(:blank, :inflector) 
 
 class MockDataset < Sequel::Dataset
   def insert(*args); end

data/lib/hash_extentions.rb

@@ -1,4 +1,28 @@
-class Hash 
+require 'json'
+class Hash
+  XML_TYPE_NAMES =
+      {
+          "Symbol"     => "symbol",
+          "Fixnum"     => "integer",
+          "Bignum"     => "integer",
+          "BigDecimal" => "decimal",
+          "Float"      => "float",
+          "TrueClass"  => "boolean",
+          "FalseClass" => "boolean",
+          "Date"       => "date",
+          "DateTime"   => "datetime",
+          "Time"       => "datetime",
+          "ActiveSupport::TimeWithZone" => "datetime"
+      }
+
+  XML_FORMATTING =
+      {
+          "symbol"   => Proc.new { |symbol| symbol.to_s },
+          "date"     => Proc.new { |date| date.strftime('%d/%m/%Y') },
+          "datetime" => Proc.new { |time| time.xmlschema },
+          "yaml"     => Proc.new { |yaml| yaml.to_yaml }
+      }
+
   def limit_to_keys(limit_keys)
     dup.limit_to_keys!(limit_keys)
   end
@@ -17,4 +41,32 @@ class Hash
   def deep_clone
     Marshal::load(Marshal.dump(self))
   end
+
+  # Return a new hash with all keys converted to strings.
+  def stringify_keys
+    dup.stringify_keys!
+  end
+
+  # Destructively convert all keys to strings.
+  def stringify_keys!
+    keys.each do |key|
+      self[key.to_s] = delete(key)
+    end
+    self
+  end
+
+  # Return a new hash with all keys converted to symbols, as long as
+  # they respond to +to_sym+.
+  def symbolize_keys
+    dup.symbolize_keys!
+  end
+
+  # Destructively convert all keys to symbols, as long as they respond
+  # to +to_sym+.
+  def symbolize_keys!
+    keys.each do |key|
+      self[(key.to_sym rescue key) || key] = delete(key)
+    end
+    self
+  end
 end

data/lib/models/trip_leg.rb

@@ -663,9 +663,9 @@ class TripLeg < Sequel::Model(:'trip legs')
   column_def_datetime :actual_departure_date_time_gmt, :'dept date act gmt', :'dept time act gmt'
 
   def actual_takeoff_date_time_gmt
-    date = actual_departure_date_gmt
-    date += 1.day if t_o_time_act_gmt < dept_time_act_gmt
-    date.to_datetime.advance(:minutes=>t_o_time_act_gmt)
+    time = t_o_time_act_gmt
+    time += 60*24 if t_o_time_act_gmt < dept_time_act_gmt
+    DateTime.from_fos_date_time(dept_date_act_gmt, time)
   end
 
   column_view   :arrival_date_gmt,      :date,  :actual_arrival_date_gmt
@@ -673,9 +673,9 @@ class TripLeg < Sequel::Model(:'trip legs')
   column_def_datetime :actual_arrival_date_time_gmt, :'arrival date gmt', :'arriv time act gmt'
 
   def actual_land_date_time_gmt
-    date = actual_arrival_date_gmt
-    date -= 1.day if land_time_act_gmt > arriv_time_act_gmt
-    date.to_datetime.advance(:minutes=>land_time_act_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)
   end
 
   column_view   :dept_date_act_local,   :date,  :actual_departure_date_local
@@ -705,12 +705,16 @@ class TripLeg < Sequel::Model(:'trip legs')
   column_view   :dept_date_act_home,    :date,  :actual_departure_date_base
   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 + (home_tz_gmt_offset/10).hours; end
+  def actual_departure_date_time_base
+    (actual_departure_date_time_gmt.to_time + (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 + (home_tz_gmt_offset/10).hours; end
+  def actual_arrival_date_time_base
+    (actual_arrival_date_time_gmt.to_time + (home_tz_gmt_offset/10).hours).to_datetime
+  end
 
   column_view :ete,                 :time
   column_view :eft,                 :time

data/lib/sequel/fos_dates.rb

@@ -1,6 +1,5 @@
 class Date
   FOS_JD_OFFSET_DAYS = Date.parse('1899-12-31').jd
-  DATE_FORMATS[:mdy] = "%m/%d/%Y"
 
   def self.from_fos_days(days)
     self.jd(FOS_JD_OFFSET_DAYS + days)
@@ -9,10 +8,26 @@ class Date
   def to_fos_days
     jd - FOS_JD_OFFSET_DAYS
   end
+
+  ######## from Ruby Cookbook #########
+  def to_gm_time
+    to_time(new_offset, :gm)
+  end
+
+  def to_local_time
+    to_time(new_offset(DateTime.now.offset-offset), :local)
+  end
+
+  private
+  def to_time(dest, method)
+    #Convert a fraction of a day to a number of microseconds
+    usec = (dest.send(:sec_fraction) * 60 * 60 * 24 * (10**6)).to_i
+    Time.send(method, dest.year, dest.month, dest.day, dest.send(:hour), dest.send(:min),
+              dest.send(:sec), usec)
+  end
 end
 
 module TimeFunctions
-
   def as_minutes
     hour*60 + min
   end
@@ -21,7 +36,7 @@ module TimeFunctions
     return 0 if hour + min == 0
     minutes = hour*60 + min
     val = "#{minutes/60}.#{((100*(minutes.modulo(60)))/60).to_s.rjust(2, '0')}"
-    BigDecimal.new(val, 2).round(2).to_s
+    BigDecimal.new(val, 2).round(2).to_f
   end
 
   # xos is rounding XOJET STYLE, which is a funky copy of how ipc did it
@@ -29,7 +44,7 @@ module TimeFunctions
     return 0 if hour + min == 0
     # It was determined that "ODD" increments of .05 (ie .15, .35, .55, .75, .95) of an hour (ie. 9,21,33,45,57 minutes) rounded UP whereas even increments of .05 rounded DOWN - sn
     minutes = as_minutes
-    (minutes/60.0 + ([9, 21, 33, 45, 57].include?( min ) ? 0.001 : -0.001)).round(2)
+    (minutes/60.0 + ([9, 21, 33, 45, 57].include?(min) ? 0.001 : -0.001)).round(2)
   end
 
   # xos is rounding XOJET STYLE, which is a funky copy of how ipc did it
@@ -37,11 +52,11 @@ module TimeFunctions
     return 0 if hour + min == 0
     # It was determined that "ODD" increments of .05 (ie .15, .35, .55, .75, .95) of an hour (ie. 9,21,33,45,57 minutes) rounded UP whereas even increments of .05 rounded DOWN - sn
     minutes = as_minutes
-    (minutes/60.0 + ([9, 21, 33, 45, 57].include?( min ) ? 0.01 : -0.01)).round(1)
+    (minutes/60.0 + ([9, 21, 33, 45, 57].include?(min) ? 0.01 : -0.01)).round(1)
   end
 
   def hm
-    to_s(:hm)
+    strftime("%H:%M")
   end
 
   def to_fos_days
@@ -52,12 +67,10 @@ end
 class Time
   include TimeFunctions
 
-  DATE_FORMATS[:hm] = "%H:%M"
-
   alias :original_to_s :to_s
 
   def to_s(args=nil)
-    args = :hm unless args
+    return self.strftime('%H:%M') if args == :hm or !args
     self.original_to_s(args)
   end
 
@@ -68,7 +81,25 @@ class Time
   end
 
   class << self
-    alias from_minutes from_fos_time 
+    alias from_minutes from_fos_time
+  end
+
+  ######## from Ruby Cookbook #########
+  def to_datetime
+    # Convert seconds + microseconds into a fractional number of seconds
+    seconds = sec + Rational(usec, 10**6)
+
+    # Convert a UTC offset measured in minutes to one measured in a
+    # fraction of a day.
+    offset = Rational(utc_offset, 60 * 60 * 24)
+    DateTime.new(year, month, day, hour, min, seconds, offset)
+  end
+
+  # This is a view "February 01, 2010 01:40" that be parsed directly by javascript
+  # ie. in javascript you can say:  Date.parse( "this to long view" )   and you
+  # will get a date object
+  def long_view
+    self.strftime('%B %d, %Y %H:%M')
   end
 end
 
@@ -79,16 +110,17 @@ class DateTime
   def self.from_fos_date_time(days, minutes)
     days = 0 unless days
     minutes = 0 unless minutes
-    Date.from_fos_days(days).to_datetime.advance(:minutes=>minutes)
+    (Date.from_fos_days(days).to_gm_time + minutes.minutes).to_datetime
   end
 
   def view
     to_s
   end
 
-  # This is a view that be parsed directly by javascript ie. in javascript 
-  # you can say:  Date.parse( "this to long view" )   and you will get a date object
+  # This is a view "February 01, 2010 01:40" that be parsed directly by javascript
+  # ie. in javascript you can say:  Date.parse( "this to long view" )   and you
+  # will get a date object
   def long_view
-    to_s(:long)
+    self.strftime('%B %d, %Y %H:%M')
   end
 end