galakei 0.6.6 → 0.7.0

data/app/controllers/galakei/spacer_controller.rb

@@ -2,7 +2,7 @@ class Galakei::SpacerController < ActionController::Base
   def create
     respond_to do |format|
       format.gif do
-        send_data(Galakei::Spacer.new(params[:color]).create, :disposition => "inline", :type => :gif)
+        send_data(Galakei::Spacer.create_gif(params[:color]), :disposition => "inline", :type => :gif)
       end
     end
   end

data/lib/galakei/docomo_css/stylesheet.rb

@@ -120,7 +120,7 @@ EOD
     def self.apply(element, property,value)
       color = value.split(/\s/).last.split('#').last
       thickness = value.match(/(\d+)px/)[1]
-      img = Galakei::Spacer.new(color).img_tag(:height => thickness)
+      img = Galakei::Spacer.img_tag(:color => color, :height => thickness)
 
       case property
       when 'border'
@@ -131,6 +131,8 @@ EOD
       when 'border-bottom'
         element.after(img)
       end
+    rescue => err
+      Rails.logger.warn("could not insert spacer gif: #{err}")
     end
   end
 end

data/lib/galakei/spacer.rb

@@ -1,54 +1,46 @@
 module Galakei
-  class Spacer
-    HEX = [
-      '47494638396101000100f70000',
-      'f'*1530,
-      '2c000000000100010000080400010404003b'
-    ]
+  module Spacer
 
-    def initialize(color)
-      @color = color.gsub('#','')
-    end
+    GIF_DATA_PREFIX = ['47494638396101000100f70000'].pack('H*')
+    GIF_DATA_POSTFIX = ['f'*1530 + '2c000000000100010000080400010404003b'].pack('H*')
 
-    def create
-      num = hex.size
-      raise 'invalid hex' if num % 2 != 0
-      bin = ''
-      (num/2).times do |i|
-        bin += (hex[2 * (i + 1) - 2,2]).to_i(16).chr
-      end
-      return bin
-    end
+    NAMED_COLORS = {
+      'maroon' => '800000',
+      'red' => 'ff0000',
+      'orange' => 'ffA500',
+      'yellow' => 'ffff00',
+      'olive' => '808000',
+      'purple' => '800080',
+      'fuchsia' => 'ff00ff',
+      'white' => 'ffffff',
+      'lime' => '00ff00',
+      'green' => '008000',
+      'navy' => '000080',
+      'blue' => '0000ff',
+      'aqua' => '00ffff',
+      'teal' => '008080',
+      'black' => '000000',
+      'silver' => 'c0c0c0',
+      'gray' =>'808080',
+      'black' => '000000' }
 
-    def hex
-      hex_color = case @color
-                  when 'maroon'; '800000' 
-                  when 'red'; 'ff0000' 
-                  when 'orange'; 'ffA500'
-                  when 'yellow'; 'ffff00' 
-                  when 'olive'; '808000'
-                  when 'purple'; '800080'
-                  when 'fuchsia'; 'ff00ff'
-                  when 'white'; 'ffffff'
-                  when 'lime'; '00ff00'
-                  when 'green'; '008000'
-                  when 'navy'; '000080'
-                  when 'blue'; '0000ff'
-                  when 'aqua'; '00ffff'
-                  when 'teal'; '008080'
-                  when 'black'; '000000'
-                  when 'silver'; 'c0c0c0'
-                  when 'gray'; '808080'
-                  when 'black'; '000000'
-                  else @color
-                  end
-      HEX[0] + hex_color + HEX[1] + HEX[2]
+    def self.create_gif(hex_color)
+      raise "invalid color '#{hex_color}'" unless /[0-9a-f]{6}/i =~ hex_color
+      GIF_DATA_PREFIX + [hex_color].pack('H*') + GIF_DATA_POSTFIX
     end
 
-    def img_tag(options = {})
+    def self.img_tag(options = {})
       width = options[:width] || '100%'
       height = options[:height] || 1
-      "<img src='/galakei/spacer/#{@color}' width='#{width}' height='#{height}'>"
+      hex_color = color2hex(options[:color])
+      "<img src='/galakei/spacer/#{hex_color}' width='#{width}' height='#{height}'>"
+    end
+
+    def self.color2hex(color)
+      hex_color = NAMED_COLORS[color] || color.gsub('#','').downcase
+      hex_color = hex_color.sub(/(.)(.)(.)/, '\1\1\2\2\3\3') if hex_color.size == 3
+      raise "invalid color '#{color}'" unless /[0-9a-f]{6}/i =~ hex_color
+      hex_color
     end
   end
 end

data/lib/galakei/version.rb

@@ -1,3 +1,3 @@
 module Galakei
-  VERSION = "0.6.6"
+  VERSION = "0.7.0"
 end

data/spec/galakei/docomo_css/stylesheet_spec.rb

@@ -223,6 +223,15 @@ EOD
       it_should_behave_like 'border'
     end
 
+    context 'border invalid color' do
+      let(:css) { "div { border: 1px solid #blubb; } "}
+      it "should apply nothing" do
+        elm = subject
+        elm.previous_sibling.to_s.should == ''
+        elm.next_sibling.to_s.should == ''
+      end
+    end
+
     context 'border-top' do
       let(:css) { "div { border-top: 1px solid #000000; } "}
       it_should_behave_like 'border top'

data/spec/galakei/spacer_spec.rb

@@ -1,16 +1,29 @@
 require 'spec_helper'
 
 describe Galakei::Spacer do
-  context "#000000" do
-    subject { described_class.new("#000000") }
-    it { subject.img_tag.should == %Q[<img src='/galakei/spacer/000000' width='100%' height='1'>] }
-    it { subject.create.should_not be_nil }
+
+  context "img_tag" do
+    { "#000000" => "000000",
+      "black" => "000000",
+      "aqua" => "00ffff",
+      "F0d" => "ff00dd",
+    }.each do |name, col|
+      it "should create correct markup for color #{name}" do
+        subject.img_tag(:color => name).should == %Q[<img src='/galakei/spacer/#{col}' width='100%' height='1'>]
+      end
+    end
+
+    it "shouldn't allow invalid colors" do
+      lambda { subject.img_tag(:color => "bla") }.should raise_error(RuntimeError)
+    end
   end
-  %w[000000 aqua black blue fuchsia gray green lime maroon navy olive orange purple red silver teal white yellow].each do |s|
-    context s do
-      subject { described_class.new(s) }
-      it { subject.img_tag.should == %Q[<img src='/galakei/spacer/#{s}' width='100%' height='1'>] }
-      it { subject.create.should_not be_nil }
+
+  BLACK_GIF = "GIF89a\x01\x00\x01\x00\xF7\x00\x00\x00\x00\x00\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF,\x00\x00\x00\x00\x01\x00\x01\x00\x00\b\x04\x00\x01\x04\x04\x00;"
+
+  context "create gif" do
+    it("should create a gif for hex") { subject.create_gif("000000").should == BLACK_GIF }
+    it("shouldn't allow invalid colors") do
+      lambda { subject.create_gif("bla") }.should raise_error(RuntimeError)
     end
-  end 
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: galakei
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.6
+  version: 0.7.0
 platform: ruby
 authors: 
 - Paul McMahon