fossil 0.5.20 → 0.5.21

data/VERSION

@@ -1 +1 @@
-0.5.20
+0.5.21

data/fossil.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fossil}
-  s.version = "0.5.20"
+  s.version = "0.5.21"
 
   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-12-16}
+  s.date = %q{2010-12-20}
   s.description = %q{Access FOS/betrieve db with this Sequel based orm wrapper}
   s.email = %q{plardin@xojet.com}
   s.extra_rdoc_files = [

data/lib/dbr_models/trip.rb

@@ -1,6 +1,6 @@
 class Trip
   one_to_many :passengers, :class => :TripPassenger, :key=>:trip_id, :primary_key=>:id
+  one_to_many :trip_legs, :class => :TripLeg, :key=>:'trip number', :primary_key=>:'trip number'
   many_to_one :trip_requester, :class => :Passenger, :key=>:requester_id
   many_to_one :quote, :class => :Quote, :key=>:quote_id
-  one_to_many :trip_legs, :class => :TripLeg, :key=>:'trip number', :primary_key=>:'trip number'
 end

data/lib/models/crew_duty.rb

@@ -129,13 +129,11 @@ class CrewDuty < Sequel::Model(:'crew duty')
   column_def_datetime :duty_end_time,     :'act end date home', :'act end time home'
 
   # Fetches the crew duty records in a given interval
-  def self.find_crew_duty_in_time_range(from_datetime, to_datetime)
+  def self.find_crew_duty_in_time_range(from_date, to_date)
     # Fetching the records verified or amended in the time interval passed in
-    CrewDuty.filter(
-      {:verified=>1, :amended=>0, :verified_date=>from_datetime.to_fos_days, :verified_time=>(from_datetime.as_minutes..1440)} |
-      {:verified=>1, :amended=>0, :verified_date=>to_datetime.to_fos_days, :verified_time=>(0..to_datetime.as_minutes)} |
-      {:verified=>1, :amended=>1, :amended_date=>from_datetime.to_fos_days, :amended_time=>(from_datetime.as_minutes..1440)} |
-      {:verified=>1, :amended=>1, :amended_date=>to_datetime.to_fos_days, :amended_time=>(0..to_datetime.as_minutes)}
+    filter(
+      {:verified=>1, :amended=>0, :verified_date=>from_date.to_fos_days..to_date.to_fos_days} |
+      {:verified=>1, :amended=>1, :amended_date=>from_date.to_fos_days..to_date.to_fos_days}
     ).all
   end
 end

data/spec/sequel/core_patch_spec.rb

@@ -2,51 +2,52 @@ 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 works to see dbr tables" do
-#      [TripLeg,Trip,Aircraft,Code,CrewLeg].each{|model| model.db=@db}
+#    it "actually works to see a fos table" do
+#      TripLeg.db=@db
 #      TripLeg.first.should_not be nil
-#      TripLeg.first.trip.should_not be nil
-##      p TripLeg.select(:trip_number).eager_graph(:trip).sql
-##      p TripLeg.filter(:id=>"WERJ-1-17-40385-1243").first
-##      p TripLeg.filter(:'trip legs__trip_number'=>68070,:leg_number=>5).eager_graph(:crew_legs => [:crew_name, :position_code]).sql
-##      t = TripLeg.filter(:'trip legs__trip_number'=>68070,:leg_number=>5).eager_graph(:crew_legs => [:crew_name, :position_code]).all.first
-##      p [t.status,t.division,t.regulation,t.closed,t.ete,t.department,t.deadhead,t.company]
-##      p TripLeg.filter(:id=>"WERJ-1-17-40385-1243").eager_graph(:aircraft).all.first
-##      TripLeg.filter(:'trip legs__kid_date'=>40475..40475, :cancel_code=>0,:leg_type_code=>7).eager_graph(:crew_legs=>:position_code).all.size.should == 3
 #    end
 #  end
 
-  it "set_db method finds sets db on all Sequel models" do
-    db = Sequel.fos('fos')
-    Sequel.set_db db
-    Trip.db.should == db
+  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 works to see dbr tables" do
+      [TripLeg,Trip,Quote,Aircraft,Code,CrewLeg].each{|model| model.db=@db}
+#      TripLeg.first.should_not be nil
+#      TripLeg.first.trip.should_not be nil
+      p Trip.eager_graph(:quote).sql
+#      p TripLeg.select(:trip_number).eager_graph(:trip).sql
+#      p TripLeg.filter(:id=>"WERJ-1-17-40385-1243").first
+#      p TripLeg.filter(:'trip legs__trip_number'=>68070,:leg_number=>5).eager_graph(:crew_legs => [:crew_name, :position_code]).sql
+#      t = TripLeg.filter(:'trip legs__trip_number'=>68070,:leg_number=>5).eager_graph(:crew_legs => [:crew_name, :position_code]).all.first
+#      p [t.status,t.division,t.regulation,t.closed,t.ete,t.department,t.deadhead,t.company]
+#      p TripLeg.filter(:id=>"WERJ-1-17-40385-1243").eager_graph(:aircraft).all.first
+#      TripLeg.filter(:'trip legs__kid_date'=>40475..40475, :cancel_code=>0,:leg_type_code=>7).eager_graph(:crew_legs=>:position_code).all.size.should == 3
+    end
   end
 
+#  it "set_db method finds sets db on all Sequel models" do
+#    db = Sequel.fos('fos')
+#    Sequel.set_db db
+#    Trip.db.should == db
+#  end
+
   it "converts fos_id to key that can be used to query model" do
     Sequel.fos_id_to_lookup_key("MERE-0-8-40443-1259").should == ['MERE',0,8,40443,1259]
   end

data/spec/silly_spec.rb

@@ -5,9 +5,15 @@ require 'pp'
 # 800 557-9965
 # 0279507735
 
-DB = Sequel.fos('flyos', :loggers=>[Logger.new($stdout)])
+DB = Sequel.fos('fosprod', :loggers=>[Logger.new($stdout)])
+#DB = Sequel.fos('flyos', :loggers=>[Logger.new($stdout)])
+CrewDuty.db = DB
 
-[Airport,TripLeg,AirportFbo].each{|m| m.db=DB}
+date = Date.today - 1
+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] }
+
+#[Personnel,Airport,TripLeg,AirportFbo].each{|m| m.db=DB}
+#p Personnel.first(:employee_name.like('%chmo%'))
 #[Trip,CrewLeg,TripLeg,Passenger,Aircraft,Airport,AirportFbo,CrewLeg,Code,Personnel,Comment].each{|m| m.db=DB}
 #p TripLeg.all.collect{ |t| [t.pic,t.sic,t.departure_fbo__name,t.arrival_fbo__name]}
 #t = Trip.filter(:trips__trip_number=>8).eager_graph(:trip_legs).all.first
@@ -20,7 +26,8 @@ DB = Sequel.fos('flyos', :loggers=>[Logger.new($stdout)])
 # end
 
 #p AirportFbo.filter(:icao=>'KSFO').count
-DB.execute('Update "trip legs" set "pax count" = 5 where "trip number" = 62 and "leg number" = 1 ')
+#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" = 6 where "trip number" = 62 and "leg number" = 1 ')
 #tl = TripLeg.filter(:trip_number=>62,:leg_number=>1).first#eager_graph(:arrival_fbo).all.first
 #p tl.fos_id
 #p tl.pax_count

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 20
-  version: 0.5.20
+  - 21
+  version: 0.5.21
 platform: ruby
 authors: 
 - Patrick Lardin, Daniel Sudol
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-16 00:00:00 -08:00
+date: 2010-12-20 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency