ballot_box 0.1.5 → 0.1.6

data/lib/ballot_box/version.rb

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

data/lib/ballot_box/voting.rb

@@ -38,17 +38,35 @@ module BallotBox
       end
       
       def chart(mode)
-        result = case mode.to_s.downcase
-          when 'dates' then chart_dates
-          when 'browsers' then chart_browsers
-          when 'platforms' then chart_platforms
+        case mode.to_s.downcase
+          when 'dates' then [chart_dates]
+          when 'browsers' then [chart_browsers]
+          when 'platforms' then [chart_platforms]
+          when 'dates_browsers' then chart_dates_browsers
         end
-        
-        [ result ].to_json
       end
       
       protected
-      
+        
+        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
+          
+          result << { 
+            :name => "total", 
+            :data => data.group_by(&:created_at).collect { |created_at, items| [created_at, items.sum(&:rating) ] }
+          }
+          
+          data.group_by(&:browser_name).each do |browser_name, items|
+            result << { 
+              :name => browser_name, 
+              :data => items.collect { |item| [ item.created_at, item.rating.to_i ] } 
+            }
+          end
+          
+          result
+        end
+        
         def chart_dates
           data = scoped.select("DATE(created_at) AS created_at, SUM(value) AS rating").group("DATE(created_at)").all
           data.collect { |item| [ item.created_at, item.rating.to_i ] }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ballot_box
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Igor Galeta
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-17 00:00:00 Z
+date: 2011-11-01 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: browser
@@ -57,23 +58,24 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - app/models/ballot_box/vote.rb
-- lib/generators/ballot_box/install_generator.rb
-- lib/generators/ballot_box/USAGE
-- lib/generators/ballot_box/templates/migrate/create_votes.rb
+- lib/ballot_box/engine.rb
 - lib/ballot_box/base.rb
 - lib/ballot_box/config.rb
-- lib/ballot_box/callbacks.rb
 - lib/ballot_box/manager.rb
 - lib/ballot_box/version.rb
-- lib/ballot_box/engine.rb
-- lib/ballot_box/voting.rb
-- lib/ballot_box/strategies/base.rb
 - lib/ballot_box/strategies/authenticated.rb
+- lib/ballot_box/strategies/base.rb
+- lib/ballot_box/voting.rb
+- lib/ballot_box/callbacks.rb
 - lib/ballot_box.rb
+- lib/generators/ballot_box/install_generator.rb
+- lib/generators/ballot_box/templates/migrate/create_votes.rb
+- lib/generators/ballot_box/USAGE
 - MIT-LICENSE
 - Rakefile
 - Gemfile
 - README.rdoc
+has_rdoc: true
 homepage: https://github.com/galetahub/ballot_box
 licenses: []
 
@@ -103,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ballot_box
-rubygems_version: 1.8.11
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: The BallotBox gem enables visitors to vote for and against voteable objects