aggregate_columns 0.9.1 → 0.9.2

data/Rakefile

@@ -14,7 +14,7 @@ PKG_FILES = FileList[
 
 spec = Gem::Specification.new do |s|
   s.name = "aggregate_columns"
-  s.version = "0.9.1"
+  s.version = "0.9.2"
   s.author = "Marek Janukowicz"
   s.email = "marek@janukowicz.net"
   s.homepage = "http://www.bitbucket.org/starware/aggregate_columns"

data/lib/aggregate_columns.rb

@@ -47,7 +47,7 @@ module AggregateColumns
 
   module MethodsRails3
 
-    def aggregate_columns( options )
+    def aggregate_column( options )
       rel = self.select( "#{table_name}.*" )
       # Process options
       options.assert_valid_keys( :association, :column, :function, :result_column, :join_type )
@@ -68,16 +68,18 @@ module AggregateColumns
       # (and not that complicated) to make it work on ActiveRecord::Relation
       # instances
       assoc_reflection = reflect_on_association( association )
-      foreign_key = assoc_reflection.primary_key_name # As stupid as it looks, this is actually correct
+      foreign_key = assoc_reflection.foreign_key
       aggregate_table_name = assoc_reflection.table_name
       klass = assoc_reflection.klass
       join_type = options[:join_type] || "LEFT" # TODO: check if within allowed values
 
-      aggregate_rel = klass.select( "#{foreign_key}, #{function}(#{field}) AS #{result_column}" ).from( aggregate_table_name ).group( foreign_key )
+      aggregate_rel = klass.select( "#{function}(#{field}) AS #{result_column}" ).from( aggregate_table_name ).where( "#{table_name}.id = #{result_column}_join.#{foreign_key}" )
+      #aggregate_rel = klass.select( "#{foreign_key}, #{function}(#{field}) AS #{result_column}" ).from( aggregate_table_name ).group( foreign_key )
       aggregate_rel = yield( aggregate_rel ) if block_given?
       rel = rel.
-        joins( "#{join_type.to_s.upcase} JOIN (#{aggregate_rel.to_sql}) #{result_column}_join ON #{table_name}.id = #{result_column}_join.#{foreign_key}" ).
-        select( result_column.to_s ).
+        #joins( "#{join_type.to_s.upcase} JOIN (#{aggregate_rel.to_sql}) #{result_column}_join ON #{table_name}.id = #{result_column}_join.#{foreign_key}" ).
+        #select( result_column.to_s ).
+        select( "(#{aggregate_rel.to_sql}) AS #{result_column}" ).
         order( "#{result_column} DESC" ) # You might reorder if you want to have it differently
       return rel
     end

metadata

@@ -1,50 +1,71 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: aggregate_columns
-version: !ruby/object:Gem::Version
-  version: 0.9.1
+version: !ruby/object:Gem::Version 
+  hash: 63
   prerelease: 
+  segments: 
+  - 0
+  - 9
+  - 2
+  version: 0.9.2
 platform: ruby
-authors:
+authors: 
 - Marek Janukowicz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-29 00:00:00.000000000 Z
+
+date: 2011-12-07 00:00:00 +01:00
+default_executable: 
 dependencies: []
+
 description: 
 email: marek@janukowicz.net
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README
-files:
+files: 
 - Rakefile
 - README
 - lib/aggregate_columns.rb
 - test/aggregate_columns_test.rb
 - test/test_helper.rb
+has_rdoc: true
 homepage: http://www.bitbucket.org/starware/aggregate_columns
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Create and use aggregate columns in Rails applications
 test_files: []
+