chicago 0.3.9 → 0.3.10

data/VERSION

@@ -1 +1 @@
-0.3.9
+0.3.10

data/chicago.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chicago}
-  s.version = "0.3.9"
+  s.version = "0.3.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin 'Gus' Knowlden"]
-  s.date = %q{2009-12-21}
+  s.date = %q{2010-05-10}
   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 = [
@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
   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.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",

data/lib/chicago/riot/macros.rb

@@ -25,8 +25,10 @@ module Chicago
         end.matches(expected_path)
       end
 
-      def asserts_json_response(json)
-        asserts_content_type 'application/json'
+      def asserts_json_response(*args)
+        content_type = args.length > 1 ? args.shift : 'application/json'
+        json = args.shift
+        asserts_content_type content_type
 
         json = json.to_json unless json.instance_of?(String)
         json

data/test/riot_tests/riot_macros_test.rb

@@ -5,6 +5,16 @@ context "Riot Macros Test:" 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
 
@@ -12,4 +22,14 @@ context "Riot Macros Test:" 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

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: chicago
 version: !ruby/object:Gem::Version 
-  version: 0.3.9
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 10
+  version: 0.3.10
 platform: ruby
 authors: 
 - Justin 'Gus' Knowlden
@@ -9,29 +14,33 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-21 00:00:00 -06:00
+date: 2010-05-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: riot
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rack-test
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  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.
 email: gus@gusg.us
 executables: []
@@ -77,18 +86,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Sinatra runtime and testing extensions used commonly by Thumblemonks