apirunner 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/apirunner.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{apirunner}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jan@moviepilot.com"]
-  s.date = %q{2010-09-28}
+  s.date = %q{2010-09-29}
   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 = [

data/lib/api_runner.rb

@@ -17,7 +17,7 @@ class ApiRunner
     load_config(env)
     load_excludes(env)
     load_url_spec
-    @http_client = HttpClient.new(@configuration.host, @configuration.port, @configuration.namespace)
+    @http_client = HttpClient.new(@configuration.protocol, @configuration.host, @configuration.port, @configuration.namespace)
     @expectation = ExpectationMatcher.new(@excludes)
   end
 
@@ -38,7 +38,7 @@ class ApiRunner
   # runs all testcases that are provided by the testclass an fills errors if there are any
   def run_tests
     @spec.each do |test_case|
-      response = send_request(test_case['request']['method'].downcase.to_sym, test_case['request']['path'], test_case['request']['headers'], test_case['request']['body'])
+      response = send_request(test_case['request']['method'].downcase.to_sym, test_case['request']['path'], test_case['request']['headers'], test_case['request']['body'], test_case['request']['parameters'])
       @expectation.test_types.each do |test_type|
         result = @expectation.check(test_type, response, test_case)
         if not result.succeeded
@@ -56,8 +56,8 @@ class ApiRunner
   end
 
   # sends http request and fetches response using the given http client
-  def send_request(method, uri, headers, data)
-    @http_client.send_request(method, uri, headers, data)
+  def send_request(method, uri, headers, data, params)
+    @http_client.send_request(method, uri, headers, data, params)
   end
 
   # builds target uri from base uri generated of host port and namespace as well as the ressource path

data/lib/http_client.rb

@@ -1,15 +1,16 @@
 class HttpClient
   require 'net/http'
 
-  def initialize(host, port, namespace)
+  def initialize(protocol, host, port, namespace)
     @http = Net::HTTP.new(host, port)
+    @protocol = protocol
     @host = host
     @port = port
     @namespace = namespace
   end
 
-  def send_request(method, resource, headers=nil, data=nil)
-    build_response(self.send(method.to_s.downcase, headers, resource, data))
+  def send_request(method, resource, headers=nil, data=nil, params=nil)
+    build_response(self.send(method.to_s.downcase, headers, resource, data, params))
   end
 
   protected
@@ -22,37 +23,50 @@ class HttpClient
     response.code = raw_response.code
     response.message = raw_response.message
     response.body = raw_response.body
-    # response.headers = raw_response.header
-    # TODO improve me!
     response.headers = JSON.parse(raw_response.header.to_json) rescue nil
     response
   end
 
-  def get(headers, resource, params)
-    request = Net::HTTP::Get.new(resource_path(resource), initheader = headers)
+  # sends GET request and returns response
+  def get(headers, resource, data, params)
+    request = Net::HTTP::Get.new(build_uri(resource, params).request_uri, initheader = headers)
     @http.request(request)
   end
 
-  def put(headers, resource, data)
+  # sends PUT request and returns response
+  def put(headers, resource, data, params)
     request = Net::HTTP::Put.new(resource_path(resource), initheader = headers)
     request.body = data.to_json
     @http.request(request)
   end
 
-  def post(headers, resource, data)
+  # sends POST request and returns response
+  def post(headers, resource, data, params)
     request = Net::HTTP::Post.new(resource_path(resource), initheader = headers)
     request.body = data.to_json
     @http.request(request)
   end
 
-
-  def delete(headers, resource, params)
+  # sends DELETE request and returns response
+  def delete(headers, resource, data, params)
     request = Net::HTTP::Delete.new(resource_path(resource), initheader = headers)
     @http.request(request)
   end
 
+  # redefines the resource path including the namespace
   def resource_path(resource)
+    @namespace.nil? ? resource : "/" + @namespace + resource
     "/" + @namespace + resource
   end
-end
 
+  # rebuild a uri in details, so that another protocol, host, port and GET params can be specified, after Net::HTTP was created
+  def build_uri(resource, params=nil)
+    uri = URI.parse(@protocol + "://" + @host + ((@port.nil? || @port != "80") ? ":#{@port}" : ""))
+    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.path = resource_path(resource)
+    uri
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - jan@moviepilot.com
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-28 00:00:00 +02:00
+date: 2010-09-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -271,7 +271,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3503113694537890218
+      hash: -4005892316896513096
       segments: 
       - 0
       version: "0"