weighted_average 1.0.3 → 1.1.0

data/CHANGELOG

@@ -0,0 +1,5 @@
+1.1.0 / 2012-05-21
+
+* Bug fixes
+
+  * Don't rely on ActiveRecord::Relation#quoted_table_name; use ActiveRecord::Relation#table.name instead.

data/lib/weighted_average.rb

@@ -22,11 +22,14 @@ module WeightedAverage
     # AirlineAircraftSeatClass
     association_class = association.klass if association
     
+    # `aircraft`
+    table_name = connection.quote_table_name table.name
+
     # `airline_aircraft_seat_classes`
     weighted_by_table_name = if association_class
       association_class.quoted_table_name
     else
-      quoted_table_name
+      table_name
     end
       
     # `airline_aircraft_seat_classes`.`weighting`
@@ -41,12 +44,12 @@ module WeightedAverage
     
     # `aircraft`.`passengers`
     disaggregate_by_column_name = if options[:disaggregate_by]
-      [ quoted_table_name, connection.quote_column_name(options[:disaggregate_by]) ].join '.'
+      [ table_name, connection.quote_column_name(options[:disaggregate_by]) ].join '.'
     end
 
     # [ `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 '.'
+      [ table_name, connection.quote_column_name(data_column_name) ].join '.'
     end
 
     relation = select("(SUM(1.0 * (#{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/lib/weighted_average/version.rb

@@ -1,3 +1,3 @@
 module WeightedAverage
-  VERSION = '1.0.3'
+  VERSION = '1.1.0'
 end

data/test/helper.rb

@@ -1,10 +1,8 @@
 require 'bundler/setup'
 require 'minitest/spec'
 require 'minitest/autorun'
-require 'cohort_scope'
+require 'cohort_analysis'
 
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'weighted_average'
 
 class MiniTest::Unit::TestCase
@@ -221,10 +219,8 @@ ActiveRecord::Schema.define(:version => 20090819143429) do
 end
 
 class Segment < ActiveRecord::Base
-  set_primary_key :row_hash
+  self.primary_key = 'row_hash'
   validates_presence_of :row_hash
-  extend CohortScope
-  self.minimum_cohort_size = 1
   belongs_to :aircraft, :foreign_key => 'bts_aircraft_type', :primary_key => 'bts_aircraft_type'
   has_one :aircraft_class, :through => :aircraft
 end
@@ -285,7 +281,7 @@ end
 end
 
 class AircraftDeux < ActiveRecord::Base
-  set_primary_key 'icao_code'
+  self.primary_key = 'icao_code'
   has_many :segments, :primary_key => 'my_bts_aircraft_type_code', :foreign_key => 'bts_aircraft_type'
 end
 

data/test/test_weighted_average.rb

@@ -186,8 +186,20 @@ describe WeightedAverage do
 
   it "does custom weighting, with a cohort" do
     should_have_same_sql(
-      "SELECT (SUM(1.0 * (segments.load_factor) * segments.passengers) / SUM(segments.passengers)) AS weighted_average FROM segments WHERE segments.payload = 5 AND (segments.load_factor IS NOT NULL) AND (segments.passengers > 0)",
-      Segment.big_cohort(:payload => 5).weighted_average_relation(:load_factor, :weighted_by => :passengers)
+      "SELECT (SUM(1.0 * (segments.load_factor) * segments.passengers) / SUM(segments.passengers)) AS weighted_average 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
+
+  it "properly picks up table name" do
+    c = Segment.connection
+    c.execute %{
+      CREATE TEMPORARY TABLE moo LIKE #{Segment.quoted_table_name}
+    }
+    relation = ActiveRecord::Relation.new(Segment, Arel::Table.new(:moo))
+    should_have_same_sql(
+      "SELECT (SUM(1.0 * (moo.distance) * moo.passengers) / SUM(moo.passengers)) AS weighted_average FROM moo WHERE (moo.distance IS NOT NULL) AND (moo.passengers > 0)",
+      relation.weighted_average_relation('distance', :weighted_by => 'passengers')
     )
   end
 

data/weighted_average.gemspec

@@ -1,6 +1,5 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "weighted_average/version"
+require File.expand_path("../lib/weighted_average/version", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "weighted_average"
@@ -22,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'activesupport', '~>3'
   s.add_runtime_dependency 'arel', '>= 2'
   
-  s.add_development_dependency 'cohort_scope', '>= 0.2.1'
+  s.add_development_dependency 'cohort_analysis', '>= 0.2.1'
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'mysql'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weighted_average
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-03 00:00:00.000000000Z
+date: 2012-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2153427740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -24,10 +24,15 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *2153427740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2153423280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -35,10 +40,15 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *2153423280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: arel
-  requirement: &2153412260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +56,15 @@ dependencies:
         version: '2'
   type: :runtime
   prerelease: false
-  version_requirements: *2153412260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: cohort_scope
-  requirement: &2153409560 !ruby/object:Gem::Requirement
+  name: cohort_analysis
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +72,15 @@ dependencies:
         version: 0.2.1
   type: :development
   prerelease: false
-  version_requirements: *2153409560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2153407140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +88,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153407140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153405020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +104,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153405020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql
-  requirement: &2153395960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,10 +120,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153395960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &2153389740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,7 +136,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153389740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Perform weighted averages, even across associations. Rails 3 only because
   it uses ARel.
 email:
@@ -110,8 +150,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .document
 - .gitignore
+- CHANGELOG
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -141,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: weighted_average
-rubygems_version: 1.8.10
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Perform weighted averages. Rails 3 only.

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE