mercury 0.9.3 → 0.9.4

data/lib/mercury/images.rb

@@ -1,33 +1,27 @@
 module Sinatra
   module Images
     def self.registered(app)
-      app.get '/*.gif' do
-        stream_image([params["splat"][0],'gif'].join('.'),"image/gif")    
-      end
-
-      app.get '/*.png' do
-        stream_image([params["splat"][0],'png'].join('.'),"image/png")
-      end
-
-      app.get '/*.jpg' do
-        stream_image([params["splat"][0],'jpg'].join('.'),"image/jpg")
-      end
-
-      app.get '/*.jpeg' do
-        stream_image([params["splat"][0],'jpeg'].join('.'),"image/jpeg")
+      # stream images
+      app.get %r{[gif|jpg|png|jpeg]$} do
+        content_type get_image_type(request.path_info)
+        File.open(options.views + request.path_info, 'rb') do |file| 
+          file.read
+        end 
       end
     end
     
-  private
-    def get_image(filename)
-      open(File.join(options.views, filename), 'rb') { |file| file.read }    
-    end
-
-    def stream_image(filename, ct)
-      content_type(ct)    
-      get_image(filename)
+    def get_image_type(image_name)
+      if image_name =~ /.gif/
+        "image/gif"
+      elsif image_name =~ /.jpg/
+        "image/jpg"
+      elsif image_name =~ /.png/
+        "image/png"
+      elsif image_name =~ /.jpeg/
+        "image/jpeg"
+      end
     end
-    
+        
   end
   register Images
 end

data/lib/mercury.rb

@@ -8,7 +8,7 @@ require File.dirname(__FILE__) + '/mercury/images'
 # Core Sinatra application to run mercury apps
 class Mercury < Sinatra::Application
   helpers Sinatra::Helpers
-  helpers Sinatra::Images
+  register Sinatra::Images
   
   set :root,  FileUtils.pwd.gsub("\n",'')
   set :public, File.dirname(__FILE__) + '/public'
@@ -23,8 +23,9 @@ class Mercury < Sinatra::Application
 private  
     
   def get_view(filename)
-    if File.exists?(File.join(options.views, filename))
-      view_file = File.join(options.views,filename) 
+    full_file = File.join(options.views, filename)
+    if File.exists?(full_file)
+      view_file = full_file 
     else
       view_directory = File.join(File.dirname(__FILE__),'views')
       view_file = File.join(view_directory,filename)

data/spec/lib/mercury/images_spec.rb

@@ -0,0 +1,33 @@
+require File.expand_path(File.dirname(__FILE__) + '../../../spec_helper')
+
+describe "images" do
+
+  include Rack::Test::Methods
+
+  def app
+    Mercury
+  end
+
+  it "should return gif" do
+    File.stub!(:open).and_return('foobar')
+    get "/hello.gif"
+    puts last_response.body.should == 'foobar'
+  end
+  
+  it "should return correct file content type for gif" do
+    app.get_image_type('/hello.gif').should == "image/gif"
+  end
+
+  it "should return correct file content type for jpg" do
+    app.get_image_type('/hello.jpg').should == "image/jpg"
+  end
+
+  it "should return correct file content type for png" do
+    app.get_image_type('/hello.png').should == "image/png"
+  end
+
+  it "should return correct file content type for jpeg" do
+    app.get_image_type('/hello.jpeg').should == "image/jpeg"
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mercury
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors: 
 - Tom Wilson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-23 00:00:00 -04:00
+date: 2010-03-24 00:00:00 -04:00
 default_executable: mercury
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -132,5 +132,6 @@ signing_key:
 specification_version: 3
 summary: Easy Hacking with Haml, Sass, JQuery, CoffeeScript
 test_files: 
+- spec/lib/mercury/images_spec.rb
 - spec/mercury_spec.rb
 - spec/spec_helper.rb