apirunner 0.4.10 → 0.5.0

data/Gemfile

@@ -7,7 +7,8 @@ source "http://rubygems.org"
 # Include everything needed to run rake, tests, features, etc.
 
 gem 'nokogiri', '~> 1.4.3.1'
-gem 'json'
+gem 'json', '~> 1.4.6'
+gem 'aaronh-chronic', '~> 0.3.9'
 
 
 group :development do

data/Gemfile.lock

@@ -1,6 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    aaronh-chronic (0.3.9)
     builder (2.1.2)
     cucumber (0.8.5)
       builder (~> 2.1.2)
@@ -40,10 +41,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  aaronh-chronic (~> 0.3.9)
   bundler (~> 1.0.0)
   cucumber
   jeweler (~> 1.5.0.pre3)
-  json
+  json (~> 1.4.6)
   mocha (>= 0.9.8)
   nokogiri (~> 1.4.3.1)
   rcov

data/VERSION

@@ -1 +1 @@
-0.4.10
+0.5.0

data/apirunner.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{apirunner}
-  s.version = "0.4.10"
+  s.version = "0.5.0"
 
   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-29}
+  s.date = %q{2010-11-02}
   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 = [
@@ -99,7 +99,8 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<nokogiri>, ["~> 1.4.3.1"])
-      s.add_runtime_dependency(%q<json>, [">= 0"])
+      s.add_runtime_dependency(%q<json>, ["~> 1.4.6"])
+      s.add_runtime_dependency(%q<aaronh-chronic>, ["~> 0.3.9"])
       s.add_development_dependency(%q<rspec>, [">= 2.0.0.beta.19"])
       s.add_development_dependency(%q<cucumber>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -113,7 +114,8 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<nokogiri>, ["~> 1.4.3.1"])
-      s.add_dependency(%q<json>, [">= 0"])
+      s.add_dependency(%q<json>, ["~> 1.4.6"])
+      s.add_dependency(%q<aaronh-chronic>, ["~> 0.3.9"])
       s.add_dependency(%q<rspec>, [">= 2.0.0.beta.19"])
       s.add_dependency(%q<cucumber>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -128,7 +130,8 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<nokogiri>, ["~> 1.4.3.1"])
-    s.add_dependency(%q<json>, [">= 0"])
+    s.add_dependency(%q<json>, ["~> 1.4.6"])
+    s.add_dependency(%q<aaronh-chronic>, ["~> 0.3.9"])
     s.add_dependency(%q<rspec>, [">= 2.0.0.beta.19"])
     s.add_dependency(%q<cucumber>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])

data/lib/checker.rb

@@ -1,3 +1,5 @@
+require 'chronic'
+
 class Checker
   @@children = []
 
@@ -19,6 +21,17 @@ class Checker
   end
 
   private
+  def get_time(time)
+    one_day = 24 * 3600 # seconds
+    if time.match(/^@next_occurence_of/)
+      time = Chronic.parse( "next #{time.gsub(/^@next_occurence_of/, '')}" ) || Chronic.parse(time.gsub(/^@next_occurence_of/, ''))
+      time -= one_day if time - Time.now > one_day
+    else
+      time = Chronic.parse( time.gsub(/^@/,'') )
+    end
+
+    Chronic.parse(time)
+  end
 
   # tracks all children of this class
   # this way plugins can be loaded automagically
@@ -31,6 +44,26 @@ class Checker
     @excludes.include?(item)
   end
 
+  def is_time_check?(header, expectation)
+    return false unless header and expectation 
+    # only support time check for certain headers + custom X-* headers
+    return false unless ["cache-control[max-age]", "cache-control[s-maxage]", "cache-control[min-fresh]", "retry-after", "last-modified"].include?(header.downcase) || header.downcase.match(/x-/)
+    return false unless expectation.strip.match(/^@/)
+    return true
+  end
+
+
+  def compare_time(header, expectation, value)
+    return false unless is_time_check?(header, expectation)
+    if ["cache-control[max-age]", "cache-control[s-maxage]", "cache-control[min-fresh]", "retry-after"].include?(header.downcase) || header.downcase.match(/x-/)
+      diff = get_time(expectation) - Time.now - value.to_i
+    elsif header.to_s.downcase == "last-modified"
+      diff = get_time(expectation) - Chronic.parse(value)
+    end
+    
+    diff >= -5 && diff <= 5
+  end
+
   def is_number_comparison?(string)
     return false unless string
     string.match(/^[><]\s*\d+\s*$/) || string.match(/^[<>=]=\s*\d+\s*$/)

data/lib/curl_command_generator.rb

@@ -11,7 +11,7 @@ module CurlCommandGenerator
 
   def body2arg(body)
     # TODO: format body depending on the content type that is set, not always as json
-    body ? "-d'#{body.to_json}'" : ""
+    body.nil? || body == {} || body == "" ? "" : "-d'#{body.to_json}'" 
   end
 
   def headers2args(hash)

data/lib/http_client.rb

@@ -30,7 +30,19 @@ class HttpClient
     response.code = raw_response.code
     response.message = raw_response.message
     response.body = raw_response.body
-    response.headers = raw_response.to_hash.keys.inject({}){|hash, key| hash[key.to_s.downcase] = raw_response.to_hash[key][0]; hash}
+    response.headers = raw_response.to_hash.keys.inject({}){ |hash, key| 
+      value = raw_response.to_hash[key][0]
+      hash[key.to_s.downcase] = value
+      if value =~ /=/
+        sub_values = value.tr(","," ").split(" ").select{|x| x =~ /=/}
+        sub_values.each do |sub_value|
+          s_key, s_value = sub_value.split("=")
+          hash["#{key}[#{s_key}]"] = s_value
+        end
+      end
+
+      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

@@ -11,6 +11,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_time_check?(header_name, header_value)
+          if not (excluded?(header_name) or compare_time(header_name, header_value, @response.headers[header_name]))
+            result.succeeded = false
+            result.error_message = " expected header identifier --#{header_name}-- to match time (+/- 5 seconds) --#{header_value} / #{Chronic.parse(header_value.tr('@',''))}--\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

data/spec/checker_spec.rb

@@ -71,6 +71,67 @@ describe "Checker" do
 
   end
 
+  describe "time_check" do
+    it "should perform a time check for max-age, s-maxage, min-fresh, retry-after, last-modified and X-* headers when expectation starts with @" do
+      ["cache-control[max-age]", "cache-control[s-maxage]", "cache-control[min-fresh]", "retry-after", "Last-Modified", "X-My-Custom-Timestamp"].each do |header|
+        Checker.new({}, {}).send(:is_time_check?, header, "@tomorrow 4:00am").should be_true
+      end
+    end
+
+    it "should not perform a time check for a header different to max-age, s-maxage, min-fresh, retry-after or X-* headers" do
+      %w{Server Content-Type Content-Length Via Connection}.each do |header|
+        Checker.new({}, {}).send(:is_time_check?, header, "@tomorrow 4:00am").should be_false
+      end
+    end
+
+    it "should not perform a time check for if header or expectations or both are nil" do
+      Checker.new({}, {}).send(:is_time_check?, nil, "@tomorrow 4:00am").should be_false
+      Checker.new({}, {}).send(:is_time_check?, "cache-control[max-age]", nil).should be_false
+      Checker.new({}, {}).send(:is_time_check?, nil, nil).should be_false
+    end
+
+    it "should correctly interpret @next_occurence_of " do
+      one_hour = 3600 # seconds
+      current_time =  Chronic.parse("today #{Time.now.hour}:00")
+      three_hours_ago = current_time - 3*one_hour
+      in_three_hours  = current_time + 3*one_hour
+
+      Checker.new({}, {}).send(:get_time, "@next_occurence_of #{three_hours_ago.hour}:00").should == three_hours_ago + 24 * one_hour
+      Checker.new({}, {}).send(:get_time, "@next_occurence_of #{in_three_hours.hour}:00").should  == in_three_hours
+    end
+
+    it "should correctly compare delta-seconds for headers  max-age, s-maxage, min-fresh, retry-after" do
+      in_five_hours = Chronic.parse("in 5 hours")
+      ["cache-control[max-age]", "cache-control[s-maxage]", "cache-control[min-fresh]", "retry-after", "X-My-Custom-Timestamp"].each do |header|
+        Checker.new({}, {}).send(:compare_time, header, "@next_occurence_of #{in_five_hours}", 5 * 3600).should be_true
+      end
+    end
+
+    it "should correctly transform an absolute time check to date for headers Last-Modified" do
+      in_five_hours = Chronic.parse("in 5 hours")
+      Checker.new({}, {}).send(:compare_time, "Last-Modified", "@#{in_five_hours}", in_five_hours.to_s).should be_true
+    end
+
+    def in_five_hours
+      Chronic.parse("in 5 hours")
+    end
+
+    it "should compare with +/- 5 seconds tolarance" do
+      #in_five_hours = Chronic.parse("in 5 hours")
+      (-4..4).each do |diff|
+        Checker.new({}, {}).send(:compare_time, "Last-Modified", "@#{in_five_hours}", Chronic.parse( (in_five_hours + diff) ).to_s).should be_true
+        ["cache-control[max-age]", "cache-control[s-maxage]", "cache-control[min-fresh]", "retry-after", "X-My-Custom-Timestamp"].each do |header|
+          Checker.new({}, {}).send(:compare_time, header, "@next_occurence_of #{in_five_hours}", 5 * 3600 + diff).should be_true
+        end
+      end
+
+      [-6,6].each do |diff|
+        Checker.new({}, {}).send(:compare_time, "Last-Modified", "@#{in_five_hours}", Chronic.parse( (in_five_hours + diff) ).to_s).should be_false
+        Checker.new({}, {}).send(:compare_time, "Last-Modified", "@next_occurence_of #{in_five_hours}", 5 * 3600 + diff).should be_false
+      end
+    end
+  end
+
   describe "compare_number" do
     it "should compare lt and lte correctly" do
       Checker.new({}, {}).send(:compare_number, "<4", "5").should be_false

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 10
-  version: 0.4.10
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - jan@moviepilot.com
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-29 00:00:00 +02:00
+date: 2010-11-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,17 +38,34 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 4
+        - 6
+        version: 1.4.6
   type: :runtime
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: aaronh-chronic
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 3
+        - 9
+        version: 0.3.9
+  type: :runtime
+  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -62,10 +79,10 @@ dependencies:
         version: 2.0.0.beta.19
   type: :development
   prerelease: false
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: cucumber
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -75,10 +92,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -90,10 +107,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -106,10 +123,10 @@ dependencies:
         version: 1.5.0.pre3
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -119,10 +136,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: mocha
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -134,10 +151,10 @@ dependencies:
         version: 0.9.8
   type: :development
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -151,10 +168,10 @@ dependencies:
         version: 2.0.0.beta.19
   type: :development
   prerelease: false
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: cucumber
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -164,10 +181,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -179,10 +196,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id011
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -195,10 +212,10 @@ dependencies:
         version: 1.5.0.pre3
   type: :development
   prerelease: false
-  version_requirements: *id012
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -208,7 +225,7 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id013
+  version_requirements: *id014
 description: apirunner is a testsuite to query your RESTful JSON API and match response with your defined expectations
 email: developers@moviepilot.com
 executables: []
@@ -292,7 +309,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2862160756938208368
+      hash: -4037813036394983070
       segments: 
       - 0
       version: "0"