quacky-charts 0.0.6 → 0.0.7

data/README.md

@@ -22,6 +22,11 @@ Add this line to the controller:
 
 		@chart = Quacky::PieChartBuilder.new
 		
+If you want to add some custom data (otherwise you'll get dummy data):
+
+		@chart.add_data( { "label" => "Category A", "value" => 20 } )
+		@chart.add_data( { "label" => "Category B", "value" => 60 } )
+		
 and in the view:
 
 		<%= @chart.draw %>

data/lib/generators/quacky/templates/pie_charts.js.coffee

@@ -1,22 +1,37 @@
-# based on the example at https://github.com/mbostock/d3/blob/master/examples/donut/donut.html
 $(document).ready( ->
 	builder = new PieChartBuilder
 	builder.drawCharts()
 )
 
+# Draws D3 pie charts on all the elements with class "pie-chart."
 class PieChartBuilder
-
+	
+	# Grabs all the elements with class "pie-chart," and draws the chart.
 	drawCharts: ->
+		allCharts = $(".pie-chart")
+		@appendChart chart for chart in allCharts
+	
+	# Takes a container, draws a chart based on data attribute.
+	# If no init data, draws from dummy data.
+	appendChart: (container) ->
+		
 		w = 300
 		h = 300
-		r = 100
+		r = 150
 		color = d3.scale.category20c()
 		
-		data = [{"label":"one", "value":20}, 
-	          {"label":"two", "value":50}, 
-	          {"label":"three", "value":30}]
-	
-		vis = d3.select(".pie-chart").append("svg:svg").data([data]).attr("width", w).attr("height", h).append("svg:g").attr("transform", "translate(" + r + "," + r + ")")
+		# If there is data in the container's data attribute, set it.
+		# Else, use some dummy data.
+		init_data = $(container).data()["chart"]
+		if init_data.length == 0
+			data = [{"label":"Category A", "value":20}, 
+		          {"label":"Category B", "value":50}, 
+		          {"label":"Category C", "value":30}]
+		else
+			data = init_data
+		
+		# fancy D3 stuff ...
+		vis = d3.select(container).append("svg:svg").data([data]).attr("width", w).attr("height", h).append("svg:g").attr("transform", "translate(" + r + "," + r + ")")
 		arc = d3.svg.arc().outerRadius(r)
 		
 		pie = d3.layout.pie().value( (d) ->

data/lib/quacky/pie_chart_builder.rb

@@ -2,9 +2,34 @@ module Quacky
   
   class PieChartBuilder
     
-    # return a content tag that can be selected by the client-side, and drawn on
+    @data = []
+    
+    def initialize(init_data = [])
+      @data = init_data
+    end
+    
+    # Return a content tag that can be selected by the client-side, and drawn on.
+    # The data attribute of the HTML tag is @data.
     def draw
-      "<div class='pie-chart'>".html_safe
+      "<div class='pie-chart' data-chart='#{@data.to_json}'></div>".html_safe
+    end
+    
+    # Add data.  If input is a hash, add it in.  Otherwise (it's an array, most likely),
+    # set @data to input.
+    def add_data(input)
+      if input.class == Hash
+        @data << input
+      else
+        @data = input
+      end
+    end
+    
+    def clear_data
+      @data = []
+    end
+    
+    def get_data
+      @data
     end
   
   end

data/lib/quacky/version.rb

@@ -1,3 +1,3 @@
 module QuackyCharts
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/quacky-charts.rb

@@ -1,7 +1,6 @@
 require "quacky/version"
 require "quacky/pie_chart_builder"
-
-#include ActionView::Helpers::TagHelper
+require "json"
 
 module Quacky
 end

data/quacky-charts.gemspec

@@ -17,4 +17,5 @@ Gem::Specification.new do |gem|
   
   gem.add_development_dependency(%q<rspec>)
   gem.add_runtime_dependency(%q<coffee-rails>,    ["~> 3.2.1"])
+  gem.add_runtime_dependency(%q<json>)
 end

data/spec/cases/pie_chart_builder_spec.rb

@@ -12,6 +12,53 @@ describe "Quacky::PieChartBuilder" do
     chart.class.should eq(Quacky::PieChartBuilder)
   end
   
+  it "should have specified data if passed as an initialization variable" do 
+    example_data_set = [ { "label" => "one", "value" => 20 }, { "label" => "two", "value" => 50 } ]
+    chart = Quacky::PieChartBuilder.new(example_data_set)
+    chart.get_data.should eq(example_data_set)
+  end
+  
+  it "should have one data point after adding one data point" do
+    chart = Quacky::PieChartBuilder.new
+    
+    example_data_point = { "label" => "one", "value" => 20 }
+    
+    chart.add_data(example_data_point)
+    chart.get_data.should eq( [ example_data_point ] )
+  end
+  
+  it "should have two data points after adding two sequentially" do
+    chart = Quacky::PieChartBuilder.new
+    
+    first_example_data_point = { "label" => "one", "value" => 20 }
+    second_example_data_point = { "label" => "two", "value" => 50 }
+    
+    chart.add_data(first_example_data_point)
+    chart.add_data(second_example_data_point)
+    chart.get_data.should eq( [ first_example_data_point, second_example_data_point ] )
+  end
+  
+  it "should be able to accept an array of data, rather than a hash" do
+    chart = Quacky::PieChartBuilder.new
+    
+    first_example_data_point = { "label" => "one", "value" => 20 }
+    second_example_data_point = { "label" => "two", "value" => 50 }
+    
+    chart.add_data( [ first_example_data_point, second_example_data_point ] )
+    chart.get_data.should eq( [ first_example_data_point, second_example_data_point ] )
+  end
+  
+  it "should clear and replace data if an array is added" do
+    chart = Quacky::PieChartBuilder.new
+    
+    first_example_data_point = { "label" => "one", "value" => 20 }
+    second_example_data_point = { "label" => "two", "value" => 50 }
+    
+    chart.add_data(first_example_data_point)
+    chart.add_data( [ first_example_data_point, second_example_data_point ] )
+    chart.get_data.should eq( [ first_example_data_point, second_example_data_point ] )
+  end
+  
   it "should be able to draw and raise error" do
     chart = Quacky::PieChartBuilder.new
     lambda {chart.draw}.should raise_error

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quacky-charts
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-24 00:00:00.000000000 Z
+date: 2012-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -43,6 +43,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.1
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Rails Charting Gem
 email:
 - travissheppard.1988@gmail.com