chicago 0.3.6 → 0.3.7

data/Rakefile

@@ -22,11 +22,6 @@ Rake::TestTask.new("test:shoulda") do |t|
   t.verbose = true
 end
 
-# task :test => [:set_test_env] do
-#   $:.concat ['./lib', './test/shoulda_tests']
-#   Dir.glob("./test/shoulda_tests/*_test.rb").each { |test| require test }
-# end
-
 desc "Open an irb session preloaded with this library"
 task :console do
   exec "irb -rubygems"

data/VERSION

@@ -0,0 +1 @@
+0.3.7

data/chicago.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chicago}
-  s.version = "0.3.6"
+  s.version = "0.3.7"
 
   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.date = %q{2009-12-14}
   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 = [
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
      "MIT-LICENSE",
      "README.markdown",
      "Rakefile",
+     "VERSION",
      "chicago.gemspec",
      "lib/chicago.rb",
      "lib/chicago/application.rb",

data/lib/chicago/riot.rb

@@ -1 +1,36 @@
-require 'chicago/riot/macros'
+require 'chicago/riot/macros'
+require 'rack/test'
+
+class Riot::Situation
+  include Rack::Test::Methods
+
+  # Allows Rack test methods to work in your Riot tests. Simply do this in your setup or test method:
+  #
+  #   context "MyApp" do
+  #     setup { @app = MyApp }
+  #
+  #     context "get /foo" do
+  #       setup { get "/foo" }
+  #       # ... tests ...
+  #     end
+  #   end
+  def app
+    @app
+  end
+
+  # Sets up a Sinatra::Base subclass defined with the block given. Used in setup or individual test methods
+  # to define an application
+  #
+  #   context "get /foo" do
+  #     setup do
+  #       mock_app {
+  #         get("/foo") { stuff; status 200; }
+  #       }
+  #       get "/foo"
+  #     end
+  #     asserts_response_status 200
+  #   end
+  def mock_app(base=Sinatra::Base, &block)
+    @app = Sinatra.new(base, &block)
+  end
+end

data/test/riot_tests/test_helper.rb

@@ -3,20 +3,7 @@
 end
 
 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.
-  def mock_app(base=Sinatra::Base, &block)
-    @app = Sinatra.new(base, &block)
-  end
-
   def extend_mock_app(&block)
     @app.instance_eval(&block)
   end
-
-  def app
-    @app
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: chicago
 version: !ruby/object:Gem::Version 
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors: 
 - Justin 'Gus' Knowlden
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-21 00:00:00 -06:00
+date: 2009-12-14 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,6 +45,7 @@ files:
 - MIT-LICENSE
 - README.markdown
 - Rakefile
+- VERSION
 - chicago.gemspec
 - lib/chicago.rb
 - lib/chicago/application.rb