thumblemonks-chicago 0.1.2.3 → 0.1.2.4

data/chicago.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name     = "chicago"
-  s.version  = "0.1.2.3"
-  s.date     = "2008-12-05"
+  s.version  = "0.1.2.4"
+  s.date     = "2009-02-01"
   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"
@@ -29,8 +29,8 @@ Gem::Specification.new do |s|
   
   s.test_files = %w[
     test/application_test.rb
-    test/responders_test.rb
     test/helpers_test.rb
+    test/responders_test.rb
     test/test_helper.rb
   ]
 end

data/lib/chicago/application.rb

@@ -1,6 +1,6 @@
 module Thumblemonks
   module Sinatra
-    module Application
+    module Base
 
       # Assumes all CSS is SASS and is referenced as being in a directory named stylesheets
       def catch_all_css(path='/stylesheets')
@@ -18,21 +18,9 @@ module Thumblemonks
         end
       end
 
-    end # Application
+    end # Base
 
-    module Object
-      def self.forward_sinatra_method(*methods)
-        Array(methods).each do |method|
-          module_eval <<-EOS
-            def #{method}(*args, &b) ::Sinatra.application.#{method}(*args, &b); end
-          EOS
-        end
-      end
-
-      forward_sinatra_method :catch_all_css, :get_obvious
-    end # Object
   end # Sinatra
 end # Thumblemonks
 
-Sinatra::Application.instance_eval { include Thumblemonks::Sinatra::Application }
-Object.instance_eval { include Thumblemonks::Sinatra::Object }
+Sinatra::Base.extend(Thumblemonks::Sinatra::Base)

data/lib/chicago/helpers.rb

@@ -33,4 +33,4 @@ module Thumblemonks
   end # Sinatra
 end # Thumblemonks
 
-Sinatra::EventContext.instance_eval { include Thumblemonks::Sinatra::Helpers }
+Sinatra::Base.instance_eval { include Thumblemonks::Sinatra::Helpers }

data/lib/chicago/responders.rb

@@ -12,4 +12,4 @@ module Thumblemonks
   end # Sinatra
 end # Thumblemonks
 
-Sinatra::EventContext.instance_eval { include Thumblemonks::Sinatra::Responders }
+Sinatra::Base.instance_eval { include Thumblemonks::Sinatra::Responders }

data/lib/chicago/shoulda/sinatra.rb

@@ -16,7 +16,8 @@ module Thumblemonks
         end
       
         def should_have_response_body(expected)
-          should("have response body") { assert_response_body expected }
+          name = expected.is_a?(String) ? expected[0...15] : expected.to_s
+          should("have response body like #{name}") { assert_response_body expected }
         end
 
         def should_have_content_type(expected)

data/test/application_test.rb

@@ -1,11 +1,17 @@
 require File.join(File.dirname(__FILE__), 'test_helper')
 
 class ApplicationTest < Test::Unit::TestCase
-  
+
   context "catching all css" do
     context "with default path" do
       setup do
-        get_it '/stylesheets/foo.css'
+        mock_app {
+          catch_all_css
+          template :foo do
+            ".bar\n  :display none"
+          end
+        }
+        get '/stylesheets/foo.css'
       end
 
       should_have_response_status 200
@@ -15,7 +21,13 @@ class ApplicationTest < Test::Unit::TestCase
 
     context "with specified path" do
       setup do
-        get_it '/css/goo.css'
+        mock_app {
+          catch_all_css('/css')
+          template :goo do
+            ".car\n  :display some"
+          end
+        }
+        get '/css/goo.css'
       end
 
       should_have_response_status 200
@@ -26,7 +38,13 @@ class ApplicationTest < Test::Unit::TestCase
 
   context "getting obvious views" do
     setup do
-      get_it '/baz'
+      mock_app {
+        get_obvious 'baz'
+        template :baz do
+          "Whatever man. That's just like, your opinion."
+        end
+      }
+      get '/baz'
     end
 
     should_have_response_body "Whatever man. That's just like, your opinion."

data/test/helpers_test.rb

@@ -1,57 +1,119 @@
 require File.join(File.dirname(__FILE__), 'test_helper')
 
 class HelpersTest < Test::Unit::TestCase
-  context "including stylesheets" do
-    should_invoke_helper(:stylesheet_include, 'foo') do
-      assert_match %r[^<link( \w+=".+"){4}/>$], @response.body
-      assert_match %r[href="/stylesheets/foo\.css"], @response.body
-      assert_match %r[media="screen"], @response.body
-      assert_match %r[rel="stylesheet"], @response.body
-      assert_match %r[type="text/css"], @response.body
-    end
-
-    should_invoke_helper(:stylesheet_include, 'bar', :media => 'print', :baz => 'boo') do
-      assert_match %r[^<link( \w+=".+"){5}/>$], @response.body
-      assert_match %r[href="/stylesheets/bar\.css"], @response.body
-      assert_match %r[media="print"], @response.body
-      assert_match %r[rel="stylesheet"], @response.body
-      assert_match %r[type="text/css"], @response.body
-      assert_match %r[baz="boo"], @response.body
-    end
-
-    should_invoke_helper(:stylesheet_include, 'http://example.com') do
-      assert_match %r[href="http://example.com"], @response.body
-    end
+  context "including stylesheet" do
+    context "for plain old foo" do
+      setup do
+        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
+        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
+        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
-    should_invoke_helper(:javascript_include, 'foo') do
-      assert_match %r[^<script( \w+=".+"){2}></script>$], @response.body
-      assert_match %r[src="/javascripts/foo\.js"], @response.body
-      assert_match %r[type="text/javascript"], @response.body
-    end
-
-    should_invoke_helper(:javascript_include, 'foo', :type => "text/blarg", :gus => "nice") do
-      assert_match %r[^<script( \w+=".+"){3}></script>$], @response.body
-      assert_match %r[src="/javascripts/foo\.js"], @response.body
-      assert_match %r[type="text/blarg"], @response.body
-      assert_match %r[gus="nice"], @response.body
-    end
-
-    should_invoke_helper(:javascript_include, 'http://example.com') do
-      assert_match %r[src="http://example.com"], @response.body
-    end
+    context "for plain old foo" do
+      setup do
+        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
+        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
+        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
-    should_invoke_helper(:anchor, 'foo', '/bar') do
-      assert_equal %Q[<a href="/bar">foo</a>], @response.body
-    end
-
-    should_invoke_helper(:anchor, 'foo bear', '/bar/ler', :title => "gus is nice") do
-      assert_match %r[^<a( \w+=".+"){2}>foo bear</a>$], @response.body
-      assert_match %r[href="/bar/ler"], @response.body
-      assert_match %r[title="gus is nice"], @response.body
-    end
+    context "for plain old foo" do
+      setup do
+        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
+        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/responders_test.rb

@@ -4,7 +4,13 @@ class RespondersTest < Test::Unit::TestCase
 
   context "json response" do
     setup do
-      get_it "/json_bait"
+      mock_app {
+        get "/json_bait" do
+          status(201)
+          json_response({:foo => "bar"})
+        end
+      }
+      get "/json_bait"
     end
 
     should_have_response_status 201

data/test/test_helper.rb

@@ -1,36 +1,19 @@
 require 'rubygems'
 
-require 'sinatra'
-require 'sinatra/test/unit'
 require 'shoulda'
 
+require 'sinatra/base'
+require 'sinatra/test'
+require 'sinatra/test/unit'
+
 require 'chicago'
 require 'chicago/shoulda'
 
-# JSON Stuff
-get "/json_bait" do
-  status(201)
-  json_response({:foo => "bar"})
+module Sinatra::Test
+  # 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
 end
-
-# CSS Stuff
-
-catch_all_css
-template :foo do
-  ".bar\n  :display none"
-end
-
-catch_all_css('/css')
-template :goo do
-  ".car\n  :display some"
-end
-
-# Getting obvious
-
-get_obvious 'baz'
-template :baz do
-  "Whatever man. That's just like, your opinion."
-end
-
-# Helpers
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thumblemonks-chicago
 version: !ruby/object:Gem::Version 
-  version: 0.1.2.3
+  version: 0.1.2.4
 platform: ruby
 authors: 
 - Justin Knowlden
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-05 00:00:00 -08:00
+date: 2009-02-01 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -66,6 +66,6 @@ specification_version: 2
 summary: Sinatra runtime and testing extensions used commonly by Thumblemonks
 test_files: 
 - test/application_test.rb
-- test/responders_test.rb
 - test/helpers_test.rb
+- test/responders_test.rb
 - test/test_helper.rb