weighted_average 1.0.1 → 1.0.2

data/Rakefile

@@ -1,5 +1,3 @@
-require "bundler/gem_tasks"
-
 require 'rake'
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|

data/lib/weighted_average/version.rb

@@ -1,3 +1,3 @@
 module WeightedAverage
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/lib/weighted_average.rb

@@ -5,7 +5,8 @@ require "weighted_average/version"
 module WeightedAverage
   # Returns a number.
   def weighted_average(*args)
-    connection.select_value(weighted_average_relation(*args).to_sql, 'weighted_average').to_f
+    weighted_average = connection.select_value(weighted_average_relation(*args).to_sql, 'weighted_average')
+    weighted_average.nil? ? nil : weighted_average.to_f
   end
 
   # Returns the ARel relation for a weighted average query.

data/test/helper.rb

@@ -232,6 +232,11 @@ end
 (1..10).each do |i|
   a = Segment.new
   a.payload = i
+  a.distance = i
+  a.load_factor = i
+  a.seats = i
+  a.bts_aircraft_type = i
+  a.passengers = i
   a.row_hash = SecureRandom.hex(10)
   a.save!
 end
@@ -245,6 +250,13 @@ class AirlineAircraftSeatClass < ActiveRecord::Base
   has_one :aircraft_class, :through => :aircraft
 end
 
+(1..10).each do |i|
+  a = AirlineAircraftSeatClass.new
+  a.aircraft_id = i
+  a.seats = i
+  a.pitch = i
+  a.save!
+end
 
 class Aircraft < ActiveRecord::Base
   has_many :segments, :foreign_key => 'bts_aircraft_type', :primary_key => 'bts_aircraft_type'
@@ -252,12 +264,34 @@ class Aircraft < ActiveRecord::Base
   has_many :airline_aircraft_seat_classes
 end
 
+(1..10).each do |i|
+  a = Aircraft.new
+  a.seats = i
+  a.m3 = i
+  a.bts_aircraft_type = i
+  a.aircraft_class_id = i
+  a.save!
+end
+
 class AircraftClass < ActiveRecord::Base
   has_many :aircraft
   has_many :airline_aircraft_seat_classes, :through => :aircraft
 end
 
+(1..10).each do |i|
+  a = AircraftClass.new
+  a.id = i
+  a.save!
+end
+
 class AircraftDeux < ActiveRecord::Base
   set_primary_key 'icao_code'
   has_many :segments, :primary_key => 'my_bts_aircraft_type_code', :foreign_key => 'bts_aircraft_type'
 end
+
+(1..10).each do |i|
+  a = AircraftDeux.new
+  a.icao_code = SecureRandom.hex(2)
+  a.m3 = i
+  a.save!
+end

data/test/test_weighted_average.rb

@@ -60,6 +60,13 @@ describe WeightedAverage do
     )
   end
   
+  # nothing but nils
+  
+  it "returns nil if the values to be weighted are all nil" do
+    Segment.weighted_average(:mail, :weighted_by => :passengers).must_be_nil
+    Segment.weighted_average(:seats, :weighted_by => :passengers).wont_be_nil
+  end
+  
   # multiple columns
   
   it "adds multiple columns before averaging" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weighted_average
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-28 00:00:00.000000000Z
+date: 2011-10-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2154896080 !ruby/object:Gem::Requirement
+  requirement: &2154760200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -24,10 +24,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *2154896080
+  version_requirements: *2154760200
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2154895560 !ruby/object:Gem::Requirement
+  requirement: &2154759700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -35,10 +35,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *2154895560
+  version_requirements: *2154759700
 - !ruby/object:Gem::Dependency
   name: arel
-  requirement: &2154895060 !ruby/object:Gem::Requirement
+  requirement: &2154759240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -46,10 +46,10 @@ dependencies:
         version: '2'
   type: :runtime
   prerelease: false
-  version_requirements: *2154895060
+  version_requirements: *2154759240
 - !ruby/object:Gem::Dependency
   name: cohort_scope
-  requirement: &2154894580 !ruby/object:Gem::Requirement
+  requirement: &2154758780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: 0.0.2
   type: :development
   prerelease: false
-  version_requirements: *2154894580
+  version_requirements: *2154758780
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2154894160 !ruby/object:Gem::Requirement
+  requirement: &2154758400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154894160
+  version_requirements: *2154758400
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2154893580 !ruby/object:Gem::Requirement
+  requirement: &2154757940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154893580
+  version_requirements: *2154757940
 - !ruby/object:Gem::Dependency
   name: mysql
-  requirement: &2154893020 !ruby/object:Gem::Requirement
+  requirement: &2154757520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,10 +90,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154893020
+  version_requirements: *2154757520
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &2154892540 !ruby/object:Gem::Requirement
+  requirement: &2154757100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,7 +101,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154892540
+  version_requirements: *2154757100
 description: Perform weighted averages, even across associations. Rails 3 only because
   it uses ARel.
 email: