fossil 0.5.42 → 0.5.43

data/VERSION

@@ -1 +1 @@
-0.5.42
+0.5.43

data/fossil.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fossil}
-  s.version = "0.5.42"
+  s.version = "0.5.43"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Sudol", "Patrick Lardin"]
-  s.date = %q{2011-03-17}
+  s.date = %q{2011-03-21}
   s.description = %q{Access FOS/betrieve db with this Sequel based orm wrapper}
   s.email = %q{dansudol@yahoo.com}
   s.extra_rdoc_files = [

data/lib/models/flight_log_expense.rb

@@ -159,18 +159,9 @@ class FlightLogExpense < Sequel::Model(:'flight log expenses')
   def fuel_passdown_hash
     expense_type = type_string
     tl           = trip_leg
-    p expense_type
-    p tl
-    p vendor_id
-    p tl.send("#{expense_type}_fuel_vendor")
-    p tl.dep_fuel_vendor
-    p tl.arr_fuel_vendor
     vendor       = tl.send("#{expense_type}_fuel_vendor__company_2")
-    p vendor
     vendor       = tl.send("#{expense_type}_fuel_vendor__company_1") if !vendor or vendor == ""
-    p vendor
     vendor       = tl.send("#{expense_type}_fuel_vendor__vendor_id") if !vendor or vendor == ""
-    p vendor
     airport      = tl.send("#{expense_type}_icao_val")
     fbo          = tl.send("#{expense_type}_fbo__name")
     aircraft     = (tl.aircraft ? tl.tail_number : tl.aircraft_id)

data/lib/models/trip_leg.rb

@@ -950,7 +950,7 @@ class TripLeg < Sequel::Model(:'trip legs')
       TripLeg.filter(:cancelled => 0, :status => [0,1,2]).
               filter(~{:'leg state' => 5}).
               filter({:'dept date act local' => start_date..end_date,
-                      :'depart date - local'   => start_date...end_date}.sql_or).limit(10).all
+                      :'depart date - local'   => start_date...end_date}.sql_or).all
     end
 
     def fuel_data_by_fbo_keys trip_legs, fbo_keys

data/lib/sequel/model_patch.rb

@@ -246,9 +246,11 @@ class Sequel::Model
           when :time
             Time.from_fos_time(column_value) if column_value
           when :currency
+#            (column_value || 0).to_currency
             number_to_currency((column_value || 0).to_f/100, :unit=>'', :precision=>2)
           when :precision
-            # precision wont do delimiter .. so send to currency
+#            (column_value || 0).to_currency
+#            precision wont do delimiter .. so send to currency
             number_to_currency((column_value || 0).to_f/100, :unit=>'', :precision=>2)
           when :boolean
             return "True" if column_value and (column_value == 1 or column_value == true)

data/lib/support/core_extensions.rb

@@ -40,8 +40,8 @@ class Float
   end
 
   def to_currency
-    int, frac = self.round(2).to_s.split('.')
-    num = int.gsub(/(\d)(?=(\d\d\d)+(\d))/, '\\1,')
+    int, frac = sprintf('%0.2f', self.round(2)).split('.')
+    num = int.gsub(/(\d)(?=(\d\d\d)+(?!\d))/, '\\1,')
     "$#{num}.#{frac}"
   end
 end

data/spec/core_extensions_spec.rb

@@ -35,6 +35,10 @@ describe Integer do
     i = 10343
     i.in_hundredths.should == 172.38
   end
+
+  it "should be able to convert to a currency string" do
+    123423.to_currency.should == "$123,423.00"
+  end
 end
 
 describe Float do
@@ -47,6 +51,10 @@ describe Float do
     i = 10343.56
     i.in_hundredths.should == 172.39
   end
+
+  it "should be able to convert to a currency string" do
+    123423.5673.to_currency.should == "$123,423.57"
+  end
 end
 
 describe Range do

data/spec/silly_spec.rb

@@ -1,6 +1,27 @@
 require_relative '../lib/fossil'
 require 'logger'
+#require 'fossil_dbr'
 require 'pp'
+require 'active_record'
+
+class TripLegSummary < ActiveRecord::Base
+  set_table_name :trip_leg_summary
+  h = {"adapter"=>"mysql", "username"=>"flyos", "password"=>"flyos", "host"=>"localhost", "database"=>"flyos_fos_summary"}
+  establish_connection h
+end
+p TripLegSummary.first
+
+old_summary_values=
+{:id=>"CTA-2-17-38922-1090",
+ :trip_requester=>"Wayne,John",
+ :pic=>"JS",
+ :sic=>"RBB",
+ :fuel_burned=>0,
+ :fuel_vendor=>"None",
+ :fueler_flags=>0,
+ :fbo_flags=>Date.today
+}
+
 
 #class Sequel::Model::Associations::OneToManyAssociationReflection
 #  # one_to_many associations can only have associated objects if none of
@@ -9,16 +30,37 @@ require 'pp'
 #    !self[:primary_keys].any?{|k| obj.send(k).nil?}
 #  end
 #end
+#h = {"adapter"=>"mysql", "username"=>"datamart", "password"=>"datap@ss", "host"=>"hrkdm.pcmt.local", "database"=>"dbr"}
+#DB = Sequel.fos_dbr(h)
+DB = Sequel.fos('flyos', :loggers=>[Logger.new($stdout)])
+#DB.loggers=[Logger.new($stdout)]#File.expand_path("log/#{RAILS_ENV}.log"))]
+[TripLeg, Aircraft].each { |model| model.db = DB }
+#p [TripLeg.min(:kid_date),TripLeg.max(:kid_date)]
+#p [Date.from_fos_days(TripLeg.min(:kid_date)),Date.from_fos_days(TripLeg.max(:kid_date))]
+#p [Date.from_fos_days(TripLeg.min(:depart_date_local)),Date.from_fos_days(TripLeg.max(:depart_date_local))]
+#p Date.from_fos_days 38922
 
 #DB = Sequel.fos('fosprod', :loggers=>[Logger.new($stdout)])
 #DB = Sequel.fos('fos', :loggers=>[Logger.new($stdout)])
 #DB = Sequel.fos('demo_company_fos_db')#, :loggers=>[Logger.new($stdout)])
-DB = Sequel.fos('flyos', :loggers=>[Logger.new($stdout)])
+#DB = Sequel.fos('flyos', :loggers=>[Logger.new($stdout)])
 #[CityPair,CityCost].each {|model| model.db = DB}
 #p CityPair.first.city_costs
 #p CityPair.first.send('kid - user')
 #[TripLeg].each {|model| model.db = DB}
-p DB.run("UPDATE \"TRIP LEGS\" SET \"NOTE\" = 'hi rob' WHERE (\"TRIP NUMBER\" = 45) AND (\"LEG NUMBER\" = 1)")
+#p TripLeg.filter(:trip_number=>45,:leg_number=>1).first.arrival_transport_comment
+#p Comment.filter(:kid_date=>38922,:kid_time=>1090,:kid_mult=>2,:kid_comm=>37).count
+#p Aircraft.all.collect &:aircraft_id
+
+#aircraft_ids = ["7RN", "45FM", "567T", "65PC", "67AS", "7NPN", "567Y", "89TY", "334D", "199J", "344D"]
+#aircraft_id = TripLeg.filter(:trip_number=>45,:leg_number=>1).first.aircraft_id
+#index = aircraft_ids.index(aircraft_id)
+#next_index = index == aircraft_ids.length-1 ? 0 : index + 1
+#p aircraft_ids[next_index]
+#DB.run("UPDATE \"TRIP LEGS\" SET \"aircraft id\" = '#{aircraft_ids[next_index]}' WHERE (\"TRIP NUMBER\" = 45) AND (\"LEG NUMBER\" = 1)")
+
+
+#p DB.run("UPDATE \"TRIP LEGS\" SET \"NOTE\" = 'hi rob' WHERE (\"TRIP NUMBER\" = 45) AND (\"LEG NUMBER\" = 1)")
 #p TripLeg.filter(:trip_number=>45,:leg_number=>1).first.note
 #tl = TripLeg.filter(:trip_number=>45,:leg_number=>1).first
 #tl.note = "hi tob"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 42
-  version: 0.5.42
+  - 43
+  version: 0.5.43
 platform: ruby
 authors: 
 - Daniel Sudol
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-17 00:00:00 -07:00
+date: 2011-03-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency