fossil 0.3.49 → 0.4.0

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.10.0')
+     gemspec.add_dependency('sequel', '= 3.12.0')
      gemspec.add_dependency('activesupport', '= 2.3.5')
      gemspec.add_development_dependency('rspec')
      gemspec.authors = ["Patrick Lardin, Daniel Sudol"]

data/VERSION

@@ -1 +1 @@
-0.3.49
+0.4.0

data/fossil.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fossil}
-  s.version = "0.3.49"
+  s.version = "0.4.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-05-09}
+  s.date = %q{2010-06-08}
   s.description = %q{Access FOS/betrieve db with this Sequel based orm wrapper}
   s.email = %q{plardin@xojet.com}
   s.files = [
@@ -134,7 +134,7 @@ Gem::Specification.new do |s|
      "spec/helper_classes.rb",
      "spec/helper_methods.rb",
      "spec/models/code_spec.rb",
-     "spec/models/quote.rb",
+     "spec/models/quote_spec.rb",
      "spec/models/trip_leg_spec.rb",
      "spec/models/trip_spec.rb",
      "spec/models/vendor_document_spec.rb",
@@ -150,7 +150,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Sequel orm wrapper to FOS}
   s.test_files = [
     "spec/hash_extentions_spec.rb",
@@ -166,8 +166,8 @@ Gem::Specification.new do |s|
      "spec/helper_classes.rb",
      "spec/models/code_spec.rb",
      "spec/models/trip_leg_spec.rb",
+     "spec/models/quote_spec.rb",
      "spec/models/vendor_document_spec.rb",
-     "spec/models/quote.rb",
      "spec/models/trip_spec.rb",
      "spec/be_model_with_values_matcher.rb"
   ]
@@ -177,16 +177,16 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<sequel>, ["= 3.10.0"])
+      s.add_runtime_dependency(%q<sequel>, ["= 3.12.0"])
       s.add_runtime_dependency(%q<activesupport>, ["= 2.3.5"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
     else
-      s.add_dependency(%q<sequel>, ["= 3.10.0"])
+      s.add_dependency(%q<sequel>, ["= 3.12.0"])
       s.add_dependency(%q<activesupport>, ["= 2.3.5"])
       s.add_dependency(%q<rspec>, [">= 0"])
     end
   else
-    s.add_dependency(%q<sequel>, ["= 3.10.0"])
+    s.add_dependency(%q<sequel>, ["= 3.12.0"])
     s.add_dependency(%q<activesupport>, ["= 2.3.5"])
     s.add_dependency(%q<rspec>, [">= 0"])
   end

data/lib/fossil.rb

@@ -1,10 +1,10 @@
 require 'rubygems'
 
 begin
-  gem 'sequel', '=3.10.0'
+  gem 'sequel', '=3.12.0'
   require('sequel')
 rescue LoadError => e
-  raise("To use Fossil you need the sequel gem:\n '$ sudo gem install sequel -v=3.10.0'")
+  raise("To use Fossil you need the sequel gem:\n '$ sudo gem install sequel -v=3.12.0'")
 end
 
 begin

data/lib/models/flight_log_expense.rb

@@ -1,5 +1,7 @@
 class FlightLogExpense < Sequel::Model(:'flight log expenses')
 
+    code_association :expense_type_value, :'type', :flight_log_expense_type
+
 #### BEGIN GENERATED SECTION ####
 	set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']
 

data/lib/models/trip_leg.rb

@@ -42,6 +42,11 @@ class TripLeg < Sequel::Model(:'trip legs')
   many_to_one :departure_airport, :class=>:Airport, :key=>:departure_icao, :primary_key=>:icao #:key=>nil, :dataset=>proc{ ref_method = self[:'depart-icao/iata/id']; case ref_method; when 1 then Airport.filter(:'icao'=>self[:'departure icao']); when 2 then Airport.filter(:'iata'=>self[:'departure iata']); else Airport.filter(:'airport id prefix'.like("%#{self[:'depart a/p prefix']}"), :'airport id'.like("%#{self[:'depart airport id']}")); end }
   many_to_one :alternate_arrival_airport, :class=>:Airport, :key=>nil, :dataset=>proc{ Airport.filter(:'airport id prefix'.like("%#{self[:'arr alt prefix']}"), :'airport id'.like( "%#{self[:'arr alt id']}"))}
   many_to_one :alternate_departure_airport, :class=>:Airport, :key=>nil, :dataset=>proc{ Airport.filter(:'airport id prefix'.like("%#{self[:'dep alt prefix']}"), :'airport id'.like( "%#{self[:'dep alt id']}"))}
+  many_to_one :comment_value, :class=>:Comment, :key=>primary_key#, :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[:"kid - comm"]) }
+  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"=>self[:"fueler comment"]) }
+  many_to_one :catering_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[:"catering comment"]) }
+  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"]) }
+  many_to_one :crew_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"=>self[:"mics serv 2 comment"]) }
 
   # One to many associations with composite primary keys
   o_to_n :crew_legs, :class=>:CrewLeg, :prefix=>'trip leg'

data/lib/sequel/pervasive_adapter.rb

@@ -11,12 +11,25 @@ module Sequel
         ds.extend(DatasetMethods)
         ds
       end
-      
-#      def connect(server)
-#        conn = super(server)
-#        conn.autocommit = false if RAILS_ENV == 'test'
-#        conn
-#      end
+
+      # special transaction method since pervasive does not support transactions
+      # through sql "start transaction" statement. be sure to use begin/rescue
+      # if you want to recover from failure since this method throws errors
+      def do_transaction(&block)
+        synchronize do |conn|
+          begin
+            conn.autocommit = false
+            yield conn
+            r = conn.run("commit"); r.drop
+          rescue Exception,Error => se
+            r = conn.run("rollback"); r.drop
+            raise_error(se, :disconnect=>se.message.match(/08S01/) )
+          ensure
+            conn.autocommit = true
+            r.drop if r
+          end
+        end
+      end
 
       def select_fields(table, *fields)
         dataset.select_fields(table, *fields)

data/lib/sequel/serializer/serializer.rb

@@ -1,4 +1,4 @@
-require 'active_support/json'
+#require 'active_support/json'
 
 module Sequel
   module Serialization

data/spec/models/trip_leg_spec.rb

@@ -106,4 +106,38 @@ describe TripLeg do
     tl.total_trip_statute_miles.should == 10.0
   end
 
+  describe 'crew brief fields' do
+    before :all do
+      set_fos_db([TripLeg,Comment])
+      @trip_leg = TripLeg.first(:trip_number=>50885,:leg_number=>1)
+#      @trip_leg = TripLeg.first(:trip_number=>76478,:leg_number=>1)
+#      @trip_leg = TripLeg.first(~:fueler_comment=>0,~:catering_comment=>0,~:limo_comment=>0)
+    end
+
+    it "comment field" do
+      @trip_leg.comment_value.comment.should =="Contact: Chris Kelley 415-927-2123"
+    end
+
+    it "catering departure value" do
+      @trip_leg.catering_departure.should == 1
+    end
+
+    it "departure fbo comment value" do
+      @trip_leg.departure_fbo_comment_value.comment.should == "3028 Peacekeeper Way\r\nSacramento, CA 95652"
+    end
+
+    it "catering comment value" do
+      @trip_leg.catering_comment_value.comment.should == "Catering: Standard drinks and snacks for all live legs"
+    end
+
+    it "limo comment value" do
+      @trip_leg.limo_comment_value.comment.should == "Transportation: Passenger arranged for all live legs"
+    end
+
+    it "crew fbo comment value" do
+      @trip_leg.crew_fbo_comment_value.should == nil
+    end
+  end
+
 end
+

data/spec/models/trip_spec.rb

@@ -10,7 +10,6 @@ describe "Trip" do
     trip = Trip.new(:kid_date=>1,:kid_time=>2,:kid_user=>3,:kid_mult=>4,:kid_comm=>5)
     mock(Code).valid_value_for_group?(254, :aircraft_document) {true}
     doc = VendorDocument.new(:file_name_prefix=>"TRIP", :file_name=>"whatever", :doc_type_value=> 254, :trip_number=>111)
-    doc.save()
     trip.add_attachment(doc)
     doc.kid_user.should == "ADMN"
     doc.image_name.should == "TRIP/whatever"

data/spec/sequel/pervasive_adapter_spec.rb

@@ -0,0 +1,26 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Sequel::Pervasive::DatabaseMethods do
+
+  it "supports transactions" do
+    set_fos_db([Trip])
+    t = Trip.first
+    ### surround with begin/rescue
+    begin
+      ### testing do_transaction
+      r = nil
+      Trip.db.do_transaction do |conn|
+        # increment the value of fs_visa by one
+        r = conn.run(Trip.filter(t.pk_hash).update_sql(:fs_visa=>t.fs_visa.succ))
+        raise(Exception, 'testing do_transaction transactions')
+      end
+      ### end testing do_transaction
+    rescue StandardError => e
+    ensure
+      r.drop if r
+    end
+    # check if the values have changed
+    Trip.first.fs_visa.should == t.fs_visa
+  end
+
+end

data/spec/sequel/serializer/xml_serializer_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 require File.dirname(__FILE__) + '/../spec_helper_tables' unless metaclass.class_variable_defined? :@@set_up_demo_tables
-require 'active_resource'
+#require 'active_resource'
 
 describe "Sequel::Serializer" do
  
@@ -73,14 +73,14 @@ describe "Sequel::Serializer" do
         } )
   end
 
-  it "converts to ActiveResource::Base from xml" do
-    class Dudeman < ActiveResource::Base; self.site = ""; end
-    hash = Hash.from_xml( Dude.first.to_xml(:only=> :name, :include=> :horses) )
-    dudeman = Dudeman.new( hash.values.first )
-    dudeman.name.should == 'dano'
-    dudeman.horses.size.should == 2
-    dudeman.horses.first.name == 'pinto'
-  end
+#  it "converts to ActiveResource::Base from xml" do
+#    class Dudeman < ActiveResource::Base; self.site = ""; end
+#    hash = Hash.from_xml( Dude.first.to_xml(:only=> :name, :include=> :horses) )
+#    dudeman = Dudeman.new( hash.values.first )
+#    dudeman.name.should == 'dano'
+#    dudeman.horses.size.should == 2
+#    dudeman.horses.first.name == 'pinto'
+#  end
 
 end
 

data/spec/spec_helper.rb

@@ -7,7 +7,7 @@ unless defined?(DB_DEMO)
   DB_DEMO = Sequel.odbc('demodata')#, :loggers=>[Logger.new($stdout)])
   DB_DEMO.extend(Sequel::Pervasive::DatabaseMethods)
                                                   
-  DB_FOS = Sequel.odbc('fos', :loggers=>[Logger.new($stdout)])
+  DB_FOS = Sequel.odbc('fos')#, :loggers=>[Logger.new($stdout)])
   DB_FOS.extend(Sequel::Pervasive::DatabaseMethods)
 end
 
@@ -22,32 +22,61 @@ Spec::Runner.configure do |config|
   config.include(BeModelWithValuesMatcher)
 end
 
-# These are special modifictations for testing with mysql db instead of pervasive
-# if its not windows or linux where pervasive db is running ) .. modify the
-# pervasive adapter to act more like mysql, so that the tests can still run.
-# This is not ideal, but it works
-unless RUBY_PLATFORM =~ /mswin32|linux/
+module Sequel::Pervasive::DatabaseMethods
 
-  module Sequel::Pervasive::DatabaseMethods
-    def auto_increment_sql; "AUTO_INCREMENT" end
-    def begin_transaction_sql; "BEGIN" end
-    def commit_transaction_sql; "COMMIT" end
-    def rollback_transaction_sql; "ROLLBACK" end
+  # turn autocommit offffffffff
+  def connect(server)
+    conn = super(server)
+    conn.autocommit = false
+    conn
   end
 
-  module Sequel::Pervasive::DatasetMethods
-    def quoted_identifier(name, convert=true)
-      convert ? "`#{convert_aliased_col_to_real_col(name)}`" : "`#{name}`"
-    end
-
-    def select_clause_methods
-      super
-    end
-
-    def select_limit_sql(sql)
-      super(sql)
-    end
-  end
+# overriding execute to be able to rollback after each call
+#  def execute(sql, opts={})
+#    log_info(sql)
+#    synchronize(opts[:server]) do |conn|
+#      begin
+#        r = conn.run(sql)
+#        yield(r) if block_given?
+#      rescue Exception => e
+#        raise_error(e, :disconnect=>e.message.match(/08S01/))
+#      ensure
+#        ######### ROLLLLLLLBACK ###########
+#        r1 = conn.run("rollback"); r1.drop
+#        r.drop if r
+#      end
+#      nil
+#    end
+#  end
 
 end
 
+# These are special modifictations for testing with mysql db instead of pervasive
+# if its not windows or linux where pervasive db is running ) .. modify the
+# pervasive adapter to act more like mysql, so that the tests can still run.
+# This is not ideal, but it works
+#unless RUBY_PLATFORM =~ /mswin32|linux/
+#
+#  module Sequel::Pervasive::DatabaseMethods
+#    def auto_increment_sql; "AUTO_INCREMENT" end
+#    def begin_transaction_sql; "BEGIN" end
+#    def commit_transaction_sql; "COMMIT" end
+#    def rollback_transaction_sql; "ROLLBACK" end
+#  end
+#
+#  module Sequel::Pervasive::DatasetMethods
+#    def quoted_identifier(name, convert=true)
+#      convert ? "`#{convert_aliased_col_to_real_col(name)}`" : "`#{name}`"
+#    end
+#
+#    def select_clause_methods
+#      super
+#    end
+#
+#    def select_limit_sql(sql)
+#      super(sql)
+#    end
+#  end
+#
+#end
+

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: fossil
 version: !ruby/object:Gem::Version 
-  version: 0.3.49
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Patrick Lardin, Daniel Sudol
@@ -9,39 +14,49 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-09 00:00:00 -07:00
+date: 2010-06-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sequel
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 3.10.0
-    version: 
+        segments: 
+        - 3
+        - 12
+        - 0
+        version: 3.12.0
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 5
         version: 2.3.5
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id003
 description: Access FOS/betrieve db with this Sequel based orm wrapper
 email: plardin@xojet.com
 executables: []
@@ -172,7 +187,7 @@ files:
 - spec/helper_classes.rb
 - spec/helper_methods.rb
 - spec/models/code_spec.rb
-- spec/models/quote.rb
+- spec/models/quote_spec.rb
 - spec/models/trip_leg_spec.rb
 - spec/models/trip_spec.rb
 - spec/models/vendor_document_spec.rb
@@ -197,18 +212,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Sequel orm wrapper to FOS
@@ -226,7 +243,7 @@ test_files:
 - spec/helper_classes.rb
 - spec/models/code_spec.rb
 - spec/models/trip_leg_spec.rb
+- spec/models/quote_spec.rb
 - spec/models/vendor_document_spec.rb
-- spec/models/quote.rb
 - spec/models/trip_spec.rb
 - spec/be_model_with_values_matcher.rb