apirunner 0.3.9 → 0.3.10

data/VERSION

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

data/apirunner.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{apirunner}
-  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 = ["jan@moviepilot.com"]
-  s.date = %q{2010-10-13}
+  s.date = %q{2010-10-14}
   s.description = %q{apirunner is a testsuite to query your RESTful JSON API and match response with your defined expectations}
   s.email = %q{developers@moviepilot.com}
   s.extra_rdoc_files = [
@@ -62,6 +62,7 @@ Gem::Specification.new do |s|
     "spec/checker_spec.rb",
     "spec/expectation_matcher_spec.rb",
     "spec/http_client_spec.rb",
+    "spec/response_body_checker_spec.rb",
     "spec/result_spec.rb",
     "spec/spec_helper.rb"
   ]
@@ -75,6 +76,7 @@ Gem::Specification.new do |s|
     "spec/checker_spec.rb",
     "spec/expectation_matcher_spec.rb",
     "spec/http_client_spec.rb",
+    "spec/response_body_checker_spec.rb",
     "spec/result_spec.rb",
     "spec/spec_helper.rb"
   ]

data/lib/api_runner.rb

@@ -37,6 +37,7 @@ class ApiRunner
       puts("Server #{@configuration.host} seems to be unavailable!")
     end
     error_count = @results.select{ |r| !r.succeeded }.count
+    puts "\n\nResults: I greatfully ran #{ @spec.size } test(s), \033[32m#{ @spec.size - error_count }\033[0m succeeded, \033[31m#{ error_count }\033[0m failed."
     exit(error_count)
   end
 

data/lib/http_client.rb

@@ -42,7 +42,7 @@ class HttpClient
   def put(headers, resource, data, params)
     request = Net::HTTP::Put.new(resource_path(resource), initheader = headers)
     request.body = data.to_json
-    return Benchmark.realtime { @response = @http.request(request) }, @response
+    return Benchmark.realtime{ @response = @http.request(request) }, @response
   end
 
   # sends POST request and returns response
@@ -69,7 +69,7 @@ class HttpClient
     uri.scheme = @protocol
     uri.host = @host
     uri.port = @port
-    uri.query = "".concat(params.collect { |k,v| "#{k}=#{CGI::escape(v.to_s)}" }.reverse.join('&')) if not params.nil?
+    uri.query = params.collect{ |k,v| "#{k}=#{CGI::escape(v.to_s)}" }.reverse.join('&') if not params.nil?
     uri.path = resource_path(resource)
     uri
   end

data/lib/plugins/plug04_response_body_checker.rb

@@ -86,6 +86,6 @@ class ResponseBodyChecker < Checker
   # returns relative path for matching the target tree of the response body
   # explicit array adressing is replaced by *
   def relative_path(path)
-    path.gsub(/\/([^\/]+)\[\d+\]\//i,"/*/")
+    path.gsub(/\/([^\/]+)\[\d+\]/i,"/*")
   end
 end

data/spec/checker_spec.rb

@@ -9,27 +9,17 @@ describe "Checker" do
       Checker.available_plugins.size.should_not == 0
     end
   end
-  describe "relative_path" do
-    it 'should substitute an absolute addressing in a given path' do
-      pending "Move me"
-      path = "/bla/foo/values[6]/duffy/duck"
-      Checker.new({},{}).send(:relative_path, path).should eql "/bla/foo/*/duffy/duck"
-    end
-    it 'should substitute more than one absolute adressing in a given path' do
-      pending "Move me"
-      path = "/bla/foo/values[6]/duffy/friends[1]/duck"
-      Checker.new({},{}).send(:relative_path, path).should eql "/bla/foo/*/duffy/*/duck"
+  describe "excluded?" do
+    it "should return true if a given item is not part of the instances exludes" do
+      c = Checker.new({}, {}, ["exclude_1", "exclude_2"])
+      c.send(:excluded?, "exclude_1").should be_true
+      c.send(:excluded?, "exclude_2").should be_true
     end
-    it 'should return a string' do
-      pending "Move me"
-      path = "/bla/foo/values[6]/duffy/friends[1]/duck"
-      Checker.new({},{}).send(:relative_path, path).should be_a(String)
+    it "should return false if a given item is part of the instances excludes" do
+      c = Checker.new({}, {}, ["exclude_1", "exclude_2"])
+      c.send(:excluded?, "no_exclude").should be_false
     end
   end
-  describe "excluded?" do
-    it "should return true if a given item is not part of the instances exludes"
-    it "should return false if a given item is part of the instances excludes"
-  end
   describe "is_regex?" do
     it 'should return true if the given string seems to be a regular expression' do
       string = "/^\d{3}$/"

data/spec/response_body_checker_spec.rb

@@ -0,0 +1,22 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "ResponseBodyChecker" do
+  describe "relative_path" do
+    it 'should substitute an absolute addressing in a given path' do
+      path = "/bla/foo/values[6]/duffy/duck"
+      ResponseBodyChecker.new({},{}).send(:relative_path, path).should eql "/bla/foo/*/duffy/duck"
+    end
+    it 'should substitute more than one absolute adressing in a given path' do
+      path = "/bla/foo/values[6]/duffy/friends[1]/duck"
+      ResponseBodyChecker.new({},{}).send(:relative_path, path).should eql "/bla/foo/*/duffy/*/duck"
+    end
+    it "should substiiture at the end of the path too" do
+      path = "/bla/foo/values[6]/duffy/friends[1]/duck/ibizas[7]"
+      ResponseBodyChecker.new({}, {}).send(:relative_path, path).should eql "/bla/foo/*/duffy/*/duck/*"
+    end
+    it 'should return a string' do
+      path = "/bla/foo/values[6]/duffy/friends[1]/duck"
+     ResponseBodyChecker.new({},{}).send(:relative_path, path).should be_a(String)
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 9
-  version: 0.3.9
+  - 10
+  version: 0.3.10
 platform: ruby
 authors: 
 - jan@moviepilot.com
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-13 00:00:00 +02:00
+date: 2010-10-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -251,6 +251,7 @@ files:
 - spec/checker_spec.rb
 - spec/expectation_matcher_spec.rb
 - spec/http_client_spec.rb
+- spec/response_body_checker_spec.rb
 - spec/result_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -267,7 +268,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2406206885312499226
+      hash: -568682113681026828
       segments: 
       - 0
       version: "0"
@@ -292,5 +293,6 @@ test_files:
 - spec/checker_spec.rb
 - spec/expectation_matcher_spec.rb
 - spec/http_client_spec.rb
+- spec/response_body_checker_spec.rb
 - spec/result_spec.rb
 - spec/spec_helper.rb