cuba 0.0.5 → 0.1.0

data/Rakefile

@@ -1,5 +1,7 @@
 task :test do
-  system "cd test && ruby cuba_test.rb"
+  require "cutest"
+
+  Cutest.run(Dir["test/*.rb"])
 end
 
 task :default => :test

data/cuba.gemspec

@@ -1,17 +1,14 @@
 Gem::Specification.new do |s|
   s.name              = "cuba"
-  s.version           = "0.0.5"
+  s.version           = "0.1.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"]
   s.email             = ["michel@soveran.com"]
   s.homepage          = "http://github.com/soveran/cuba"
-  s.files = ["LICENSE", "README.markdown", "Rakefile", "lib/cuba/ron.rb", "lib/cuba/rum.rb", "lib/cuba/test.rb", "lib/cuba/version.rb", "lib/cuba.rb", "cuba.gemspec", "test/cuba_test.rb", "test/webrat.log"]
-  s.add_dependency "rack", ">= 1.1.0"
-  s.add_dependency "haml", ">= 2.2.22"
-  s.add_dependency "tilt", ">= 0.9"
-  s.add_dependency "webrat", ">= 0.7.0"
-  s.add_dependency "contest", ">= 0.1.2"
-  s.add_dependency "stories", ">= 0.1.3"
-  s.add_dependency "rack-test", ">= 0.5.3"
+  s.files = ["LICENSE", "README.markdown", "Rakefile", "lib/cuba/ron.rb", "lib/cuba/rum.rb", "lib/cuba/test.rb", "lib/cuba/version.rb", "lib/cuba.rb", "cuba.gemspec", "test/integration.rb", "test/webrat.log"]
+  s.add_dependency "rack", "~> 1.2"
+  s.add_dependency "tilt", "~> 1.1"
+  s.add_development_dependency "cutest", "~> 0.1"
+  s.add_development_dependency "capybara", "~> 0.1"
 end

data/lib/cuba/ron.rb

@@ -1,5 +1,4 @@
 require "cuba/rum"
-require "haml"
 require "tilt"
 
 module Cuba
@@ -8,9 +7,9 @@ module Cuba
       Thread.current[:_cache] ||= Tilt::Cache.new
     end
 
-    def haml(template, locals = {})
+    def render(template, locals = {})
       _cache.fetch(template, locals) {
-        Tilt::HamlTemplate.new("#{template}.haml")
+        Tilt.new(template)
       }.render(self, locals)
     end
 

data/lib/cuba/test.rb

@@ -1,25 +1,9 @@
-require "webrat"
-require "rack/test"
-require "stories"
-require "stories/runner"
+require "cuba"
+require "cutest"
+require "capybara/dsl"
 
-Webrat.configure do |config|
-  config.mode = :rack
+class Cutest::Scope
+  include Capybara
 end
 
-class Test::Unit::TestCase
-  include Rack::Test::Methods
-  include Webrat::Methods
-  include Webrat::Matchers
-  include Stories::Webrat
-
-  def app
-    Cuba
-  end
-end
-
-module Cuba
-  def self.test(name, &block)
-    Test::Unit::TestCase.context(name, &block)
-  end
-end
+Capybara.app = Cuba

data/lib/cuba/version.rb

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

data/test/integration.rb

@@ -0,0 +1,4 @@
+test "examples" do
+  `cd example && rake -I../lib`
+  assert $?.exitstatus == 0
+end

data/test/webrat.log

@@ -1,9 +1,5 @@
-# Logfile created on 2010-05-08 22:24:04 -0300 by logger.rb/20321
-D, [2010-05-08T22:24:04.490239 #59737] DEBUG -- : REQUESTING PAGE: GET / with {} and HTTP headers {}
-D, [2010-05-08T22:24:04.502240 #59737] DEBUG -- : REQUESTING PAGE: GET /login with {} and HTTP headers {"HTTP_REFERER"=>"/"}
-D, [2010-05-08T22:24:04.504636 #59737] DEBUG -- : REQUESTING PAGE: POST /login with {"user"=>"Michel"} and HTTP headers {"HTTP_REFERER"=>"/login"}
-D, [2010-05-08T22:24:04.507504 #59737] DEBUG -- : REQUESTING PAGE: GET / with {} and HTTP headers {"HTTP_REFERER"=>"/login"}
-D, [2010-05-14T12:19:24.081242 #70310] DEBUG -- : REQUESTING PAGE: GET / with {} and HTTP headers {}
-D, [2010-05-14T12:19:24.127110 #70310] DEBUG -- : REQUESTING PAGE: GET /login with {} and HTTP headers {"HTTP_REFERER"=>"/"}
-D, [2010-05-14T12:19:24.129474 #70310] DEBUG -- : REQUESTING PAGE: POST /login with {"user"=>"Michel"} and HTTP headers {"HTTP_REFERER"=>"/login"}
-D, [2010-05-14T12:19:24.132340 #70310] DEBUG -- : REQUESTING PAGE: GET / with {} and HTTP headers {"HTTP_REFERER"=>"/login"}
+# Logfile created on 2010-06-11 01:04:00 -0300 by logger.rb/20321
+D, [2010-06-11T01:04:00.071479 #37917] DEBUG -- : REQUESTING PAGE: GET / with {} and HTTP headers {}
+D, [2010-06-11T01:04:00.082487 #37917] DEBUG -- : REQUESTING PAGE: GET /login with {} and HTTP headers {"HTTP_REFERER"=>"/"}
+D, [2010-06-11T01:04:00.084940 #37917] DEBUG -- : REQUESTING PAGE: POST /login with {"user"=>"Michel"} and HTTP headers {"HTTP_REFERER"=>"/login"}
+D, [2010-06-11T01:04:00.087758 #37917] DEBUG -- : REQUESTING PAGE: GET / with {} and HTTP headers {"HTTP_REFERER"=>"/login"}

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: cuba
 version: !ruby/object:Gem::Version 
-  hash: 21
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 5
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors: 
 - Michel Martens
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-14 00:00:00 -03:00
+date: 2010-09-22 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,111 +23,56 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 1
-        - 1
-        - 0
-        version: 1.1.0
+        - 2
+        version: "1.2"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: haml
+  name: tilt
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 43
         segments: 
-        - 2
-        - 2
-        - 22
-        version: 2.2.22
+        - 1
+        - 1
+        version: "1.1"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: tilt
+  name: cutest
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
         segments: 
         - 0
-        - 9
-        version: "0.9"
-  type: :runtime
+        - 1
+        version: "0.1"
+  type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: webrat
+  name: capybara
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 7
-        - 0
-        version: 0.7.0
-  type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: contest
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
         segments: 
         - 0
         - 1
-        - 2
-        version: 0.1.2
-  type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: stories
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 0
-        - 1
-        - 3
-        version: 0.1.3
-  type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rack-test
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 5
-        - 3
-        version: 0.5.3
-  type: :runtime
-  version_requirements: *id007
+        version: "0.1"
+  type: :development
+  version_requirements: *id004
 description: Cuba is a light wrapper for Rum, a microframework for Rack applications.
 email: 
 - michel@soveran.com
@@ -148,7 +92,7 @@ files:
 - lib/cuba/version.rb
 - lib/cuba.rb
 - cuba.gemspec
-- test/cuba_test.rb
+- test/integration.rb
 - test/webrat.log
 has_rdoc: true
 homepage: http://github.com/soveran/cuba
@@ -164,7 +108,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -173,7 +116,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"

data/test/cuba_test.rb

@@ -1,54 +0,0 @@
-$:.unshift(File.dirname(__FILE__) + "/../lib/")
-
-require "cuba"
-require "cuba/test"
-
-form = <<EOS
-  <form action="/login" method="post">
-    <input name="user">
-    <input type="submit" value="Login">
-  </form>
-EOS
-
-Cuba.define do
-  on get do
-    on path("login") do
-      res.write "Enter your username"
-      res.write form
-    end
-
-    on default do
-      if session[:user]
-        res.write "Hey #{session[:user]}!"
-      else
-        res.redirect "/login"
-      end
-    end
-  end
-
-  on post, path("login") do
-    on param("user") do |user|
-      session[:user] = user
-      res.write "Got #{user}"
-    end
-  end
-end
-
-Cuba.test "Sample Site" do
-  story "As a user I want to be able to login" do
-    scenario "A user submits good info" do
-      visit "/"
-
-      assert_contain "Enter your username"
-
-      fill_in "user", :with => "Michel"
-      click_button "Login"
-
-      assert_contain "Got Michel"
-
-      visit "/"
-
-      assert_contain "Hey Michel!"
-    end
-  end
-end