aggregate_columns 0.9.5 → 0.9.6

data/aggregate_columns.gemspec

@@ -22,6 +22,6 @@ Gem::Specification.new do |s|
 	s.add_development_dependency "rake"
   s.add_development_dependency "activerecord", ">= 2"
 	s.add_development_dependency "activesupport", ">= 2"
-	s.add_development_dependency "activerecord-nulldb-adapter"
+	s.add_development_dependency "activerecord-nulldb-adapter", "0.2.0" # 0.2.1 explicitly forbids Rails >= 3.1
 
 end

data/lib/aggregate_columns.rb

@@ -50,15 +50,19 @@ module AggregateColumns
     def aggregate_columns( options )
       rel = self.select( "#{table_name}.*" )
       # Process options
-      options.assert_valid_keys( :association, :column, :function, :result_column, :join_type )
+      options.assert_valid_keys( :association, :column, :function, :result_column, :join_type, :expression )
       association = options[:association]
       unless association
         raise ArgumentError, "No association given" 
       end
-      field = options[:column] || '*'
-      function = options[:function] || :count
+      #field = options[:column] || '*'
+      #function = options[:function] || :count
+      aggregate_expression = options[:expression]
       result_column = options[:result_column]
-      unless result_column
+      unless aggregate_expression
+        field = options[:column] || '*'
+        function = options[:function] || :count
+        aggregate_expression = "#{function}(#{field})"
         # Defaults:
         # count(*) on comments => comment_count
         # sum(votes) on comment => comments_votes_sum
@@ -74,14 +78,14 @@ module AggregateColumns
       join_type = options[:join_type] # TODO: check if within allowed values
 
       if join_type
-        aggregate_rel = klass.select( "#{foreign_key}, #{function}(#{field}) AS #{result_column}" ).from( aggregate_table_name ).group( foreign_key )
+        aggregate_rel = klass.select( "#{foreign_key}, #{aggregate_expression} 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 ).
           order( "#{result_column} DESC" ) # You might reorder if you want to have it differently
       else
-        aggregate_rel = klass.select( "#{function}(#{field}) AS #{result_column}" ).from( aggregate_table_name ).where( "#{table_name}.id = #{foreign_key}" )
+        aggregate_rel = klass.select( "#{aggregate_expression} AS #{result_column}" ).from( aggregate_table_name ).where( "#{table_name}.id = #{foreign_key}" )
         aggregate_rel = yield( aggregate_rel ) if block_given?
         rel = rel.
           select( "(#{aggregate_rel.to_sql}) AS #{result_column}" ).

data/lib/aggregate_columns/version.rb

@@ -1,3 +1,3 @@
 module AggregateColumns
-  VERSION = "0.9.5"
+  VERSION = "0.9.6"
 end

data/test/rails_3_test.rb

@@ -45,6 +45,15 @@ if Rails::VERSION::MAJOR == 3
       assert_empty relation.joins_values
     end
 
+    def test_expression
+      relation = Post.aggregate_columns( :association => :comments, :expression => "(created_at + updated_at)", :result_column => :ultimate_at )
+      assert_equal 2, relation.select_values.count
+      assert relation.select_values.include?( "(SELECT (created_at + updated_at) AS ultimate_at FROM comments  WHERE (posts.id = post_id)) AS ultimate_at" )
+      assert_equal relation.order_values, ["ultimate_at DESC"]
+      assert_empty relation.where_values
+      assert_empty relation.joins_values
+    end
+
     def test_result_column
       relation = Post.aggregate_columns( :association => :comments, :function => :max, :column => :created_at, :result_column => :max_created_at )
       assert_equal 2, relation.select_values.count

metadata

@@ -1,103 +1,78 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: aggregate_columns
-version: !ruby/object:Gem::Version 
-  hash: 49
+version: !ruby/object:Gem::Version
+  version: 0.9.6
   prerelease: 
-  segments: 
-  - 0
-  - 9
-  - 5
-  version: 0.9.5
 platform: ruby
-authors: 
+authors:
 - Marek Janukowicz/Starware
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-03 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &7063280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        version: "2"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *7063280
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &7061440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *7061440
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &7055400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        version: "2"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *7055400
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &7052700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        version: "2"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: activerecord-nulldb-adapter
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *7052700
+- !ruby/object:Gem::Dependency
+  name: activerecord-nulldb-adapter
+  requirement: &7051800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 0.2.0
   type: :development
-  version_requirements: *id005
-description: ""
-email: 
+  prerelease: false
+  version_requirements: *7051800
+description: ''
+email:
 - marek@janukowicz.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .hgignore
 - Gemfile
 - README
@@ -108,41 +83,31 @@ files:
 - test/rails_2_test.rb
 - test/rails_3_test.rb
 - test/test_helper.rb
-has_rdoc: true
-homepage: ""
+homepage: ''
 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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Create and use aggregate columns in Rails applications
-test_files: 
+test_files:
 - test/rails_2_test.rb
 - test/rails_3_test.rb
 - test/test_helper.rb