svg_charts 1.04 → 2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9920997d912efe6b187a38cdd73c986820f5e03
-  data.tar.gz: 79c7fa131050c51b12a6be59270ffb4721cbc2cf
+  metadata.gz: 2ef2bf97f73e4421d0c5f21d46c15edc2a17e143
+  data.tar.gz: 53d3e6e0150077460727318a64b8c7b0f2c3dfd5
 SHA512:
-  metadata.gz: cf9df50976608b2a741c768dc0fd3358fb7c205c5454912595d4f4d46946132c54eda5b1e50dd20f759e56570021f409ccf33c9c3949f85cc471c560f62a4694
-  data.tar.gz: 20aa4daebd225210fc5fffa7f4f4883d9919edcfa7f75c376b50706aa28e4f075891736c0873ac8748817e1b7bbd9004968046ae16670cb04193d30e6037a519
+  metadata.gz: e479de15f2056ef6447f8ef1248bebb8eb6a6c914643018c9daefe7c6037e02cde5d48a561696ec62dcc4f66ebeb31094fd70e19ae3ea02736c0fff0512ef69d
+  data.tar.gz: bddead4d0d98523a0367c104353f965c8d53336198949c135b67539adb4e2214bfc277703eaf3e24fedba21e83cfd24aa87374e26b6418dc2756620c563ebb5d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    svg_charts (1.03)
+    svg_charts (1.04)
 
 GEM
   remote: http://rubygems.org/

data/lib/charts/bar.rb

@@ -0,0 +1,127 @@
+module SVGCharts
+  class Bar
+    include SVGElements
+
+    def initialize(options)
+      validation options, [:width, :height, :y_retreat, :x_retreat]
+
+      @width = options[:width]
+      @height = options[:height]
+
+      @y_retreat = options[:y_retreat]
+      @x_retreat = options[:x_retreat]
+    end
+
+    def scale(options)
+      validation options, [:y_label, :x_label]
+
+      scale = line({
+        :x1 => @x_retreat - 8,
+        :x2 => @x_retreat - 8,
+        :y1 => @y_retreat - 2,
+        :y2 => @height + 13,
+        :line_width => 2,
+        :color => "#aaa"
+      })
+
+      scale << line({
+        :x1 => 0,
+        :x2 => @width,
+        :y1 => @height,
+        :y2 => @height,
+        :line_width => 2,
+        :color => "#aaa"
+      })
+
+      scale << text({
+        :x => @width/2 - (options[:y_label].length * 2),
+        :y => @height + 30,
+        :color => "#bbb",
+        :font_size => 11,
+        :font_weight => "bold",
+        :value => options[:x_label]
+      })
+
+      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 => options[:y_label]
+      })
+
+      scale
+    end
+
+    def draw(options)
+      validation options, [:scale, :data, :data_color, :show_scale]
+
+      calculate_coordinates options[:data]
+
+      elements = ""
+
+      @coordinates.each_with_index do |coordinate, i|
+        elements << rect({
+          :x => coordinate[0] * 1.025,
+          :y => coordinate[2],
+          :width => coordinate[1] - coordinate[0],
+          :height => @height - coordinate[2],
+          :color => options[:data_color]
+        })
+
+        elements << text({
+          :x => (((coordinate[1] - coordinate[0]) - options[:scale][i].length)/2) + (coordinate[0] * 1.025) - 10,
+          :y => coordinate[2] - 10,
+          :color => options[:data_color],
+          :font_size => 11,
+          :font_weight => "bold",
+          :value => options[:data][i]
+        })
+
+        if options[:show_scale]
+          elements << text({
+            :x => (((coordinate[1] - coordinate[0]) - options[:scale][i].length)/2) + (coordinate[0] * 1.025) - 10,
+            :y => @height + 12,
+            :color => "#999",
+            :font_size => 10,
+            :font_weight => "normal",
+            :value => options[:scale][i]
+          })
+        end
+      end
+
+      elements
+    end
+
+    private
+    def calculate_coordinates(data)
+      @coordinates = []
+
+      y_positions = (@height - @y_retreat)/data.max
+      x_positions = (@width - (@x_retreat * 2))/data.size
+
+      data.each_with_index do |value, i|
+        x1 = @x_retreat + (x_positions * i)
+        y1 = @height - (y_positions * value)
+
+        unless data[i + 1].nil?
+          x2 = @x_retreat + (x_positions * (i + 1))
+        else
+          x2 = @width - (@x_retreat + 12)
+        end
+
+        @coordinates << [x1.abs, x2.abs, y1.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

@@ -1,3 +1,3 @@
 module SVGCharts
-  VERSION = "1.04"
+  VERSION = "2.0"
 end

data/lib/svg_charts.rb

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

data/spec/charts/bar_spec.rb

@@ -0,0 +1,130 @@
+require "spec_helper"
+
+describe SVGCharts::Bar do
+  context "initialize object" do
+    context "missing parameters" do
+      it "when hash empty" do
+        expect { chart = SVGCharts::Bar.new }.to raise_error(ArgumentError)
+      end
+
+      it "when the hash keys is incomplete" do
+        options = {
+          :width => 300,
+          :height => 300
+        }
+
+        expect { chart = SVGCharts::Bar.new options }.to raise_error(ArgumentError)
+      end
+    end
+  end
+
+  def count_words(expression, target)
+    counter = 0
+
+    expression.split.each do |word|
+      counter += 1 if word.include? target
+    end
+
+    counter
+  end
+
+  context "set scale" do
+    before do
+      @svg_chart = SVGCharts::Bar.new({
+        :height => 300,
+        :width => 300,
+        :y_retreat => 20,
+        :x_retreat => 20
+      })
+    end
+
+    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"
+        }
+
+        expect { chart = @svg_chart.scale options }.to raise_error(ArgumentError)
+      end
+    end
+
+    context "when generated" do
+      it "check values" do
+        scale = @svg_chart.scale({
+          :y_label => "Label1",
+          :x_label => "Label2"
+        })
+
+        scale = scale.gsub( /<[^>]*>/, " ").split
+        scale.should include("Label1")
+        scale.should include("Label2")
+      end
+
+      it "check elements" do
+        scale = @svg_chart.scale({
+          :y_label => "Label1",
+          :x_label => "Label2"
+        })
+
+        count_words(scale, "<line").should == 2
+        count_words(scale, "<text").should == 2
+      end
+    end
+  end
+
+  context "set chart" do
+    before do
+      @svg_chart = SVGCharts::Bar.new({
+        :height => 300,
+        :width => 300,
+        :y_retreat => 20,
+        :x_retreat => 20
+      })
+    end
+
+    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
+        }
+
+        expect { chart = @svg_chart.draw options }.to raise_error(ArgumentError)
+      end
+    end
+
+    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
+        })
+
+        count_words(chart, "<rect").should == 3
+        count_words(chart, "<text").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
+        })
+
+        count_words(chart, "<rect").should == 3
+        count_words(chart, "<text").should == 6
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: svg_charts
 version: !ruby/object:Gem::Version
-  version: '1.04'
+  version: '2.0'
 platform: ruby
 authors:
 - Rogério Zambon
@@ -35,10 +35,12 @@ files:
 - Gemfile
 - Gemfile.lock
 - README.md
+- lib/charts/bar.rb
 - lib/charts/elements.rb
 - lib/charts/line.rb
 - lib/charts/version.rb
 - lib/svg_charts.rb
+- spec/charts/bar_spec.rb
 - spec/charts/line_spec.rb
 - spec/spec_helper.rb
 - svg_charts.gemspec