fossil 0.5.2 → 0.5.3

data/README.rdoc

@@ -0,0 +1,3 @@
+Fossil gem by Patrick Lardin and Daniel Sudol
+
+Released under the MIT License: www.opensource.org/licenses/mit-license.php

data/Rakefile

@@ -9,7 +9,7 @@
      gemspec.description = "Access FOS/betrieve db with this Sequel based orm wrapper"  
      gemspec.email = "plardin@xojet.com"  
      gemspec.homepage = ""
-     gemspec.add_dependency('sequel', '= 3.13.0')
+     gemspec.add_dependency('sequel', '= 3.14.0')
      gemspec.add_dependency('ruby-odbc')
      gemspec.add_development_dependency('rspec')
      gemspec.authors = ["Patrick Lardin, Daniel Sudol"]

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.5.3

data/fossil.gemspec

@@ -5,18 +5,26 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fossil}
-  s.version = "0.5.2"
+  s.version = "0.5.3"
 
   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-10-04}
+  s.date = %q{2010-10-26}
   s.description = %q{Access FOS/betrieve db with this Sequel based orm wrapper}
   s.email = %q{plardin@xojet.com}
+  s.extra_rdoc_files = [
+    "README.rdoc"
+  ]
   s.files = [
-    "Rakefile",
+    "README.rdoc",
+     "Rakefile",
      "VERSION",
      "fossil.gemspec",
      "lib/date_extentions.rb",
+     "lib/dbr_models/group_cost.rb",
+     "lib/dbr_models/quote.rb",
+     "lib/dbr_models/trip.rb",
+     "lib/dbr_models/trip_leg.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",
@@ -146,6 +154,7 @@ Gem::Specification.new do |s|
      "spec/sequel/model_patch_spec.rb",
      "spec/sequel/pervasive_adapter_spec.rb",
      "spec/sequel/serializer/json_serializer_spec.rb",
+     "spec/sequel/serializer/json_serializer_with_active_support_spec.rb",
      "spec/sequel/serializer/xml_serializer_spec.rb",
      "spec/sequel/spec_helper_tables.rb",
      "spec/spec_helper.rb"
@@ -164,6 +173,7 @@ Gem::Specification.new do |s|
      "spec/sequel/fos_dates_spec.rb",
      "spec/sequel/core_patch_spec.rb",
      "spec/sequel/spec_helper_tables.rb",
+     "spec/sequel/serializer/json_serializer_with_active_support_spec.rb",
      "spec/sequel/serializer/json_serializer_spec.rb",
      "spec/sequel/serializer/xml_serializer_spec.rb",
      "spec/sequel/pervasive_adapter_spec.rb",
@@ -182,16 +192,16 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     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<sequel>, ["= 3.14.0"])
       s.add_runtime_dependency(%q<ruby-odbc>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
     else
-      s.add_dependency(%q<sequel>, ["= 3.13.0"])
+      s.add_dependency(%q<sequel>, ["= 3.14.0"])
       s.add_dependency(%q<ruby-odbc>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
     end
   else
-    s.add_dependency(%q<sequel>, ["= 3.13.0"])
+    s.add_dependency(%q<sequel>, ["= 3.14.0"])
     s.add_dependency(%q<ruby-odbc>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
   end

data/lib/dbr_models/group_cost.rb

@@ -0,0 +1,3 @@
+class GroupCost
+  one_to_many :costs, :class => :OneCost, :key => :group_id, :primary_key=>:id
+end

data/lib/dbr_models/quote.rb

@@ -0,0 +1,9 @@
+class Quote
+
+  many_to_one :trip, :class=>:Trip, :key=>:trip_id
+  many_to_one :requester, :class=>:Passenger, :key=>:pax_id
+  many_to_one :group_cost, :class=>:GroupCost, :key=>:costgroup_id
+  one_to_many :quote_legs, :class=>:QuoteLeg, :key=>:quotes_id, :primary_key=>:id
+  many_to_one :client_invoice_comment, :class=>:Comment, :key=>:client_invoice_comment_id
+
+end

data/lib/dbr_models/trip.rb

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

data/lib/dbr_models/trip_leg.rb

@@ -0,0 +1,24 @@
+################################################################################
+#
+# This TripLeg is overriding the TripLeg model in fossil.
+# It is pulling data from the mysql in memory database which is a copy of the fos
+# trip leg table but with an added id column, and single ids for all foreign keys,
+# so the associations are all rewritten to use the single primary key.
+# The other methods are special methods for datamart trip_leg summary table
+#
+class TripLeg
+  one_to_many :crew_legs, :class=>:CrewLeg, :key=>:trip_leg_id, :primary_key=>:id
+  one_to_many :flight_log_expenses, :class=>:FlightLogExpense, :key=>:trip_leg_id, :primary_key=>:id
+  many_to_one :trip, :class=>:Trip, :key=>:trips_id
+  many_to_one :arrival_fbo, :class=>:AirportFbo, :key=>:fbo_id
+  many_to_one :departure_fbo, :class=>:AirportFbo, :key=>:fueler_id
+  many_to_one :trip_requester, :class=>:Passenger, :key=>:requester_id
+  many_to_one :leg_requestor, :class=>:Passenger, :key=>:leg_req_id
+  many_to_one :departure_catering_comment,  :class=>:Comment,  :key=>:departure_catering_comment_id
+  many_to_one :arrival_catering_comment,    :class=>:Comment,  :key=>:arrival_catering_comment_id
+  many_to_one :departure_transport_comment, :class=>:Comment,  :key=>:departure_transport_comment_id
+  many_to_one :arrival_transport_comment,   :class=>:Comment,  :key=>:arrival_transport_comment_id
+  many_to_one :departure_general_comment,   :class=>:Comment,  :key=>:departure_general_comment_id
+  many_to_one :arrival_general_comment,     :class=>:Comment,  :key=>:arrival_general_comment_id
+
+end

data/lib/fossil.rb

@@ -1,20 +1,12 @@
 require 'rubygems'
 
 begin
-  gem 'sequel', '=3.13.0'
+  gem 'sequel', '=3.14.0'
   require('sequel')
 rescue LoadError => e
-  raise("To use Fossil you need the sequel gem:\n '$ sudo gem install sequel -v=3.13.0'")
+  raise("To use Fossil you need the sequel gem:\n '$ sudo gem install sequel -v=3.14.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
-
 dir = File.dirname(__FILE__)
 files = [File.join(dir,'number_helper.rb')] +
         [File.join(dir,'hash_extentions.rb')] +

data/lib/models/trip_leg.rb

@@ -63,10 +63,10 @@ class TripLeg < Sequel::Model(:'trip legs')
   many_to_one :departure_fbo_comment_value, :class=>:Comment, :key=>nil, :dataset=>proc { Comment.filter( :"kid - date"=>self[:"kid - date"], :"kid - time"=>self[:"kid - time"], :"kid - user"=>self[:"kid - user"], :"kid - mult"=>self[:"kid - mult"], :"kid - comm"=>43) }
   many_to_one :arrival_fbo_comment_value, :class=>:Comment, :key=>nil, :dataset=>proc { Comment.filter( :"kid - date"=>self[:"kid - date"], :"kid - time"=>self[:"kid - time"], :"kid - user"=>self[:"kid - user"], :"kid - mult"=>self[:"kid - mult"], :"kid - comm"=>34) }
   many_to_one :departure_catering_comment, :class=>:Comment, :key=>nil, :dataset=>proc { Comment.filter( :"kid - date"=>self[:"kid - date"], :"kid - time"=>self[:"kid - time"], :"kid - user"=>self[:"kid - user"], :"kid - mult"=>self[:"kid - mult"], :"kid - comm"=>37) }
-  many_to_one :departure_transport_comment, :class=>:Comment, :key=>nil, :dataset=>proc { Comment.filter( :"kid - date"=>self[:"kid - date"], :"kid - time"=>self[:"kid - time"], :"kid - user"=>self[:"kid - user"], :"kid - mult"=>self[:"kid - mult"], :"kid - comm"=>41) }
-  many_to_one :departure_general_comment, :class=>:Comment, :key=>nil, :dataset=>proc { Comment.filter( :"kid - date"=>self[:"kid - date"], :"kid - time"=>self[:"kid - time"], :"kid - user"=>self[:"kid - user"], :"kid - mult"=>self[:"kid - mult"], :"kid - comm"=>183) }
   many_to_one :arrival_catering_comment, :class=>:Comment, :key=>nil, :dataset=>proc { Comment.filter( :"kid - date"=>self[:"kid - date"], :"kid - time"=>self[:"kid - time"], :"kid - user"=>self[:"kid - user"], :"kid - mult"=>self[:"kid - mult"], :"kid - comm"=>1) }
+  many_to_one :departure_transport_comment, :class=>:Comment, :key=>nil, :dataset=>proc { Comment.filter( :"kid - date"=>self[:"kid - date"], :"kid - time"=>self[:"kid - time"], :"kid - user"=>self[:"kid - user"], :"kid - mult"=>self[:"kid - mult"], :"kid - comm"=>41) }
   many_to_one :arrival_transport_comment, :class=>:Comment, :key=>nil, :dataset=>proc { Comment.filter( :"kid - date"=>self[:"kid - date"], :"kid - time"=>self[:"kid - time"], :"kid - user"=>self[:"kid - user"], :"kid - mult"=>self[:"kid - mult"], :"kid - comm"=>36) }
+  many_to_one :departure_general_comment, :class=>:Comment, :key=>nil, :dataset=>proc { Comment.filter( :"kid - date"=>self[:"kid - date"], :"kid - time"=>self[:"kid - time"], :"kid - user"=>self[:"kid - user"], :"kid - mult"=>self[:"kid - mult"], :"kid - comm"=>183) }
   many_to_one :arrival_general_comment, :class=>:Comment, :key=>nil, :dataset=>proc { Comment.filter( :"kid - date"=>self[:"kid - date"], :"kid - time"=>self[:"kid - time"], :"kid - user"=>self[:"kid - user"], :"kid - mult"=>self[:"kid - mult"], :"kid - comm"=>185) }
 
   many_to_one :limo_comment_value, :class=>:Comment, :key=>nil, :dataset=>proc { Comment.filter( :"kid - date"=>self[:"kid - date"], :"kid - time"=>self[:"kid - time"], :"kid - user"=>self[:"kid - user"], :"kid - mult"=>self[:"kid - mult"], :"kid - comm"=>self[:"limo comment"]) }

data/lib/sequel/core_patch.rb

@@ -7,6 +7,15 @@ module Sequel
       db
     end
 
+    def fos_dbr(opts={})
+      db = Sequel.mysql(opts)
+      db.extend(MySql::Pervasive::DatabaseMethods)
+      # require the dbr libs
+      dbr_lib_dir = File.join(File.dirname(__FILE__),'..','lib','dbr_fos_models')
+      Dir.glob(File.join(dbr_lib_dir , '*.rb')).each{|f| require f}
+      db
+    end
+
     # sets the db to all sequel models
     def set_db(db)
       Sequel::Model.find_children.each { |klass| klass.to_s.constantize.db=db }

data/lib/sequel/fos_dates.rb

@@ -22,8 +22,7 @@ class Date
   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)
+    Time.send(method, dest.year, dest.month, dest.day, dest.send(:hour), dest.send(:min), dest.send(:sec), usec)
   end
 end
 

data/spec/models/trip_leg_spec.rb

@@ -2,6 +2,12 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe TripLeg do
 
+  it "catering association works with eager graph" do
+    set_fos_db([TripLeg,Comment])
+    t = TripLeg.filter(:'trip legs__kid_date'=>66254).eager_graph(:aircraft).limit(1).all.first
+    t.departure_general_comment
+  end
+
 #  describe "arrival_airport assoc works" do
 #    before :all do
 #      set_fos_db([Airport])
@@ -81,16 +87,16 @@ describe TripLeg do
 #    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)
 #  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
-    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 => home_tz_gmt_offset)
-    tl.actual_arrival_date_time_base.should == DateTime.new(1900, 1, 2, 16, 40, 0)
-  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
+#    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 => 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
@@ -123,11 +129,11 @@ describe TripLeg do
 #      tl = TripLeg.new(:trip_number=>100, :leg_number=>1, :trip=>@t)
 #      tl.passenger_list.should == ''
 #    end
-#
-###    it "when leg has no pax/deadhead" do
-###      tl = TripLeg.new(:trip_number=>100,:leg_number=>1, :trip=>@t, :status=>1,:deadhead=>1)
-###      tl.passenger_list.should == ''
-###    end
+##
+####    it "when leg has no pax/deadhead" do
+####      tl = TripLeg.new(:trip_number=>100,:leg_number=>1, :trip=>@t, :status=>1,:deadhead=>1)
+####      tl.passenger_list.should == ''
+####    end
 #
 #    it "when leg has some in range ( and put lead pax name first )" do
 #      stub(@t).passengers { [@p1, @p2, @p3] }
@@ -154,7 +160,11 @@ describe TripLeg do
 #    tl = TripLeg.new(:trip_number=>100, :leg_number=>3, :trip=>@t)
 #    tl.total_trip_statute_miles.should == 10.0
 #  end
-#
+
+
+
+
+
 #  describe 'crew brief fields' do
 #    before :all do
 #      set_fos_db([TripLeg, Comment])

data/spec/sequel/core_patch_spec.rb

@@ -7,7 +7,7 @@ describe Sequel do
       @db = Sequel.fos('fos')
     end
 
-    it "instantiate a fos/pervasive db from an odbc name" do
+    it "instantiates a fos/pervasive db from an odbc name" do
       @db.should_not be nil
     end
 
@@ -17,6 +17,24 @@ describe Sequel do
     end
   end
 
+  describe "has method 'fos_dbr' that" do
+    before :all do
+      hash = {:host=>'hrkdm.pcmt.local', :user=>'datamart', :password=>'datap@ss', :database=>'dbr'}
+      @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.db=@db
+      TripLeg.first.should_not be nil
+      Aircraft.db=@db
+      TripLeg.first.aircraft.should_not be nil
+    end
+  end
+
   it "set_db method finds sets db on all Sequel models" do
     db = Sequel.fos('fos')
     Sequel.set_db db

data/spec/sequel/fos_dates_spec.rb

@@ -41,6 +41,8 @@ describe "fos_dates" do
 
   it "DateTime from fos date time" do
     DateTime.from_fos_date_time(40209,100).should == DateTime.new(2010,2,1,1,40,0)
+    p DateTime.from_fos_date_time(0,1440)
+    DateTime.from_fos_date_time(0,100).should == DateTime.new(1899,12,31,1,40,0)
   end
 
   it "DateTime has long_view method that makes long formatted string" do

data/spec/sequel/serializer/json_serializer_spec.rb

@@ -24,6 +24,8 @@ describe "Sequel::Serializer" do
       add_test_table_data({:id=>1, :'goofy name col' => 123})
       array = [TestTable.first]
       array.to_fos_json(:methods=>[:'goofy name col']).should=="[{\"goofy name col\":123}]"
+      # another one just in case
+      Dude.all.to_fos_json(:methods=>[:name]).should == "[{\"name\":\"dano\"},{\"name\":\"eric\"}]"
     end
 
     it "shows methods which are dynamically delegated" do
@@ -31,7 +33,6 @@ describe "Sequel::Serializer" do
       data = TestTable.first
       data.to_fos_json(:methods=>[:date_col__round]).should == "{\"date_col__round\":123}"
     end
-
   end
 
 end

data/spec/sequel/serializer/json_serializer_with_active_support_spec.rb

@@ -0,0 +1,40 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../spec_helper_tables' unless metaclass.class_variable_defined? :@@set_up_demo_tables
+
+require 'active_support'
+
+describe "Sequel::Serializer with active support loaded" do
+
+  describe "to_fos_json method" do
+    before :each do 
+      set_demo_db([TestTable,Dude,Horse])
+    end
+
+    it "adds :only=>[] to the options hash" do
+      data = Trip.new
+      mock(data).to_json({:only=>[], :methods=>[]})
+      data.to_fos_json(:methods=>[])
+    end
+
+    it "handles single sequel model" do
+      add_test_table_data({:id=>1, :'goofy name col' => 123})
+      data = TestTable.first
+      data.to_fos_json(:methods=>[:'goofy name col']).should == "{\"goofy name col\":123}"
+    end
+
+    it "handles an array of sequel models" do
+      add_test_table_data({:id=>1, :'goofy name col' => 123})
+      array = [TestTable.first]
+      array.to_fos_json(:methods=>[:'goofy name col']).should=="[{\"goofy name col\":123}]"
+      # another one just in case
+      Dude.all.to_fos_json(:methods=>[:name]).should == "[{\"name\":\"dano\"},{\"name\":\"eric\"}]"
+    end
+
+    it "shows methods which are dynamically delegated" do
+      add_test_table_data({:id=>1, :'date_col' => 123})
+      data = TestTable.first
+      data.to_fos_json(:methods=>[:date_col__round]).should == "{\"date_col__round\":123}"
+    end
+  end
+
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 2
-  version: 0.5.2
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - Patrick Lardin, Daniel Sudol
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-04 00:00:00 -07:00
+date: 2010-10-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,9 +27,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 3
-        - 13
+        - 14
         - 0
-        version: 3.13.0
+        version: 3.14.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -64,13 +64,18 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README.rdoc
 files: 
+- README.rdoc
 - Rakefile
 - VERSION
 - fossil.gemspec
 - lib/date_extentions.rb
+- lib/dbr_models/group_cost.rb
+- lib/dbr_models/quote.rb
+- lib/dbr_models/trip.rb
+- lib/dbr_models/trip_leg.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
@@ -200,6 +205,7 @@ files:
 - spec/sequel/model_patch_spec.rb
 - spec/sequel/pervasive_adapter_spec.rb
 - spec/sequel/serializer/json_serializer_spec.rb
+- spec/sequel/serializer/json_serializer_with_active_support_spec.rb
 - spec/sequel/serializer/xml_serializer_spec.rb
 - spec/sequel/spec_helper_tables.rb
 - spec/spec_helper.rb
@@ -244,6 +250,7 @@ test_files:
 - spec/sequel/fos_dates_spec.rb
 - spec/sequel/core_patch_spec.rb
 - spec/sequel/spec_helper_tables.rb
+- spec/sequel/serializer/json_serializer_with_active_support_spec.rb
 - spec/sequel/serializer/json_serializer_spec.rb
 - spec/sequel/serializer/xml_serializer_spec.rb
 - spec/sequel/pervasive_adapter_spec.rb