fossil 0.5.34 → 0.5.35

data/VERSION

@@ -1 +1 @@
-0.5.34
+0.5.35

data/fossil.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fossil}
-  s.version = "0.5.34"
+  s.version = "0.5.35"
 
   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-10}
+  s.date = %q{2011-03-15}
   s.description = %q{Access FOS/betrieve db with this Sequel based orm wrapper}
   s.email = %q{dansudol@yahoo.com}
   s.extra_rdoc_files = [
@@ -20,6 +20,9 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "fossil.gemspec",
+     "lib/dbr_models/aircraft.rb",
+     "lib/dbr_models/airport.rb",
+     "lib/dbr_models/airport_fbo.rb",
      "lib/dbr_models/flight_log_expense.rb",
      "lib/dbr_models/group_cost.rb",
      "lib/dbr_models/personnel.rb",
@@ -55,6 +58,7 @@ Gem::Specification.new do |s|
      "lib/models/cargo.rb",
      "lib/models/check_group.rb",
      "lib/models/checklist.rb",
+     "lib/models/city_cost.rb",
      "lib/models/city_pair.rb",
      "lib/models/code.rb",
      "lib/models/comment.rb",
@@ -146,6 +150,7 @@ Gem::Specification.new do |s|
      "spec/helper_classes.rb",
      "spec/helper_methods.rb",
      "spec/models/airport_fbo_spec.rb",
+     "spec/models/city_pair_spec.rb",
      "spec/models/code_spec.rb",
      "spec/models/flight_log_expense_spec.rb",
      "spec/models/quote_spec.rb",
@@ -191,6 +196,7 @@ Gem::Specification.new do |s|
      "spec/models/vendor_document_spec.rb",
      "spec/models/trip_spec.rb",
      "spec/models/airport_fbo_spec.rb",
+     "spec/models/city_pair_spec.rb",
      "spec/be_model_with_values_matcher.rb"
   ]
 

data/lib/dbr_models/aircraft.rb

@@ -0,0 +1,3 @@
+class Aircraft
+  
+end

data/lib/dbr_models/airport.rb

@@ -0,0 +1,3 @@
+class Airport
+  one_to_many :airport_fbos, :class=>:AirportFbo, :primary_key=>:id, :key=>:airport_id
+end

data/lib/dbr_models/airport_fbo.rb

@@ -0,0 +1,3 @@
+class AirportFbo
+  many_to_one :airport, :class=>:Airport, :key=>:airport_id
+end

data/lib/fos_schema/fos_table_gen.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'sequel'
 require 'logger'
-require File.dirname(__FILE__) +'/../sequel/pervasive'
+require_relative '../sequel/pervasive_adapter'
 
 Sequel::Model.plugin(:schema)
 $db = Sequel.connect('odbc:/FOS')#, :loggers => [ Logger.new( $stdout ) ] )
@@ -57,7 +57,7 @@ COLUMN_DEFINITIONS
   end
 
   def write_class_file
-    file_name = File.join("..","..","models","#{@file_name}.rb")
+    file_name = File.join("..","models","#{@file_name}.rb")
     puts "filename=#{file_name}"
     file_str = File.exists?(file_name) ? File.read(file_name) : new_class_text
     sequel_part = build_sequel_section
@@ -118,7 +118,9 @@ end
 
 files = XFILE.filter(~:'xf$flags' => 16).and(:'xf$loc'.like('%.btr')).or(:'xf$loc'.like('%.BTR'))
 files.each do |file| 
-  p file[:'xf$name']
-  fos_class_gen = FOSClassGenerator.new(file) 
-  fos_class_gen.write_class_file
+  if file[:'xf$name'] == "CITY COST"
+    p file[:'xf$name']
+    fos_class_gen = FOSClassGenerator.new(file)
+    fos_class_gen.write_class_file
+  end
 end

data/lib/models/aircraft.rb

@@ -5,6 +5,7 @@ class Aircraft < Sequel::Model(:'aircraft')
   # One to many to one associations with atomic primary keys
   one_to_many :trips, :class=>:Trip, :key=>:'aircraft id', :primary_key=>:'aircraft id'
   one_to_many :trip_legs, :class=>:TripLeg, :key=>:'aircraft id', :primary_key=>:'aircraft id'
+  many_to_one :aircraft_type, :class=>:AircraftType, :key=>:'type id', :primary_key=>:'type id'
   n_to_o :owner, :class=>:Passenger, :prefix=>'owner'
 
   code_association :company_value,    :'company code',   :company

data/lib/models/city_cost.rb

@@ -0,0 +1,46 @@
+class CityCost < Sequel::Model(:'city cost')
+  set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
+
+  unrestrict_primary_key
+
+  def after_initialize
+    set_kids if new?
+  end
+
+  def set_kids
+    self.kid_date = rand(65535)
+    self.kid_time = rand(65535)
+    self.kid_comm = rand(255)
+    self.kid_mult = rand(255)
+    self.kid_user = rand(36**4).to_s(36)
+    self.owner_kid_date = citypair.kid_date
+    self.owner_kid_time = citypair.kid_time
+    self.owner_kid_mult = citypair.kid_mult
+    self.owner_kid_comm = citypair.kid_comm
+    self.owner_kid_user = citypair.kid_user
+  end
+
+  n_to_o :city_pair, :class=>:CityPair, :prefix=>'owner'
+
+#### BEGIN GENERATED SECTION ####
+
+  column_alias :dh_fare, :'dh fare'
+  column_alias :effective_date, :'effective date'
+  column_alias :end_date, :'end date'
+  column_alias :fare, :'fare'
+  column_alias :internal0, :'internal0'
+  column_alias :kid_comm, :'kid - comm'
+  column_alias :kid_date, :'kid - date'
+  column_alias :kid_mult, :'kid - mult'
+  column_alias :kid_time, :'kid - time'
+  column_alias :kid_user, :'kid - user'
+  column_alias :owner_kid_comm, :'owner kid - comm'
+  column_alias :owner_kid_date, :'owner kid - date'
+  column_alias :owner_kid_mult, :'owner kid - mult'
+  column_alias :owner_kid_time, :'owner kid - time'
+  column_alias :owner_kid_user, :'owner kid - user'
+  column_alias :key0, :'key0'
+  column_alias :key1, :'key1'
+#### END GENERATED SECTION ####
+
+end

data/lib/models/city_pair.rb

@@ -1,43 +1,60 @@
 class CityPair < Sequel::Model(:'city pair')
+  set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
+
+  unrestrict_primary_key
+
+  def after_initialize
+    set_kids if new?
+  end
+
+  def set_kids
+    self.kid_date = rand(65535)
+    self.kid_time = rand(65535)
+    self.kid_comm = rand(255)
+    self.kid_mult = rand(255)
+    self.kid_user = rand(36**4).to_s(36)
+  end
+  
+  o_to_n :city_costs, :class=>:CityCost, :prefix=>'owner'
 
 #### BEGIN GENERATED SECTION ####
-	set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
 
-	column_alias :additional_distance, :'additional distance'
-	column_alias :additional_time, :'additional time'
-	column_alias :aircraft_type_id, :'aircraft type id'
-	column_alias :allocation_1, :'allocation 1'
-	column_alias :allocation_2, :'allocation 2'
-	column_alias :cklist_kid_comm, :'cklist kid - comm'
-	column_alias :cklist_kid_date, :'cklist kid - date'
-	column_alias :cklist_kid_mult, :'cklist kid - mult'
-	column_alias :cklist_kid_time, :'cklist kid - time'
-	column_alias :cklist_kid_user, :'cklist kid - user'
-	column_alias :dh_fare, :'dh fare'
-	column_alias :distance, :'distance'
-	column_alias :fare, :'fare'
-	column_alias :flight_time, :'flight time'
-	column_alias :from_ap_id, :'from ap id'
-	column_alias :from_ap_prefix, :'from ap prefix'
-	column_alias :from_area_id, :'from area id'
-	column_alias :internal01, :'internal01'
-	column_alias :internal02, :'internal02'
-	column_alias :kid_comm, :'kid - comm'
-	column_alias :kid_date, :'kid - date'
-	column_alias :kid_mult, :'kid - mult'
-	column_alias :kid_time, :'kid - time'
-	column_alias :kid_user, :'kid - user'
-	column_alias :outside_eec_percent, :'outside eec percent'
-	column_alias :to_ap_id, :'to ap id'
-	column_alias :to_ap_prefix, :'to ap prefix'
-	column_alias :to_area_id, :'to area id'
-	column_alias :internal0, :'internal0'
-	column_alias :key0, :'key0'
-	column_alias :key1, :'key1'
-	column_alias :key2, :'key2'
-	column_alias :key3, :'key3'
-	column_alias :key4, :'key4'
-	column_alias :key5, :'key5'
+  column_alias :additional_distance, :'additional distance'
+  column_alias :additional_time, :'additional time'
+  column_alias :aircraft_type_id, :'aircraft type id'
+  column_alias :allocation_1, :'allocation 1'
+  column_alias :allocation_2, :'allocation 2'
+  column_alias :cklist_kid_comm, :'cklist kid - comm'
+  column_alias :cklist_kid_date, :'cklist kid - date'
+  column_alias :cklist_kid_mult, :'cklist kid - mult'
+  column_alias :cklist_kid_time, :'cklist kid - time'
+  column_alias :cklist_kid_user, :'cklist kid - user'
+  column_alias :dh_fare, :'dh fare'
+  column_alias :distance, :'distance'
+  column_alias :expiration_date, :'expiration date'
+  column_alias :fare, :'fare'
+  column_alias :flight_time, :'flight time'
+  column_alias :from_ap_id, :'from ap id'
+  column_alias :from_ap_prefix, :'from ap prefix'
+  column_alias :from_area_id, :'from area id'
+  column_alias :internal01, :'internal01'
+  column_alias :internal02, :'internal02'
+  column_alias :kid_comm, :'kid - comm'
+  column_alias :kid_date, :'kid - date'
+  column_alias :kid_mult, :'kid - mult'
+  column_alias :kid_time, :'kid - time'
+  column_alias :kid_user, :'kid - user'
+  column_alias :outside_eec_percent, :'outside eec percent'
+  column_alias :to_ap_id, :'to ap id'
+  column_alias :to_ap_prefix, :'to ap prefix'
+  column_alias :to_area_id, :'to area id'
+  column_alias :internal0, :'internal0'
+  column_alias :key0, :'key0'
+  column_alias :key1, :'key1'
+  column_alias :key2, :'key2'
+  column_alias :key3, :'key3'
+  column_alias :key4, :'key4'
+  column_alias :key5, :'key5'
 #### END GENERATED SECTION ####
 
 end

data/lib/models/trip_leg.rb

@@ -8,8 +8,6 @@ class TripLeg < Sequel::Model(:'trip legs')
   many_to_one :locked_by, :class=>:User, :key=>:'locked by - user id', :primary_key=>:'users initials'
   many_to_one :leg_rate_aircraft, :class=>:Aircraft, :key=>:'leg rate ac id', :primary_key=>:'aircraft id'
   many_to_one :authorizer_name, :class=>:Personnel, :key=>:authorization, :primary_key=>:employee_id
-  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 associations with composite primary keys
   n_to_o :trip, :class=>:Trip, :prefix=>'trips'

data/lib/models/vendor_document.rb

@@ -1,6 +1,8 @@
 class VendorDocument < Sequel::Model(:'vendor documents')
   set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
 
+  unrestrict_primary_key
+
   # helper accessors for creating vendor document
   # filename_prefix helps set up the path to the document
   attr_accessor :doc_type_value, :file_name_prefix, :doc_type, :file_name
@@ -9,9 +11,6 @@ class VendorDocument < Sequel::Model(:'vendor documents')
   column_alias :trip_number, :number, :type => :integer
   column_alias :description, :name
 
-  # Developpers must have the ability to set the PK programmatically
-  unrestrict_primary_key
-
   # Code associations
   code_association :type, :document_type, :aircraft_document
 

data/spec/models/city_pair_spec.rb

@@ -0,0 +1,50 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+RSpec::Matchers.define :have_valid_kid_keys do |expected|
+  match do |actual|
+    actual.kid_date.to_s.should =~ /\d{1,5}/
+    actual.kid_time.to_s.should =~ /\d{1,5}/
+    actual.kid_user.should =~ /\w{4}/
+    actual.kid_mult.to_s.should =~ /\d{1,3}/
+    actual.kid_comm.to_s.should =~ /\d{1,3}/
+  end
+end
+
+
+class Sequel::Model::Associations::OneToManyAssociationReflection
+  # one_to_many associations can only have associated objects if none of
+  # the :keys options have a nil value.
+  def can_have_associated_objects?(obj)
+    !self[:primary_keys].any?{|k| obj.send(k).nil?}
+#     !self[:primary_keys].any?{|k| obj.send(:[],k).nil?}
+  end
+end
+
+describe CityPair do
+
+    it "sets kid values for new city_pair" do
+      city_pair = CityPair.new
+      begin
+        city_pair.should have_valid_kid_keys
+#        p CityPair.aliases
+        p city_pair.city_costs
+#        p city_pair.kid_user
+#        p city_pair.send(:[],:'kid - user')
+      rescue => e
+        pp [e,e.backtrace]
+      end
+    end
+
+    it "sets kid vlues for CityCost" do
+#      city_pair = CityPair.new
+#      city_cost = CityCost.new(:city_pair=>city_pair)
+#      city_cost.should have_valid_kid_keys
+#      city_pair.kid_date.to_s.should =~ /\d{4,5}/
+#      city_pair.kid_time.to_s.should =~ /\d{4,5}/
+#      city_pair.kid_user.should =~ /\w{4}/
+#      city_pair.kid_mult.to_s.should =~ /\d{1,3}/
+#      city_pair.kid_comm.to_s.should =~ /\d{1,3}/
+    end
+
+end
+

data/spec/silly_spec.rb

@@ -3,31 +3,38 @@ require 'logger'
 require 'pp'
 
 #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)])
-#[AirportFuel].each {|model| model.db = DB}
-#[Trip, TripLeg, Aircraft].each {|model| model.db = DB}
-
+#[CityPair,CityCost].each {|model| model.db = DB}
+[Vendor].each {|model| model.db = DB}
+#p Aircraft.first.type_id
 #p [AirportFuel.min(:kid_date),AirportFuel.max(:kid_date)]
 #p [TripLeg.min(:dept_date_gmt),TripLeg.max(:dept_date_gmt)]
 #p [Date.from_fos_days(TripLeg.min(:dept_date_gmt)).to_s,Date.from_fos_days(TripLeg.max(:dept_date_gmt)).to_s]
-
-#p TripLeg.filter(:)
+p Vendor.count
+#p TripLeg.filter{kid_date > 40500}.limit(10).all.collect &:dep_fuel_vendor
 #p Passenger.filter(:kid_date=>38439, :kid_time=>1428, :kid_comm=>1, :kid_mult=>0).first
 #p Aircraft.filter(:kid_date=>39722).first.owner_name
 #p Aircraft.select(:kid_date,:owner_kid_date,:owner_kid_time).all.collect{|c| [c.kid_date,c.owner_kid_date,c.owner_kid_time] }
-#p Aircraft.select(:kid_date,:owner_name,:owner_kid_user,:owner_kid_comm,:owner_kid_mult,:owner_kid_date,:owner_kid_time).filter(~:owner_kid_date=>0).all.collect{|c| [c.kid_date,c.owner_name,c.owner_kid_user,c.owner_kid_comm,c.owner_kid_mult,c.owner_kid_date,c.owner_kid_time] }
+#p Aircraft.select(:kid_date,:tail_number,:owner_name,:owner_kid_user,:owner_kid_comm,:owner_kid_mult,:owner_kid_date,:owner_kid_time).all.collect{|c| [c.kid_date,c.tail_number,c.owner_name,c.owner_kid_user,c.owner_kid_comm,c.owner_kid_mult,c.owner_kid_date,c.owner_kid_time] }
 #p Aircraft.select(:owner_name).all.collect(&:owner_name).uniq.sort
-
+#p Passenger.filter(:name.like('%CTA%')).first
+#p TripLeg.all.collect(&:aircraft__tail_number).uniq
+#
 #Aircraft.first.owner
 #p TripLeg.filter{flight_time_actual > 0 }.first.aft_time_view
 
 #p TripLeg.select(:cancel_code).distinct(:cancel_code)
 #p TripLeg.filter{ cancel_code >1 }.count
 
-#p TripLeg.first(:trip_number=>98,:leg_number=>3).fill_hash(
-#    [:kid_date,:planned_departure_date_time_gmt]
+#p TripLeg.first(:trip_number=>85868,:leg_number=>4).fill_hash(
+#p TripLeg.first(:trip_number=>87204,:leg_number=>2).fill_hash(
+#    [:kid_date,:planned_departure_date_time_gmt,:status,:deadhead,:leg_type_code,:trip__trip_type_code]
 #)
 
+#pp TripLeg.first(:trip_number=>87204,:leg_number=>2).trip.values
+
 #p QuoteLeg.filter{kid_date > (Date.today-30)}.filter{block_time_actual > 0}.first.confirmation_number
 #p t.actual_departure_date_time_gmt.to_time
 #p t.actual_departure_date_time_gmt.to_time.utc

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@ require_relative '../lib/fossil'
 require 'rspec'
 require 'rr'
 require 'logger'
+require 'pp'
 
 p RUBY_VERSION
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 34
-  version: 0.5.34
+  - 35
+  version: 0.5.35
 platform: ruby
 authors: 
 - Daniel Sudol
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-10 00:00:00 -08:00
+date: 2011-03-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,6 +72,9 @@ files:
 - Rakefile
 - VERSION
 - fossil.gemspec
+- lib/dbr_models/aircraft.rb
+- lib/dbr_models/airport.rb
+- lib/dbr_models/airport_fbo.rb
 - lib/dbr_models/flight_log_expense.rb
 - lib/dbr_models/group_cost.rb
 - lib/dbr_models/personnel.rb
@@ -107,6 +110,7 @@ files:
 - lib/models/cargo.rb
 - lib/models/check_group.rb
 - lib/models/checklist.rb
+- lib/models/city_cost.rb
 - lib/models/city_pair.rb
 - lib/models/code.rb
 - lib/models/comment.rb
@@ -198,6 +202,7 @@ files:
 - spec/helper_classes.rb
 - spec/helper_methods.rb
 - spec/models/airport_fbo_spec.rb
+- spec/models/city_pair_spec.rb
 - spec/models/code_spec.rb
 - spec/models/flight_log_expense_spec.rb
 - spec/models/quote_spec.rb
@@ -270,4 +275,5 @@ test_files:
 - spec/models/vendor_document_spec.rb
 - spec/models/trip_spec.rb
 - spec/models/airport_fbo_spec.rb
+- spec/models/city_pair_spec.rb
 - spec/be_model_with_values_matcher.rb