aggregate_columns 0.9.3 → 0.9.4

data/.hgignore

@@ -0,0 +1,3 @@
+syntax: glob
+*swp
+pkg/*

data/Rakefile

@@ -1,50 +1 @@
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-require 'rake/gempackagetask'
-
-PKG_FILES = FileList[
-  '[a-zA-Z]*',
-  'generators/**/*',
-  'lib/**/*',
-  'rails/**/*',
-  'tasks/**/*',
-  'test/**/*'
-]
-
-spec = Gem::Specification.new do |s|
-  s.name = "aggregate_columns"
-  s.version = "0.9.3"
-  s.author = "Marek Janukowicz"
-  s.email = "marek@janukowicz.net"
-  s.homepage = "http://www.bitbucket.org/starware/aggregate_columns"
-  s.platform = Gem::Platform::RUBY
-  s.summary = "Create and use aggregate columns in Rails applications"
-  s.files = PKG_FILES.to_a
-  s.require_path = "lib"
-  s.has_rdoc = false
-  s.extra_rdoc_files = ["README"]
-end
-
-desc 'Create gem'
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
-
-desc 'Run tests'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
-
-desc 'Generate RDoc documentation'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'AggregateColumns'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
+require "bundler/gem_tasks"

data/lib/aggregate_columns.rb

@@ -71,16 +71,22 @@ module AggregateColumns
       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
+      join_type = options[:join_type] # TODO: check if within allowed values
 
-      aggregate_rel = klass.select( "#{function}(#{field}) AS #{result_column}" ).from( aggregate_table_name ).where( "#{table_name}.id = #{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 ).
-        select( "(#{aggregate_rel.to_sql}) AS #{result_column}" ).
-        order( "#{result_column} DESC" ) # You might reorder if you want to have it differently
+      if join_type
+        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 ).
+          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 = yield( aggregate_rel ) if block_given?
+        rel = rel.
+          select( "(#{aggregate_rel.to_sql}) AS #{result_column}" ).
+          order( "#{result_column} DESC" ) # You might reorder if you want to have it differently
+      end
       return rel
     end
   end

metadata

@@ -1,40 +1,55 @@
 --- !ruby/object:Gem::Specification 
 name: aggregate_columns
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 51
   prerelease: 
   segments: 
   - 0
   - 9
-  - 3
-  version: 0.9.3
+  - 4
+  version: 0.9.4
 platform: ruby
 authors: 
-- Marek Janukowicz
+- Marek Janukowicz/Starware
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-12-07 00:00:00 +01:00
+date: 2011-12-09 00:00:00 +01:00
 default_executable: 
-dependencies: []
-
-description: 
-email: marek@janukowicz.net
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        version: "2"
+  type: :runtime
+  version_requirements: *id001
+description: ""
+email: 
+- marek@janukowicz.net
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README
+extra_rdoc_files: []
+
 files: 
-- Rakefile
+- .hgignore
 - README
+- Rakefile
 - lib/aggregate_columns.rb
 - test/aggregate_columns_test.rb
 - test/test_helper.rb
 has_rdoc: true
-homepage: http://www.bitbucket.org/starware/aggregate_columns
+homepage: ""
 licenses: []
 
 post_install_message: 
@@ -67,5 +82,6 @@ rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Create and use aggregate columns in Rails applications
-test_files: []
-
+test_files: 
+- test/aggregate_columns_test.rb
+- test/test_helper.rb