ramhoj-scruffy 0.2.6 → 0.2.7

data/lib/scruffy/components/legend.rb

@@ -2,7 +2,7 @@ module Scruffy::Components
 
   class Legend < Base
     FONT_SIZE = 80
-    
+
     def draw(svg, bounds, options={})
       vertical = options[:vertical_legend]
       legend_info = relevant_legend_info(options[:layers])
@@ -34,28 +34,28 @@ module Scruffy::Components
           y = 0
           size = relative(50)
         end
-        
+
         # "#{x} #{y} #{@line_height} #{size}"
-        
-        svg.rect(:x => x, 
-          :y => y, 
-          :width => size, 
+
+        svg.rect(:x => x,
+          :y => y,
+          :width => size,
           :height => size,
           :fill => legend_info[idx][:color])
 
-        svg.text(legend_info[idx][:title], 
-          :x => x + @line_height, 
+        svg.text(legend_info[idx][:title],
+          :x => x + @line_height,
           :y => y + text_height * 0.75,
-          'font-size' => text_height, 
+          'font-size' => text_height,
           'font-family' => options[:theme].font_family,
           :style => "color: #{options[:theme].marker || 'white'}",
           :fill => (options[:theme].marker || 'white'))
       end
     end   # draw
-    
+
     protected
     # Collects Legend Info from the provided Layers.
-    # 
+    #
     # Automatically filters by legend's categories.
     def relevant_legend_info(layers, categories=(@options[:category] ? [@options[:category]] : @options[:categories]))
       legend_info = layers.inject([]) do |arr, layer|
@@ -70,11 +70,11 @@ module Scruffy::Components
         arr
       end
     end   # relevant_legend_info
-      
+
     # Returns an array consisting of the total width needed by the legend
     # information, as well as an array of @x-coords for each element. If
     # vertical, then these are @y-coords, and @x is 0
-    # 
+    #
     # ie: [200, [0, 50, 100, 150]]
     def layout(legend_info_array, vertical = false)
       if vertical
@@ -96,10 +96,10 @@ module Scruffy::Components
           enum[0] += (relative(50) * elem[:title].length)       # Add room for text
 
           [enum.first, enum.last]
-        end        
+        end
       end
     end
 
   end   # class Legend
-  
-end   # Scruffy::Components
+
+end   # Scruffy::Components

data/lib/scruffy/rasterizers/rmagick_rasterizer.rb

@@ -10,7 +10,13 @@ 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'
+      unless defined? Magick
+        begin
+          require 'rmagick'
+        rescue LoadError
+          require 'RMagick'
+        end
+      end
 
       image = Magick::Image::from_blob(svg)[0]
 
@@ -24,4 +30,4 @@ module Scruffy::Rasterizers
       image.to_blob { self.format = options[:as] }
     end
   end
-end
+end

data/lib/scruffy/version.rb

@@ -1,3 +1,3 @@
 module Scruffy
-  VERSION = '0.2.6'
+  VERSION = '0.2.7'
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 6
-  version: 0.2.6
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-03 00:00:00 +02:00
+date: 2010-09-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency