chicago 0.3.11 → 0.3.12

data/VERSION

@@ -1 +1 @@
-0.3.11
+0.3.12

data/chicago.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chicago}
-  s.version = "0.3.11"
+  s.version = "0.3.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin 'Gus' Knowlden"]

data/lib/chicago/riot/macros.rb

@@ -29,15 +29,14 @@ module Chicago
       #   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} }
+      #   asserts_json_response { {"foo" => @some_value}.to_json }
+      #   asserts_json_response("text/javascript;charset=utf-8") { {"foo" => @some_value}.to_json }
       def asserts_json_response(*args, &block)
-        json = block_given? ? instance_eval(&block) : args.pop
-
-        json = json.to_json unless json.instance_of?(String)
-        asserts("response body has JSON") do
-          last_response.body
-        end.equals(json)
+        unless block_given?
+          json = args.pop
+          json = json.to_json unless json.instance_of?(String)
+        end
+        asserts("response body has JSON") { last_response.body }.equals(&(block || lambda {json}))
 
         asserts_content_type(args.empty? ? 'application/json' : args.shift)
       end

data/test/riot_macros_test.rb

@@ -35,8 +35,9 @@ context "Riot Macros Test:" do
     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"} }
-    end # with special 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
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 11
-  version: 0.3.11
+  - 12
+  version: 0.3.12
 platform: ruby
 authors: 
 - Justin 'Gus' Knowlden