scruffy 0.2.4 → 0.2.5

data/Manifest.txt

@@ -71,7 +71,6 @@ tasks/environment.rake
 tasks/website.rake
 test/graph_creation_test.rb
 test/test_helper.rb
-test/test_scruffy.rb
 website/images/blank.gif.html
 website/images/graphs/all_smiles.png
 website/images/graphs/bar_test.png

data/lib/scruffy/components/data_markers.rb

@@ -9,10 +9,13 @@ module Scruffy
     
           (0...options[:point_markers].size).map do |idx| 
             x_coord = point_distance * idx
-            svg.text(options[:point_markers][idx], :x => x_coord, :y => bounds[:height], 
-                     'font-size' => relative(90), 
-                     :fill => (options[:theme].marker || 'white').to_s, 
-                     'text-anchor' => 'middle') unless options[:point_markers][idx].nil?
+            svg.text(options[:point_markers][idx],
+              :x => x_coord,
+              :y => bounds[:height], 
+              'font-size' => relative(90),
+              'font-family' => options[:theme].font_family,
+              :fill => (options[:theme].marker || 'white').to_s, 
+              'text-anchor' => 'middle') unless options[:point_markers][idx].nil?
           end
         end
       end   # draw

data/lib/scruffy/components/label.rb

@@ -2,9 +2,15 @@ module Scruffy
   module Components
     class Label < Base
       def draw(svg, bounds, options={})
-        svg.text(@options[:text], :class => 'text', :x => (bounds[:width] / 2), :y => bounds[:height], 
-                'font-size' => relative(100), :fill => options[:theme].marker, :stroke => 'none', 'stroke-width' => '0',
-                'text-anchor' => (@options[:text_anchor] || 'middle'))
+        svg.text(@options[:text],
+          :class => 'text',
+          :x => (bounds[:width] / 2),
+          :y => bounds[:height], 
+          'font-size' => relative(100),
+          'font-family' => options[:theme].font_family,
+          :fill => options[:theme].marker,
+          :stroke => 'none', 'stroke-width' => '0',
+          'text-anchor' => (@options[:text_anchor] || 'middle'))
       end
     end
   end

data/lib/scruffy/components/legend.rb

@@ -42,11 +42,12 @@ module Scruffy::Components
           :width => size, 
           :height => size,
           :fill => legend_info[idx][:color])
-                  
+
         svg.text(legend_info[idx][:title], 
           :x => x + @line_height, 
           :y => y + text_height * 0.75,
           'font-size' => text_height, 
+          'font-family' => options[:theme].font_family,
           :style => "color: #{options[:theme].marker || 'white'}",
           :fill => (options[:theme].marker || 'white'))
       end

data/lib/scruffy/components/title.rb

@@ -2,9 +2,17 @@ module Scruffy
   module Components
     class Title < Base
       def draw(svg, bounds, options={})
-        svg.text(options[:title], :class => 'title', :x => (bounds[:width] / 2), :y => bounds[:height], 
-                'font-size' => relative(100), :fill => options[:theme].marker, :stroke => 'none', 'stroke-width' => '0',
-                'text-anchor' => (@options[:text_anchor] || 'middle'))
+        if options[:title]
+          svg.text(options[:title],
+            :class => 'title',
+            :x => (bounds[:width] / 2),
+            :y => bounds[:height], 
+            'font-size' => relative(100),
+            'font-family' => options[:theme].font_family,
+            :fill => options[:theme].marker,
+            :stroke => 'none', 'stroke-width' => '0',
+            'text-anchor' => (@options[:text_anchor] || 'middle'))
+        end
       end
     end
   end

data/lib/scruffy/components/value_markers.rb

@@ -18,11 +18,12 @@ module Scruffy
           marker_value = options[:value_formatter].route_format(marker_value, idx, options.merge({:all_values => all_values})) if options[:value_formatter]
 
           svg.text( marker_value.to_s, 
-                    :x => bounds[:width], 
-                    :y => (bounds[:height] - marker), 
-                    'font-size' => relative(8),
-                    :fill => ((options.delete(:marker_color_override) || options[:theme].marker) || 'white').to_s,
-                    'text-anchor' => 'end')
+            :x => bounds[:width], 
+            :y => (bounds[:height] - marker), 
+            'font-size' => relative(8),
+            'font-family' => options[:theme].font_family,
+            :fill => ((options.delete(:marker_color_override) || options[:theme].marker) || 'white').to_s,
+            'text-anchor' => 'end')
         end
         
       end

data/lib/scruffy/layers/pie_slice.rb

@@ -1,9 +1,9 @@
 module Scruffy::Layers
   # ==Scruffy::Layers::PieSlice
-  #
+  # 
   # Author:: A.J. Ostman
   # Date:: August 14th, 2006
-  #
+  # 
   # Basic Pie Chart Slice..
     
   class PieSlice < Base
@@ -20,10 +20,12 @@ module Scruffy::Layers
     attr_accessor :center_x, :center_y
     
     def draw(svg, coords, options = {})
-      # Scaler is the multiplier to normalize the values to a percentage across the Pie Chart
+      # Scaler is the multiplier to normalize the values to a percentage across
+      # the Pie Chart
       @scaler = options[:scaler] || 1
       
-      # Degree Offset is degrees by which the pie chart is twisted when it begins
+      # Degree Offset is degrees by which the pie chart is twisted when it
+      # begins
       @degree_offset = options[:degree_offset] || @options[:degree_offset] || 0
       
       # Percent Used keeps track of where in the pie chart we are
@@ -42,13 +44,13 @@ module Scruffy::Layers
       shadow_color = options[:shadow_color] || @options[:shadow_color] || "white"
       shadow_opacity = options[:shadow_opacity] || @options[:shadow_opacity] || 0.06
       
-      # Coordinates for the center of the pie chart. 
+      # Coordinates for the center of the pie chart.
       @center_x = relative_width(options[:center_x]) || relative_width(@options[:center_x]) || relative_width(50)
       @center_y = relative_height(options[:center_y]) || relative_height(@options[:center_y]) || relative_height(50)
       radius = @diameter / 2.0
       
-      # Graphing calculated using percent of graph. 
-      # We later multiply by 3.6 to convert to 360 degree system.
+      # Graphing calculated using percent of graph. We later multiply by 3.6 to
+      # convert to 360 degree system.
       percent = @scaler * sum_values
       
 
@@ -60,8 +62,8 @@ module Scruffy::Layers
       radians_mid_point = radians_start + ((radians_end - radians_start) / 2)
       
       if options[:explode]
-          @center_x = @center_x + (Math.sin(radians_mid_point) * relative(options[:explode]))
-          @center_y = @center_y - (Math.cos(radians_mid_point) * relative(options[:explode]))
+        @center_x = @center_x + (Math.sin(radians_mid_point) * relative(options[:explode]))
+        @center_y = @center_y - (Math.cos(radians_mid_point) * relative(options[:explode]))
       end
   
 
@@ -80,7 +82,7 @@ module Scruffy::Layers
         
         if shadow
           svg.circle(:cx => "#{@center_x + shadow_x}", :cy => "#{@center_y + shadow_y}", :r=>"#{radius}",:stroke => "none", 
-                     :fill => shadow_color.to_s,  :style => "fill-opacity: #{shadow_opacity.to_s};")
+            :fill => shadow_color.to_s,  :style => "fill-opacity: #{shadow_opacity.to_s};")
         end
         
         svg.circle(:cx => "#{@center_x}", :cy => "#{@center_y}", :r=>"#{radius}",:stroke => stroke, :fill => color.to_s)
@@ -88,27 +90,30 @@ module Scruffy::Layers
       else  
         if shadow
           svg.path(:d =>  "M#{@center_x + shadow_x},#{@center_y + shadow_y} L#{x_start + shadow_x},#{y_start + shadow_y} A#{radius},#{radius} 0, #{percent >= 50 ? '1' : '0'}, 1, #{x_end + shadow_x} #{y_end + shadow_y} Z", 
-                 :fill => shadow_color.to_s, :style => "fill-opacity: #{shadow_opacity.to_s};")
+            :fill => shadow_color.to_s, :style => "fill-opacity: #{shadow_opacity.to_s};")
         end
         
         svg.path(:d =>  "M#{@center_x},#{@center_y} L#{x_start},#{y_start} A#{radius},#{radius} 0, #{percent >= 50 ? '1' : '0'}, 1, #{x_end} #{y_end} Z", 
-               :stroke => stroke, :fill => color.to_s)
+          :stroke => stroke, :fill => color.to_s)
       end
       
       text_x = @center_x + (Math.sin(radians_mid_point) * radius * MARKER_OFFSET_RATIO)
       text_y = @center_y - (Math.cos(radians_mid_point) * radius * MARKER_OFFSET_RATIO)
 
-      svg.text("#{sprintf('%d', percent)}%", :x => text_x, :y => text_y + relative(MARKER_FONT_SIZE / 2), 
-                     'font-size' => relative(MARKER_FONT_SIZE), 
-                     :fill => (options[:theme].marker || 'black').to_s, 
-                     'text-anchor' => 'middle')
+      svg.text("#{sprintf('%d', percent)}%",
+        :x => text_x,
+        :y => text_y + relative(MARKER_FONT_SIZE / 2), 
+        'font-size' => relative(MARKER_FONT_SIZE),
+        'font-family' => options[:theme].font_family,
+        :fill => (options[:theme].marker || 'black').to_s, 
+        'text-anchor' => 'middle')
     end
 
-      protected
-        def generate_coordinates(options = {})
-            # Coordinate Generation didn't make much sense here. 
-            # Overridden just because Brasten said this would be overridden.
-        end
+    protected
+    def generate_coordinates(options = {})
+      # Coordinate Generation didn't make much sense here. Overridden just
+      # because Brasten said this would be overridden.
     end
+  end
   
 end

data/lib/scruffy/version.rb

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

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.4</a>
+      <a href="http://rubyforge.org/projects/scruffy" class="numbers">0.2.5</a>
     </div>
     <p><a href="index.html">Home</a>
 <a href="doc">Documentation</a>
@@ -246,12 +246,17 @@ Scruffy is designed to be extremely extendible. Adding new graph types or themes
 
 	<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>
+	<li><strong>2008-10-13, Scruffy 0.2.5</strong> &#8211; Fixed font_family settings from theme.</li>
 	</ul></h2>
 
 
+	<ul>
+	<li><strong>2008-08-22, Scruffy 0.2.4</strong> &#8211; Bug fixes:
+Bug 21517, legend text missing, fixed.
+Bug 21604, Fails to properly require RMagick, fixed.</li>
+	</ul>
+
+
 	<ul>
 	<li><strong>July 8th, 2008, Scruffy 0.2.3</strong> &#8211; Pie Charts added.</li>
 	</ul>
@@ -289,7 +294,7 @@ Check out more examples at <a href="http://www.ibrasten.com/articles/tag/scruffy
     urchinTracker();
 </script>
     <p class="coda">
-      22nd August 2008<br>
+      13th October 2008<br>
     </p>
 </div>
 

data/website/index.txt

@@ -173,9 +173,11 @@ 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-10-13, Scruffy 0.2.5* - Fixed font_family settings from theme.
+
 * *2008-08-22, Scruffy 0.2.4* - Bug fixes:
-#21517, legend text missing, fixed.
-#21604, Fails to properly require RMagick, fixed.
+Bug 21517, legend text missing, fixed.
+Bug 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.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Brasten Sager
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-22 00:00:00 +10:00
+date: 2008-10-13 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -111,7 +111,6 @@ files:
 - tasks/website.rake
 - test/graph_creation_test.rb
 - test/test_helper.rb
-- test/test_scruffy.rb
 - website/images/blank.gif.html
 - website/images/graphs/all_smiles.png
 - website/images/graphs/bar_test.png
@@ -178,4 +177,3 @@ specification_version: 2
 summary: A powerful, clean graphing library for Ruby.
 test_files: 
 - test/test_helper.rb
-- test/test_scruffy.rb

data/test/test_scruffy.rb

@@ -1,11 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-class TestScruffy < Test::Unit::TestCase
-
-  def setup
-  end
-  
-  def test_truth
-    assert true
-  end
-end