svg_charts 1.0 → 1.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 54e2d61c5b862d2563636268a0b6f257a1eb4512
+  data.tar.gz: 3b8f4b7399292b8f92e75ec201c829f42b1db1fb
+SHA512:
+  metadata.gz: f461cce55168620110f26c085dadeff3c75b977c86379be58e0b88abb5436720186bb204ebd22159eb4f974de6414d8bec1a8c2f765fb7b5f0164e5db3bea621
+  data.tar.gz: 941dd3606d129893f975b1728431a8b0b24826c9be194c9acbfdf0fd94a2074efc26181d900ab14ae524c5f5095d003be83a48828c8eba7ca9d9a86fe5d44619

data/Gemfile

@@ -0,0 +1,2 @@
+source "http://rubygems.org"
+gemspec

data/Gemfile.lock

@@ -0,0 +1,24 @@
+PATH
+  remote: .
+  specs:
+    svg_charts (1.0.3)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.2.1)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rspec
+  svg_charts!

data/{README.rdoc → README.md}

@@ -1,47 +1,56 @@
-= SVGCharts
+# SVGCharts
 
 Draw charts using SVG.
 
-== Installation
+## Installation
 
   gem install svg_charts
 
-== Usage
+## Usage
 
-  # file.rb
-  require "rubygems"
-  require "svg_charts"
+~~~.ruby
+#=> file.rb
 
-  line_chart = SVGCharts::Line.new({
-    :height => 320,
-    :width => 680,
-    :y_retreat => 20,
-    :y_label => "Numbers",
-    :x_retreat => 20,
-    :x_label => "Letters",
-    :x_scale => ["A", "B", "C"],
-    :data => [10, 20, 30],
-    :data_color => "#000000"
-  })
+require "rubygems"
+require "svg_charts"
 
-  @scale = line_chart.draw_scale
-  @chart = line_chart.draw_chart
+line = SVGCharts::Line.new({
+  :height => 300,
+  :width => 300,
+  :y_retreat => 20,
+  :x_retreat => 20
+})
 
-  # file.html
-  <svg width="680" height="350">
-    <%= @scale %>
-    <%= @chart %>
-  </svg>
+@scale = line.scale({
+  :y_label => "Numbers",
+  :x_label => "Letters"
+})
 
-== Maintainer
+@chart = line.draw({
+  :scale => ["A", "B", "C"],
+  :data => [10, 20, 30],
+  :data_color => "#000000",
+  :show_scale => true,
+  :show_dashed => true
+})
+~~~
 
-* Rogério Zambon (http://rogeriozambon.com)
+	# file.erb
 
-== Collaborators
+	<svg width="680" height="350">
+		<%= @scale %>
+		<%= @chart %>
+	</svg>
 
-* André Ronix (http://www.linkedin.com/pub/andr%C3%A9-s-ronix/27/212/3b2)
+## Maintainer
 
-== License
+* Rogério Zambon (http://rogerio.me)
+
+## Collaborators
+
+* André Ronix (http://www.linkedin.com/pub/andr%C3%A9-s-ronix/27/212/3b2): Generated the coordinates calc.
+
+## License
 
 (The MIT License)
 

data/lib/charts/line.rb

@@ -2,31 +2,20 @@ module SVGCharts
   class Line
     include SVGElements
 
-    def initialize(options = {})
-      raise ArgumentError if options.empty?
-
-      [:width, :height, :y_retreat, :y_label, :x_retreat, :x_label, :x_scale, :data, :data_color].each do |key|
-        raise ArgumentError unless options.has_key?(key)
-      end
+    def initialize(options)
+      validation options, [:width, :height, :y_retreat, :x_retreat]
 
       @width = options[:width]
       @height = options[:height]
 
       @y_retreat = options[:y_retreat]
-      @y_label = options[:y_label]
-
       @x_retreat = options[:x_retreat]
-      @x_label = options[:x_label]
-      @x_scale = options[:x_scale]
-
-      @data = options[:data]
-      @data_color = options[:data_color]
     end
 
-    def draw_scale
-      scales = ""
+    def scale(options)
+      validation options, [:y_label, :x_label]
 
-      scales << line({
+      scale = line({
         :x1 => @x_retreat - 8,
         :x2 => @x_retreat - 8,
         :y1 => @y_retreat - 2,
@@ -35,7 +24,7 @@ module SVGCharts
         :color => "#aaa"
       })
 
-      scales << line({
+      scale << line({
         :x1 => 0,
         :x2 => @width,
         :y1 => @height,
@@ -44,30 +33,32 @@ module SVGCharts
         :color => "#aaa"
       })
 
-      scales << text({
-        :x => @width/2 - (@y_label.length * 2),
+      scale << text({
+        :x => @width/2 - (options[:y_label].length * 2),
         :y => @height + 30,
         :color => "#bbb",
         :font_size => 11,
         :font_weight => "bold",
-        :value => @x_label
+        :value => options[:x_label]
       })
 
-      scales << text_with_rotation({
-        :x => @height/2 - (@y_label.length * 2),
+      scale << text_with_rotation({
+        :x => @height/2 - (options[:y_label].length * 2),
         :y => 8,
         :color => "#bbb",
         :font_size => 11,
         :font_weight => "bold",
         :rotate => "270 #{@height/2} #{@height/2}",
-        :value => @y_label
+        :value => options[:y_label]
       })
 
-      scales
+      scale
     end
 
-    def draw_chart
-      calculate_coordinates
+    def draw(options)
+      validation options, [:scale, :data, :data_color, :show_scale, :show_dashed]
+
+      calculate_coordinates options[:data]
 
       elements = ""
 
@@ -78,17 +69,19 @@ module SVGCharts
           :y1 => coordinate[2],
           :y2 => coordinate[3],
           :line_width => 1,
-          :color => "#999"
+          :color => options[:data_color]
         })
 
-        elements << line_dashed({
-          :x1 => coordinate[0],
-          :x2 => coordinate[0],
-          :y1 => @height,
-          :y2 => coordinate[2],
-          :line_width => 1,
-          :color => "#b9b9b9"
-        })
+        if options[:show_dashed]
+          elements << line_dashed({
+            :x1 => coordinate[0],
+            :x2 => coordinate[0],
+            :y1 => @height,
+            :y2 => coordinate[2],
+            :line_width => 1,
+            :color => "#b9b9b9"
+          })
+        end
 
         elements << circle({
           :x => coordinate[0],
@@ -102,39 +95,41 @@ module SVGCharts
         elements << text({
           :x => coordinate[0] - 10,
           :y => coordinate[2] - 10,
-          :color => @data_color,
+          :color => options[:data_color],
           :font_size => 11,
           :font_weight => "bold",
-          :value => @data[i]
+          :value => options[:data][i]
         })
 
-        elements << text({
-          :x => coordinate[0] - 5,
-          :y => @height + 12,
-          :color => "#999",
-          :font_size => 10,
-          :font_weight => "normal",
-          :value => @x_scale[i]
-        })
+        if options[:show_scale]
+          elements << text({
+            :x => coordinate[0] - 5,
+            :y => @height + 12,
+            :color => "#999",
+            :font_size => 10,
+            :font_weight => "normal",
+            :value => options[:scale][i]
+          })
+        end
       end
 
       elements
     end
 
     private
-    def calculate_coordinates
+    def calculate_coordinates(data)
       @coordinates = []
 
-      y_positions = (@height - @y_retreat)/@data.max
-      x_positions = @width/@data.size
+      y_positions = (@height - @y_retreat)/data.max
+      x_positions = @width/data.size
 
-      @data.each_with_index do |value, i|
+      data.each_with_index do |value, i|
         x1 = @x_retreat + (x_positions * i)
         y1 = @height - (y_positions * value)
 
-        unless @data[i + 1].nil?
+        unless data[i + 1].nil?
           x2 = @x_retreat + (x_positions * (i + 1))
-          y2 = @height - (y_positions * @data[i + 1])
+          y2 = @height - (y_positions * data[i + 1])
         else
           x2 = x1
           y2 = y1
@@ -143,5 +138,13 @@ module SVGCharts
         @coordinates << [x1.abs, x2.abs, y1.abs, y2.abs]
       end
     end
+
+    def validation(options, params)
+      raise ArgumentError if options.empty?
+
+      params.each do |key|
+        raise ArgumentError unless options.has_key?(key)
+      end
+    end
   end
 end

data/lib/charts/version.rb

@@ -0,0 +1,3 @@
+module SVGCharts
+  VERSION = "1.0.3"
+end

data/lib/svg_charts.rb

@@ -1,2 +1,3 @@
 require "charts/elements"
 require "charts/line"
+require "charts/version"

data/spec/charts/line_spec.rb

@@ -1,79 +1,135 @@
 require "spec_helper"
 
 describe SVGCharts::Line do
-  context "missing parameters" do
-    it "when hash empty" do
-      expect { chart = SVGCharts::Line.new }.to raise_error(ArgumentError)
+  context "initialize object" do
+    context "missing parameters" do
+      it "when hash empty" do
+        expect { chart = SVGCharts::Line.new }.to raise_error(ArgumentError)
+      end
+
+      it "when the hash keys is incomplete" do
+        options = {
+          :width => 300,
+          :height => 300
+        }
+
+        expect { chart = SVGCharts::Line.new options }.to raise_error(ArgumentError)
+      end
     end
+  end
 
-    it "when the hash keys is incomplete" do
-      options = {
-        :width => 300,
-        :height => 300
-      }
+  def count_words(expression, target)
+    counter = 0
 
-      expect { chart = SVGCharts::Line.new options }.to raise_error(ArgumentError)
+    expression.split.each do |word|
+      counter += 1 if word.include? target
     end
+
+    counter
   end
 
-  context "when generated" do
+  context "set scale" do
     before do
-      @options = {
-        :height => 320,
-        :width => 680,
+      @svg_chart = SVGCharts::Line.new({
+        :height => 300,
+        :width => 300,
         :y_retreat => 20,
-        :y_label => "Numbers",
-        :x_retreat => 20,
-        :x_label => "Letters",
-        :x_scale => ["A", "B", "C"],
-        :data => [10, 20, 30],
-        :data_color => "#000000"
-      }
+        :x_retreat => 20
+      })
     end
 
-    it "check chart values" do
-      line_chart = SVGCharts::Line.new(@options).draw_chart
+    context "missing parameters" do
+      it "when hash empty" do
+        expect { chart = @svg_chart.scale }.to raise_error(ArgumentError)
+      end
+
+      it "when the hash keys is incomplete" do
+        options = {
+          :y_label => "First label"
+        }
 
-      values = line_chart.gsub( /<[^>]*>/, " ").split
-      values.should include("10")
-      values.should include("20")
-      values.should include("30")
-      values.should include("A")
-      values.should include("B")
-      values.should include("C")
+        expect { chart = @svg_chart.scale options }.to raise_error(ArgumentError)
+      end
     end
 
-    it "check scale values" do
-      line_chart = SVGCharts::Line.new(@options).draw_scale
+    context "when generated" do
+      it "check values" do
+        scale = @svg_chart.scale({
+          :y_label => "Label1",
+          :x_label => "Label2"
+        })
 
-      values = line_chart.gsub( /<[^>]*>/, " ").split
-      values.should include("Letters")
-      values.should include("Numbers")
-    end
+        scale = scale.gsub( /<[^>]*>/, " ").split
+        scale.should include("Label1")
+        scale.should include("Label2")
+      end
 
-    def count_words(expression, target)
-      counter = 0
+      it "check elements" do
+        scale = @svg_chart.scale({
+          :y_label => "Label1",
+          :x_label => "Label2"
+        })
 
-      expression.split.each do |word|
-        counter += 1 if word.include? target
+        count_words(scale, "<line").should == 2
+        count_words(scale, "<text").should == 2
       end
+    end
+  end
 
-      counter
+  context "set chart" do
+    before do
+      @svg_chart = SVGCharts::Line.new({
+        :height => 300,
+        :width => 300,
+        :y_retreat => 20,
+        :x_retreat => 20
+      })
     end
 
-    it "check chart elements" do
-      line_chart = SVGCharts::Line.new(@options).draw_chart
+    context "missing parameters" do
+      it "when hash empty" do
+        expect { chart = @svg_chart.draw }.to raise_error(ArgumentError)
+      end
+
+      it "when the hash keys is incomplete" do
+        options = {
+          :data_color => "#000000",
+          :show_scale => false,
+          :show_dashed => false
+        }
 
-      count_words(line_chart, "<line").should == 6
-      count_words(line_chart, "<text").should == 6
-      count_words(line_chart, "<circle").should == 3
+        expect { chart = @svg_chart.draw options }.to raise_error(ArgumentError)
+      end
     end
 
-    it "check scale elements" do
-      line_chart = SVGCharts::Line.new(@options).draw_scale
+    context "when generated" do
+      it "check elements with no scale and dashed" do
+        chart = @svg_chart.draw({
+          :scale => ["A", "B", "C"],
+          :data => [10, 20, 30],
+          :data_color => "#000000",
+          :show_scale => false,
+          :show_dashed => false
+        })
+
+        count_words(chart, "<line").should == 3
+        count_words(chart, "<text").should == 3
+        count_words(chart, "<circle").should == 3
+      end
+
+      it "check elements with scale and dashed" do
+        chart = @svg_chart.draw({
+          :scale => ["A", "B", "C"],
+          :data => [10, 20, 30],
+          :data_color => "#000000",
+          :show_scale => true,
+          :show_dashed => true
+        })
 
-      count_words(line_chart, "<line").should == 2
-      count_words(line_chart, "<text").should == 2
+        count_words(chart, "<line").should == 6
+        count_words(chart, "<text").should == 6
+        count_words(chart, "<circle").should == 3
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -1 +1,6 @@
-Dir[File.expand_path("../../lib/charts", __FILE__) + "/*.rb"].each { |file| require file }
+require "bundler/setup"
+Bundler.require :default, :development
+
+require "svg_charts"
+require "charts/elements"
+require "charts/line"

data/svg_charts.gemspec

@@ -1,24 +1,19 @@
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "charts/version"
+
 Gem::Specification.new do |s|
-  s.authors = ["Rogério Zambon"]
-  s.date = "2013-01-25"
-  s.description = "Draw charts using SVG."
-  s.email = "rogeriozambon@gmail.com"
-  s.files = [
-    ".rspec",
-    "lib/charts/elements.rb",
-    "lib/charts/line.rb",
-    "lib/svg_charts.rb",
-    "spec/spec_helper.rb",
-    "spec/charts/line_spec.rb",
-    "VERSION",
-    "README.rdoc",
-    "svg_charts.gemspec"
-  ]
-  s.homepage = "http://github.com/rogeriozambon/svg_charts"
-  s.name = "svg_charts"
+  s.name        = "svg_charts"
+  s.version     = SVGCharts::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Rogério Zambon"]
+  s.email       = ["rogeriozambon@gmail.com"]
+  s.homepage    = "http://github.com/rogeriozambon/svg_charts"
+  s.summary     = "Draw charts using SVG."
+  s.description = s.summary
+
+  s.files         = `git ls-files`.split("\n")
   s.require_paths = ["lib"]
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.8.23")
-  s.summary = s.description
-  s.version = "1.0"
+
+  s.add_development_dependency "rspec"
 end

metadata

@@ -1,53 +1,68 @@
 --- !ruby/object:Gem::Specification
 name: svg_charts
 version: !ruby/object:Gem::Version
-  version: '1.0'
-  prerelease: 
+  version: 1.0.3
 platform: ruby
 authors:
 - Rogério Zambon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-25 00:00:00.000000000 Z
-dependencies: []
+date: 2013-03-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Draw charts using SVG.
-email: rogeriozambon@gmail.com
+email:
+- rogeriozambon@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - .rspec
+- Gemfile
+- Gemfile.lock
+- README.md
 - lib/charts/elements.rb
 - lib/charts/line.rb
+- lib/charts/version.rb
 - lib/svg_charts.rb
-- spec/spec_helper.rb
 - spec/charts/line_spec.rb
-- VERSION
-- README.rdoc
+- spec/spec_helper.rb
 - svg_charts.gemspec
 homepage: http://github.com/rogeriozambon/svg_charts
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.8.23
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Draw charts using SVG.
 test_files: []

data/VERSION

@@ -1 +0,0 @@
-1.0