chicago 0.3.4 → 0.3.5

data/Rakefile

@@ -9,10 +9,8 @@ task(:set_test_env) { ENV['RACK_ENV'] ||= 'test' }
 
 desc "Run all tests"
 task :test => [:set_test_env] do
-  require 'protest'
   $:.concat ['./lib', './test']
   Dir.glob("./test/*_test.rb").each { |test| require test }
-  Protest.report
 end
 
 task "test:shoulda" => [:set_test_env]

data/chicago.gemspec

@@ -1,14 +1,14 @@
 Gem::Specification.new do |s|
   s.name     = "chicago"
-  s.version  = "0.3.4"
-  s.date     = "2009-10-02"
+  s.version  = "0.3.5"
+  s.date     = "2009-10-04"
   s.summary  = "Sinatra runtime and testing extensions used commonly by Thumblemonks"
   s.email    = %w[gus@gusg.us gabriel.gironda@gmail.com]
   s.homepage = "http://github.com/thumblemonks/chicago/tree/master"
   s.description = "Sinatra runtime and testing extensions used commonly by Thumblemonks. For example, :json_response, which turns an object into JSON and sets the content-type appropriately."
   s.authors  = %w[Justin\ Knowlden Gabriel\ Gironda]
 
-  s.has_rdoc = false
+  s.has_rdoc = true
   s.rdoc_options = ["--main", "README.markdown"]
   s.extra_rdoc_files = ["README.markdown"]
 
@@ -20,9 +20,9 @@ Gem::Specification.new do |s|
     lib/chicago.rb
     lib/chicago/application.rb
     lib/chicago/helpers.rb
-    lib/chicago/protest.rb
-    lib/chicago/protest/macros.rb
     lib/chicago/responders.rb
+    lib/chicago/riot.rb
+    lib/chicago/riot/macros.rb
     lib/chicago/shoulda.rb
     lib/chicago/shoulda/sinatra.rb
   ]
@@ -33,6 +33,10 @@ Gem::Specification.new do |s|
     test/helpers_test.rb
     test/protest_macros_test.rb
     test/responders_test.rb
+    test/shoulda_tests/application_test.rb
+    test/shoulda_tests/helpers_test.rb
+    test/shoulda_tests/responders_test.rb
+    test/shoulda_tests/test_helper.rb
     test/test_helper.rb
   ]
 end

data/lib/chicago/riot.rb

@@ -0,0 +1 @@
+require 'chicago/riot/macros'

data/lib/chicago/{protest → riot}/macros.rb

@@ -1,7 +1,7 @@
 require 'json'
 
 module Chicago
-  module Protest
+  module Riot
     module Macros
       def asserts_response_status(expected)
         asserts("response status is #{expected}") { last_response.status }.equals(expected)
@@ -39,7 +39,7 @@ module Chicago
         asserts_location expected_path
       end
     end # Macros
-  end # Protest
+  end # Riot
 end # Chicago
 
-Protest::Context.instance_eval { include Chicago::Protest::Macros }
+Riot::Context.instance_eval { include Chicago::Riot::Macros }

data/test/protest_macros_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-context "Protest Macros Test:" do
+context "Riot Macros Test:" do
   setup do
     mock_app {
       helpers Sinatra::Chicago::Responders

data/test/shoulda_tests/application_test.rb

@@ -0,0 +1,48 @@
+require 'test_helper'
+
+class ApplicationTest < Test::Unit::TestCase
+
+  def app
+    @app = mock_app {
+      register Sinatra::Chicago
+
+      template(:foo) { ".bar\n  :display none" }
+      template(:goo) { ".car\n  :display some" }
+      template(:baz) { "Whatever man. That's just like, your opinion." }
+
+      catch_all_css
+      catch_all_css('/css')
+
+      get_obvious 'baz'
+    }
+  end
+
+  # TODO: change to namespace
+  context "catching all css" do
+    context "with default path" do
+      setup { get '/stylesheets/foo.css' }
+      should_have_response_status 200
+      should_have_content_type 'text/css'
+      should_have_response_body %r[.bar \{\s+display: none; \}\s]
+    end
+
+    context "with specified path" do
+      setup { get '/css/goo.css' }
+      should_have_response_status 200
+      should_have_content_type 'text/css'
+      should_have_response_body %r[.car \{\s+display: some; \}\s]
+    end
+
+    context "with path that's not a defined a sass file" do
+      setup { get '/stylesheets/zoo.css' }
+      should_have_response_status 404
+      should_have_content_type 'text/css'
+    end
+  end # catching all css
+
+  context "getting obvious views" do
+    setup { get '/baz' }
+    should_have_response_body "Whatever man. That's just like, your opinion."
+  end # getting obvious views
+
+end

data/test/shoulda_tests/helpers_test.rb

@@ -0,0 +1,125 @@
+require 'test_helper'
+
+class HelpersTest < Test::Unit::TestCase
+  def app
+    @app = mock_app {
+      helpers Sinatra::Chicago::Helpers
+    }
+  end
+
+  context "including stylesheet" do
+    context "for plain old foo" do
+      setup do
+        extend_mock_app {
+          template(:foo) { "= stylesheet_include('foo')" }
+          get('/foo') { haml :foo }
+        }
+        get '/foo'
+      end
+
+      should_have_response_body %r[^<link( \w+=".+"){4}/>$]
+      should_have_response_body %r[href="/stylesheets/foo\.css"]
+      should_have_response_body %r[media="screen"]
+      should_have_response_body %r[rel="stylesheet"]
+      should_have_response_body %r[type="text/css"]
+    end # for plain old foo
+
+    context "for bar with options" do
+      setup do
+        extend_mock_app {
+          template(:foo) { "= stylesheet_include('bar', :media => 'print', :baz => 'boo')" }
+          get('/foo') { haml :foo }
+        }
+        get '/foo'
+      end
+
+      should_have_response_body %r[^<link( \w+=".+"){5}/>$]
+      should_have_response_body %r[href="/stylesheets/bar\.css"]
+      should_have_response_body %r[media="print"]
+      should_have_response_body %r[rel="stylesheet"]
+      should_have_response_body %r[type="text/css"]
+      should_have_response_body %r[baz="boo"]
+    end # for bar with options
+
+    context "with a specific href" do
+      setup do
+        extend_mock_app {
+          template(:foo) { "= stylesheet_include('http://example.com')" }
+          get('/foo') { haml :foo }
+        }
+        get '/foo'
+      end
+      should_have_response_body %r[href="http://example.com"]
+    end # with a specific href
+  end # including stylesheets
+
+  context "including javascript" do
+    context "for plain old foo" do
+      setup do
+        extend_mock_app {
+          template(:foo) { "= javascript_include('foo')" }
+          get('/foo') { haml :foo }
+        }
+        get '/foo'
+      end
+
+      should_have_response_body %r[^<script( \w+=".+"){2}></script>$]
+      should_have_response_body %r[src="/javascripts/foo\.js"]
+      should_have_response_body %r[type="text/javascript"]
+    end # for plain old foo
+
+    context "for foo with options" do
+      setup do
+        extend_mock_app {
+          template(:foo) { "= javascript_include('foo', :type => 'text/blarg', :gus => 'nice')" }
+          get('/foo') { haml :foo }
+        }
+        get '/foo'
+      end
+
+      should_have_response_body %r[^<script( \w+=".+"){3}></script>$]
+      should_have_response_body %r[src="/javascripts/foo\.js"]
+      should_have_response_body %r[type="text/blarg"]
+      should_have_response_body %r[gus="nice"]
+    end # for foo with options
+
+    context "with a specific src" do
+      setup do
+        extend_mock_app {
+          template(:foo) { "= javascript_include('http://example.com')" }
+          get('/foo') { haml :foo }
+        }
+        get '/foo'
+      end
+      should_have_response_body %r[src="http://example.com"]
+    end # with a specific src
+  end # including javascript
+
+  context "using an anchor" do
+    context "for plain old foo" do
+      setup do
+        extend_mock_app {
+          template(:foo) { "= anchor('foo', '/bar')" }
+          get('/foo') { haml :foo }
+        }
+        get '/foo'
+      end
+
+      should_have_response_body %Q[<a href="/bar">foo</a>]
+    end # for plain old foo
+
+    context "with options" do
+      setup do
+        extend_mock_app {
+          template(:foo) { "= anchor('foo bear', '/bar/ler', :title => 'gus is nice')" }
+          get('/foo') { haml :foo }
+        }
+        get '/foo'
+      end
+
+      should_have_response_body %r[^<a( \w+=".+"){2}>foo bear</a>$]
+      should_have_response_body %r[href="/bar/ler"]
+      should_have_response_body %r[title="gus is nice"]
+    end # with options
+  end # using an anchor
+end

data/test/shoulda_tests/responders_test.rb

@@ -0,0 +1,28 @@
+require 'test_helper'
+
+class RespondersTest < Test::Unit::TestCase
+  def app
+    @app = mock_app {
+      helpers Sinatra::Chicago::Responders
+      get "/json_bait" do
+        status(201)
+        json_response({:foo => "bar"})
+      end
+
+      get "/no_bait" do
+        status(200)
+        json_response(nil)
+      end
+    }
+  end
+
+  context "json response" do
+    setup { get "/json_bait" }
+    should_have_json_response({:foo => :bar})
+  end # json response
+
+  context "json response with null data" do
+    setup { get "/no_bait" }
+    should_have_json_response(/^$/)
+  end # json response
+end

data/test/shoulda_tests/test_helper.rb

@@ -0,0 +1,21 @@
+%w[ rubygems test/unit shoulda haml sass chicago rack/test chicago/shoulda ].each do |lib|
+  require lib
+end
+
+module Rack::Test::Methods
+  # Sets up a Sinatra::Base subclass defined with the block
+  # given. Used in setup or individual spec methods to establish
+  # the application.
+  def mock_app(base=Sinatra::Base, &block)
+    @app = Sinatra.new(base, &block)
+  end
+
+  def extend_mock_app(&block)
+    @_rack_test_session ||= Rack::Test::Session.new(app)
+    @app.instance_eval(&block)
+  end
+end
+
+class Test::Unit::TestCase
+  include Rack::Test::Methods
+end

data/test/test_helper.rb

@@ -1,4 +1,4 @@
-%w[ rubygems protest haml sass chicago rack/test chicago/protest ].each do |lib|
+%w[ rubygems riot haml sass chicago rack/test chicago/riot ].each do |lib|
   require lib
 end
 
@@ -20,6 +20,8 @@ module Rack::Test::Methods
   end
 end
 
-class Protest::Situation
+class Riot::Situation
   include Rack::Test::Methods
 end
+
+at_exit { Riot.report }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: chicago
 version: !ruby/object:Gem::Version 
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors: 
 - Justin Knowlden
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-02 00:00:00 -05:00
+date: 2009-10-04 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -31,9 +31,9 @@ files:
 - lib/chicago.rb
 - lib/chicago/application.rb
 - lib/chicago/helpers.rb
-- lib/chicago/protest.rb
-- lib/chicago/protest/macros.rb
 - lib/chicago/responders.rb
+- lib/chicago/riot.rb
+- lib/chicago/riot/macros.rb
 - lib/chicago/shoulda.rb
 - lib/chicago/shoulda/sinatra.rb
 has_rdoc: true
@@ -71,4 +71,8 @@ test_files:
 - test/helpers_test.rb
 - test/protest_macros_test.rb
 - test/responders_test.rb
+- test/shoulda_tests/application_test.rb
+- test/shoulda_tests/helpers_test.rb
+- test/shoulda_tests/responders_test.rb
+- test/shoulda_tests/test_helper.rb
 - test/test_helper.rb

data/lib/chicago/protest.rb

@@ -1 +0,0 @@
-require 'chicago/protest/macros'