riot-gear 0.0.7 → 0.0.8

data/Rakefile

@@ -40,7 +40,7 @@ begin
     gem.authors = ["Justin 'Gus' Knowlden"]
     gem.add_dependency 'riot'
     gem.add_dependency 'httparty'
-    gem.add_development_dependency 'webmock'
+    gem.add_development_dependency 'webmock', ">=1.6.1"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/lib/riot/gear/context/asserts_json.rb

@@ -4,11 +4,22 @@ module Riot
   module Gear
     module AssertsJson
 
-      def asserts_json(json_path)
-        asserts("value from body as json:#{json_path}") do
-          json_path(response, json_path)
+      # Returns the value of passing the JSON path to the json_path helper. If a handler block is provided,
+      # that block will be called with the value and the response from the block will be used as the actual
+      # in the assertion test.
+      #
+      #   asserts_json("http.status_code").equals(200)
+      #
+      #   asserts_json("http") do |value|
+      #     value["status_code"]
+      #   end.equals(200)
+      def asserts_json(json_string, &handler)
+        asserts("value from body as json:#{json_string}") do
+          value = json_path(response, json_string)
+          handler ? handler.call(value) : value
         end
       end
+
     end # AssertsJson
   end # Gear
 end # Riot

data/riot-gear.gemspec

@@ -1,59 +1,59 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{riot-gear}
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin 'Gus' Knowlden"]
-  s.date = %q{2010-07-12}
+  s.date = %q{2010-12-23}
   s.description = %q{Riot + HTTParty smoke testing framework. You'd use it for integration testing with real HTTP requests and responses}
   s.email = %q{gus@gusg.us}
   s.extra_rdoc_files = [
     "README.md"
   ]
   s.files = [
-    ".gitignore",
-     "README.md",
-     "Rakefile",
-     "VERSION",
-     "lib/riot/gear.rb",
-     "lib/riot/gear/context.rb",
-     "lib/riot/gear/context/asserts_header.rb",
-     "lib/riot/gear/context/asserts_json.rb",
-     "lib/riot/gear/context/asserts_status.rb",
-     "lib/riot/gear/context/persist_cookie.rb",
-     "lib/riot/gear/middleware.rb",
-     "lib/riot/gear/middleware/riotparty.rb",
-     "riot-gear.gemspec",
-     "test/actions/delete_test.rb",
-     "test/actions/get_test.rb",
-     "test/actions/post_test.rb",
-     "test/actions/put_test.rb",
-     "test/helpers/cookie_values_test.rb",
-     "test/helpers/json_path_test.rb",
-     "test/riotparty_proxy_methods_test.rb",
-     "test/setting_up_gear_context_test.rb",
-     "test/teststrap.rb"
+    "README.md",
+    "Rakefile",
+    "VERSION",
+    "lib/riot/gear.rb",
+    "lib/riot/gear/context.rb",
+    "lib/riot/gear/context/asserts_header.rb",
+    "lib/riot/gear/context/asserts_json.rb",
+    "lib/riot/gear/context/asserts_status.rb",
+    "lib/riot/gear/context/persist_cookie.rb",
+    "lib/riot/gear/middleware.rb",
+    "lib/riot/gear/middleware/riotparty.rb",
+    "riot-gear.gemspec",
+    "test/actions/delete_test.rb",
+    "test/actions/get_test.rb",
+    "test/actions/post_test.rb",
+    "test/actions/put_test.rb",
+    "test/assertions/asserts_json_test.rb",
+    "test/helpers/cookie_values_test.rb",
+    "test/helpers/json_path_test.rb",
+    "test/riotparty_proxy_methods_test.rb",
+    "test/setting_up_gear_context_test.rb",
+    "test/teststrap.rb"
   ]
   s.homepage = %q{http://github.com/thumblemonks/riot-gear}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Riot + HTTParty smoke testing framework}
   s.test_files = [
     "test/actions/delete_test.rb",
-     "test/actions/get_test.rb",
-     "test/actions/post_test.rb",
-     "test/actions/put_test.rb",
-     "test/helpers/cookie_values_test.rb",
-     "test/helpers/json_path_test.rb",
-     "test/riotparty_proxy_methods_test.rb",
-     "test/setting_up_gear_context_test.rb",
-     "test/teststrap.rb"
+    "test/actions/get_test.rb",
+    "test/actions/post_test.rb",
+    "test/actions/put_test.rb",
+    "test/assertions/asserts_json_test.rb",
+    "test/helpers/cookie_values_test.rb",
+    "test/helpers/json_path_test.rb",
+    "test/riotparty_proxy_methods_test.rb",
+    "test/setting_up_gear_context_test.rb",
+    "test/teststrap.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -63,16 +63,16 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<riot>, [">= 0"])
       s.add_runtime_dependency(%q<httparty>, [">= 0"])
-      s.add_development_dependency(%q<webmock>, [">= 0"])
+      s.add_development_dependency(%q<webmock>, [">= 1.6.1"])
     else
       s.add_dependency(%q<riot>, [">= 0"])
       s.add_dependency(%q<httparty>, [">= 0"])
-      s.add_dependency(%q<webmock>, [">= 0"])
+      s.add_dependency(%q<webmock>, [">= 1.6.1"])
     end
   else
     s.add_dependency(%q<riot>, [">= 0"])
     s.add_dependency(%q<httparty>, [">= 0"])
-    s.add_dependency(%q<webmock>, [">= 0"])
+    s.add_dependency(%q<webmock>, [">= 1.6.1"])
   end
 end
 

data/test/actions/delete_test.rb

@@ -1,7 +1,7 @@
 require 'teststrap'
 
 context "Sending a DELETE request" do
-  teardown { reset_webmock }
+  # teardown { reset_webmock }
 
   asserts("not defining a base_uri") do
     Riot::Context.new("foo") { delete "/foo" }.run(Riot::SilentReporter.new)

data/test/actions/get_test.rb

@@ -1,7 +1,7 @@
 require 'teststrap'
 
 context "Sending a GET request" do
-  teardown { reset_webmock }
+  # teardown { reset_webmock }
 
   asserts("not defining a base_uri") do
     Riot::Context.new("foo") { get "/foo" }.run(Riot::SilentReporter.new)

data/test/actions/post_test.rb

@@ -1,7 +1,7 @@
 require 'teststrap'
 
 context "Sending a POST request" do
-  teardown { reset_webmock }
+  # teardown { reset_webmock }
 
   asserts("not defining a base_uri") do
     Riot::Context.new("foo") { post "/foo" }.run(Riot::SilentReporter.new)

data/test/actions/put_test.rb

@@ -1,7 +1,7 @@
 require 'teststrap'
 
 context "Sending a PUT request" do
-  teardown { reset_webmock }
+  # teardown { reset_webmock }
 
   asserts("not defining a base_uri") do
     Riot::Context.new("foo") { put "/foo" }.run(Riot::SilentReporter.new)

data/test/assertions/asserts_json_test.rb

@@ -0,0 +1,18 @@
+require 'teststrap'
+
+context "The asserts_json macro" do
+  
+  helper(:response) do
+    {
+      "a" => {"b" => "foo"},
+      "c" => [["foo", 1], ["bar", 2]]
+    }
+  end
+
+  asserts_json("a.b").equals("foo")
+
+  asserts_json("c") do |value|
+    value.map { |string, number| number }
+  end.equals([1,2])
+  
+end # The asserts_json macro

data/test/helpers/json_path_test.rb

@@ -56,4 +56,15 @@ context "The json_path helper" do
       json_path({"a" => [ {"b" => "nil"}, {"c" => ["foo", "bar"]} ]}, '[a][1].c[0]')
     end.equals("foo")
   end # for mix of hash and index based-lookups
+
+  context "when response is an array" do
+    asserts("path of existing '[1]'") do
+      json_path(["foo", "bar"], '[1]')
+    end.equals("bar")
+
+    asserts("path of existing '[1].zoot[a]'") do
+      json_path(["foo", {"zoot" => {"a" => "bar"}}], '[1].zoot[a]')
+    end.equals("bar")
+  end # when response is an array
+
 end # The json_path helper

data/test/teststrap.rb

@@ -6,7 +6,8 @@ require 'rubygems'
 require 'json'
 require 'riot'
 require 'webmock'
-Riot::Situation.instance_eval { include WebMock }
+
+Riot::Situation.instance_eval { include WebMock::API }
 
 require 'riot/gear'
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: riot-gear
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Justin 'Gus' Knowlden
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-12 00:00:00 -05:00
+date: 2010-12-23 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,10 +54,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 13
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 6
+        - 1
+        version: 1.6.1
   type: :development
   version_requirements: *id003
 description: Riot + HTTParty smoke testing framework. You'd use it for integration testing with real HTTP requests and responses
@@ -69,7 +71,6 @@ extensions: []
 extra_rdoc_files: 
 - README.md
 files: 
-- .gitignore
 - README.md
 - Rakefile
 - VERSION
@@ -86,6 +87,7 @@ files:
 - test/actions/get_test.rb
 - test/actions/post_test.rb
 - test/actions/put_test.rb
+- test/assertions/asserts_json_test.rb
 - test/helpers/cookie_values_test.rb
 - test/helpers/json_path_test.rb
 - test/riotparty_proxy_methods_test.rb
@@ -96,8 +98,8 @@ homepage: http://github.com/thumblemonks/riot-gear
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -130,6 +132,7 @@ test_files:
 - test/actions/get_test.rb
 - test/actions/post_test.rb
 - test/actions/put_test.rb
+- test/assertions/asserts_json_test.rb
 - test/helpers/cookie_values_test.rb
 - test/helpers/json_path_test.rb
 - test/riotparty_proxy_methods_test.rb

data/.gitignore

@@ -1,5 +0,0 @@
-.DS_Store
-.bundle/*
-*.tmproj
-pkg/*
-.rvmrc