apirunner 0.2.3 → 0.2.4

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/apirunner.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{apirunner}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   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-29}
+  s.date = %q{2010-09-30}
   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 = [
@@ -48,6 +48,7 @@ Gem::Specification.new do |s|
     "lib/http_client.rb",
     "lib/result.rb",
     "lib/tasks/api.rake",
+    "lib/testcase.rb",
     "spec/.rspec",
     "spec/api_runner_spec.rb",
     "spec/expectation_matcher_spec.rb",

data/lib/api_configuration.rb

@@ -2,5 +2,13 @@ class ApiConfiguration
 
   attr_accessor :protocol, :host, :namespace, :port, :verbosity, :priority
 
+  # initializes a configuration object from given YAML file for given environment
+  def initialize(raw_config, env)
+    raw_config[env.to_s].each { |key, value| self.instance_variable_set("@#{key}", value) }
+    self.verbosity = raw_config['general']['verbosity'].first
+    self.priority = raw_config['general']['priority'] || 0
+    self
+  end
+
 end
 

data/lib/api_runner.rb

@@ -3,6 +3,7 @@ class ApiRunner
   require 'expectation_matcher'
   require 'http_client'
   require 'api_configuration'
+  require 'testcase'
 
   CONFIG_FILE = "config/api_runner.yml"
   SPEC_PATH = "test/api_runner/"
@@ -13,8 +14,7 @@ class ApiRunner
     @spec = []
     @results = []
     @excludes = []
-    @configuration = ApiConfiguration.new
-    load_config(env)
+    @configuration = ApiConfiguration.new(YAML.load_file(self.class.config_file), env)
     load_excludes(env)
     load_url_spec
     @http_client = HttpClient.new(@configuration.protocol, @configuration.host, @configuration.port, @configuration.namespace)
@@ -39,7 +39,7 @@ class ApiRunner
   def run_tests
     puts "Running exactly #{@spec.size} 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'], test_case['request']['parameters'])
+      response = send_request_for(test_case)
       @expectation.test_types.each do |test_type|
         result = @expectation.check(test_type, response, test_case)
         if not result.succeeded
@@ -57,8 +57,8 @@ class ApiRunner
   end
 
   # sends http request and fetches response using the given http client
-  def send_request(method, uri, headers, data, params)
-    @http_client.send_request(method, uri, headers, data, params)
+  def send_request_for(testcase)
+    @http_client.send_request(testcase.request['method'], testcase.request['path'], testcase.request['headers'], testcase.request['body'], testcase.request['parameters'])
   end
 
   # builds target uri from base uri generated of host port and namespace as well as the ressource path
@@ -72,14 +72,6 @@ class ApiRunner
     !@http_client.send_request(:get, "#{@configuration.protocol}://#{@configuration.host}:#{@configuration.port}", nil, {:timeout => 5}).nil?
   end
 
-  # loads environment config data from yaml file
-  def load_config(env)
-    config = YAML.load_file(self.class.config_file)
-    config[env.to_s].each { |key, value| @configuration.instance_variable_set("@#{key}", value) }
-    @configuration.verbosity = config['general']['verbosity'].first
-    @configuration.priority = config['general']['priority'] || 0
-  end
-
   # loads spec cases from yaml files
   def load_url_spec
     path = self.class.spec_path
@@ -87,7 +79,16 @@ class ApiRunner
     Dir.new(path).entries.each do |dir_entry|
       specs.push *YAML.load_file(path+dir_entry) if not (File.directory? dir_entry or dir_entry.match(/^\./) or dir_entry.match(/excludes/))
     end
-    @spec = priorize(partition(specs))
+    @spec = objectize(priorize(partition(specs)))
+  end
+
+  # converts the given array of raw testcases to an array of testcase objects
+  def objectize(raw_specs)
+    specs = []
+    raw_specs.each do |spec|
+      specs << Testcase.new(spec)
+    end
+    specs
   end
 
   # returns only spec whose priority level is less or equals configures priority level

data/lib/expectation_matcher.rb

@@ -23,9 +23,9 @@ class ExpectationMatcher
   # matches the given response code
   def response_code(response, testcase)
     result = Result.new(testcase, response)
-    if not testcase['response_expectation']['status_code'].to_s == response.code.to_s
+    if not testcase.response_expectation['status_code'].to_s == response.code.to_s
       result.succeeded = false
-      result.error_message = " expected response code --#{testcase['response_expectation']['status_code']}--\n got response code --#{response.code}--"
+      result.error_message = " expected response code --#{testcase.response_expectation['status_code']}--\n got response code --#{response.code}--"
     end
     result
   end
@@ -46,7 +46,7 @@ class ExpectationMatcher
   def response_headers(response, testcase)
     result = Result.new(testcase, response)
 
-    testcase['response_expectation']['headers'].each_pair do |header_name, header_value|
+    testcase.response_expectation['headers'].each_pair do |header_name, header_value|
       if is_regex?(header_value)
         if not (excluded?(header_name) or regex_matches?(header_value, response.headers[header_name]))
           result.succeeded = false
@@ -58,7 +58,7 @@ class ExpectationMatcher
           result.error_message = " expected header identifier --#{header_name}-- to match --#{header_value}--\n got --#{response.headers[header_name]}--"
         end
       end
-    end unless (testcase['response_expectation']['headers'].nil? or testcase['response_expectation']['headers'].empty?)
+    end unless (testcase.response_expectation['headers'].nil? or testcase.response_expectation['headers'].empty?)
     return result
   end
 
@@ -67,15 +67,15 @@ class ExpectationMatcher
     result = Result.new(testcase, response)
 
     # special case: the whole body has to be matched via a regular expression
-    if is_regex?(testcase['response_expectation']['body'])
-      if not regex_matches?(testcase['response_expectation']['body'], response.body)
+    if is_regex?(testcase.response_expectation['body'])
+      if not regex_matches?(testcase.response_expectation['body'], response.body)
         result.succeeded = false
-        result.error_message = " expected the whole body to match regex --#{testcase['response_expectation']['body']}--\n got --#{response.body}--"
+        result.error_message = " expected the whole body to match regex --#{testcase.response_expectation['body']}--\n got --#{response.body}--"
       end
       return result
     end
 
-    expected_body_hash = testcase['response_expectation']['body']
+    expected_body_hash = testcase.response_expectation['body']
 
     # in case we have no body expectation we simply return success
     return result if expected_body_hash.nil?

data/lib/testcase.rb

@@ -0,0 +1,11 @@
+class Testcase
+
+  attr_reader :raw, :request, :response_expectation
+
+  def initialize(raw)
+    @raw = raw
+    @request = @raw['request']
+    @response_expectation = @raw['response_expectation']
+  end
+
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - jan@moviepilot.com
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-29 00:00:00 +02:00
+date: 2010-09-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -252,6 +252,7 @@ files:
 - lib/http_client.rb
 - lib/result.rb
 - lib/tasks/api.rake
+- lib/testcase.rb
 - spec/.rspec
 - spec/api_runner_spec.rb
 - spec/expectation_matcher_spec.rb
@@ -271,7 +272,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3550102861078407058
+      hash: -4241672918987621375
       segments: 
       - 0
       version: "0"