weighted_average 2.0.0 → 2.0.1

data/CHANGELOG

@@ -1,3 +1,9 @@
+2.0.1 / 2012-06-06
+
+* Bug fixes
+
+  * Support more than 1 or 2 data columns
+
 2.0.0 / 2012-05-29
 
 * Enhancements

data/lib/weighted_average/arel_select_manager_instance_methods.rb

@@ -26,6 +26,7 @@ module WeightedAverage
     #
     # @return [Arel::SelectManager] A relation you can play around with.
     def weighted_average_relation(data_column_names, options = {})
+      data_column_names = Array.wrap data_column_names
       left = self.source.left
 
       weighted_by_column = case options[:weighted_by]
@@ -43,14 +44,26 @@ module WeightedAverage
         left[options[:disaggregate_by]]
       end
 
-      data_columns = ::Array.wrap(data_column_names).map do |data_column_name|
+      data_columns = data_column_names.map do |data_column_name|
         left[data_column_name]
       end
 
+      data_columns_sum = data_columns.inject(nil) do |memo, data_column|
+        if memo
+          Arel::Nodes::Addition.new(memo, data_column)
+        else
+          data_column
+        end
+      end
+
+      if data_column_names.many?
+        data_columns_sum = Arel::Nodes::Grouping.new(data_columns_sum)
+      end
+
       if disaggregate_by_column
-        self.projections = [Arel::Nodes::Division.new(Arel::Nodes::Sum.new(weighted_by_column * (data_columns.inject(:+)) / disaggregate_by_column * 1.0), Arel::Nodes::Sum.new([weighted_by_column]))]
+        self.projections = [Arel::Nodes::Division.new(Arel::Nodes::Sum.new(weighted_by_column * data_columns_sum / disaggregate_by_column * 1.0), Arel::Nodes::Sum.new([weighted_by_column]))]
       else
-        self.projections = [Arel::Nodes::Division.new(Arel::Nodes::Sum.new(weighted_by_column * (data_columns.inject(:+)) * 1.0), Arel::Nodes::Sum.new([weighted_by_column]))]
+        self.projections = [Arel::Nodes::Division.new(Arel::Nodes::Sum.new(weighted_by_column * data_columns_sum * 1.0), Arel::Nodes::Sum.new([weighted_by_column]))]
       end
 
       data_columns_not_eq_nil = data_columns.inject(nil) do |memo, data_column|

data/lib/weighted_average/version.rb

@@ -1,3 +1,3 @@
 module WeightedAverage
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 end

data/test/test_weighted_average.rb

@@ -71,8 +71,8 @@ describe WeightedAverage do
   
   it "adds multiple columns before averaging" do
     should_have_same_sql(
-      "SELECT SUM(airline_aircraft_seat_classes.weighting * (airline_aircraft_seat_classes.seats + airline_aircraft_seat_classes.pitch) * 1.0) / SUM(airline_aircraft_seat_classes.weighting) FROM airline_aircraft_seat_classes WHERE airline_aircraft_seat_classes.seats IS NOT NULL AND airline_aircraft_seat_classes.pitch IS NOT NULL AND airline_aircraft_seat_classes.weighting > 0",
-      AirlineAircraftSeatClass.weighted_average_relation(['seats', 'pitch'])
+      "SELECT SUM(airline_aircraft_seat_classes.weighting * (airline_aircraft_seat_classes.seats + airline_aircraft_seat_classes.pitch + airline_aircraft_seat_classes.width) * 1.0) / SUM(airline_aircraft_seat_classes.weighting) FROM airline_aircraft_seat_classes WHERE airline_aircraft_seat_classes.seats IS NOT NULL AND airline_aircraft_seat_classes.pitch IS NOT NULL AND airline_aircraft_seat_classes.width IS NOT NULL AND airline_aircraft_seat_classes.weighting > 0",
+      AirlineAircraftSeatClass.weighted_average_relation(['seats', 'pitch', 'width'])
     )
   end
   
@@ -186,7 +186,7 @@ describe WeightedAverage do
 
   it "does custom weighting, with a cohort" do
     should_have_same_sql(
-      "SELECT SUM(segments.passengers * segments.load_factor * 1.0) / SUM(segments.passengers) FROM segments WHERE (segments.payload = 5) AND segments.load_factor IS NOT NULL AND segments.passengers > 0",
+      "SELECT SUM(segments.passengers * segments.load_factor * 1.0) / SUM(segments.passengers) FROM segments WHERE segments.payload = 5 AND segments.load_factor IS NOT NULL AND segments.passengers > 0",
       Segment.cohort(:payload => 5).weighted_average_relation(:load_factor, :weighted_by => :passengers)
     )
   end
@@ -234,6 +234,6 @@ describe WeightedAverage do
     # make sure the "best" SQL is valid
     ActiveRecord::Base.connection.execute(best)
     # compare everything to the known good
-    args.each { |arg| best.must_equal arg }
+    args.each { |arg| arg.must_equal best }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weighted_average
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-29 00:00:00.000000000 Z
+date: 2012-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -202,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: weighted_average
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Perform weighted averages. Rails 3 only.