apirunner 0.4.6 → 0.4.7

data/VERSION

@@ -1 +1 @@
-0.4.6
+0.4.7

data/apirunner.gemspec

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

data/lib/checker.rb

@@ -31,6 +31,16 @@ class Checker
     @excludes.include?(item)
   end
 
+  def is_number_comparison?(string)
+    return false unless string
+    string.match(/^[><]\s*\d+\s*$/) || string.match(/^[<>=]=\s*\d+\s*$/)
+  end
+
+  def compare_number(expectation, value)
+    return false unless value && value.match(/[\d\.]+/)
+    eval "#{value}#{expectation}"
+  end
+
   # returns true if given string seems to be a regular expression
   def is_regex?(string)
     string.to_s.match(/^\/.+\/$/)

data/lib/http_client.rb

@@ -26,7 +26,7 @@ class HttpClient
     response.code = raw_response.code
     response.message = raw_response.message
     response.body = raw_response.body
-    response.headers = JSON.parse(raw_response.headers.to_json) rescue ""
+    response.headers = raw_response.to_hash.keys.inject({}){|hash, key| hash[key] = raw_response.to_hash[key][0]; hash}
     response.runtime = runtime
     response.fully_qualified_path = (method == "GET" ? build_uri(resource, params).request_uri : resource_path(resource))
     response

data/lib/plugins/plug03_response_header_checker.rb

@@ -10,6 +10,11 @@ class ResponseHeaderChecker < Checker
             result.succeeded = false
             result.error_message = " expected header identifier --#{header_name}-- to match regex --#{header_value}--\n got --#{@response.headers[header_name]}--"
           end
+        elsif is_number_comparison?(header_value)
+          if not (excluded?(header_name) or compare_number(header_value, @response.headers[header_name]))
+            result.succeeded = false
+            result.error_message = " expected header identifier --#{header_name}-- to match number comparison --#{header_value}--\n got --#{@response.headers[header_name]}--"
+          end
         else
           if not (excluded?(header_name) or string_matches?(header_value, @response.headers[header_name]))
             result.succeeded = false

data/spec/api_runner_spec.rb

@@ -10,7 +10,7 @@ describe 'apirunner' do
   describe 'initialize' do
     it 'should fill all instance variables properly' do
       @a.instance_variable_get(:@spec).should be_a(Array)
-      @a.instance_variable_get(:@spec).size.should == 58
+      @a.instance_variable_get(:@spec).size.should == 165
       @a.instance_variable_get(:@results).should be_a(Array)
       @a.instance_variable_get(:@results).size.should == 0
       @a.instance_variable_get(:@configuration).should be_a(ApiConfiguration)

data/spec/checker_spec.rb

@@ -34,6 +34,90 @@ describe "Checker" do
       Checker.new({},{}).send(:is_regex?, string).should be_false
     end
   end
+
+  describe "is_number_comparison?" do
+    it "should return true when expectation starts with <=, >=, >,<, ==" do
+      [">", ">=", "<", "<=", "=="].each do |comp|
+        string = "#{comp}4"
+        Checker.new({}, {}).send(:is_number_comparison?, string).should be_true
+        string = "#{comp} 4"
+        Checker.new({}, {}).send(:is_number_comparison?, string).should be_true
+        string = "#{comp} 4                                                           "
+        Checker.new({}, {}).send(:is_number_comparison?, string).should be_true
+      end
+    end
+
+    it "should return false when expectation does not start with >,<, =" do
+      [">", ">=", "<", "<=", "=="].each do |comp|
+        string = "#{comp}hallo"
+        Checker.new({}, {}).send(:is_number_comparison?, string).should be_false
+        string = "#{comp} hallo"
+        Checker.new({}, {}).send(:is_number_comparison?, string).should be_false
+        string = "#{comp}"
+        Checker.new({}, {}).send(:is_number_comparison?, string).should be_false
+        string = "#{comp} 4 hihihihihihi"
+        Checker.new({}, {}).send(:is_number_comparison?, string).should be_false
+      end
+
+      string = "/hallo/"
+      Checker.new({}, {}).send(:is_number_comparison?, string).should be_false
+      string = "hallo"
+      Checker.new({}, {}).send(:is_number_comparison?, string).should be_false
+      string = ""
+      Checker.new({}, {}).send(:is_number_comparison?, string).should be_false
+      string = nil
+      Checker.new({}, {}).send(:is_number_comparison?, string).should be_false
+    end
+
+  end
+
+  describe "compare_number" do
+    it "should compare lt and lte correctly" do
+      Checker.new({}, {}).send(:compare_number, "<4", "5").should be_false
+      Checker.new({}, {}).send(:compare_number, "< 4", "5").should be_false
+
+      Checker.new({}, {}).send(:compare_number, "< 4", "3").should be_true
+      Checker.new({}, {}).send(:compare_number, "<4", "3").should be_true
+
+      Checker.new({}, {}).send(:compare_number, "<=4", "4").should be_true
+      Checker.new({}, {}).send(:compare_number, "<= 4", "4").should be_true
+      Checker.new({}, {}).send(:compare_number, "<=4", "5").should be_false
+      Checker.new({}, {}).send(:compare_number, "<= 4", "5").should be_false
+      Checker.new({}, {}).send(:compare_number, "<=4", "3").should be_true
+      Checker.new({}, {}).send(:compare_number, "<= 4", "3").should be_true
+    end
+
+    it "should compare gt and gte correctly" do
+      Checker.new({}, {}).send(:compare_number, ">4", "5").should be_true
+      Checker.new({}, {}).send(:compare_number, "> 4", "5").should be_true
+
+      Checker.new({}, {}).send(:compare_number, "> 4", "3").should be_false
+      Checker.new({}, {}).send(:compare_number, ">4", "3").should be_false
+
+      Checker.new({}, {}).send(:compare_number, ">=4", "4").should be_true
+      Checker.new({}, {}).send(:compare_number, ">= 4", "4").should be_true
+      Checker.new({}, {}).send(:compare_number, ">=4", "5").should be_true
+      Checker.new({}, {}).send(:compare_number, ">= 4", "5").should be_true
+      Checker.new({}, {}).send(:compare_number, ">=4", "3").should be_false
+      Checker.new({}, {}).send(:compare_number, ">= 4", "3").should be_false
+    end
+
+    it "should compare ==" do
+      Checker.new({}, {}).send(:compare_number, "==4", "5").should be_false
+      Checker.new({}, {}).send(:compare_number, "== 4", "5").should be_false
+
+      Checker.new({}, {}).send(:compare_number, "==4", "4").should be_true
+      Checker.new({}, {}).send(:compare_number, "==4", "4").should be_true
+    end
+
+    it "should return false when it gets unexpected header values" do
+      Checker.new({}, {}).send(:compare_number, "==4", nil).should be_false
+      Checker.new({}, {}).send(:compare_number, "== 4", "Exception").should be_false
+      Checker.new({}, {}).send(:compare_number, "== 4", "q").should be_false
+    end
+
+  end
+
   describe "regex_matches?" do
     it 'should return true if the given regular expression matches the given value' do
       regex = "^\\d{2}$"

data/spec/http_client_spec.rb

@@ -34,14 +34,14 @@ describe 'http_client' do
       response = raw_response_struct.new
       response.code    = 404
       response.message = "Hi Duffy Duck"
-      response.headers = { :daisy => "duck" }
+      response.stub!(:to_hash).and_return({ :daisy => ["duck"] })
       response.body    = { :duffy => "duck" }
       response.runtime = 0.123456789
       response.fully_qualified_path = "/path/to/resource"
       @http_client.send(:build_response, response, 0.0, "GET", "resource", {}).code.should_not be_nil
       @http_client.send(:build_response, response, 0.0, "GET", "resource", {}).message.should_not be_nil
       @http_client.send(:build_response, response, 0.0, "GET", "resource", {}).body.should == {:duffy => "duck"}
-      @http_client.send(:build_response, response, 0.0, "GET", "resource", {}).headers.should == {"daisy" => "duck"}
+      @http_client.send(:build_response, response, 0.0, "GET", "resource", {}).headers.should == {:daisy => "duck"}
     end
   end
   describe "resource_path" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 6
-  version: 0.4.6
+  - 7
+  version: 0.4.7
 platform: ruby
 authors: 
 - jan@moviepilot.com
@@ -291,7 +291,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4108885877346893427
+      hash: -3482657105735188905
       segments: 
       - 0
       version: "0"