weighted_average 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/weighted_average.rb

@@ -30,7 +30,8 @@ module ActiveRecord
       # set up join ON
       join_on = if association_class
         raise ArgumentError, "#{association.primary_key_name} isn't a column in the #{association_class.table_name} table" unless association_class.column_names.include?(association.primary_key_name)
-        foreign_arel_table[association.primary_key_name].eq arel_table[primary_key]
+        join_key = association.options[:primary_key].present? ? association.options[:primary_key] : primary_key
+        foreign_arel_table[association.primary_key_name].eq arel_table[join_key]
       end
       
       # 'weighting'

data/test/helper.rb

@@ -23,11 +23,11 @@ ActiveRecord::Base.establish_connection(
   'adapter' => 'mysql',
   'database' => 'weighted_average_test',
   'username' => 'root',
-  'password' => ''
+  'password' => 'password'
 )
 
 ActiveSupport::Inflector.inflections do |inflect|
-  inflect.uncountable %w{aircraft airline_aircraft}
+  inflect.uncountable %w{aircraft airline_aircraft aircraft_deux AircraftDeux}
   inflect.uncountable 'commons'
   inflect.uncountable 'food'
   inflect.uncountable 'shelter'
@@ -126,6 +126,33 @@ ActiveRecord::Schema.define(:version => 20090819143429) do
     t.integer  "bts_aircraft_type"
   end
   
+  create_table "aircraft_deux", :id => false, :force => true do |t|
+    t.string 'icao_code'
+    t.string   "name"
+    t.integer  "seats"
+    t.integer  "fuel_type_id"
+    t.float    "endpoint_fuel"
+    t.integer  "manufacturer_id"
+    t.datetime "updated_at"
+    t.datetime "created_at"
+    t.date     "bts_begin_date"
+    t.date     "bts_end_date"
+    t.float    "load_factor"
+    t.float    "freight_share"
+    t.float    "m3"
+    t.float    "m2"
+    t.float    "m1"
+    t.float    "distance"
+    t.float    "payload"
+    t.integer  "aircraft_class_id"
+    t.float    "multiplier"
+    t.string   "manufacturer_name"
+    t.string   "brighter_planet_aircraft_class_code"
+    t.integer  "weighting"
+    t.integer  "my_bts_aircraft_type_code"
+  end
+  execute 'ALTER TABLE aircraft_deux ADD PRIMARY KEY (icao_code);'
+  
   create_table "aircraft_classes", :force => true do |t|
     t.string  "name"
     t.integer "seats"
@@ -218,3 +245,8 @@ class AircraftClass < ActiveRecord::Base
   has_many :aircraft, :class_name => 'Aircraft'
   has_many :airline_aircraft_seat_classes, :through => :aircraft
 end
+
+class AircraftDeux < ActiveRecord::Base
+  set_primary_key 'icao_code'
+  has_many :segments, :class_name => "Segment", :primary_key => 'my_bts_aircraft_type_code', :foreign_key => 'bts_aircraft_type'
+end

data/test/test_weighted_average.rb

@@ -109,6 +109,13 @@ class TestWeightedAverage < Test::Unit::TestCase
     )
   end
   
+  should "do foreign custom weighting with custom join keys" do
+    should_have_same_sql(
+      "SELECT (SUM((`aircraft_deux`.`m3`) * `segments`.`passengers`) / SUM(`segments`.`passengers`)) AS weighted_average, 12345 FROM `aircraft_deux` LEFT OUTER JOIN `segments` ON `segments`.`bts_aircraft_type` = `aircraft_deux`.`my_bts_aircraft_type_code` WHERE (`aircraft_deux`.`m3` IS NOT NULL)",
+      AircraftDeux.weighted_average_relation(:m3, :weighted_by => [:segments, :passengers])
+    )
+  end
+  
   # scoped
   
   should "do default weighting, scoped" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-07 00:00:00 -04:00
+date: 2010-05-17 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency