ballot_box 0.1.6 → 0.1.7

data/Gemfile

@@ -3,7 +3,7 @@ source "http://rubygems.org"
 gemspec
 
 gem "rails", "3.0.10"
-gem "mysql2", "0.2.7"
+gem "mysql2", "0.2.13"
 
 gem "rspec-rails", "~> 2.7.0"
 gem "database_cleaner", "~> 0.6.7"

data/lib/ballot_box/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module BallotBox
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/lib/ballot_box/voting.rb

@@ -48,13 +48,23 @@ module BallotBox
       
       protected
         
+        # Simple little alias
+        def tn
+          quoted_table_name
+        end
+        
         def chart_dates_browsers
           result = []
-          data = scoped.select("DATE(created_at) AS created_at, SUM(value) AS rating, browser_name").group("DATE(created_at), browser_name").all
+          t = quoted_table_name
+          cols = ["DATE(#{tn}.created_at) AS created_at", 
+                  "SUM(#{tn}.value) AS rating", 
+                  "#{tn}.browser_name"]
+                  
+          data = scoped.select(cols.join(',')).group("DATE(#{tn}.created_at), #{tn}.browser_name").all
           
           result << { 
             :name => "total", 
-            :data => data.group_by(&:created_at).collect { |created_at, items| [created_at, items.sum(&:rating) ] }
+            :data => data.group_by(&:created_at).collect { |created_at, items| [created_at, items.sum(&:rating).to_i ] }
           }
           
           data.group_by(&:browser_name).each do |browser_name, items|
@@ -68,17 +78,20 @@ module BallotBox
         end
         
         def chart_dates
-          data = scoped.select("DATE(created_at) AS created_at, SUM(value) AS rating").group("DATE(created_at)").all
+          t = quoted_table_name
+          cols = ["DATE(#{tn}.created_at) AS created_at", "SUM(#{tn}.value) AS rating"]
+          data = scoped.select(cols.join(',')).group("DATE(#{tn}.created_at)").all
           data.collect { |item| [ item.created_at, item.rating.to_i ] }
         end
         
         def chart_browsers
-          data = scoped.select("browser_name, SUM(value) AS rating").group("browser_name").all
+          t = quoted_table_name
+          data = scoped.select("#{tn}.browser_name, SUM(#{tn}.value) AS rating").group("#{tn}.browser_name").all
           data.collect { |item| [ item.browser_name, item.rating.to_i ] }
         end
         
         def chart_platforms
-          data = scoped.select("browser_platform, SUM(value) AS rating").group("browser_platform").all
+          data = scoped.select("#{tn}.browser_platform, SUM(#{tn}.value) AS rating").group("#{tn}.browser_platform").all
           data.collect { |item| [ item.browser_platform, item.rating.to_i ] }
         end
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ballot_box
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Igor Galeta
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-01 00:00:00 +02:00
+date: 2011-11-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency