fossil 0.5.36 → 0.5.37

data/VERSION

@@ -1 +1 @@
-0.5.36
+0.5.37

data/fossil.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fossil}
-  s.version = "0.5.36"
+  s.version = "0.5.37"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Sudol", "Patrick Lardin"]

data/lib/models/city_cost.rb

@@ -13,11 +13,11 @@ class CityCost < Sequel::Model(:'city cost')
     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
+    self.owner_kid_date = city_pair.kid_date
+    self.owner_kid_time = city_pair.kid_time
+    self.owner_kid_mult = city_pair.kid_mult
+    self.owner_kid_comm = city_pair.kid_comm
+    self.owner_kid_user = city_pair.kid_user
   end
 
   n_to_o :city_pair, :class=>:CityPair, :prefix=>'owner'

data/lib/models/trip_leg.rb

@@ -75,7 +75,6 @@ class TripLeg < Sequel::Model(:'trip legs')
   o_to_n :crew_legs, :class=>:CrewLeg, :prefix=>'trip leg'
   o_to_n :audit_trails, :class=>:AuditTrail, :prefix=>'owner'
   o_to_n :flight_log_expenses, :class=>:FlightLogExpense, :prefix=>'trip leg'
-  o_to_n :fuel_expenses, :class=>:FlightLogExpense, :prefix=>'trip leg', :extra_conditions => {:type => 1}
 
   # Code associations
   code_association :approval_value, :'approval code', :trip_approval
@@ -901,6 +900,10 @@ class TripLeg < Sequel::Model(:'trip legs')
   end
 
   # Fuel Expense Stuff
+  def fuel_expenses
+    flight_log_expenses.select{ |expense| expense.type == 1 }
+  end
+
   def departure_fuel_expenses
     fuel_expenses.select { |expense| expense.arrival_airport == 0 }
   end

data/lib/sequel/model_patch.rb

@@ -55,6 +55,8 @@ class Sequel::Model
     if method.to_s.split(/__/).size > 1
       generate_delegator(method)
       send(method.to_s.gsub('__', '_').to_sym)
+    elsif self.class.instance_variable_get("@aliases").values.include? method
+      send(:[],method)
     else
       super(method, * args, & block)
     end

data/spec/models/city_pair_spec.rb

@@ -10,40 +10,17 @@ RSpec::Matchers.define :have_valid_kid_keys do |expected|
   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
+      city_pair.should have_valid_kid_keys
     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}/
+      city_pair = CityPair.new
+      city_cost = CityCost.new(:city_pair=>city_pair)
+      city_cost.should have_valid_kid_keys
     end
 
 end

data/spec/silly_spec.rb

@@ -2,12 +2,22 @@ require_relative '../lib/fossil'
 require 'logger'
 require 'pp'
 
+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?}
+  end
+end
+
 #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)])
-#[CityPair,CityCost].each {|model| model.db = DB}
-[TripLeg,FlightLogExpense].each {|model| model.db = DB}
+[CityPair,CityCost].each {|model| model.db = DB}
+p CityPair.first.city_costs
+#p CityPair.first.send('kid - user')
+#[TripLeg,FlightLogExpense].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)]
@@ -78,8 +88,8 @@ DB = Sequel.fos('fos', :loggers=>[Logger.new($stdout)])
 #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" = 4 where "trip number" = 62 and "leg number" = 1 ')
 #tl = TripLeg.filter(:trip_number=>69012,:leg_number=>1).eager_graph(:fuel_expenses).all.first
-tl = TripLeg.first
-p tl.fuel_expenses
+#tl = TripLeg.first
+#p tl.fuel_expenses
 #p tl.actual_arrival_date_time_gmt
 #date = TripLeg.filter(:arr_date_act_gmt=>0).filter{:verify_date >0}.order(:kid_date).last.kid_date # :arrival_date_gmt
 #p Date.from_fos_days(date).to_s

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 36
-  version: 0.5.36
+  - 37
+  version: 0.5.37
 platform: ruby
 authors: 
 - Daniel Sudol