cuba 0.1.0 → 0.2.0

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Michel Martens
+Copyright (c) 2010 Michel Martens and Damian Janowski
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.markdown

@@ -8,9 +8,13 @@ Rum based microframework for web development.
 Description
 -----------
 
-Cuba is a light wrapper around [Rum](http://github.com/chneukirchen/rum), a tiny but powerful mapper for [Rack](http://github.com/chneukirchen/rack) applications.
+Cuba is a light wrapper around [Rum](http://github.com/chneukirchen/rum),
+a tiny but powerful mapper for [Rack](http://github.com/chneukirchen/rack)
+applications.
 
-It integrates [Haml](http://haml-lang.com/) templates via [Tilt](http://github.com/rtomayko/tilt), and testing via [Contest](http://github.com/citrusbyte/contest) and [Stories](http://github.com/citrusbyte/stories).
+It integrates many templates via [Tilt](http://github.com/rtomayko/tilt),
+and testing via [Cutest](http://github.com/djanowski/cutest) and
+[Capybara](http://github.com/jnicklas/capybara).
 
 Usage
 -----
@@ -20,6 +24,8 @@ Here's a simple application:
     # cat hello_world.rb
     require "cuba"
 
+    Cuba.use Rack::Session::Cookie
+
     Cuba.define do
       on get do
         on path("hello") do
@@ -35,13 +41,11 @@ Here's a simple application:
     # cat hello_world_test.rb
     require "cuba/test"
 
-    Cuba.test "My App" do
-      story "As a user I want to be greeted with a Hello world" do
-        scenario "A user visits the homepage" do
-          visit "/"
+    scope do
+      test "Homepage" do
+        visit "/"
 
-          assert_contain "Hello world!"
-        end
+        assert has_content?("Hello world!")
       end
     end
 
@@ -54,7 +58,10 @@ To run it, you can create a `config.ru`:
 
 That's it, you can now run `rackup` and enjoy what you have just created.
 
-For more information about what you can do, check [Rum's documentation](http://github.com/chneukirchen/rum). To see how you can test it, check the documentation for [Stories](http://github.com/citrusbyte/stories).
+For more information about what you can do, check [Rum's
+documentation](http://github.com/chneukirchen/rum). To see how you can test it,
+check the documentation for [Cutest](http://github.com/djanowski/cutest) and
+[Capybara](http://github.com/jnicklas/capybara).
 
 Installation
 ------------
@@ -64,7 +71,7 @@ Installation
 License
 -------
 
-Copyright (c) 2010 Michel Martens
+Copyright (c) 2010 Michel Martens and Damian Janowski
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

data/cuba.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = "cuba"
-  s.version           = "0.1.0"
+  s.version           = "0.2.0"
   s.summary           = "Rum based microframework for web applications."
   s.description       = "Cuba is a light wrapper for Rum, a microframework for Rack applications."
   s.authors           = ["Michel Martens"]

data/lib/cuba.rb

@@ -2,14 +2,19 @@ require "cuba/version"
 require "cuba/ron"
 
 module Cuba
+  def self.app
+    @app ||= Rack::Builder.new
+  end
+
+  def self.use(middleware)
+    app.use(middleware)
+  end
+
   def self.define(&block)
-    @app = Rack::Builder.new do
-      use Rack::Session::Cookie
-      run Cuba::Ron.new(&block)
-    end
+    app.run Cuba::Ron.new(&block)
   end
 
   def self.call(env)
-    @app.call(env)
+    app.call(env)
   end
 end

data/lib/cuba/version.rb

@@ -1,3 +1,3 @@
 module Cuba
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Michel Martens
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-22 00:00:00 -03:00
+date: 2010-09-25 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency