apirunner 0.1.9 → 0.1.10

data/VERSION

@@ -1 +1 @@
-0.1.9
+0.1.10

data/apirunner.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{apirunner}
-  s.version = "0.1.9"
+  s.version = "0.1.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jan@moviepilot.com"]

data/examples/test/api_runner/001_create_ressource.yml

@@ -1,6 +1,8 @@
 ---
 - name: 'Create new User'
   request:
+    headers:
+      Content-Type: 'application/json'
     path:        '/users/duffyduck'
     method:      'PUT'
     body:
@@ -42,6 +44,8 @@
       fsk:            "18"
 - name: 'Update existing User - Update watchlist'
   request:
+    headers:
+      Content-Type: 'application/json'
     path:       '/users/duffyduck/watchlist'
     method:     'PUT'
     body:
@@ -52,6 +56,8 @@
     body:
 - name: 'Check User FSK,Watchlist'
   request:
+    headers:
+      Content-Type: 'application/json'
     path:        '/users/duffyduck'
     method:      'GET'
   response_expectation:
@@ -75,6 +81,8 @@
         m79: 2.5
 - name: 'Set 10 Ratings'
   request:
+    headers:
+      Content-Type: 'application/json'
     path:        '/users/duffyduck/ratings'
     method:      'PUT'
     body:
@@ -92,6 +100,8 @@
       Last-Modified:    /.*/
 - name: 'Check User Ratings Update'
   request:
+    headers:
+      Content-Type: 'application/json'
     path:        '/users/duffyduck'
     method:      'GET'
   response_expectation:

data/lib/api_runner.rb

@@ -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']['body'])
+      response = send_request(test_case['request']['method'].downcase.to_sym, test_case['request']['path'], test_case['request']['headers'], test_case['request']['body'])
       @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, data)
-    @http_client.send_request(method, uri, data)
+  def send_request(method, uri, headers, data)
+    @http_client.send_request(method, uri, headers, data)
   end
 
   # builds target uri from base uri generated of host port and namespace as well as the ressource path
@@ -68,7 +68,7 @@ class ApiRunner
   # returns true if server is available
   def server_is_available?
     return true
-    !@http_client.send_request(:get, "#{@configuration.protocol}://#{@configuration.host}:#{@configuration.port}", {:timeout => 5}).nil?
+    !@http_client.send_request(:get, "#{@configuration.protocol}://#{@configuration.host}:#{@configuration.port}", nil, {:timeout => 5}).nil?
   end
 
   # loads environment config data from yaml file

data/lib/expectation_matcher.rb

@@ -31,7 +31,6 @@ class ExpectationMatcher
   end
 
   # checks the format of the given data of JSON conformity
-  # returns a structure containing return value and error if there is one
   def response_body_format(response, testcase)
     result_struct = Struct.new(:succeeded, :error)
     results = result_struct.new(:succeeded => true, :error => nil)

data/lib/http_client.rb

@@ -8,8 +8,8 @@ class HttpClient
     @namespace = namespace
   end
 
-  def send_request(method, resource, data=nil)
-    build_response(self.send(method.to_s.downcase, resource, data))
+  def send_request(method, resource, headers=nil, data=nil)
+    build_response(self.send(method.to_s.downcase, headers, resource, data))
   end
 
   protected
@@ -26,28 +26,27 @@ class HttpClient
     response
   end
 
-  def get(resource, params)
-    request = Net::HTTP::Get.new(resource_path(resource), initheader = {'Content-Type' =>'application/json'})
-    response = @http.request(request)
-    return response
+  def get(headers, resource, params)
+    request = Net::HTTP::Get.new(resource_path(resource), initheader = headers)
+    @http.request(request)
   end
 
-  def put(resource, data)
-    request = Net::HTTP::Put.new(resource_path(resource), initheader = {'Content-Type' =>'application/json'})
+  def put(headers, resource, data)
+    request = Net::HTTP::Put.new(resource_path(resource), initheader = headers)
     request.body = data.to_json
-    response = @http.request(request)
+    @http.request(request)
   end
 
-  def post(resource, data)
-    request = Net::HTTP::Post.new(resource_path(resource), initheader = {'Content-Type' =>'application/json'})
+  def post(headers, resource, data)
+    request = Net::HTTP::Post.new(resource_path(resource), initheader = headers)
     request.body = data.to_json
-    response = @http.request(request)
+    @http.request(request)
   end
 
 
-  def delete(resource, params)
-    request = Net::HTTP::Delete.new(resource_path(resource), initheader = {'Content-Type' =>'application/json'})
-    response = @http.request(request)
+  def delete(headers, resource, params)
+    request = Net::HTTP::Delete.new(resource_path(resource), initheader = headers)
+    @http.request(request)
   end
 
   def resource_path(resource)
@@ -55,29 +54,3 @@ class HttpClient
   end
 end
 
-
-class HttPartyClient
-  require 'httparty'
-  include HTTParty
-
-  # sends http request with given method, uri and data and returns servers response
-  def send_request(method, uri, data=nil)
-    options = { :body => data.to_json, :format => :json }
-    build_response(self.class.send(method, uri, options))
-  end
-
-  protected
-
-  # returns struct containing response.code, headers, body and message
-  # this is only for easily interfaceing another http client
-  def build_response(raw_response)
-    response_struct = Struct.new(:code, :message, :headers, :body)
-    response = response_struct.new
-    response.code = raw_response.code
-    response.message = raw_response.message
-    response.headers = raw_response.headers
-    response.body = raw_response.body
-    response
-  end
-end
-

data/lib/result.rb

@@ -45,16 +45,22 @@ class Result
 
   # yields the verbose error messages
   def be_verbose(index)
+    debugger
       puts "\n#{result_case} (#{index+1}) - \"#{@testcase['name']}\""
       puts @error_message
-      puts ("  More more more verbosity\n")
-      puts ("  request method: #{@testcase['request']['method']}")
-      puts ("  resource path: #{@testcase['request']['path']}")
-      puts ("  request headers: #{@testcase['request']['headers']}")
-      puts ("  JSON body sent: #{@testcase['request']['body']}")
-      puts ("  response status code: #{@testcase['response_expectation']['status_code']}")
-      puts ("  response headers: #{@testcase['response_expectation']['headers']}")
-      puts ("  response body: #{@testcase['response_expectation']['body']}")
+      puts("  More more more verbosity\n")
+      puts("  request method: #{@testcase['request']['method']}")
+      puts("  resource path: #{@testcase['request']['path']}")
+      puts("  request headers: #{@testcase['request']['headers']}")
+      puts("  JSON body sent: #{@testcase['request']['body']}")
+      puts("  expectation:")
+      puts("    response status code: #{@testcase['response_expectation']['status_code']}")
+      puts("    response headers: #{@testcase['response_expectation']['headers']}")
+      puts("    response body: #{@testcase['response_expectation']['body']}")
+      puts("  result:")
+      puts("    response status code: #{@response.code}")
+      puts("    response headers: #{@response.headers}")
+      puts("    repsonse body: #{JSON.parse(@response.body)}")
   end
 
   # returns the result case for interpolation in the output message header

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 9
-  version: 0.1.9
+  - 10
+  version: 0.1.10
 platform: ruby
 authors: 
 - jan@moviepilot.com
@@ -265,7 +265,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2943715373765808099
+      hash: -1888087046839663550
       segments: 
       - 0
       version: "0"