chicago 0.3.10 → 0.3.11

data/Rakefile

@@ -10,15 +10,7 @@ task(:set_test_env) { ENV['RACK_ENV'] ||= 'test' }
 desc "Run all tests"
 Rake::TestTask.new("test") do |t|
   t.libs.concat ['./lib', './test']
-  t.test_files = FileList['test/riot_tests/*_test.rb']
-  t.verbose = true
-end
-
-task "test:shoulda" => [:set_test_env]
-desc "Run all Shoulda based tests"
-Rake::TestTask.new("test:shoulda") do |t|
-  t.libs.concat ['./lib', './test']
-  t.test_files = FileList['test/shoulda_tests/*_test.rb']
+  t.test_files = FileList['test/*_test.rb']
   t.verbose = true
 end
 

data/VERSION

@@ -1 +1 @@
-0.3.10
+0.3.11

data/chicago.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chicago}
-  s.version = "0.3.10"
+  s.version = "0.3.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin 'Gus' Knowlden"]
-  s.date = %q{2010-05-10}
+  s.date = %q{2010-05-12}
   s.description = %q{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.email = %q{gus@gusg.us}
   s.extra_rdoc_files = [
@@ -28,17 +28,11 @@ Gem::Specification.new do |s|
      "lib/chicago/responders.rb",
      "lib/chicago/riot.rb",
      "lib/chicago/riot/macros.rb",
-     "lib/chicago/shoulda.rb",
-     "lib/chicago/shoulda/sinatra.rb",
-     "test/riot_tests/application_test.rb",
-     "test/riot_tests/helpers_test.rb",
-     "test/riot_tests/responders_test.rb",
-     "test/riot_tests/riot_macros_test.rb",
-     "test/riot_tests/test_helper.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/application_test.rb",
+     "test/helpers_test.rb",
+     "test/responders_test.rb",
+     "test/riot_macros_test.rb",
+     "test/teststrap.rb"
   ]
   s.homepage = %q{http://github.com/thumblemonks/chicago}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -46,15 +40,11 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{Sinatra runtime and testing extensions used commonly by Thumblemonks}
   s.test_files = [
-    "test/riot_tests/application_test.rb",
-     "test/riot_tests/helpers_test.rb",
-     "test/riot_tests/responders_test.rb",
-     "test/riot_tests/riot_macros_test.rb",
-     "test/riot_tests/test_helper.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/application_test.rb",
+     "test/helpers_test.rb",
+     "test/responders_test.rb",
+     "test/riot_macros_test.rb",
+     "test/teststrap.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/chicago/riot/macros.rb

@@ -25,19 +25,21 @@ module Chicago
         end.matches(expected_path)
       end
 
-      def asserts_json_response(*args)
-        content_type = args.length > 1 ? args.shift : 'application/json'
-        json = args.shift
-        asserts_content_type content_type
+      # Usage:
+      #   asserts_json_response({"foo" => "bar"})
+      #   asserts_json_response('{"foo":"bar"}')
+      #   asserts_json_response("text/javascript;charset=utf-8", {"foo" => "bar"})
+      #   asserts_json_response { {"foo" => @some_value} }
+      #   asserts_json_response("text/javascript;charset=utf-8") { {"foo" => @some_value} }
+      def asserts_json_response(*args, &block)
+        json = block_given? ? instance_eval(&block) : args.pop
 
         json = json.to_json unless json.instance_of?(String)
-        json
-
         asserts("response body has JSON") do
           last_response.body
         end.equals(json)
-        # Calling situation is kind of yucky, but maybe not. The maybe not is because of how explicit it is
-        # to say "situation" (gus)
+
+        asserts_content_type(args.empty? ? 'application/json' : args.shift)
       end
 
       # Usage:

data/test/{riot_tests/application_test.rb → application_test.rb}

@@ -1,4 +1,4 @@
-require 'riot_tests/test_helper'
+require 'teststrap'
 
 context "Application Test:" do
 

data/test/{riot_tests/helpers_test.rb → helpers_test.rb}

@@ -1,4 +1,4 @@
-require 'riot_tests/test_helper'
+require 'teststrap'
 
 context "Helpers Test:" do
   setup do

data/test/{riot_tests/responders_test.rb → responders_test.rb}

@@ -1,4 +1,4 @@
-require 'riot_tests/test_helper'
+require 'teststrap'
 
 context "Responders Test:" do
   setup do

data/test/riot_macros_test.rb

@@ -0,0 +1,42 @@
+require 'teststrap'
+
+context "Riot Macros Test:" do
+  setup do
+    mock_app {
+      helpers Sinatra::Chicago::Responders
+      get("/redirector") { redirect '/foo/bar' }
+
+      get("/basic-json") do
+        content_type 'application/json'
+        {:foo => "bar"}.to_json
+      end
+
+      get("/json-with-content-type") do
+        content_type 'text/javascript', :charset => "utf-8"
+        {:foo => "bar"}.to_json
+      end
+    }
+  end
+
+  context "asserts redirected to" do
+    setup { get('/redirector') }
+    asserts_redirected_to('/foo/bar')
+  end # asserts redirected to
+
+  context "json response" do
+    context "basic" do
+      setup { get('/basic-json') }
+      asserts_json_response({:foo => "bar"})
+    end # basic
+
+    context "with special content-type" do
+      setup { get('/json-with-content-type') }
+      asserts_json_response("text/javascript;charset=utf-8", {:foo => "bar"})
+    end # with special content-type
+
+    context "with content expectation provided as block" do
+      setup { get('/json-with-content-type') }
+      asserts_json_response("text/javascript;charset=utf-8") { {:foo => "bar"} }
+    end # with special content-type
+  end # json response
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 10
-  version: 0.3.10
+  - 11
+  version: 0.3.11
 platform: ruby
 authors: 
 - Justin 'Gus' Knowlden
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-10 00:00:00 -05:00
+date: 2010-05-12 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,17 +62,11 @@ files:
 - lib/chicago/responders.rb
 - lib/chicago/riot.rb
 - lib/chicago/riot/macros.rb
-- lib/chicago/shoulda.rb
-- lib/chicago/shoulda/sinatra.rb
-- test/riot_tests/application_test.rb
-- test/riot_tests/helpers_test.rb
-- test/riot_tests/responders_test.rb
-- test/riot_tests/riot_macros_test.rb
-- test/riot_tests/test_helper.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/application_test.rb
+- test/helpers_test.rb
+- test/responders_test.rb
+- test/riot_macros_test.rb
+- test/teststrap.rb
 has_rdoc: true
 homepage: http://github.com/thumblemonks/chicago
 licenses: []
@@ -104,12 +98,8 @@ signing_key:
 specification_version: 3
 summary: Sinatra runtime and testing extensions used commonly by Thumblemonks
 test_files: 
-- test/riot_tests/application_test.rb
-- test/riot_tests/helpers_test.rb
-- test/riot_tests/responders_test.rb
-- test/riot_tests/riot_macros_test.rb
-- test/riot_tests/test_helper.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/application_test.rb
+- test/helpers_test.rb
+- test/responders_test.rb
+- test/riot_macros_test.rb
+- test/teststrap.rb

data/lib/chicago/shoulda.rb

@@ -1 +0,0 @@
-require 'chicago/shoulda/sinatra'

data/lib/chicago/shoulda/sinatra.rb

@@ -1,83 +0,0 @@
-require 'json'
-require 'ostruct'
-
-module ThumbleMonks
-  module Chicago
-    module Shoulda
-
-      def self.included(klass)
-        klass.extend(Macros)
-        klass.send(:include, Helpers)
-      end
-
-      module Macros
-        def should_have_response_status(expected)
-          should("have response status") { assert_response expected }
-        end
-      
-        def should_have_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)
-          should("have content_type") { assert_content_type expected }
-        end
-
-        def should_have_json_response(json={}, &block)
-          should_have_content_type 'application/json'
-          should "have JSON response in the body" do
-            json = self.instance_eval(&block) if block_given?
-            json = json.to_json unless json.instance_of?(String) || json.instance_of?(Regexp)
-            assert_response_body json
-          end
-        end
-
-        # Checks to see if there is a redirect in play and the path the redirect goes to
-        #
-        # Example:
-        #   should_be_redirected_to { "/users/@user.id" }
-        #   should_be_redirected_to "/home"
-        def should_be_redirected_to(expected_path=nil, &block)
-          should "be redirected to #{expected_path || 'a url'}" do
-            expected_path = self.instance_eval(&block) if block_given?
-            assert_redirected_to expected_path
-          end
-        end
-      end # Macros
-
-      module Helpers
-        def deny(check, message=nil)
-          assert(!check, message)
-        end
-
-        def assert_response(status)
-          assert_equal status, last_response.status
-        end
-
-        def assert_response_body(body)
-          assert_match body, last_response.body
-        end
-
-        def assert_content_type(expected)
-          assert_equal expected, last_response.headers['Content-type']
-        end
-
-        # Usage:
-        #
-        # assert_redirected_to '/foo/bar'
-        #   or
-        # assert_redirected_to %r[foo.bar]
-        def assert_redirected_to(expected_path)
-          yield if block_given?
-          assert_response 302
-          action = expected_path.kind_of?(Regexp) ? 'match' : 'equal'
-          send("assert_#{action}", expected_path, last_response.headers["Location"])
-        end
-      end # Helpers
-
-    end # Shoulda
-  end # Chicago
-end # ThumbleMonks
-
-Test::Unit::TestCase.instance_eval { include ThumbleMonks::Chicago::Shoulda }

data/test/riot_tests/riot_macros_test.rb

@@ -1,35 +0,0 @@
-require 'riot_tests/test_helper'
-
-context "Riot Macros Test:" do
-  setup do
-    mock_app {
-      helpers Sinatra::Chicago::Responders
-      get("/redirector") { redirect '/foo/bar' }
-
-      get("/basic-json") do
-        content_type 'application/json'
-        {:foo => "bar"}.to_json
-      end
-
-      get("/json-with-content-type") do
-        content_type 'text/javascript', :charset => "utf-8"
-        {:foo => "bar"}.to_json
-      end
-    }
-  end
-
-  context "asserts redirected to" do
-    setup { get('/redirector') }
-    asserts_redirected_to('/foo/bar')
-  end # asserts redirected to
-
-  context "basic json response" do
-    setup { get('/basic-json') }
-    asserts_json_response({:foo => "bar"})
-  end # asserts redirected to
-
-  context "json response with special content-type" do
-    setup { get('/json-with-content-type') }
-    asserts_json_response("text/javascript;charset=utf-8", {:foo => "bar"})
-  end # asserts redirected to
-end

data/test/shoulda_tests/application_test.rb

@@ -1,48 +0,0 @@
-require 'shoulda_tests/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

@@ -1,125 +0,0 @@
-require 'shoulda_tests/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

@@ -1,28 +0,0 @@
-require 'shoulda_tests/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

@@ -1,19 +0,0 @@
-%w[ rubygems test/unit shoulda haml sass chicago rack/test chicago/shoulda ].each do |lib|
-  require lib
-end
-
-class Test::Unit::TestCase
-  include 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