rack-golden_frill 0.1.1 → 0.1.2

data/lib/golden_frill.rb

@@ -10,7 +10,7 @@ module GoldenFrill
   # Optional:
   #  frill_color: the color of the frill. If not provided, will be a darker color than the base
   def self.run!(opts)
-    width, height, base_color, output_path = opts[:width], opts[:height], opts[:base_color], opts[:output_path]
+    width, height, base_color, output_path = opts[:width].to_i, opts[:height].to_i, opts[:base_color], opts[:output_path]
     
     bot_height = height.to_i + (width.to_f * GoldenRatio).to_i
     png = ChunkyPNG::Image.new(width.to_i, bot_height)

data/lib/golden_frill/version.rb

@@ -1,3 +1,3 @@
 module GoldenFrill
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/rack/golden_frill.rb

@@ -6,14 +6,13 @@ module Rack
       raise ArgumentError, "#{output_path} is not a directory" unless ::File.directory?(@root)
     end
 
-    def call env      
-      unless env["PATH_INFO"] =~ /#{@root}/
+    def call env
+      unless env["PATH_INFO"] =~ /images\/frill_/
         return @app.call(env)
       end
 
+      command = env["PATH_INFO"].match(/\/frill_(.*)\.png/i)[1]
       request = ::Rack::Request.new(env)
-      command = env["PATH_INFO"].match(/#{@root}\/frill_(.*)\.png/i)[1]
-      
       image_path = ::File.join(@root,"frill_#{command}.png")
       if ::File.exist?(image_path)
         return ::Rack::File.new(@root).call(env)
@@ -21,10 +20,9 @@ module Rack
       
       opts = { :output_path => image_path }
       opts[:base_color], opts[:width], opts[:height], opts[:frill_color] = command.split('.')
-      ::GoldenFrill.new(opts).run!
-
+      ::GoldenFrill.run!(opts)
       # Redirect to this URL since it will now be served.
-      return [301, {'Location' => request.url}, 'Redirecting to created image.']
+      return [301, {'Location' => request.url}, ['Redirecting to created image.']]
     end
   end
 end

data/test/test_rack.rb

@@ -0,0 +1,22 @@
+require 'test/unit'
+require 'golden_frill'
+require 'rack/golden_frill'
+require 'rack/test'
+require 'fileutils'
+class TestRack < Test::Unit::TestCase
+  include Rack::Test::Methods
+  OUTPUT_ROOT = ::File.expand_path('./images', File::dirname(__FILE__))
+  
+  def app
+    Rack::GoldenFrill.new lambda{|x| [200, {}, ["OK"]]}, OUTPUT_ROOT
+  end
+  
+  def test_dynamic_generation
+    filename = 'frill_d4412d.14.36.png'
+    
+    FileUtils.rm(File.join(OUTPUT_ROOT, filename)) rescue Errno::ENOENT
+    get "/images/#{filename}"
+    assert_equal 301, last_response.status
+    assert File.exists?(File.join(OUTPUT_ROOT, filename))
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Alexander Bartlow
@@ -90,6 +90,7 @@ files:
 - lib/rack/golden_frill.rb
 - test/images/.gitignore
 - test/test_frills.rb
+- test/test_rack.rb
 has_rdoc: true
 homepage: http://rubygems.org/gems/golden_frill
 licenses: []