thumblemonks-chicago 0.2.2 → 0.3

data/README.markdown

@@ -18,16 +18,20 @@ And you'll get some helpful Sinatra extensions and helpers.
 If you're Sinatra app is considered modular - as in, you are not using the `Sinatra::Default` app - you will want to add the following in your app:
 
     YourApp < Sinatra::Base
-      register Sinatra::ThumbleMonks::Base      # for some DSL helpers
-      helpers Sinatra::ThumbleMonks::Helpers    # for standard helpers
-      helpers Sinatra::ThumbleMonks::Responders # for JSON assistance
+      register Sinatra::Chicago            # for some DSL helpers
+      helpers Sinatra::Chicago::Helpers    # for standard helpers
+      helpers Sinatra::Chicago::Responders # for JSON assistance
     end
 
 You don't necessarily need all of them. You just need to "include" the statements that mix-in the functionality you want.
 
 ### Sinatra testing
 
-If you're using Shoulda in your tests of your Sinatra app, do this:
+Assuming you have required 'rack/test', like so:
+
+    require 'rack/test'
+
+This is because these macros use last_request defined by the Rack/Test library. If you're using Shoulda in your tests of your Sinatra app, do this:
 
     require 'chicago/shoulda'
 

data/chicago.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = "chicago"
-  s.version  = "0.2.2"
+  s.version  = "0.3"
   s.date     = "2009-05-28"
   s.summary  = "Sinatra runtime and testing extensions used commonly by Thumblemonks"
   s.email    = %w[gus@gusg.us gabriel.gironda@gmail.com]

data/lib/chicago/application.rb

@@ -1,6 +1,5 @@
 module Sinatra
-  module ThumbleMonks
-    module Base
+  module Chicago
 
       # Assumes all CSS is SASS and is referenced as being in a directory named stylesheets
       # If SASS file is not defined, the route will passed on to - theoretically - the real
@@ -23,8 +22,7 @@ module Sinatra
         end
       end
 
-    end # Base
-  end # ThumbleMonks
+  end # Chicago
 
-  register ThumbleMonks::Base
+  register Chicago
 end # Sinatra

data/lib/chicago/helpers.rb

@@ -1,5 +1,5 @@
 module Sinatra
-  module ThumbleMonks
+  module Chicago
     module Helpers
       # A basic anchor (link_to) tag
       #
@@ -71,7 +71,7 @@ module Sinatra
         options.map {|k,v| "#{k}=\"#{v}\""}.join(' ')
       end
     end # Helpers
-  end # ThumbleMonks
+  end # Chicago
 
-  helpers ThumbleMonks::Helpers
+  helpers Chicago::Helpers
 end # Sinatra

data/lib/chicago/responders.rb

@@ -1,5 +1,5 @@
 module Sinatra
-  module Thumblemonks
+  module Chicago
     module Responders
 
       # Returns a JSON response for an object
@@ -9,7 +9,7 @@ module Sinatra
       end
 
     end # Responders
-  end # Thumblemonks
+  end # Chicago
 
-  helpers Thumblemonks::Responders
+  helpers Chicago::Responders
 end # Sinatra

data/lib/chicago/shoulda/sinatra.rb

@@ -2,8 +2,8 @@ require 'json'
 require 'ostruct'
 
 module ThumbleMonks
-  module Shoulda
-    module Sinatra
+  module Chicago
+    module Shoulda
 
       def self.included(klass)
         klass.extend(Macros)
@@ -52,15 +52,15 @@ module ThumbleMonks
         end
 
         def assert_response(status)
-          assert_equal status, @response.status
+          assert_equal status, last_response.status
         end
 
         def assert_response_body(body)
-          assert_match body, @response.body
+          assert_match body, last_response.body
         end
 
         def assert_content_type(expected)
-          assert_equal expected, @response.headers['Content-type']
+          assert_equal expected, last_response.headers['Content-type']
         end
 
         # Usage:
@@ -72,12 +72,12 @@ module ThumbleMonks
           yield if block_given?
           assert_response 302
           action = expected_path.kind_of?(Regexp) ? 'match' : 'equal'
-          send("assert_#{action}", expected_path, @response.headers["Location"])
+          send("assert_#{action}", expected_path, last_response.headers["Location"])
         end
       end # Helpers
 
-    end # Sinatra
-  end # Shoulda
+    end # Shoulda
+  end # Chicago
 end # ThumbleMonks
 
-Test::Unit::TestCase.instance_eval { include ThumbleMonks::Shoulda::Sinatra }
+Test::Unit::TestCase.instance_eval { include ThumbleMonks::Chicago::Shoulda }

data/test/application_test.rb

@@ -2,15 +2,24 @@ require File.join(File.dirname(__FILE__), 'test_helper')
 
 class ApplicationTest < Test::Unit::TestCase
 
+  def 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
+
   context "catching all css" do
     context "with default path" do
       setup do
-        mock_app {
-          catch_all_css
-          template :foo do
-            ".bar\n  :display none"
-          end
-        }
         get '/stylesheets/foo.css'
       end
 
@@ -21,12 +30,6 @@ class ApplicationTest < Test::Unit::TestCase
 
     context "with specified path" do
       setup do
-        mock_app {
-          catch_all_css('/css')
-          template :goo do
-            ".car\n  :display some"
-          end
-        }
         get '/css/goo.css'
       end
 
@@ -37,8 +40,7 @@ class ApplicationTest < Test::Unit::TestCase
 
     context "with path that's not a defined a sass file" do
       setup do
-        mock_app { catch_all_css }
-        get '/stylesheets/goo.css'
+        get '/stylesheets/zoo.css'
       end
 
       should_have_response_status 404
@@ -48,12 +50,6 @@ class ApplicationTest < Test::Unit::TestCase
 
   context "getting obvious views" do
     setup do
-      mock_app {
-        get_obvious 'baz'
-        template :baz do
-          "Whatever man. That's just like, your opinion."
-        end
-      }
       get '/baz'
     end
 

data/test/helpers_test.rb

@@ -1,10 +1,16 @@
 require File.join(File.dirname(__FILE__), 'test_helper')
 
 class HelpersTest < Test::Unit::TestCase
+  def app
+    mock_app {
+      helpers Sinatra::Chicago::Helpers
+    }
+  end
+
   context "including stylesheet" do
     context "for plain old foo" do
       setup do
-        mock_app {
+        extend_mock_app {
           template(:foo) { "= stylesheet_include('foo')" }
           get('/foo') { haml :foo }
         }
@@ -20,7 +26,7 @@ class HelpersTest < Test::Unit::TestCase
 
     context "for bar with options" do
       setup do
-        mock_app {
+        extend_mock_app {
           template(:foo) { "= stylesheet_include('bar', :media => 'print', :baz => 'boo')" }
           get('/foo') { haml :foo }
         }
@@ -37,7 +43,7 @@ class HelpersTest < Test::Unit::TestCase
 
     context "with a specific href" do
       setup do
-        mock_app {
+        extend_mock_app {
           template(:foo) { "= stylesheet_include('http://example.com')" }
           get('/foo') { haml :foo }
         }
@@ -50,7 +56,7 @@ class HelpersTest < Test::Unit::TestCase
   context "including javascript" do
     context "for plain old foo" do
       setup do
-        mock_app {
+        extend_mock_app {
           template(:foo) { "= javascript_include('foo')" }
           get('/foo') { haml :foo }
         }
@@ -64,7 +70,7 @@ class HelpersTest < Test::Unit::TestCase
 
     context "for foo with options" do
       setup do
-        mock_app {
+        extend_mock_app {
           template(:foo) { "= javascript_include('foo', :type => 'text/blarg', :gus => 'nice')" }
           get('/foo') { haml :foo }
         }
@@ -79,7 +85,7 @@ class HelpersTest < Test::Unit::TestCase
 
     context "with a specific src" do
       setup do
-        mock_app {
+        extend_mock_app {
           template(:foo) { "= javascript_include('http://example.com')" }
           get('/foo') { haml :foo }
         }
@@ -92,7 +98,7 @@ class HelpersTest < Test::Unit::TestCase
   context "using an anchor" do
     context "for plain old foo" do
       setup do
-        mock_app {
+        extend_mock_app {
           template(:foo) { "= anchor('foo', '/bar')" }
           get('/foo') { haml :foo }
         }
@@ -104,7 +110,7 @@ class HelpersTest < Test::Unit::TestCase
 
     context "with options" do
       setup do
-        mock_app {
+        extend_mock_app {
           template(:foo) { "= anchor('foo bear', '/bar/ler', :title => 'gus is nice')" }
           get('/foo') { haml :foo }
         }

data/test/responders_test.rb

@@ -2,14 +2,18 @@ require File.join(File.dirname(__FILE__), 'test_helper')
 
 class RespondersTest < Test::Unit::TestCase
 
+  def app
+    mock_app {
+      helpers Sinatra::Chicago::Responders
+      get "/json_bait" do
+        status(201)
+        json_response({:foo => "bar"})
+      end
+    }
+  end
+
   context "json response" do
     setup do
-      mock_app {
-        get "/json_bait" do
-          status(201)
-          json_response({:foo => "bar"})
-        end
-      }
       get "/json_bait"
     end
 

data/test/test_helper.rb

@@ -1,25 +1,21 @@
-require 'rubygems'
-
-require 'haml'
-require 'sass'
-require 'sinatra'
-require 'test/unit'
-require 'sinatra/test'
-
-require 'shoulda'
-
-require 'chicago'
-require 'chicago/shoulda'
+%w[ rubygems haml sass chicago test/unit rack/test shoulda chicago/shoulda ].each do |lib|
+  require lib
+end
 
-module Sinatra::Test
+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::Default, &block)
+  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 Sinatra::Test
+  include Rack::Test::Methods
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thumblemonks-chicago
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: "0.3"
 platform: ruby
 authors: 
 - Justin Knowlden