weighted_average 0.0.5 → 0.0.6

data/Rakefile

@@ -10,8 +10,8 @@ begin
     gem.email = "seamus@abshere.net"
     gem.homepage = "http://github.com/seamusabshere/weighted_average"
     gem.authors = ["Seamus Abshere", "Andy Rossmeissl", "Ian Hough", "Matt Kling"]
-    gem.add_dependency 'activerecord', '>=3.0.0.beta2'
-    gem.add_dependency 'arel', '>=0.3.3'
+    gem.add_dependency 'activerecord', '~>3'
+    gem.add_dependency 'arel', '~>2'
     gem.add_development_dependency 'cohort_scope', '>=0.0.2'
     gem.add_development_dependency "shoulda", ">= 2.10.3"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/lib/weighted_average.rb

@@ -7,13 +7,10 @@ module WeightedAverage
   end
 
   # Returns the ARel relation for a weighted average query.
-  def weighted_average_relation(column_names, options = {})
+  def weighted_average_relation(data_column_names, options = {})
     raise ArgumentError, "Only use array form if the weighting column in the foreign table is not called 'weighting'" if options[:weighted_by].is_a?(Array) and options[:weighted_by].length != 2
     raise ArgumentError, "No nil values in weighted_by, please" if Array.wrap(options[:weighted_by]).any?(&:nil?)
   
-    # aircraft['seats'] or (aircraft['seats'] + aircraft['payload'])
-    columns = Array.wrap(column_names).map { |column_name| arel_table[column_name.to_s] }
-
     # :airline_aircraft_seat_class
     association = if options[:weighted_by].present?
       options[:weighted_by].is_a?(Array) ? reflect_on_association(options[:weighted_by].first.to_sym) : reflect_on_association(options[:weighted_by].to_sym)
@@ -21,34 +18,37 @@ module WeightedAverage
   
     # AirlineAircraftSeatClass
     association_class = association.klass if association
-        
-    # AirlineAircraftSeatClass.arel_table
-    foreign_arel_table = association_class.arel_table if association_class
-  
-    # 'weighting'
-    weighted_by_column = if association_class and options[:weighted_by].is_a?(Array)
+    
+    # `airline_aircraft_seat_classes`
+    weighted_by_table_name = if association_class
+      association_class.quoted_table_name
+    else
+      quoted_table_name
+    end
+      
+    # `airline_aircraft_seat_classes`.`weighting`
+    weighted_by_column_name = if association_class and options[:weighted_by].is_a?(Array)
       options[:weighted_by].last.to_s
     elsif !association_class and (options[:weighted_by].is_a?(String) or options[:weighted_by].is_a?(Symbol))
       options[:weighted_by].to_s
     else
       'weighting'
     end
-  
-    # [foreign_]arel_table['weighting']
-    weighted_by = if foreign_arel_table
-      foreign_arel_table[weighted_by_column]
-    else
-      arel_table[weighted_by_column]
+    weighted_by_column_name = [ weighted_by_table_name, connection.quote_column_name(weighted_by_column_name) ].join '.'
+    
+    # `aircraft`.`passengers`
+    disaggregate_by_column_name = if options[:disaggregate_by]
+      [ quoted_table_name, connection.quote_column_name(options[:disaggregate_by]) ].join '.'
     end
 
-    disaggregate_by = if options[:disaggregate_by].present?
-      raise ArgumentError, "Disaggregating by a foreign table isn't supported right now" if options[:disaggregate_by].is_a?(Array)
-      arel_table[options[:disaggregate_by].to_s]
+    # [ `aircraft`.`foo`, `aircraft`.`baz` ]
+    data_column_names = Array.wrap(data_column_names).map do |data_column_name|
+      [ quoted_table_name, connection.quote_column_name(data_column_name) ].join '.'
     end
 
-    relation = select("(SUM((#{columns.map { |column| column.to_sql }.join(' + ')}) #{"/ #{disaggregate_by.to_sql} " if disaggregate_by}* #{weighted_by.to_sql}) / SUM(#{weighted_by.to_sql})) AS weighted_average")
-    columns.each do |column|
-      relation = relation.where("#{column.to_sql} IS NOT NULL")
+    relation = select("(SUM((#{data_column_names.join(' + ')}) #{"/ #{disaggregate_by_column_name} " if disaggregate_by_column_name}* #{weighted_by_column_name}) / SUM(#{weighted_by_column_name})) AS weighted_average")
+    data_column_names.each do |data_column_name|
+      relation = relation.where("#{data_column_name} IS NOT NULL")
     end
     # FIXME this will break on through relationships, where it has to be :aircraft => :aircraft_class
     relation = relation.joins(association.name) if association_class

data/test/helper.rb

@@ -1,7 +1,9 @@
 require 'rubygems'
 require 'test/unit'
 require 'shoulda'
-require 'ruby-debug'
+unless RUBY_VERSION >= '1.9'
+  require 'ruby-debug'
+end
 require 'logger'
 require 'cohort_scope'
 

data/weighted_average.gemspec

@@ -0,0 +1,63 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{weighted_average}
+  s.version = "0.0.6"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Seamus Abshere", "Andy Rossmeissl", "Ian Hough", "Matt Kling"]
+  s.date = %q{2010-11-16}
+  s.description = %q{Perform weighted averages, even across associations. Rails 3 only because it uses ARel.}
+  s.email = %q{seamus@abshere.net}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "lib/weighted_average.rb",
+     "test/helper.rb",
+     "test/test_weighted_average.rb",
+     "weighted_average.gemspec"
+  ]
+  s.homepage = %q{http://github.com/seamusabshere/weighted_average}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Perform weighted averages. Rails 3 only.}
+  s.test_files = [
+    "test/helper.rb",
+     "test/test_weighted_average.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activerecord>, ["~> 3"])
+      s.add_runtime_dependency(%q<arel>, ["~> 2"])
+      s.add_development_dependency(%q<cohort_scope>, [">= 0.0.2"])
+      s.add_development_dependency(%q<shoulda>, [">= 2.10.3"])
+    else
+      s.add_dependency(%q<activerecord>, ["~> 3"])
+      s.add_dependency(%q<arel>, ["~> 2"])
+      s.add_dependency(%q<cohort_scope>, [">= 0.0.2"])
+      s.add_dependency(%q<shoulda>, [">= 2.10.3"])
+    end
+  else
+    s.add_dependency(%q<activerecord>, ["~> 3"])
+    s.add_dependency(%q<arel>, ["~> 2"])
+    s.add_dependency(%q<cohort_scope>, [">= 0.0.2"])
+    s.add_dependency(%q<shoulda>, [">= 2.10.3"])
+  end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: weighted_average
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-20 00:00:00 -05:00
+date: 2010-11-16 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,15 +27,12 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 299253626
+        hash: 5
         segments: 
         - 3
-        - 0
-        - 0
-        - beta2
-        version: 3.0.0.beta2
+        version: "3"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -44,14 +41,12 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 7
         segments: 
-        - 0
-        - 3
-        - 3
-        version: 0.3.3
+        - 2
+        version: "2"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -105,6 +100,7 @@ files:
 - lib/weighted_average.rb
 - test/helper.rb
 - test/test_weighted_average.rb
+- weighted_average.gemspec
 has_rdoc: true
 homepage: http://github.com/seamusabshere/weighted_average
 licenses: []