chicago 0.3.5 → 0.3.6

data/.gitignore

@@ -0,0 +1 @@
+*.gem

data/README.markdown

@@ -5,7 +5,19 @@
 
 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.
 
-## What what?
+Chicago is a collection of runtime and test extensions and helpers that makes some common tasks 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:
+
+    sudo gem sources -a http://gemcutter.org
+
+Then, installing chicago is a quick gem install:
+
+    sudo gem install chicago
+
+## Usage
 
 ### Sinatra runtime app
 
@@ -31,9 +43,9 @@ 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 [Protest](http://github.com/thumblemonks/protest) in your tests of your Sinatra app, do this:
+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:
 
-    require 'chicago/protest'
+    require 'chicago/riot'
 
 ... and you'll get a bunch of cool Protest macros for testing specific Sinatra stuff.
 

data/Rakefile

@@ -8,15 +8,16 @@ task :default => [:test]
 task(:set_test_env) { ENV['RACK_ENV'] ||= 'test' }
 
 desc "Run all tests"
-task :test => [:set_test_env] do
-  $:.concat ['./lib', './test']
-  Dir.glob("./test/*_test.rb").each { |test| require test }
+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 << "test/shoulda_tests"
+  t.libs.concat ['./lib', './test']
   t.test_files = FileList['test/shoulda_tests/*_test.rb']
   t.verbose = true
 end
@@ -30,3 +31,23 @@ 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/chicago.gemspec

@@ -1,42 +1,75 @@
-Gem::Specification.new do |s|
-  s.name     = "chicago"
-  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]
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
 
-  s.has_rdoc = true
-  s.rdoc_options = ["--main", "README.markdown"]
-  s.extra_rdoc_files = ["README.markdown"]
+Gem::Specification.new do |s|
+  s.name = %q{chicago}
+  s.version = "0.3.6"
 
-  # run git ls-files to get an updated list
-  s.files = %w[
-    MIT-LICENSE
-    README.markdown
-    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
-    lib/chicago/shoulda.rb
-    lib/chicago/shoulda/sinatra.rb
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Justin 'Gus' Knowlden"]
+  s.date = %q{2009-11-21}
+  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",
+     "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",
+     "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"
   ]
-  
-  s.test_files = %w[
-    Rakefile
-    test/application_test.rb
-    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
+  s.homepage = %q{http://github.com/thumblemonks/chicago}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  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"
   ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    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
 end
+

data/lib/chicago/riot/macros.rb

@@ -21,12 +21,15 @@ module Chicago
         end.matches(expected_path)
       end
 
-      def asserts_json_response(json, &block)
+      def asserts_json_response(json)
         asserts_content_type 'application/json'
+
+        json = json.to_json unless json.instance_of?(String)
+        json
+
         asserts("response body has JSON") do
-          json = json.to_json unless json.instance_of?(String)
-          json
-        end.equals(situation.last_response.body)
+          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)
       end
@@ -42,4 +45,4 @@ module Chicago
   end # Riot
 end # Chicago
 
-Riot::Context.instance_eval { include Chicago::Riot::Macros }
+Riot::Context.instance_eval { include Chicago::Riot::Macros }

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

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

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

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

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

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

data/test/{protest_macros_test.rb → riot_tests/riot_macros_test.rb}

@@ -1,15 +1,15 @@
-require 'test_helper'
+require 'riot_tests/test_helper'
 
 context "Riot Macros Test:" do
   setup do
     mock_app {
       helpers Sinatra::Chicago::Responders
-      get("/redirecter") { redirect '/foo/bar' }
+      get("/redirector") { redirect '/foo/bar' }
     }
   end
 
   context "asserts redirected to" do
-    setup { get('/redirecter') }
+    setup { get('/redirector') }
     asserts_redirected_to('/foo/bar')
   end # asserts redirected to
 end

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

@@ -2,7 +2,9 @@
   require lib
 end
 
-module Rack::Test::Methods
+class Riot::Situation
+  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.
@@ -11,7 +13,6 @@ module Rack::Test::Methods
   end
 
   def extend_mock_app(&block)
-    @_rack_test_session ||= Rack::Test::Session.new(app)
     @app.instance_eval(&block)
   end
 
@@ -19,9 +20,3 @@ module Rack::Test::Methods
     @app
   end
 end
-
-class Riot::Situation
-  include Rack::Test::Methods
-end
-
-at_exit { Riot.report }

data/test/shoulda_tests/application_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'shoulda_tests/test_helper'
 
 class ApplicationTest < Test::Unit::TestCase
 

data/test/shoulda_tests/helpers_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'shoulda_tests/test_helper'
 
 class HelpersTest < Test::Unit::TestCase
   def app

data/test/shoulda_tests/responders_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'shoulda_tests/test_helper'
 
 class RespondersTest < Test::Unit::TestCase
   def app

data/test/shoulda_tests/test_helper.rb

@@ -2,7 +2,9 @@
   require lib
 end
 
-module Rack::Test::Methods
+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.
@@ -15,7 +17,3 @@ module Rack::Test::Methods
     @app.instance_eval(&block)
   end
 end
-
-class Test::Unit::TestCase
-  include Rack::Test::Methods
-end

metadata

@@ -1,23 +1,39 @@
 --- !ruby/object:Gem::Specification 
 name: chicago
 version: !ruby/object:Gem::Version 
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors: 
-- Justin Knowlden
-- Gabriel Gironda
+- Justin 'Gus' Knowlden
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-10-04 00:00:00 -05:00
+date: 2009-11-21 00:00:00 -06:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: riot
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rack-test
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 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.
-email: 
-- gus@gusg.us
-- gabriel.gironda@gmail.com
+email: gus@gusg.us
 executables: []
 
 extensions: []
@@ -25,8 +41,10 @@ extensions: []
 extra_rdoc_files: 
 - README.markdown
 files: 
+- .gitignore
 - MIT-LICENSE
 - README.markdown
+- Rakefile
 - chicago.gemspec
 - lib/chicago.rb
 - lib/chicago/application.rb
@@ -36,14 +54,22 @@ files:
 - 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
 has_rdoc: true
-homepage: http://github.com/thumblemonks/chicago/tree/master
+homepage: http://github.com/thumblemonks/chicago
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --main
-- README.markdown
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -66,13 +92,12 @@ signing_key:
 specification_version: 3
 summary: Sinatra runtime and testing extensions used commonly by Thumblemonks
 test_files: 
-- Rakefile
-- test/application_test.rb
-- test/helpers_test.rb
-- test/protest_macros_test.rb
-- test/responders_test.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/test_helper.rb