rack-cappuccino 0.0.1 → 0.0.2

data/Gemfile.lock

@@ -22,6 +22,3 @@ DEPENDENCIES
   rake
   rcov
   rspec (>= 2.0.0)
-
-METADATA
-  version: 1.0.6

data/README.markdown

@@ -1,26 +1,26 @@
 # rack-cappuccino
 
-Create a Rack app from your Cappuccino app. Makes it easy to quickly get a Cappuccino app online using Heroku.
+Create a Rack app from your Cappuccino app.
 
 ## Usage
 
-Add a Gemfile in the root of your app with the following:
+#### Build your Release target
+
+    jake release
+
+#### Create a Gemfile in your Build/Release/APPNAME directory, with the following:
 
     source :rubygems
     gem "rack-cappuccino"
-  
-Create a config.ru with the following:
 
-    require "bundler/setup"
+#### Create a config.ru in the same directory, with the following:
+
     require "rack/cappuccino"
-  
-    run Rack::Cappuccino.new(:appname => APPNAME)
-  
-Replace APPNAME with the name of your app as it appears in the Build/Release directory.
+    run Rack::Cappuccino
 
-## Build before you deploy
+#### To run locally, from your Build/Release/APPNAME directory, run:
 
-Make sure you build your Release target before you deploy your app. Rack::Cappuccino uses it as the root directory for the Rack app.
+    rackup
 
 ## Contributing to rack-cappuccino
  

data/Rakefile

@@ -1,5 +1,3 @@
-require 'bundler'
-Bundler.setup(:default, :development)
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)

data/lib/rack/cappuccino.rb

@@ -1,29 +1,41 @@
-require "pathname"
-require "rack/request"
+require "sinatra"
 
 module Rack
-  class Cappuccino
-    VERSION = "0.0.1"
+  class Cappuccino < Sinatra::Base
+    VERSION = "0.0.2"
     
-    attr_accessor :root
+    # Caller from when this file is loaded. Includes +config.ru+
+    # which we need for +root+.
+    #
+    CALLER  = caller
 
-    def initialize(*args)
-      appname = args.last.delete(:appname)
-      @root   = "Build/Release/#{appname}"
+    # Little big of magic to find the directory of the +config.ru+
+    # file, ie: the root directory for our application.
+    #
+    # It looks through +CALLER+ for a call originating from +config.ru+,
+    # extracts it's relative path out and join it with +Dir.getwd+.
+    # This gives us the full path to +config.ru+ and subsequently
+    # the root of our app.
+    #
+    # If +config.ru+ was not used, it raises an error.
+    #
+    def self.root
+      config = CALLER.select { |c| c =~ /(config.ru)/ }.first
+      config = config.scan(/(^.*?config\.ru)/).flatten.first
+      ::File.dirname(::File.join(Dir.getwd, config))
+    rescue NoMethodError => e
+      raise "Rack::Cappuccino apps must be loaded from a config.ru file."
     end
 
-    def call(env)
-      info = Request.new(env).path_info
-      info = "/index.html" if info == "/"
-      path = Pathname.new(::File.join(@root, info))
-      mime = Mime.mime_type(path.extname)
+    mime_type :plist, "application/octet-stream"
+    mime_type :sj,    "application/octet-stream"
+    mime_type :cib,   "application/octet-stream"
 
-      if path.exist? && !path.directory? && path.to_s !~ /\.\./
-        [200, { "Content-Type" => mime, "Content-Length" => path.size.to_s }, [path.read]]
-      else
-        [404, {"Content-Type" => "text/plain"}, [""]]
-      end
-    end
+    set :static, true
+    set :public, lambda { self.root }
 
+    get "/" do
+      send_file ::File.join(self.class.public, "index.html")
+    end
   end
 end

data/spec/rack/cappuccino_spec.rb

@@ -1,55 +1,59 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
-describe Rack::Cappuccino do
-  include SpecHelper
+describe "Rack::Cappuccino" do
+  include Rack::Test::Methods
+  
   NOT_FOUND = 404
   OK        = 200
-
-  let(:resp) { get("/index.html") }
-
-  it "should construct the root path based on 'appname'" do
-    app = Rack::Cappuccino.new(:appname => "Hasslehoff")
-    app.root.should == "Build/Release/Hasslehoff"
+  
+  def app
+    support_root = File.expand_path("../../support", __FILE__)
+    Rack::Cappuccino.stub(:root).and_return(support_root)
+    Rack::Cappuccino
   end
 
   it "should send a 200" do
-    resp.status.should == OK
+    get "/index.html"
+    last_response.status.should == OK
   end
 
   it "should return a 404 for non-existent resources" do
-    resp = get("/doesnt_exist.html")
-    resp.status.should == NOT_FOUND
+    get "/doesnt_exist.html"
+    last_response.status.should == NOT_FOUND
   end
 
   it "should not allow .. in the path" do
-    resp = get("/../spec_helper.rb")
-    resp.status.should == NOT_FOUND
+    get "/../spec_helper.rb"
+    last_response.status.should == NOT_FOUND
   end
 
   it "should have a content-length of 20" do
-    resp.headers["Content-Length"].to_i.should == 20
+    get "/index.html"
+    last_response.headers["Content-Length"].to_i.should == 20
   end
 
   it "should handle html content-type" do
-    resp.content_type.should == "text/html"
+    get "/index.html"
+    last_response.content_type.should =~ %r{text/html}
   end
 
-  it "should have the file contents as the response body" do
-    resp.body.should == "<h1>Hello World</h1>"
+  it "should have the file contents as the last_responseonse body" do
+    get "/index.html"
+    last_response.body.should == "<h1>Hello World</h1>"
   end
   
   it "should return the body on index.html if an empty path is given" do
-    resp = get("/")
-    resp.body.should == "<h1>Hello World</h1>"
+    get "/"
+    last_response.status.should == OK
   end
 
   it "should handle css content-type" do
-    resp = get("/style.css")
-    resp.content_type.should == "text/css"
+    get "/style.css"
+    last_response.content_type.should =~ %r{text/css}
   end
 
   it "should handle javascript content-type" do
-    resp = get("/script.js")
-    resp.content_type.should == "application/javascript"
+    get "/script.js"
+    last_response.content_type.should =~ %r{application/javascript}
   end
 end

data/spec/spec_helper.rb

@@ -1,16 +1,4 @@
 require "rspec"
-require "rack/mock"
+require "rack/test"
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require "rack/cappuccino"
-
-module SpecHelper
-  def initialize
-    @app      = Rack::Cappuccino.new(:appname => "Foobar")
-    @app.root = File.join(File.dirname(__FILE__), "support")
-  end
-  
-  def get(path)
-    request = Rack::MockRequest.new(@app)
-    request.get(path)
-  end
-end
+require "rack/cappuccino"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Matte Noble
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-17 00:00:00 -05:00
+date: 2010-11-19 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency