fossil 0.5.35 → 0.5.36

data/VERSION

@@ -1 +1 @@
-0.5.35
+0.5.36

data/fossil.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fossil}
-  s.version = "0.5.35"
+  s.version = "0.5.36"
 
   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-15}
+  s.date = %q{2011-03-16}
   s.description = %q{Access FOS/betrieve db with this Sequel based orm wrapper}
   s.email = %q{dansudol@yahoo.com}
   s.extra_rdoc_files = [

data/lib/models/flight_log_expense.rb

@@ -4,6 +4,7 @@ class FlightLogExpense < Sequel::Model(:'flight log expenses')
 
   #Many to one association with composite keys
   n_to_o :trip_leg, :class=>:TripLeg, :prefix=>'trip leg'
+  many_to_one :vendor, :class=>:Vendor, :key=>:vendor_id, :primary_key=>:'vendor id'
 
 #### BEGIN GENERATED SECTION ####
   set_primary_key [:'kid - user', :'kid - mult', :'kid - comm', :'kid - date', :'kid - time']

data/lib/models/trip_leg.rb

@@ -75,6 +75,7 @@ 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
@@ -900,10 +901,6 @@ class TripLeg < Sequel::Model(:'trip legs')
   end
 
   # Fuel Expense Stuff
-  def fuel_expenses
-    flight_log_expenses.find_all { |expense| expense.type == 1 }
-  end
-
   def departure_fuel_expenses
     fuel_expenses.select { |expense| expense.arrival_airport == 0 }
   end

data/lib/sequel/model_patch.rb

@@ -20,9 +20,10 @@ class Sequel::Model
   # TripLeg['MERE',0,8,40443,1259], you would get a trip leg
   # You still have to massage this key alittle to make the query:
   # see Sequel.fos_id_to_lookup_key in core_patch.rb
-  PK_KEYS = [:"kid - user",:"kid - mult",:"kid - comm",:"kid - date",:"kid - time"]
+  PK_KEYS = [:"kid - user", :"kid - mult", :"kid - comm", :"kid - date", :"kid - time"]
+
   def fos_id
-    PK_KEYS.collect{|key| value=send(key); value.strip! if value.is_a?(String); value}.join('-')
+    PK_KEYS.collect { |key| value=send(key); value.strip! if value.is_a?(String); value }.join('-')
   end
 
   # Passing in an array of attribute / method names, fills a hash with values from
@@ -39,7 +40,7 @@ class Sequel::Model
         hash[attribute_name] = send(attribute_name) if respond_to? attribute_name
         hash
       end
-    elsif attributes.is_a? Hash 
+    elsif attributes.is_a? Hash
       hash = {}
       attributes.each do |key, attribute|
         attribute_name = attribute.to_s.gsub('__', '_').to_sym
@@ -50,12 +51,12 @@ class Sequel::Model
     end
   end
 
-  def method_missing(method, *args, &block)
+  def method_missing(method, * args, & block)
     if method.to_s.split(/__/).size > 1
       generate_delegator(method)
-      send(method.to_s.gsub('__','_').to_sym)
+      send(method.to_s.gsub('__', '_').to_sym)
     else
-      super(method, *args, &block)
+      super(method, * args, & block)
     end
   end
 
@@ -96,15 +97,31 @@ class Sequel::Model
       class_name = options[:class]
       prefix = options[:prefix]
       case assoc_type
-      when :one_to_many                 
-        key = options[:key] || primary_key
-        primary_key = options[:primary_key] || key
-        graph_conditions = { :"#{prefix} kid - date" => :'kid - date', :"#{prefix} kid - time" => :'kid - time', :"#{prefix} kid - user" => :'kid - user', :"#{prefix} kid - mult" => :'kid - mult', :"#{prefix} kid - comm" => :'kid - comm' }
-        dataset_filter = proc { class_name.to_s.constantize.filter( :"#{prefix} kid - date"=>self[:'kid - date'], :"#{prefix} kid - time"=>self[:'kid - time'], :"#{prefix} kid - user"=>self[:'kid - user'], :"#{prefix} kid - mult"=>self[:'kid - mult'], :"#{prefix} kid - comm"=>self[:'kid - comm']) }
-      when :many_to_one
-        key = nil
-        graph_conditions = { :'kid - date'=>:"#{prefix} kid - date", :'kid - time'=>:"#{prefix} kid - time", :'kid - user'=>:"#{prefix} kid - user", :'kid - mult'=>:"#{prefix} kid - mult", :'kid - comm'=>:"#{prefix} kid - comm" }
-        dataset_filter = proc { class_name.to_s.constantize.filter( :"kid - date"=>self[:"#{prefix} kid - date"], :"kid - time"=>self[:"#{prefix} kid - time"], :"kid - user"=>self[:"#{prefix} kid - user"], :"kid - mult"=>self[:"#{prefix} kid - mult"], :"kid - comm"=>self[:"#{prefix} kid - comm"]) }
+        when :one_to_many
+          key = options[:key] || primary_key
+          primary_key = options[:primary_key] || key
+          extra_dataset_conditions = options[:extra_conditions] || {}
+          graph_conditions = {:"#{prefix} kid - date" => :'kid - date',
+                              :"#{prefix} kid - time" => :'kid - time',
+                              :"#{prefix} kid - user" => :'kid - user',
+                              :"#{prefix} kid - mult" => :'kid - mult',
+                              :"#{prefix} kid - comm" => :'kid - comm'}.
+              merge(extra_dataset_conditions)
+          dataset_filter = proc {
+            class_name.to_s.constantize.filter(
+            {:"#{prefix} kid - date"=>self[:'kid - date'],
+             :"#{prefix} kid - time"=>self[:'kid - time'],
+             :"#{prefix} kid - user"=>self[:'kid - user'],
+             :"#{prefix} kid - mult"=>self[:'kid - mult'],
+             :"#{prefix} kid - comm"=>self[:'kid - comm']}.
+              merge(extra_dataset_conditions)
+            )
+          }
+        when :many_to_one
+          key = nil
+          graph_conditions = {:'kid - date'=>:"#{prefix} kid - date", :'kid - time'=>:"#{prefix} kid - time", :'kid - user'=>:"#{prefix} kid - user", :'kid - mult'=>:"#{prefix} kid - mult", :'kid - comm'=>:"#{prefix} kid - comm"}
+          extra_dataset_conditions = options[:dataset_conditions] || {}
+          dataset_filter = proc { class_name.to_s.constantize.filter({:"kid - date"=>self[:"#{prefix} kid - date"], :"kid - time"=>self[:"#{prefix} kid - time"], :"kid - user"=>self[:"#{prefix} kid - user"], :"kid - mult"=>self[:"#{prefix} kid - mult"], :"kid - comm"=>self[:"#{prefix} kid - comm"]}.merge(extra_dataset_conditions)) }
       end
       graph_conditions.merge!(options[:graph_only_conditions]) if options[:graph_only_conditions]
       send(assoc_type, assoc_name, :key=> key, :primary_key=>primary_key, :class => class_name, :dataset=> dataset_filter, :graph_only_conditions=>graph_conditions)
@@ -114,13 +131,13 @@ class Sequel::Model
     def code_association(assoc_name, column_name_holding_code, code_group_name)
       # create the many to one association
       send(:many_to_one, assoc_name, :class=>:Code, :key=>nil,
-        # dataset adds
-        :dataset=>proc {
-          value = self[column_name_holding_code] || send(column_name_holding_code)
-          Code.filter(:'value'=> value, :name=>CodeGroup.send(code_group_name))
-        },
-        # graph_only_conditions add the join conditions when using eager_graph in query
-        :graph_only_conditions => { :'value'=> column_name_holding_code, :name=>CodeGroup.send(code_group_name)}
+           # dataset adds
+           :dataset=>proc {
+             value = self[column_name_holding_code] || send(column_name_holding_code)
+             Code.filter(:'value'=> value, :name=>CodeGroup.send(code_group_name))
+           },
+           # graph_only_conditions add the join conditions when using eager_graph in query
+           :graph_only_conditions => {:'value'=> column_name_holding_code, :name=>CodeGroup.send(code_group_name)}
       )
 
       # create the :get_all method to find all codes of the code group name
@@ -128,15 +145,15 @@ class Sequel::Model
         Code.get_codes(CodeGroup.send(code_group_name))
       end
       # add a delegator that calls for the code, and one for description  
-      delegate :code,        :to=> assoc_name, :prefix=>true,   :allow_nil => true
-      delegate :description, :to=> assoc_name, :prefix=>true,   :allow_nil => true
+      delegate :code, :to=> assoc_name, :prefix=>true, :allow_nil => true
+      delegate :description, :to=> assoc_name, :prefix=>true, :allow_nil => true
     end
 
     # date_column,time_column should be a Fixnum because fos stores dates,times as numbers
     def column_def_datetime(datetime_column_name, date_column, time_column)
       inst_def datetime_column_name do
-        days = send(:[], date_column) || 0     # nil defaults to 0 days
-        minutes = send(:[], time_column) || 0  # nil defaults to 0 minutes
+        days = send(:[], date_column) || 0 # nil defaults to 0 days
+        minutes = send(:[], time_column) || 0 # nil defaults to 0 minutes
         DateTime.from_fos_date_time(days, minutes) # returns utc datetime
       end
     end
@@ -214,7 +231,7 @@ class Sequel::Model
     #  paid_boolean         => which returns a string ("False" / "True") for values ( 0 / 1 )
     #
     def column_view(column_name, type, custom_method_name=nil)
-      raise(StandardError,"Expect the type to be either :date, :datetime, :time, :currency, :precision or :boolean") unless [:date, :time, :datetime, :currency, :precision, :boolean].include? type
+      raise(StandardError, "Expect the type to be either :date, :datetime, :time, :currency, :precision or :boolean") unless [:date, :time, :datetime, :currency, :precision, :boolean].include? type
       # will get value from old_column_name
       method_name = custom_method_name || "#{column_name}_#{type.to_s}"
 
@@ -223,16 +240,16 @@ class Sequel::Model
         column_value = send(column_name)
         case type
           when :date
-           Date.from_fos_days(column_value) if column_value
+            Date.from_fos_days(column_value) if column_value
           when :time
             Time.from_fos_time(column_value) if column_value
           when :currency
-            number_to_currency( (column_value || 0).to_f/100, :unit=>'', :precision=>2)
+            number_to_currency((column_value || 0).to_f/100, :unit=>'', :precision=>2)
           when :precision
             # precision wont do delimiter .. so send to currency
-            number_to_currency( (column_value || 0).to_f/100, :unit=>'', :precision=>2)
+            number_to_currency((column_value || 0).to_f/100, :unit=>'', :precision=>2)
           when :boolean
-            return "True" if column_value and ( column_value == 1 or column_value == true )
+            return "True" if column_value and (column_value == 1 or column_value == true)
             "False"
         end
       end
@@ -267,8 +284,8 @@ class Sequel::Model
       end
     end
 
-    def select_fields(table, *fields)
-      dataset.select_fields(table, *fields)
+    def select_fields(table, * fields)
+      dataset.select_fields(table, * fields)
     end
   end
 

data/spec/silly_spec.rb

@@ -7,12 +7,13 @@ 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}
-[Vendor].each {|model| model.db = DB}
+[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)]
 #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 Vendor.count
+#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
@@ -76,7 +77,9 @@ p Vendor.count
 #p AirportFbo.filter(:icao=>'KSFO').count
 #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).first#eager_graph(:arrival_fbo).all.first
+#tl = TripLeg.filter(:trip_number=>69012,:leg_number=>1).eager_graph(:fuel_expenses).all.first
+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
-  - 35
-  version: 0.5.35
+  - 36
+  version: 0.5.36
 platform: ruby
 authors: 
 - Daniel Sudol
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-15 00:00:00 -07:00
+date: 2011-03-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency