chicago 0.3.13 → 0.4.0

data/.gitignore

@@ -1,2 +1,4 @@
 *.gem
 *.tmproj
+.rvmrc
+

data/Gemfile

@@ -0,0 +1,4 @@
+source :rubygems
+
+gemspec
+

data/Gemfile.lock

@@ -0,0 +1,22 @@
+PATH
+  remote: .
+  specs:
+    chicago (0.3.13)
+      rack-test
+      riot
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    rack (1.4.1)
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    riot (0.12.5)
+      rr
+    rr (1.0.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  chicago!

data/README.markdown

@@ -5,52 +5,29 @@
 
 Yeah, we're real clever. We're also from ["The city in mid-west best city in the whole wide wide world"](http://www.azlyrics.com/lyrics/lupefiasco/gogogadgetflow.html) ... which makes us double the clever.
 
-Chicago is a collection of runtime and test extensions and helpers that makes some common tasks a little bit easier.
+Chicago is a collection of test extensions and helpers that makes some common tasks in Sinatra a little bit easier.
 
 ## Installation
 
-First, make sure GemCutter is added to your list of sources. If not, install it like so or just follow the instructions for installing the gemcutter gem:
+Installing chicago is a quick gem install:
 
-    sudo gem sources -a http://gemcutter.org
-
-Then, installing chicago is a quick gem install:
-
-    sudo gem install chicago
+    gem install chicago
 
 ## Usage
 
-### Sinatra runtime app
-
-In your Sinatra app, do this:
-
-    require 'chicago'
-
-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::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
 
-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 [Riot](http://github.com/thumblemonks/riot) in your tests of your Sinatra app, do this:
+If you're using [Riot](http://github.com/thumblemonks/riot) in your tests of your Sinatra app, do this:
 
     require 'chicago/riot'
 
-... and you'll get a bunch of cool Protest macros for testing specific Sinatra stuff.
-
-If you're using Shoulda in your tests of your Sinatra app, do this:
+... and you'll get a bunch of cool Riot macros for testing specific Sinatra stuff:
 
-    require 'chicago/shoulda'
+* asserts_response
+* asserts_response_status
+* asserts_content_type
+* asserts_response_body
+* asserts_location
+* asserts_json_response
+* asserts_redirected_to
 
-... and you'll get a bunch of cool Shoulda macros for testing specific Sinatra stuff.

data/chicago.gemspec

@@ -1,66 +1,21 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
+require "./lib/chicago/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{chicago}
-  s.version = "0.3.13"
+  s.name          = %q{chicago}
+  s.version       = Chicago::VERSION
+  s.platform      = Gem::Platform::RUBY
 
-  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-17}
-  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 = [
-    "README.markdown"
-  ]
-  s.files = [
-    ".gitignore",
-     "MIT-LICENSE",
-     "README.markdown",
-     "Rakefile",
-     "VERSION",
-     "chicago.gemspec",
-     "lib/chicago.rb",
-     "lib/chicago/application.rb",
-     "lib/chicago/helpers.rb",
-     "lib/chicago/responders.rb",
-     "lib/chicago/riot.rb",
-     "lib/chicago/riot/macros.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"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Sinatra runtime and testing extensions used commonly by Thumblemonks}
-  s.test_files = [
-    "test/application_test.rb",
-     "test/helpers_test.rb",
-     "test/responders_test.rb",
-     "test/riot_macros_test.rb",
-     "test/teststrap.rb"
-  ]
+  s.authors       = ["Justin 'Gus' Knowlden"]
+  s.summary       = %q{Sinatra testing extensions used commonly by Thumblemonks}
+  s.description   = %q{Sinatra testing extensions used commonly by Thumblemonks.}
+  s.email         = %q{gus@gusg.us}
+  s.homepage      = %q{http://github.com/thumblemonks/chicago}
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test}/*`.split("\n")
+  s.require_paths = ["lib"]
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<riot>, [">= 0"])
-      s.add_development_dependency(%q<rack-test>, [">= 0"])
-    else
-      s.add_dependency(%q<riot>, [">= 0"])
-      s.add_dependency(%q<rack-test>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<riot>, [">= 0"])
-    s.add_dependency(%q<rack-test>, [">= 0"])
-  end
+  s.add_dependency(%q<riot>, [">= 0"])
+  s.add_dependency(%q<rack-test>, [">= 0"])
 end
 

data/lib/chicago/riot/macros.rb

@@ -46,7 +46,7 @@ module Chicago
         end
         asserts("response body has JSON") { last_response.body }.equals(&(block || lambda {json}))
 
-        asserts_content_type(args.empty? ? 'application/json' : args.shift)
+        asserts_content_type(args.empty? ? 'application/json;charset=utf-8' : args.shift)
       end
 
       # Usage:

data/lib/chicago/version.rb

@@ -0,0 +1,4 @@
+module Chicago
+  VERSION = "0.4.0"
+end
+

metadata

@@ -1,105 +1,85 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: chicago
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 13
-  version: 0.3.13
+version: !ruby/object:Gem::Version
+  version: 0.4.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Justin 'Gus' Knowlden
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-05-17 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-09-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: riot
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id002
-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.
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Sinatra testing extensions used commonly by Thumblemonks.
 email: gus@gusg.us
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- README.markdown
-files: 
+extra_rdoc_files: []
+files:
 - .gitignore
+- Gemfile
+- Gemfile.lock
 - MIT-LICENSE
 - README.markdown
-- Rakefile
-- VERSION
 - chicago.gemspec
-- lib/chicago.rb
-- lib/chicago/application.rb
-- lib/chicago/helpers.rb
-- lib/chicago/responders.rb
 - lib/chicago/riot.rb
 - lib/chicago/riot/macros.rb
-- test/application_test.rb
-- test/helpers_test.rb
-- test/responders_test.rb
-- test/riot_macros_test.rb
-- test/teststrap.rb
-has_rdoc: true
+- lib/chicago/version.rb
 homepage: http://github.com/thumblemonks/chicago
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Sinatra runtime and testing extensions used commonly by Thumblemonks
-test_files: 
-- test/application_test.rb
-- test/helpers_test.rb
-- test/responders_test.rb
-- test/riot_macros_test.rb
-- test/teststrap.rb
+summary: Sinatra testing extensions used commonly by Thumblemonks
+test_files: []

data/Rakefile

@@ -1,40 +0,0 @@
-require 'rubygems'
-require 'rake'
-require 'rake/testtask'
-
-desc 'Default task: run all tests'
-task :default => [:test]
-
-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/*_test.rb']
-  t.verbose = true
-end
-
-desc "Open an irb session preloaded with this library"
-task :console do
-  exec "irb -rubygems"
-end
-
-#
-# Some monks like diamonds. I like gems.
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "chicago"
-    gem.summary = "Sinatra runtime and testing extensions used commonly by Thumblemonks"
-    gem.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."
-    gem.email = "gus@gusg.us"
-    gem.homepage = "http://github.com/thumblemonks/chicago"
-    gem.authors = ["Justin 'Gus' Knowlden"]
-    gem.add_development_dependency "riot"
-    gem.add_development_dependency "rack-test"
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end

data/VERSION

@@ -1 +0,0 @@
-0.3.13

data/lib/chicago.rb

@@ -1,4 +0,0 @@
-require 'sinatra/base'
-require 'chicago/application'
-require 'chicago/responders'
-require 'chicago/helpers'

data/lib/chicago/application.rb

@@ -1,28 +0,0 @@
-module Sinatra
-  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
-      # CSS in the public directory.
-      def catch_all_css(path='/stylesheets')
-        get("#{path}/*.css") do
-          begin
-            content_type 'text/css'
-            sass params["splat"].first.to_sym
-          rescue Errno::ENOENT
-            pass
-          end
-        end
-      end
-
-      # When you don't want anything special, but to load a named view as HAML.
-      def get_obvious(name)
-        get "/#{name}" do
-          haml name.to_sym
-        end
-      end
-
-  end # Chicago
-
-  register Chicago
-end # Sinatra

data/lib/chicago/helpers.rb

@@ -1,77 +0,0 @@
-module Sinatra
-  module Chicago
-    module Helpers
-      # A basic anchor (link_to) tag
-      #
-      # Exmaples:
-      #
-      #   anchor('GusGus', 'http://gusg.us')
-      #   => <a href="http://gusg.us">GusG.us</a>
-      #
-      #   anchor('GusGus', 'http://gusg.us', :title => 'You know who!')
-      #   => <a href="http://gusg.us" title="You know who!">GusG.us</a>
-      def anchor(name, url, options={})
-        defaults = {:href => url}
-        options_str = hash_to_attributes(defaults.merge(options))
-        %Q[<a #{options_str}>#{name}</a>]
-      end
-
-      # A helper to include stylesheet links. Currently defaults everything to
-      # load from a /stylesheets directory.
-      #
-      # Exmaples:
-      #
-      #   stylesheet_include('foo')
-      #   => <link href="/stylsheets/foo.css" media="screen" rel="stylesheet" type="text/css" />
-      #
-      #   stylesheet_include('foo/bar')
-      #   => <link href="/stylsheets/foo/bar.css" media="screen" rel="stylesheet" type="text/css" />
-      #
-      #   stylesheet_include('foo', :media => "print")
-      #   => <link href="/stylsheets/foo.css" media="print" rel="stylesheet" type="text/css" />
-      #
-      #   stylesheet_include('http://example.com/foo.css')
-      #   => <link href="http://example.com/foo.css" media="print" rel="stylesheet" type="text/css" />
-      def stylesheet_include(name, options={})
-        name = "/stylesheets/#{name}.css" unless remote_asset?(name)
-        defaults = {:href => name, :media => "screen",
-          :rel => "stylesheet", :type => "text/css"}
-        options_str = hash_to_attributes(defaults.merge(options))
-        %Q[<link #{options_str}/>]
-      end
-
-      # A helper to include javascript source tags. Currently defaults everything
-      # to load from a /javascripts directory.
-      #
-      # Exmaples:
-      #
-      #   javascript_include('foo')
-      #   => <javascript src="/javascripts/foo.js" type="text/javascript"></script>
-      #
-      #   javascript_include('foo/bar')
-      #   => <javascript src="/javascripts/foo/bar.js" type="text/javascript"></script>
-      #
-      #   javascript_include('foo', :something => "great")
-      #   => <javascript src="/javascripts/foo.js" type="text/javascript" something="great"></script>
-      #
-      #   javascript_include('http://example.com/foo.js')
-      #   => <javascript src="http://example.com/foo.js" type="text/javascript"></script>
-      def javascript_include(name, options={})
-        name = "/javascripts/#{name}.js" unless remote_asset?(name)
-        defaults = {:src => name, :type => "text/javascript"}
-        options_str = hash_to_attributes(defaults.merge(options))
-        %Q[<script #{options_str}></script>]
-      end
-    private
-      def remote_asset?(uri)
-        uri =~ %r[^\w+://.+]
-      end
-
-      def hash_to_attributes(options)
-        options.map {|k,v| "#{k}=\"#{v}\""}.join(' ')
-      end
-    end # Helpers
-  end # Chicago
-
-  helpers Chicago::Helpers
-end # Sinatra

data/lib/chicago/responders.rb

@@ -1,15 +0,0 @@
-module Sinatra
-  module Chicago
-    module Responders
-
-      # Returns a JSON response for an object. Will return an empty string if the provided object is nil.
-      def json_response(object)
-        content_type 'application/json'
-        object ? object.to_json : ""
-      end
-
-    end # Responders
-  end # Chicago
-
-  helpers Chicago::Responders
-end # Sinatra

data/test/application_test.rb

@@ -1,48 +0,0 @@
-require 'teststrap'
-
-context "Application Test:" do
-
-  setup do
-    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' }
-      asserts_response_status 200
-      asserts_content_type 'text/css'
-      asserts_response_body %r[.bar \{\s+display: none; \}\s]
-    end
-
-    context "with specified path" do
-      setup { get '/css/goo.css' }
-      asserts_response_status 200
-      asserts_content_type 'text/css'
-      asserts_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' }
-      asserts_response_status 404
-      asserts_content_type 'text/css'
-    end
-  end # catching all css
-
-  context "getting obvious views" do
-    setup { get '/baz' }
-    asserts_response_body "Whatever man. That's just like, your opinion.\n"
-  end # getting obvious views
-
-end

data/test/helpers_test.rb

@@ -1,125 +0,0 @@
-require 'teststrap'
-
-context "Helpers Test:" do
-  setup do
-    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
-
-      asserts_response_body %r[^<link( \w+=".+"){4}/>$]
-      asserts_response_body %r[href="/stylesheets/foo\.css"]
-      asserts_response_body %r[media="screen"]
-      asserts_response_body %r[rel="stylesheet"]
-      asserts_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
-
-      asserts_response_body %r[^<link( \w+=".+"){5}/>$]
-      asserts_response_body %r[href="/stylesheets/bar\.css"]
-      asserts_response_body %r[media="print"]
-      asserts_response_body %r[rel="stylesheet"]
-      asserts_response_body %r[type="text/css"]
-      asserts_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
-      asserts_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
-
-      asserts_response_body %r[^<script( \w+=".+"){2}></script>$]
-      asserts_response_body %r[src="/javascripts/foo\.js"]
-      asserts_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
-
-      asserts_response_body %r[^<script( \w+=".+"){3}></script>$]
-      asserts_response_body %r[src="/javascripts/foo\.js"]
-      asserts_response_body %r[type="text/blarg"]
-      asserts_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
-      asserts_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
-
-      asserts_response_body %Q[<a href="/bar">foo</a>\n]
-    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
-
-      asserts_response_body %r[^<a( \w+=".+"){2}>foo bear</a>$]
-      asserts_response_body %r[href="/bar/ler"]
-      asserts_response_body %r[title="gus is nice"]
-    end # with options
-  end # using an anchor
-end

data/test/responders_test.rb

@@ -1,19 +0,0 @@
-require 'teststrap'
-
-context "Responders Test:" do
-  setup do
-    mock_app {
-      helpers Sinatra::Chicago::Responders
-      get "/json_bait" do
-        status(201)
-        json_response({:foo => "bar"})
-      end
-    }
-  end
-
-  context "json response" do
-    setup { get "/json_bait" }
-    asserts_response_status 201
-    asserts_json_response({:foo => :bar})
-  end # json response
-end

data/test/riot_macros_test.rb

@@ -1,52 +0,0 @@
-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
-      helper(:bar_value) { "bar" }
-      setup { get('/json-with-content-type') }
-      asserts_json_response("text/javascript;charset=utf-8") { {:foo => bar_value}.to_json }
-    end # with content expectation provided as block
-  end # json response
-
-  context "response body" do
-    context "with a block for the expected value" do
-      setup { get('/basic-json') }
-      asserts_response(:body).equals do
-        {:foo => "bar"}.to_json
-      end
-    end # with a block for the expected value
-  end # response body
-end

data/test/teststrap.rb

@@ -1,9 +0,0 @@
-%w[ rubygems haml sass chicago chicago/riot ].each do |lib|
-  require lib
-end
-
-class Riot::Situation
-  def extend_mock_app(&block)
-    @app.instance_eval(&block)
-  end
-end