weighted_average 2.0.1 → 2.0.2

data/CHANGELOG

@@ -1,3 +1,9 @@
+2.0.2 / 2012-06-06
+
+* Bug fixes
+
+  * Don't modify the Arel::SelectManager or ActiveRecord::Relation that #weighted_average is called on
+
 2.0.1 / 2012-06-06
 
 * Bug fixes

data/lib/weighted_average/arel_select_manager_instance_methods.rb

@@ -26,6 +26,10 @@ module WeightedAverage
     #
     # @return [Arel::SelectManager] A relation you can play around with.
     def weighted_average_relation(data_column_names, options = {})
+      unless options[:safe] == true
+        return clone.weighted_average_relation(data_column_names, options.merge(:safe => true))
+      end
+
       data_column_names = Array.wrap data_column_names
       left = self.source.left
 
@@ -48,7 +52,7 @@ module WeightedAverage
         left[data_column_name]
       end
 
-      data_columns_sum = data_columns.inject(nil) do |memo, data_column|
+      data_columns_added_together = data_columns.inject(nil) do |memo, data_column|
         if memo
           Arel::Nodes::Addition.new(memo, data_column)
         else
@@ -57,13 +61,13 @@ module WeightedAverage
       end
 
       if data_column_names.many?
-        data_columns_sum = Arel::Nodes::Grouping.new(data_columns_sum)
+        data_columns_added_together = Arel::Nodes::Grouping.new(data_columns_added_together)
       end
 
       if disaggregate_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]))]
+        self.projections = [Arel::Nodes::Division.new(Arel::Nodes::Sum.new(weighted_by_column * data_columns_added_together / 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_sum * 1.0), Arel::Nodes::Sum.new([weighted_by_column]))]
+        self.projections = [Arel::Nodes::Division.new(Arel::Nodes::Sum.new(weighted_by_column * data_columns_added_together * 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.1'
+  VERSION = '2.0.2'
 end

data/test/test_weighted_average.rb

@@ -44,6 +44,50 @@ describe WeightedAverage do
   #   )
   # end
 
+  describe :weighted_average do
+    it "does not modify the Arel::SelectManager it is used on" do
+      s_t = Segment.arel_table
+      select_manager = s_t.where(s_t[:seats].eq(9))
+      original_constraints = select_manager.constraints
+      original_sql = select_manager.to_sql
+      select_manager.weighted_average(:seats, :weighted_by => :passengers)
+      select_manager.constraints.must_equal original_constraints
+      select_manager.to_sql.must_equal original_sql
+    end
+
+    it "does not modify the ActiveRecord::Relation it is used on" do
+      s_t = Segment.arel_table
+      relation = Segment.where(s_t[:seats].eq(9))
+      original_constraints = relation.constraints
+      original_sql = relation.to_sql
+      relation.weighted_average(:seats, :weighted_by => :passengers)
+      relation.constraints.must_equal original_constraints
+      relation.to_sql.must_equal original_sql
+    end
+  end
+
+  describe :weighted_average_relation do
+    it "does not modify the Arel::SelectManager it is used on" do
+      s_t = Segment.arel_table
+      select_manager = s_t.where(s_t[:seats].eq(9))
+      original_constraints = select_manager.constraints
+      original_sql = select_manager.to_sql
+      select_manager.weighted_average_relation(:seats, :weighted_by => :passengers)
+      select_manager.constraints.must_equal original_constraints
+      select_manager.to_sql.must_equal original_sql
+    end
+
+    it "does not modify the ActiveRecord::Relation it is used on" do
+      s_t = Segment.arel_table
+      relation = Segment.where(s_t[:seats].eq(9))
+      original_constraints = relation.constraints
+      original_sql = relation.to_sql
+      relation.weighted_average_relation(:seats, :weighted_by => :passengers)
+      relation.constraints.must_equal original_constraints
+      relation.to_sql.must_equal original_sql
+    end
+  end
+
   # plain
 
   it "does default weighting" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weighted_average
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
   prerelease: 
 platform: ruby
 authors: