quacky-charts 0.0.8 → 0.0.9

data/README.md

@@ -31,6 +31,15 @@ and in the view:
 
 		<%= @chart.draw %>
 		
+To draw a line graph:
+
+    example_data = [{ time: Time.now, data: 50 },{ time: Time.now + 1.hour, data: 75 },{ time: Time.now + 2.hours, data: 25 }]
+    @line_graph = Quacky::LineGraphBuilder.new(example_data)
+    
+and in the view:
+
+    <%= @line_graph.draw %>
+		
 ## Contributing
 
 1. Fork it

data/lib/generators/quacky/install_generator.rb

@@ -16,6 +16,7 @@ module Quacky
         copy_file 'd3.v2.min.js', 'app/assets/javascripts/d3.v2.min.js'
         copy_file 'rickshaw.min.js', 'app/assets/javascripts/rickshaw.min.js'
         copy_file 'rickshaw.min.css', 'app/assets/stylesheets/rickshaw.min.css'
+        copy_file 'line_graphs.css', 'app/assets/stylesheets/line_graphs.css'
       end
   
     end

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

@@ -12,18 +12,20 @@ class LineGraphBuilder
 		@appendGraph graph for graph in allGraphs
   
 	appendGraph: (container) ->
-	  data = $(container).data()['chart']
-	  graph = new Rickshaw.Graph(
-	    element: $(container)[0]
-	    width: 580
-	    height: 250
-	    renderer: 'line'
-	    series: [{ color: 'steelblue', data: data }]
-	  )
-	  y_axis = new Rickshaw.Graph.Axis.Y(
-	    graph: graph
-	    orientation: 'left'
-	    tickFormat: Rickshaw.Fixtures.Number.formatKMBT
-	    element: document.getElementById('y-axis')
-	  )
-	  graph.render()
+		data = $(container).data()['chart']
+		graph = new Rickshaw.Graph(
+			element: $(container)[0]
+			renderer: 'line'
+			series: [{ color: 'steelblue', data: data }]
+		)
+		
+		x_axis = new Rickshaw.Graph.Axis.Time( { graph: graph } )
+		
+		y_axis = new Rickshaw.Graph.Axis.Y(
+			graph: graph
+			orientation: 'left'
+			tickFormat: Rickshaw.Fixtures.Number.formatKMBT
+			element: $('.y-axis')[0]
+		)
+		
+		graph.render()

data/lib/generators/quacky/templates/line_graphs.css

@@ -0,0 +1,14 @@
+.line-graph-container {
+    position: relative;
+    font-family: Arial, Helvetica, sans-serif;
+}
+.line-graph {
+    position: relative;
+    margin-left: 40px;
+}
+.y-axis {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    width: 40px;
+}

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

@@ -15,9 +15,9 @@ class PieChartBuilder
 	# If no init data, draws from dummy data.
 	appendChart: (container) ->
 		
-		w = 300
-		h = 300
-		r = 150
+		w = $(container).width()
+		h = w
+		r = w / 2
 		color = d3.scale.category20c()
 		
 		# If there is data in the container's data attribute, set it.

data/lib/quacky/line_graph_builder.rb

@@ -10,7 +10,7 @@ module Quacky
      # 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='line-graph' data-chart='#{self.get_data}'></div>".html_safe
+       "<div class='line-graph-container'><div class='y-axis'></div><div class='line-graph' data-chart='#{self.get_data}'></div></div>".html_safe
      end
      
      def get_data
@@ -18,7 +18,7 @@ module Quacky
        
        @data.each do |event|
          output << {
-           x: event[:time].to_i * 1000,
+           x: event[:time].to_i,
            y: event[:data]
          }
        end

data/lib/quacky/version.rb

@@ -1,3 +1,3 @@
 module QuackyCharts
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quacky-charts
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
+date: 2013-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -90,6 +90,7 @@ files:
 - lib/generators/quacky/install_generator.rb
 - lib/generators/quacky/templates/d3.v2.min.js
 - lib/generators/quacky/templates/line_graph_builder.js.coffee
+- lib/generators/quacky/templates/line_graphs.css
 - lib/generators/quacky/templates/pie_chart_builder.js.coffee
 - lib/generators/quacky/templates/rickshaw.min.css
 - lib/generators/quacky/templates/rickshaw.min.js