scruffy 0.2.3 → 0.2.4

data/History.txt

@@ -1,4 +1,9 @@
 = Scruffy Changelog
+== Version 0.2.4
+(2008-08-22)
+* Bug #21517, legend text missing, fixed.
+* Bug #21604, Fails to properly require RMagick, fixed.
+
 == Version 0.2.3
 (July 4th, 2008)
 * Got pie charts working
@@ -101,4 +106,4 @@ This is not a public release.
 * Marker transformers: currency, percentages.
 * Basic Graphs: Area, Bar, Line.
 * Advanced Graphs: Average, AllSmiles.
-* Initial documentation.
+* Initial documentation.

data/lib/scruffy/components/legend.rb

@@ -7,9 +7,16 @@ module Scruffy::Components
       vertical = options[:vertical_legend]
       legend_info = relevant_legend_info(options[:layers])
       @line_height, x, y, size = 0
-      set_line_height = 0.08 * bounds[:height]
-      @line_height = bounds[:height] / legend_info.length
-      @line_height = set_line_height if @line_height > set_line_height
+      if vertical
+        set_line_height = 0.08 * bounds[:height]
+        @line_height = bounds[:height] / legend_info.length
+        @line_height = set_line_height if @line_height >
+          set_line_height
+      else
+        set_line_height = 0.90 * bounds[:height]
+        @line_height = set_line_height
+      end
+
       text_height = @line_height * FONT_SIZE / 100
       # #TODO how does this related to @points?
       active_width, points = layout(legend_info, vertical)

data/lib/scruffy/rasterizers/rmagick_rasterizer.rb

@@ -10,7 +10,7 @@ module Scruffy::Rasterizers
     def rasterize(svg, options={})
       # I know this seems weird, I'm open to suggestions.
       # I didn't want RMagick required unless absolutely necessary.
-      require 'rmagick'
+      require 'RMagick'
 
       image = Magick::Image::from_blob(svg)[0]
 

data/lib/scruffy/version.rb

@@ -2,7 +2,7 @@ module Scruffy
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 3
+    TINY  = 4
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/website/images/graphs/bar_test.svg

@@ -65,7 +65,7 @@
     </g>
     <g transform="translate(30.0, 46.8)" id="legend">
       <rect width="10.8" x="226.8" y="0" height="10.8" fill="#6886B4"/>
-      <text font-size="1.3824" x="228.528" y="1.0368" fill="white" style="color: white">Example</text>
+      <text font-size="15.552" x="246.24" y="11.664" fill="white" style="color: white">Example</text>
     </g>
   </g>
 </svg>

data/website/images/graphs/line_test.svg

@@ -54,7 +54,7 @@
     </g>
     <g transform="translate(30.0, 46.8)" id="legend">
       <rect width="10.8" x="226.8" y="0" height="10.8" fill="#6886B4"/>
-      <text font-size="1.3824" x="228.528" y="1.0368" fill="white" style="color: white">Example</text>
+      <text font-size="15.552" x="246.24" y="11.664" fill="white" style="color: white">Example</text>
     </g>
   </g>
 </svg>

data/website/images/graphs/multi_test.svg

@@ -282,15 +282,15 @@
     </g>
     <g transform="translate(30.0, 46.8)" id="legend">
       <rect width="9.0" x="108.0" y="0" height="9.0" fill="#6886B4"/>
-      <text font-size="1.152" x="109.44" y="0.864" fill="white" style="color: white">Jeff</text>
+      <text font-size="12.96" x="124.2" y="9.72" fill="white" style="color: white">Jeff</text>
       <rect width="9.0" x="171.0" y="0" height="9.0" fill="#72AE6E"/>
-      <text font-size="1.152" x="172.44" y="0.864" fill="white" style="color: white">Jerry</text>
+      <text font-size="12.96" x="187.2" y="9.72" fill="white" style="color: white">Jerry</text>
       <rect width="9.0" x="243.0" y="0" height="9.0" fill="#D1695E"/>
-      <text font-size="1.152" x="244.44" y="0.864" fill="white" style="color: white">Jack</text>
+      <text font-size="12.96" x="259.2" y="9.72" fill="white" style="color: white">Jack</text>
       <rect width="9.0" x="306.0" y="0" height="9.0" fill="#8A6EAF"/>
-      <text font-size="1.152" x="307.44" y="0.864" fill="white" style="color: white">Brasten</text>
+      <text font-size="12.96" x="322.2" y="9.72" fill="white" style="color: white">Brasten</text>
       <rect width="9.0" x="396.0" y="0" height="9.0" fill="#FDD84E"/>
-      <text font-size="1.152" x="397.44" y="0.864" fill="white" style="color: white">Jim</text>
+      <text font-size="12.96" x="412.2" y="9.72" fill="white" style="color: white">Jim</text>
     </g>
   </g>
 </svg>

data/website/images/graphs/split_test.svg

@@ -281,15 +281,15 @@
     </g>
     <g transform="translate(30.0, 39.6)" id="legend">
       <rect width="7.2" x="140.4" y="0" height="7.2" fill="#6886B4"/>
-      <text font-size="0.9216" x="141.552" y="0.6912" fill="white" style="color: white">Jeff</text>
+      <text font-size="10.368" x="153.36" y="7.776" fill="white" style="color: white">Jeff</text>
       <rect width="7.2" x="190.8" y="0" height="7.2" fill="#FDD84E"/>
-      <text font-size="0.9216" x="191.952" y="0.6912" fill="white" style="color: white">Jerry</text>
+      <text font-size="10.368" x="203.76" y="7.776" fill="white" style="color: white">Jerry</text>
       <rect width="7.2" x="248.4" y="0" height="7.2" fill="#8A6EAF"/>
-      <text font-size="0.9216" x="249.552" y="0.6912" fill="white" style="color: white">Jack</text>
+      <text font-size="10.368" x="261.36" y="7.776" fill="white" style="color: white">Jack</text>
       <rect width="7.2" x="298.8" y="0" height="7.2" fill="#72AE6E"/>
-      <text font-size="0.9216" x="299.952" y="0.6912" fill="white" style="color: white">Brasten</text>
+      <text font-size="10.368" x="311.76" y="7.776" fill="white" style="color: white">Brasten</text>
       <rect width="7.2" x="370.8" y="0" height="7.2" fill="#D1695E"/>
-      <text font-size="0.9216" x="371.952" y="0.6912" fill="white" style="color: white">Jim</text>
+      <text font-size="10.368" x="383.76" y="7.776" fill="white" style="color: white">Jim</text>
     </g>
   </g>
 </svg>

data/website/images/graphs/stacking_test.svg

@@ -136,11 +136,11 @@
     </g>
     <g transform="translate(30.0, 46.8)" id="legend">
       <rect width="10.8" x="167.4" y="0" height="10.8" fill="#FDD84E"/>
-      <text font-size="1.3824" x="169.128" y="1.0368" fill="white" style="color: white">Jack</text>
+      <text font-size="15.552" x="186.84" y="11.664" fill="white" style="color: white">Jack</text>
       <rect width="10.8" x="243.0" y="0" height="10.8" fill="#72AE6E"/>
-      <text font-size="1.3824" x="244.728" y="1.0368" fill="white" style="color: white">Jill</text>
+      <text font-size="15.552" x="262.44" y="11.664" fill="white" style="color: white">Jill</text>
       <rect width="10.8" x="318.6" y="0" height="10.8" fill="#D1695E"/>
-      <text font-size="1.3824" x="320.328" y="1.0368" fill="white" style="color: white">Hill</text>
+      <text font-size="15.552" x="338.04" y="11.664" fill="white" style="color: white">Hill</text>
     </g>
   </g>
 </svg>

data/website/index.html

@@ -33,7 +33,7 @@
     <h1></h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/scruffy"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/scruffy" class="numbers">0.2.3</a>
+      <a href="http://rubyforge.org/projects/scruffy" class="numbers">0.2.4</a>
     </div>
     <p><a href="index.html">Home</a>
 <a href="doc">Documentation</a>
@@ -244,7 +244,12 @@ Scruffy is designed to be extremely extendible. Adding new graph types or themes
 	<p>Rubyforge Project is <a href="http://rubyforge.org/projects/scruffy/" class="major">here</a></p>
 
 
-	<h2>News</h2>
+	<h2>News
+	<ul>
+	<li><strong>2008-08-22, Scruffy 0.2.4</strong> &#8211; Bug fixes:
+#21517, legend text missing, fixed.
+#21604, Fails to properly require RMagick, fixed.</li>
+	</ul></h2>
 
 
 	<ul>
@@ -284,7 +289,7 @@ Check out more examples at <a href="http://www.ibrasten.com/articles/tag/scruffy
     urchinTracker();
 </script>
     <p class="coda">
-      9th July 2008<br>
+      22nd August 2008<br>
     </p>
 </div>
 

data/website/index.txt

@@ -173,6 +173,9 @@ The trunk repository is <code>svn://rubyforge.org/var/svn/scruffy/trunk</code> f
 Rubyforge Project is <a href="http://rubyforge.org/projects/scruffy/" class="major">here</a>
 
 h2. News
+* *2008-08-22, Scruffy 0.2.4* - Bug fixes:
+#21517, legend text missing, fixed.
+#21604, Fails to properly require RMagick, fixed.
 
 * *July 8th, 2008, Scruffy 0.2.3* - Pie Charts added.
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: scruffy
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Brasten Sager
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-05 00:00:00 +10:00
+date: 2008-08-22 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency