apirunner 0.4.9 → 0.4.10

data/VERSION

@@ -1 +1 @@
-0.4.9
+0.4.10

data/apirunner.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{apirunner}
-  s.version = "0.4.9"
+  s.version = "0.4.10"
 
   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-28}
+  s.date = %q{2010-10-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 = [
@@ -54,6 +54,7 @@ Gem::Specification.new do |s|
     "lib/apirunner/railtie.rb",
     "lib/checker.rb",
     "lib/csv_writer.rb",
+    "lib/curl_command_generator.rb",
     "lib/expectation_matcher.rb",
     "lib/http_client.rb",
     "lib/plugins/plug01_response_json_syntax_checker.rb",

data/lib/curl_command_generator.rb

@@ -0,0 +1,25 @@
+module CurlCommandGenerator
+  def curlize(url, options = {})
+    options = {:method => :get, :body => nil, :headers => nil}.merge( options )
+    "curl -i #{headers2args(options[:headers])} #{method2arg(options[:method])} #{body2arg(options[:body])} #{url}"
+  end
+
+  private
+  def method2arg(method_name)
+    method_name && [:get,:put,:delete,:post].include?(method_name.to_sym) ? "-X#{method_name.to_s.upcase}" : ""
+  end
+
+  def body2arg(body)
+    # TODO: format body depending on the content type that is set, not always as json
+    body ? "-d'#{body.to_json}'" : ""
+  end
+
+  def headers2args(hash)
+    hash ? hash.inject(""){|string, key_value| string += " -H\"#{key_value[0]}: #{escape_quotes(key_value[1])}\""} : ""
+  end
+
+
+  def escape_quotes(string)
+    string.to_s.gsub(/"/, '\"')
+  end
+end

data/lib/http_client.rb

@@ -1,4 +1,8 @@
+require 'curl_command_generator'
+
 class HttpClient
+  include ::CurlCommandGenerator
+
   require 'net/http'
   require "cgi"
   require "benchmark"
@@ -34,27 +38,31 @@ class HttpClient
 
   # 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)
+    puts curlize( build_uri(resource, params), :headers => headers, :method => :get, :body => data) if ENV['VERBOSE']
+    request = Net::HTTP::Get.new(build_uri(resource, params).request_uri, headers)
     return Benchmark.realtime{ @response = @http.request(request) }, @response
   end
 
   # sends PUT request and returns response
   def put(headers, resource, data, params)
-    request = Net::HTTP::Put.new(resource_path(resource), initheader = headers)
+    puts curlize( build_uri(resource, params), :headers => headers, :method => :put, :body => data) if ENV['VERBOSE']
+    request = Net::HTTP::Put.new(resource_path(resource), headers)
     request.body = data.to_json
     return Benchmark.realtime{ @response = @http.request(request) }, @response
   end
 
   # sends POST request and returns response
   def post(headers, resource, data, params)
-    request = Net::HTTP::Post.new(resource_path(resource), initheader = headers)
+    puts curlize( build_uri(resource, params), :headers => headers, :method => :post, :body => data) if ENV['VERBOSE']
+    request = Net::HTTP::Post.new(resource_path(resource), headers)
     request.body = data.to_json
     return Benchmark.realtime{ @response = @http.request(request) }, @response
   end
 
   # sends DELETE request and returns response
   def delete(headers, resource, data, params)
-    request = Net::HTTP::Delete.new(resource_path(resource), initheader = headers)
+    puts curlize( build_uri(resource, params), :headers => headers, :method => :delete, :body => data) if ENV['VERBOSE']
+    request = Net::HTTP::Delete.new(resource_path(resource), headers)
     return Benchmark.realtime{ @response = @http.request(request) }, @response
   end
 

data/spec/http_client_spec.rb

@@ -41,7 +41,7 @@ describe 'http_client' do
       @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
-  - 9
-  version: 0.4.9
+  - 10
+  version: 0.4.10
 platform: ruby
 authors: 
 - jan@moviepilot.com
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-28 00:00:00 +02:00
+date: 2010-10-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -256,6 +256,7 @@ files:
 - lib/apirunner/railtie.rb
 - lib/checker.rb
 - lib/csv_writer.rb
+- lib/curl_command_generator.rb
 - lib/expectation_matcher.rb
 - lib/http_client.rb
 - lib/plugins/plug01_response_json_syntax_checker.rb
@@ -291,7 +292,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4590717876218024260
+      hash: -2862160756938208368
       segments: 
       - 0
       version: "0"