rest_baby 0.5 → 0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fb014e9218f045b6869e8220de3f320cfec06f4
-  data.tar.gz: 22e183843f1926e3bfbbd295168f2356717fe538
+  metadata.gz: 86630eb56f0b1daee5aa7f2e7a28776a1e38d3b6
+  data.tar.gz: 6a44e6984e440e831bd7eb9f1ade1dc7834504bb
 SHA512:
-  metadata.gz: a31117c14615d8492718866d583f8b3680947ad5c5c906ed77dfb490d197cf40b0f8190f79ffc0cb94a5108ee087f432b48be571f9bc7027c2653232068b8544
-  data.tar.gz: 70b78cf5010e2ac75f66623e189c7f37f883e698475bfd7c9f35b473ab73afafde6f79a06ac61a88c0473675c5888c0791182dcad34bbbbf5a14219c5a1c3586
+  metadata.gz: 7be630a9887bcbbcc1b9130f3886d9beeb42ead8e1809bedd390a73d0fc0b83447a59a2a80b145dbe7cc35adc2752afac0fb8d3918ded85185656a258c527d6e
+  data.tar.gz: ac1c5a81bc2e75166a60ad9a1a7cc1bc69bd96bea059e2d4329006ebd845b3fc10fe958ce637cb0e2b86112729d56cb90f6262d3944395b34542c63ebf736008

data/.rubocop.yml

@@ -0,0 +1,20 @@
+AllCops:
+  Include:
+    - '**/Rakefile'
+    - '**/config.ru'
+    - 'lib/**/*'
+    - 'bin/**/*'
+  Exclude:
+    - 'features/**/*'
+
+# Configuration parameters: AllowURI, URISchemes.
+Metrics/LineLength:
+  Max: 81
+
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 14
+
+# Configuration parameters: CountKeywordArgs.
+Metrics/ParameterLists:
+  Max: 6

data/ChangeLog

@@ -21,3 +21,7 @@
 === Version 0.5 / 2014-07-27
 * Enabled use of query parameters on GET calls
 * Revised tests to replace expect with should
+=== Version 0.5 / 2014-07-27
+* Fixed reference to nokogiri' (~> 0)
+* Fixed all cukes, no more @wip
+* Added rubocop style-checker/lint compliance

data/Gemfile

@@ -6,3 +6,4 @@ gem 'json'
 gem 'nokogiri'
 gem 'rspec'
 gem 'webmock'
+gem 'rubocop'

data/Rakefile

@@ -1,4 +1,4 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 require 'rubygems'
 require 'cucumber'
 require 'cucumber/rake/task'
@@ -9,9 +9,9 @@ Cucumber::Rake::Task.new(:features) do |t|
   t.profile = 'default'
 end
 
-task :default => :features
+task default: :features
 
 YARD::Rake::YardocTask.new do |t|
-	t.files   = ['features/**/*.feature', 'features/**/*.rb']
-	t.options = ['--any', '--extra', '--opts'] # optional
+  t.files   = ['features/**/*.feature', 'features/**/*.rb']
+  t.options = ['--any', '--extra', '--opts'] # optional
 end

data/cucumber.yml

@@ -1,4 +1,4 @@
-default: FIG_NEWTON_FILE=mock.yml --tags ~@wip --no-source --color --format pretty
-report: FIG_NEWTON_FILE=mock.yml --no-source --color --format progress --format html --out='features_<%= Time.new.strftime('%Y-%m-%d_%H_%M_%S') %>.html'
-wip: FIG_NEWTON_FILE=mock.yml --tags @wip --color --format pretty
-core: FIG_NEWTON_FILE=mock.yml --tags @core --no-source --color --format pretty
+default: FIG_NEWTON_FILE=mock.yml DEBUG_HTTP=false --tags ~@wip --no-source --color --format pretty
+debug: FIG_NEWTON_FILE=mock.yml DEBUG_HTTP=true --no-source --color --format pretty
+report: FIG_NEWTON_FILE=mock.yml DEBUG_HTTP=false  --no-source --color --format progress --format html --out='features_<%= Time.new.strftime('%Y-%m-%d_%H_%M_%S') %>.html'
+wip: FIG_NEWTON_FILE=mock.yml DEBUG_HTTP=true --tags @wip --color --format pretty

data/features/{headers/header_options.feature → header_options.feature}

@@ -1,6 +1,7 @@
 Feature: Create a basic rest client that can get, put, post, and delete
 
-@extended @get @headers @wip
+@extended @get @header
+@header.S1
 Scenario: client uses an Accept header for a GET
   Given I have a web service
   And I have "GET" service for "/test" with the following headers
@@ -11,7 +12,8 @@ Scenario: client uses an Accept header for a GET
   And I "GET" from the web service
   Then I receive the expected message
 
-@extended @post @headers @wip
+@extended @post @headers
+@header.S2
 Scenario: client uses an Accept and a Content-Type header for a POST
   Given I have a web service
   And I have "POST" service for "/test" with the following headers
@@ -27,7 +29,8 @@ Scenario: client uses an Accept and a Content-Type header for a POST
   """
   Then I receive the expected message
 
-@extended @post @authentication @wip
+@extended @post @authentication
+@header.S3
 Scenario: client uses basic authentication
   Given I have a web service
   And I have "GET" service for "/test" for user "test" and password "rest"
@@ -36,7 +39,8 @@ Scenario: client uses basic authentication
   And I "GET" from the web service
   Then I receive the expected message
 
-@extended @post @authentication @wip
+@extended @post @authentication
+@header.S4
 Scenario: client uses a secure web server
   Given I have a secure web service
   And I have "GET" service for "/test" for user "test" and password "rest"

data/features/print_response.feature

@@ -6,7 +6,7 @@ Scenario: client rest Get
   Given I have a web service
   And I have "GET" service for "/test" as follows
     """
-    {'Answer': 'What did you expect?'}
+    {"Answer": "What did you expect?"}
     """
   And I am a rest client
   When I "GET" from the web service
@@ -18,12 +18,12 @@ Scenario: client rest Put
   Given I have a web service
   And I have "PUT" service for "/test" as follows
     """
-    {'Answer': 'What did you expect?'}
+    {"Answer": "What did you expect?"}
     """
   And I am a rest client
   When I "PUT" to the web service with the following
     """
-    {'Answer': 'What did you expect?'}
+    {"Answer": "What did you expect?"}
     """
   Then I receive the expected message
 
@@ -33,12 +33,12 @@ Scenario: client rest Post
   Given I have a web service
   And I have "POST" service for "/test" as follows
     """
-    {'Answer': 'What did you expect?'}
+    {"Answer": "What did you expect?"}
     """
   And I am a rest client
   When I "POST" to the web service with the following
     """
-    {'Answer': 'What did you expect?'}
+    {"Answer": "What did you expect?"}
     """
   Then I receive the expected message
 
@@ -48,7 +48,7 @@ Scenario: client rest Delete
   Given I have a web service
   And I have "DELETE" service for "/test" as follows
     """
-    {'Answer': 'What did you expect?'}
+    {"Answer": "What did you expect?"}
     """
   And I am a rest client
   When I "DELETE" from the web service

data/features/rest_client.feature

@@ -17,7 +17,7 @@ Scenario: client rest PUT
   And I am a rest client
   When I "PUT" to the web service with the following
     """
-    {'Question': 'What is the meaning of life?'}
+    {"Question": "What is the meaning of life?"}
     """
   Then I receive the expected message
 
@@ -29,7 +29,7 @@ Scenario: client rest POST
   And I am a rest client
   When I "POST" to the web service with the following
     """
-    {'Question': 'What is the meaning of life?'}
+    {"Question": "What is the meaning of life?"}
     """
   Then I receive the expected message
 

data/features/step_definitions/header_steps.rb

@@ -1,24 +1,34 @@
 Given(/^I have a secure web service$/) do
-	@protocol = 'https'
- 	@server = FigNewton.server
-	@port = FigNewton.port
-	@mockservice = MockRestService.new(@server, @port, @protocol)
+  @protocol = 'https'
+  @server = FigNewton.server
+  @port = FigNewton.port
+  @mockservice = MockRestService.new(@server, @port, @protocol)
 end
 
-Given(/^I have "(GET|PUT|POST|DELETE)" service for "([^"]*) with the following headers$/) do |type, path, table|
-	@path = path
-	@mockservice.store_msg(type, path, DEFAULT_MESSAGE, table.rows_hash)
+Given(/^I have "(GET|PUT|POST|DELETE)" service for "([^"]*)" \
+with the following headers$/) do |type, path, table|
+  @path = path
+  @mockservice.store_msg(type, path, DEFAULT_MSG, table.rows_hash)
 end
 
-Given(/^I have "(GET|PUT|POST|DELETE)" service for "([^"]*) for user "([^"]*) and password "([^"]*)$/) do |type, path, user, password, table|
-	@path = path
-	@mockservice.store_msg(type, path, DEFAULT_MESSAGE, table.rows_hash, user, password)
+Given(/^I have "(GET|DELETE)" service for "([^"]*)" for \
+user "([^"]*)" and password "([^"]*)"$/) do |type, path, user, password|
+  @path = path
+  @mockservice.store_msg(type, path, DEFAULT_MSG, {}, user, password)
+end
+
+Given(/^I have "(PUT|POST)" service for "([^"]*)" for \
+user "([^"]*)" and password "([^"]*)"$/) do |type, path, user, password, table|
+  @path = path
+  @headers = table.rows_hash
+  @mockservice.store_msg(type, path, DEFAULT_MSG, @headers, user, password)
 end
 
 When(/^I have the following headers?$/) do |table|
-	@restbaby.set_headers(table.rows_hash)
+  @restbaby.add_headers(table.rows_hash)
 end
 
-Given(/^I have basic auth for user "(.*?)" and password "(.*?)"$/) do |user, password|
-	@restbaby.set_auth(user, password)
+Given(/^I have basic auth for user "([^"]*)" \
+and password "(.*?)"$/) do |user, password|
+  @restbaby.set_auth(user, password)
 end

data/features/step_definitions/rest_client_steps.rb

@@ -1,72 +1,75 @@
-DEFAULT_MESSAGE = "{'Answer': 'What did you expect?'}"
+DEFAULT_MSG = "{\"Answer\": \"What did you expect?\"}"
 
 Given(/^I have a web service$/) do
-	@protocol = 'http'
-	@server = FigNewton.server
-	@port = FigNewton.port
-	@mockservice = MockRestService.new(@server, @port, @protocol)
+  @protocol = 'http'
+  @server = FigNewton.server
+  @port = FigNewton.port
+  @mockservice = MockRestService.new(@server, @port, @protocol)
 end
 
-Given(/^I have "(GET|PUT|POST|DELETE)" service for "(.*?)"$/) do |type, path|
-	if type=="GET"
-		create_get(type, path)
-	else
-		@path = path
-		@mockservice.store_msg(type, path, DEFAULT_MESSAGE)
-	end
+Given(/^I have "(GET|PUT|POST|DELETE)" service for "([^"]*)"$/) do |type, path|
+  if type == 'GET'
+    create_get(type, path)
+  else
+    @path = path
+    @mockservice.store_msg(type, path, DEFAULT_MSG)
+  end
 end
 
-Given(/^I have "(GET|PUT|POST|DELETE)" service for "(.*?)" as follows$/) do |type, path, message|
-	if type=="GET"
-		create_get(type, path, message)
-	else
-		@path = path
-		@mockservice.store_msg(type, path, message)
-	end
+Given(/^I have "(GET|PUT|POST|DELETE)" service for "([^"]*)" as follows$/) \
+do |type, path, message|
+  if type == 'GET'
+    create_get(type, path, message)
+  else
+    @path = path
+    @mockservice.store_msg(type, path, message)
+  end
 end
 
-def create_get(type, path, message = DEFAULT_MESSAGE)
-	@path = path.split('?')[0]
-	if path.split('?').length==1
-		@mockservice.store_msg("GET", @path, message)
-	else
-		@mockservice.store_get_query(path)
-	end
+def create_get(_type, path, message = DEFAULT_MSG)
+  @path = path.split('?')[0]
+  if path.split('?').length == 1
+    @mockservice.store_msg('GET', @path, message)
+  else
+    @mockservice.store_get_query(path)
+  end
 end
 
 Given(/^I am a rest client$/) do
-	@restbaby = Client.new("#{@protocol}://#{@server}:#{@port}#{@path}")
+  @restbaby = Client.new("#{@protocol}://#{@server}:#{@port}#{@path}")
 end
 
 When(/^I "(GET|DELETE)" from the web service$/) do |type|
-	case type.downcase
-	when 'get'
-		@response = @restbaby.get
-	when 'delete'
-		@response = @restbaby.delete
-	end
+  case type.downcase
+  when 'get'
+    @response = @restbaby.get
+  when 'delete'
+    @response = @restbaby.delete
+  end
 end
 
-When(/^I "(PUT|POST)" to the web service with the following$/) do |type, message|
-	case type.downcase
-	when 'put'
-		@response = @restbaby.put(message)
-	when 'post'
-		@response = @restbaby.post(message)
-	end
+When(/^I "(PUT|POST)" to the web service with the following$/) \
+do |type, message|
+  @message = JSON(message)
+  case type.downcase
+  when 'put'
+    @response = @restbaby.put(@message)
+  when 'post'
+    @response = @restbaby.post(@message)
+  end
 end
 
 When(/^I "GET" from the web service with the parameters$/) do |table|
-	@response = @restbaby.get({}, nil, table.rows_hash)
+  @response = @restbaby.get({}, nil, table.rows_hash)
 end
 
 When(/^I pause$/) do
-  pause()
+  pause
 end
 
 Then(/^I receive the expected message$/) do
-	@response.code.should eq('200')
-	@response.body.should eq(DEFAULT_MESSAGE)
+  @response.code.should eq('200')
+  expect(@response.body).to eq(DEFAULT_MSG)
 end
 
 # Then(/^I receive the following$/) do |message|
@@ -74,7 +77,7 @@ end
 # 	@response.body.should eq(message)
 # end
 
-Then(/^I receive a message with "(.*?)"$/) do |message|
-	@response.code.should eq('200')
-	@response.body.should eq(message)
+Then(/^I receive a message with "([^"]*)"$/) do |message|
+  @response.code.should eq('200')
+  @response.body.should eq(message)
 end

data/features/support/env.rb

@@ -1,9 +1,10 @@
-require 'rspec-expectations'
+require 'rspec/expectations'
 require 'fig_newton'
 require 'cucumber/rspec/doubles'
 require 'rubygems'
 require 'webmock/cucumber'
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "lib", "rest_baby.rb"))
+require File.expand_path(File.join(File.dirname(__FILE__),
+                                   '..', '..', 'lib', 'rest_baby.rb'))
 
 include RestBaby
 

data/features/support/mock_rest_service.rb

@@ -2,44 +2,51 @@ require 'webmock/cucumber'
 
 include WebMock::API
 
+# Mocking Service for testing rest calls
 class MockRestService
-
-  # STANDARD_HEADERS = {'Accept'=>'*/*', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Ruby'}
-  STANDARD_HEADERS = {'Accept'=>'*/*', 'User-Agent'=>'Ruby'}
-  STANDARD = "http"
-  SECURE = "https"
+  STANDARD_HEADERS = { 'Accept' => '*/*', 'User-Agent' => 'Ruby' }
+  STANDARD = 'http'
+  SECURE = 'https'
 
   def initialize(host, port, protocol = STANDARD)
     @protocol = protocol
     @host = host
     @port = port
     @messages = {}
-  end  
+  end
 
   def store_msg(type, path, message, headers = {}, user = nil, password = nil)
-    new_headers = STANDARD_HEADERS.merge(headers)
-    auth_string = "#{user}:#{password}@" unless (user.nil? || password.nil?)
+    url = "#{@protocol}://#{auth_string(user, password)}#{@host}:#{@port}#{path}"
     case type.downcase
-      when "get", "delete"
-        WebMock.stub_request(type.downcase.to_sym, "#{@protocol}://#{auth_string}#{@host}:#{@port}#{path}").
-          with(:headers => new_headers).
-          to_return({:body => "#{message}", :status => 200}, :headers => {})
-      when "post", "put"
-        WebMock.stub_request(type.downcase.to_sym, "#{@protocol}://#{auth_string}#{@host}:#{@port}#{path}").
-          with(:headers => new_headers).
-          to_return(:status => 200, :body => "#{message}", :headers => {})
-      else
-        raise "Unsupported type: #{type}"
+    when 'get', 'delete'
+      WebMock.stub_request(type.downcase.to_sym, url)
+        .with(headers: merge_headers(headers))
+        .to_return({ status: 200, body: "#{message}" }, headers: {})
+    when 'put', 'post'
+      WebMock.stub_request(:put, url)
+        .with(body: body,
+              headers: merge_headers(headers))
+        .to_return({ status: 200, body: "#{message}" }, headers: {})
+    else
+      fail "Unsupported type: #{type}"
     end
   end
 
+  def merge_headers(headers)
+    STANDARD_HEADERS.merge(headers)
+  end
+
+  def auth_string(user, password)
+    "#{user}:#{password}@" unless user.nil? || password.nil?
+  end
+
   def store_get_query(path, headers = {}, user = nil, password = nil)
     new_headers = STANDARD_HEADERS.merge(headers)
-    params = Hash.new
     message = path.split('?').last
-    auth_string = "#{user}:#{password}@" unless (user.nil? || password.nil?)
-    WebMock.stub_request(:get, "#{@protocol}://#{auth_string}#{@host}:#{@port}#{path}").
-      with(:headers => new_headers).
-      to_return({:body => "#{message}", :status => 200}, :headers => {})
+    auth_string = "#{user}:#{password}@" unless user.nil? || password.nil?
+    WebMock.stub_request(:get,
+                         "#{@protocol}://#{auth_string}#{@host}:#{@port}#{path}")
+      .with(headers: new_headers)
+      .to_return({ body: "#{message}", status: 200 }, headers: {})
   end
 end

data/features/support/utility.rb

@@ -1,4 +1,4 @@
-def pause()
-	print "Press Return to continue..."
+def pause
+  print 'Press Return to continue...'
   STDIN.getc
 end

data/lib/rest_baby/version.rb

@@ -1,3 +1,4 @@
+# Identify the version
 module RestBaby
-  VERSION = "0.5"
+  VERSION = '0.6'
 end

data/lib/rest_baby.rb

@@ -9,200 +9,167 @@ require 'json'
 require 'nokogiri'
 require 'rest_baby/version'
 
-# RestBaby is a small rest client. It encapsulates some of the details for creating and using the rest service.
+# RestBaby is a small rest client. It encapsulates some of the details for
+# creating and using the rest service.
 # @private
 module RestBaby
-	# Sends and receives data to a restful web service
-	class Client
-			PARAMETER_STARTER = "?"
-			PARAMETER_SEPARATOR = "&"
-
-		# The WebService Response from the last call
-		attr_reader :wsresponse
-		# The user (for authentication)
-		attr_reader :user
-		# The password for the user (for authentication)
-		attr_reader  :password
-
-		# Creates a new rest client
-		#
-		# @param url [String] url of the rest service
-		# eg. http://myrestservice.com:80/time
-		# @param headers [Hash] default headers to use.
-		# eg. '{ \"Content-Type\" => \"application/json\"}'
-		# Can be multiple headers separated by commas inside the brackets.
-		def initialize(url, headers = {}, user = nil, password = nil)
-			@url = url
-			@headers = headers
-			@user = user
-			@password = password
-
-			if ENV["DEBUG_HTTP"].nil?
-				@verbose = true
-			else
-				@verbose = ENV["DEBUG_HTTP"].downcase=='true' ? true : false
-			end
-		end
-
-		# Adds user/password to the rest client
-		#
-		# @param user [String] user that has authorization
-		# @param password [String] authorized user's password
-		def set_auth(user, password)
-			@user = user
-			@password = password
-		end
-
-		# Modifies the headers by merging new headers with current headers. 
-		#
-		# @param headers [Hash] new headers to merge with current headers
-		def set_headers(headers)
-			@headers = @headers.merge(headers)
-		end
-
-		# Basic web services Get command
-		#
-		# @param headers [Hash] header parameters including authorization and Content-Type
-		# @param path [String] Path of service to send the command to
-		# @param parameters [Hash] query string that added as part of the URL
-		# @return The response from the rest server is returned
-		def get(headers = {}, path = '', parameters = {})
-			full_path = path_with_params(path, parameters)
-			uri = URI.parse("#{@url}#{full_path}")
-			return request(uri, Net::HTTP::Get.new(uri.request_uri), nil, headers)
-		end
- 
-		# Basic web services Post command
-		# 
-		# @param path [String] Path of service to send the command to
-		# @param body [Any type of string] Data to put in the body such as json or xml
-		# @param headers [Hash] header parameters including authorization and Content-Type
-		# @return The response from the rest server is returned
-		def post(body = nil, headers = {}, path = '')
-			uri = URI.parse("#{@url}#{path}")
-			return request(uri, Net::HTTP::Post.new(uri.request_uri), body, headers)
-		end
- 
-		# Basic web services Delete command
-		# 
-		# @param path [String] Path of service to send the command to
-		# @param headers [Hash] header parameters including authorization and Content-Type
-		# @return The response from the rest server is returned
-		def delete(headers = {}, path = '')
-			uri = URI.parse("#{@url}#{path}")
-			return request(uri, Net::HTTP::Delete.new(uri.request_uri), headers)
-		end
- 
-		# Basic web services Put command
-		# 
-		# @param path [String] Path of service to send the command to
-		# @param body [String] data to put in the body
-		# @param headers [Hash] header parameters including authorization and Content-Type
-		# @return Response from the rest server is returned
-		def put(body = nil, headers = {}, path = '')
-			uri = URI.parse("#{@url}#{path}")
-			return request(uri, Net::HTTP::Put.new(uri.request_uri), body, headers)
-		end
-
-		# Get the code from the last call
-		#
-		# @return the http code such as 200, 301, 403, 404, or 500
-		def get_code
-			@wsresponse.code
-		end
- 
-		# Set verbose on or off
-		#
-		# @param on [Boolean] True=verbose, False=Not verbose
-		def set_verbose(on = true)
-			@verbose = on
-		end
-
-		private
-
-		def path_with_params(path, params)
-		   encoded_params = URI.encode_www_form(params)
-		   [path, encoded_params].join("?")
-		end
-
-		# Sending the web services command
-		#
-		# @param uri [URI] Uri to send the command to
-		# @param request [HTTP Request] command to send as Net::HTTP:<command> class; get, post, put, delete.
-		# @param body [String] data to put in the body
-		# @param headers [Hash] header parameters including authorization and Content-Type
-		# @return The response from the rest server is returned
-		def request(uri, request, body = nil, headers = {})
-			@headers.merge(headers).each { |key, value| request[key] = value }
-			request.basic_auth(@user, @password) unless @user.nil?
-			request.body = body unless body.nil?
-			http = Net::HTTP.new(uri.host, uri.port)
-			http.use_ssl = true if uri.scheme == 'https'
-			print_request(request, http, uri)
-			begin
-				@wsresponse = http.request(request)
-				print_response(@wsresponse)
-				return @wsresponse
-			rescue Timeout::Error => e 
-				raise e.message
-			end
-		end
-		
-		# Print the Request 
-		def print_request(request, http, uri)
-			if uri.query==''
-				query = ''
-			else
-				query = "?#{uri.query}"
-			end
-			if @verbose
-				puts ">> REQUEST"
-	        	puts ">  URL: #{uri.scheme}://#{uri.host}:#{uri.port}#{uri.path}#{query}"
-	        	puts ">  Headers: "
-	        	request.each { |key, value| puts " >  #{key}: #{value}" }
-	        	# puts "> Basic_Auth #{request.basic_auth}"
-		        puts ">  BODY = "
-		        if request.body.nil?
-		            puts "[Empty]"
-	            elsif request['Content-Type']=='application/json'
-		            jj JSON(request.body) 
-		        elsif request['Content-Type']=='text/csv'
-		            puts request.body
-		        elsif request['Content-Type']=='application/xml'
-		            puts pretty_xml(request.body)
-		        else
-		            puts request.body
-		        end
-		    end
-	    end
- 
-		# Pretty print the web services last response
-		def print_response(response)
-			if @verbose
-		        puts "<< RESPONSE"
-		        puts " < CODE = #{response.code}"
-		        puts " < MESSAGE = #{response.message}"
-		        response.each { |key, value| puts " < #{key} = #{value}\n"}
-		        puts " < BODY = "
-		        if response.header['Content-Type']=='application/json'
-		            jj JSON(response.body) 
-		        elsif response.header['Content-Type']=='text/csv'
-		            puts response.body
-		        elsif response.header['Content-Type']=='application/xml'
-		            puts pretty_xml(body)
-		        elsif response.body.nil?
-		            puts "[Empty]"
-		        else 
-		            puts "#{response.body}\n<"
-		        end
-		    end
-	    end
-
-	    def pretty_xml(xml)
-	    	doc = Nokogiri.XML(xml) do |config|
-  				config.default_xml.noblanks
-  			end
-  			return doc.to_xml(:indent => 2)
-  		end
-	end
+  # Sends and receives data to a restful web service
+  class Client
+    PARAM_STARTER = '?'
+    PARAM_SEPARATOR = '&'
+
+    # The WebService Response from the last call
+    attr_reader :wsresponse
+    # The user (for authentication)
+    attr_reader :user
+    # The password for the user (for authentication)
+    attr_reader :password
+    # Response Code
+    attr_reader :code
+
+    # Creates a new rest client
+    #
+    # @param url [String] url of the rest service
+    # eg. http://myrestservice.com:80/time
+    # @param headers [Hash] default headers to use.
+    # eg. '{ \"Content-Type\" => \"application/json\"}'
+    # Can be multiple headers separated by commas inside the brackets.
+    def initialize(url, headers = {}, user = nil, password = nil)
+      @url = url
+      @headers = headers
+      @user = user
+      @password = password
+      @verbose = (ENV['DEBUG_HTTP'] != 'false')
+    end
+
+    # Adds user/password to the rest client
+    #
+    # @param user [String] user that has authorization
+    # @param password [String] authorized user's password
+    def set_auth(user, password)
+      @user = user
+      @password = password
+    end
+
+    # Modifies the headers by merging new headers with current headers.
+    #
+    # @param headers [Hash] new headers to merge with current headers
+    def add_headers(headers)
+      @headers = @headers.merge(headers)
+    end
+
+    # Basic web services Get command
+    #
+    # @param headers [Hash] header parameters including authorization
+    #   and Content-Type
+    # @param path [String] Path of service to send the command to
+    # @param parameters [Hash] query string that added as part of the URL
+    # @return The response from the rest server is returned
+    def get(headers = {}, path = '', parameters = {})
+      full_path = [path, URI.encode_www_form(parameters)].join(PARAM_STARTER)
+      uri = URI.parse("#{@url}#{full_path}")
+      request = Net::HTTP::Get.new(uri.request_uri)
+      request.body = nil
+      send_request(uri, request, headers)
+    end
+
+    # Basic web services Post command
+    #
+    # @param path [String] Path of service to send the command to
+    # @param body [Any type of string] Data to put in the
+    #   body such as json or xml
+    # @param headers [Hash] header parameters including authorization
+    #   and Content-Type
+    # @return The response from the rest server is returned
+    def post(body = nil, headers = {}, path = '')
+      uri = URI.parse("#{@url}#{path}")
+      request = Net::HTTP::Post.new(uri.request_uri)
+      request.body = body unless body.nil?
+      send_request(uri, request, headers)
+    end
+
+    # Basic web services Delete command
+    #
+    # @param path [String] Path of service to send the command to
+    # @param headers [Hash] header parameters including
+    #   authorization and Content-Type
+    # @return The response from the rest server is returned
+    def delete(headers = {}, path = '', parameters = {})
+      full_path = [path, URI.encode_www_form(parameters)].join(PARAM_STARTER)
+      uri = URI.parse("#{@url}#{full_path}")
+      request = Net::HTTP::Delete.new(uri.request_uri)
+      request.body = nil
+      send_request(uri, request, headers)
+    end
+
+    # Basic web services Put command
+    #
+    # @param path [String] Path of service to send the command to
+    # @param body [String] data to put in the body
+    # @param headers [Hash] header parameters including authorization
+    #   and Content-Type
+    # @return Response from the rest server is returned
+    def put(body = nil, headers = {}, path = '')
+      uri = URI.parse("#{@url}#{path}")
+      request = Net::HTTP::Put.new(uri.request_uri)
+      request.body = body unless body.nil?
+      send_request(uri, request, headers)
+    end
+
+    private
+
+    def send_request(uri, request, headers)
+      @headers.merge(headers).each { |key, value| request[key] = value }
+      request.basic_auth(@user, @password) unless @user.nil?
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true if uri.scheme == 'https'
+      print_request(request, uri)
+      @wsresponse = http.request(request)
+      print_response(@wsresponse)
+      @wsresponse
+    end
+
+    def print_request(request, uri)
+      return nil unless @verbose
+      query = ((uri.query == '') ? '' : "?#{uri.query}")
+      puts ">> REQUEST\n"\
+        ">  URL: #{uri.scheme}://#{uri.host}:#{uri.port}#{uri.path}#{query}\n"\
+        ">  Headers:\n"\
+        "#{header_text(request, '> ')}\n"\
+        ">  BODY =\n"\
+        ">  BODY =\n#{body_text(request['Content-Type'], request.body)}"
+    end
+
+    def print_response(response)
+      return nil unless @verbose
+      puts "<< RESPONSE\n"\
+         "< CODE = #{response.code}\n"\
+         "< MESSAGE = #{response.message}\n"\
+         "#{header_text(response, ' <')}\n"\
+         "< BODY =\n#{body_text(response['Content-Type'], response.body)}"
+    end
+
+    def header_text(message, pointer)
+      headers = ''
+      message.each { |key, value| headers << "#{pointer} #{key} = #{value}\n" }
+      headers
+    end
+
+    def body_text(type, response_body)
+      return '[Empty]' if response_body.nil?
+      case type
+      when 'application/json'
+        JSON.pretty_generate(response_body)
+      when 'application/xml'
+        pretty_xml(response_body)
+      else
+        "#{response_body}\n<"
+      end
+    end
+
+    def pretty_xml(xml)
+      doc = Nokogiri.XML(xml) { |config| config.default_xml.noblanks }
+      doc.to_xml(indent: 2)
+    end
+  end
 end

data/rest_baby.gemspec

@@ -4,21 +4,21 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'rest_baby/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "rest_baby"
+  spec.name          = 'rest_baby'
   spec.version       = RestBaby::VERSION
-  spec.authors       = ["Dave McNulla"]
-  spec.email         = ["mcnulla@gmail.com"]
-  spec.description   = %q{Rest client}
-  spec.summary       = %q{This is a small rest client developed for use in testing rest services.}
-  spec.homepage      = "https://github.com/dmcnulla/rest_baby"
-  spec.license       = "MIT"
+  spec.authors       = ['Dave McNulla']
+  spec.email         = ['mcnulla@gmail.com']
+  spec.description   = 'Rest client'
+  spec.summary       = 'Small rest client developed to testing rest services.'
+  spec.homepage      = 'https://github.com/dmcnulla/rest_baby'
+  spec.license       = 'MIT'
 
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  spec.executables   = spec.files.grep(/^bin/) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(/^(test|spec|features)/)
+  spec.require_paths = ['lib']
 
-  spec.add_dependency 'nokogiri', '~> 0'
+  spec.add_dependency 'nokogiri', '~> 1.6'
   spec.add_dependency 'json', '~> 1.8', '>= 1.8.0'
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake', '~> 0'
@@ -26,5 +26,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'fig_newton', '~> 0.9'
   spec.add_development_dependency 'rspec', '~> 2.14', '>= 2.14.1'
   spec.add_development_dependency 'webmock', '~> 1.13', '>= 1.13.0'
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest_baby
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.6'
 platform: ruby
 authors:
 - Dave McNulla
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-28 00:00:00.000000000 Z
+date: 2015-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -153,6 +153,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".rubocop.yml"
 - ChangeLog
 - Gemfile
 - LICENSE.txt
@@ -202,7 +203,7 @@ files:
 - doc/stepdefinition_list.html
 - doc/tag_list.html
 - doc/top-level-namespace.html
-- features/headers/header_options.feature
+- features/header_options.feature
 - features/print_response.feature
 - features/rest_client.feature
 - features/step_definitions/header_steps.rb
@@ -234,12 +235,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: This is a small rest client developed for use in testing rest services.
+summary: Small rest client developed to testing rest services.
 test_files:
-- features/headers/header_options.feature
+- features/header_options.feature
 - features/print_response.feature
 - features/rest_client.feature
 - features/step_definitions/header_steps.rb