rest_baby 0.2 → 0.3

data/doc/stepdefinition_list.html

@@ -84,8 +84,8 @@
   <li class="r2">
   <span class='object_link'>
     <span class="pre">Given</span>
-      <a href="requirements/step_transformers.html#step_definition2-stepdefinition" title="/^I have &quot;(GET|PUT|POST|DELETE)&quot; service for &quot;(.*?)&quot; with the following headers$/">
-        <span class="name">/^I have &quot;(GET|PUT|POST|DELETE)&quot; service for &quot;(.*?)&quot; with the following headers$/</span>
+      <a href="requirements/step_transformers.html#step_definition2-stepdefinition" title="/^I have &quot;(GET|PUT|POST|DELETE)&quot; service for &quot;([^&quot;]*) with the following headers$/">
+        <span class="name">/^I have &quot;(GET|PUT|POST|DELETE)&quot; service for &quot;([^&quot;]*) with the following headers$/</span>
       </a>&nbsp;&nbsp;
   </span>
   <small>features/step_definitions/header_steps.rb:8</small>
@@ -94,9 +94,9 @@
 
   <li class="r1">
   <span class='object_link'>
-    <span class="pre">When</span>
-      <a href="requirements/step_transformers.html#step_definition3-stepdefinition" title="/^I have the following headers?$/">
-        <span class="name">/^I have the following headers?$/</span>
+    <span class="pre">Given</span>
+      <a href="requirements/step_transformers.html#step_definition3-stepdefinition" title="/^I have &quot;(GET|PUT|POST|DELETE)&quot; service for &quot;([^&quot;]*) for user &quot;([^&quot;]*) and password &quot;([^&quot;]*)$/">
+        <span class="name">/^I have &quot;(GET|PUT|POST|DELETE)&quot; service for &quot;([^&quot;]*) for user &quot;([^&quot;]*) and password &quot;([^&quot;]*)$/</span>
       </a>&nbsp;&nbsp;
   </span>
   <small>features/step_definitions/header_steps.rb:13</small>
@@ -104,20 +104,31 @@
   
 
   <li class="r2">
+  <span class='object_link'>
+    <span class="pre">When</span>
+      <a href="requirements/step_transformers.html#step_definition4-stepdefinition" title="/^I have the following headers?$/">
+        <span class="name">/^I have the following headers?$/</span>
+      </a>&nbsp;&nbsp;
+  </span>
+  <small>features/step_definitions/header_steps.rb:18</small>
+  </li>
+  
+
+  <li class="r1">
   <span class='object_link'>
     <span class="pre">Given</span>
-      <a href="requirements/step_transformers.html#step_definition4-stepdefinition" title="/^I have basic auth for user &quot;(.*?)&quot; and password &quot;(.*?)&quot;$/">
+      <a href="requirements/step_transformers.html#step_definition5-stepdefinition" title="/^I have basic auth for user &quot;(.*?)&quot; and password &quot;(.*?)&quot;$/">
         <span class="name">/^I have basic auth for user &quot;(.*?)&quot; and password &quot;(.*?)&quot;$/</span>
       </a>&nbsp;&nbsp;
   </span>
-  <small>features/step_definitions/header_steps.rb:17</small>
+  <small>features/step_definitions/header_steps.rb:22</small>
   </li>
   
 
-  <li class="r1">
+  <li class="r2">
   <span class='object_link'>
     <span class="pre">Given</span>
-      <a href="requirements/step_transformers.html#step_definition5-stepdefinition" title="/^I have a web service$/">
+      <a href="requirements/step_transformers.html#step_definition6-stepdefinition" title="/^I have a web service$/">
         <span class="name">/^I have a web service$/</span>
       </a>&nbsp;&nbsp;
   </span>
@@ -125,10 +136,10 @@
   </li>
   
 
-  <li class="r2">
+  <li class="r1">
   <span class='object_link'>
     <span class="pre">Given</span>
-      <a href="requirements/step_transformers.html#step_definition6-stepdefinition" title="/^I have &quot;(GET|PUT|POST|DELETE)&quot; service for &quot;(.*?)&quot;$/">
+      <a href="requirements/step_transformers.html#step_definition7-stepdefinition" title="/^I have &quot;(GET|PUT|POST|DELETE)&quot; service for &quot;(.*?)&quot;$/">
         <span class="name">/^I have &quot;(GET|PUT|POST|DELETE)&quot; service for &quot;(.*?)&quot;$/</span>
       </a>&nbsp;&nbsp;
   </span>
@@ -136,10 +147,10 @@
   </li>
   
 
-  <li class="r1">
+  <li class="r2">
   <span class='object_link'>
     <span class="pre">Given</span>
-      <a href="requirements/step_transformers.html#step_definition7-stepdefinition" title="/^I have &quot;(GET|PUT|POST|DELETE)&quot; service for &quot;(.*?)&quot; as follows$/">
+      <a href="requirements/step_transformers.html#step_definition8-stepdefinition" title="/^I have &quot;(GET|PUT|POST|DELETE)&quot; service for &quot;(.*?)&quot; as follows$/">
         <span class="name">/^I have &quot;(GET|PUT|POST|DELETE)&quot; service for &quot;(.*?)&quot; as follows$/</span>
       </a>&nbsp;&nbsp;
   </span>
@@ -147,10 +158,10 @@
   </li>
   
 
-  <li class="r2">
+  <li class="r1">
   <span class='object_link'>
     <span class="pre">Given</span>
-      <a href="requirements/step_transformers.html#step_definition8-stepdefinition" title="/^I am a rest client$/">
+      <a href="requirements/step_transformers.html#step_definition9-stepdefinition" title="/^I am a rest client$/">
         <span class="name">/^I am a rest client$/</span>
       </a>&nbsp;&nbsp;
   </span>
@@ -158,10 +169,10 @@
   </li>
   
 
-  <li class="r1">
+  <li class="r2">
   <span class='object_link'>
     <span class="pre">When</span>
-      <a href="requirements/step_transformers.html#step_definition9-stepdefinition" title="/^I &quot;(GET|DELETE)&quot; from the web service$/">
+      <a href="requirements/step_transformers.html#step_definition10-stepdefinition" title="/^I &quot;(GET|DELETE)&quot; from the web service$/">
         <span class="name">/^I &quot;(GET|DELETE)&quot; from the web service$/</span>
       </a>&nbsp;&nbsp;
   </span>
@@ -169,10 +180,10 @@
   </li>
   
 
-  <li class="r2">
+  <li class="r1">
   <span class='object_link'>
     <span class="pre">When</span>
-      <a href="requirements/step_transformers.html#step_definition10-stepdefinition" title="/^I &quot;(PUT|POST)&quot; to the web service with the following$/">
+      <a href="requirements/step_transformers.html#step_definition11-stepdefinition" title="/^I &quot;(PUT|POST)&quot; to the web service with the following$/">
         <span class="name">/^I &quot;(PUT|POST)&quot; to the web service with the following$/</span>
       </a>&nbsp;&nbsp;
   </span>
@@ -180,10 +191,10 @@
   </li>
   
 
-  <li class="r1">
+  <li class="r2">
   <span class='object_link'>
     <span class="pre">When</span>
-      <a href="requirements/step_transformers.html#step_definition11-stepdefinition" title="/^I pause$/">
+      <a href="requirements/step_transformers.html#step_definition12-stepdefinition" title="/^I pause$/">
         <span class="name">/^I pause$/</span>
       </a>&nbsp;&nbsp;
   </span>
@@ -191,10 +202,10 @@
   </li>
   
 
-  <li class="r2">
+  <li class="r1">
   <span class='object_link'>
     <span class="pre">Then</span>
-      <a href="requirements/step_transformers.html#step_definition12-stepdefinition" title="/^I receive the expected message$/">
+      <a href="requirements/step_transformers.html#step_definition13-stepdefinition" title="/^I receive the expected message$/">
         <span class="name">/^I receive the expected message$/</span>
       </a>&nbsp;&nbsp;
   </span>
@@ -202,10 +213,10 @@
   </li>
   
 
-  <li class="r1">
+  <li class="r2">
   <span class='object_link'>
     <span class="pre">Then</span>
-      <a href="requirements/step_transformers.html#step_definition13-stepdefinition" title="/^I receive the following$/">
+      <a href="requirements/step_transformers.html#step_definition14-stepdefinition" title="/^I receive the following$/">
         <span class="name">/^I receive the following$/</span>
       </a>&nbsp;&nbsp;
   </span>
@@ -213,17 +224,6 @@
   </li>
   
 
-  <li class="r2">
-  <span class='object_link'>
-    <span class="pre">Then</span>
-      <a href="requirements/step_transformers.html#step_definition14-stepdefinition" title="/^the response prints like the following$/">
-        <span class="name">/^the response prints like the following$/</span>
-      </a>&nbsp;&nbsp;
-  </span>
-  <small>features/step_definitions/rest_client_steps.rb:56</small>
-  </li>
-  
-
       </ul>
     </div>
   </body>

data/doc/tag_list.html

@@ -84,42 +84,48 @@
   
 
   <li class="r1">
-	<span class='object_link'><a href="requirements/tags/print.html" title="requirements::tags::print (tag)">@print</a></span>
+	<span class='object_link'><a href="requirements/tags/core.html" title="requirements::tags::core (tag)">@core</a></span>
 	<small>4</small>
   </li>
   
 
   <li class="r2">
-	<span class='object_link'><a href="requirements/tags/core.html" title="requirements::tags::core (tag)">@core</a></span>
+	<span class='object_link'><a href="requirements/tags/print.html" title="requirements::tags::print (tag)">@print</a></span>
 	<small>4</small>
   </li>
   
 
   <li class="r1">
+	<span class='object_link'><a href="requirements/tags/wip.html" title="requirements::tags::wip (tag)">@wip</a></span>
+	<small>4</small>
+  </li>
+  
+
+  <li class="r2">
 	<span class='object_link'><a href="requirements/tags/get.html" title="requirements::tags::get (tag)">@get</a></span>
 	<small>3</small>
   </li>
   
 
-  <li class="r2">
+  <li class="r1">
 	<span class='object_link'><a href="requirements/tags/put.html" title="requirements::tags::put (tag)">@put</a></span>
 	<small>2</small>
   </li>
   
 
-  <li class="r1">
+  <li class="r2">
 	<span class='object_link'><a href="requirements/tags/headers.html" title="requirements::tags::headers (tag)">@headers</a></span>
 	<small>2</small>
   </li>
   
 
-  <li class="r2">
+  <li class="r1">
 	<span class='object_link'><a href="requirements/tags/delete.html" title="requirements::tags::delete (tag)">@delete</a></span>
 	<small>2</small>
   </li>
   
 
-  <li class="r1">
+  <li class="r2">
 	<span class='object_link'><a href="requirements/tags/authentication.html" title="requirements::tags::authentication (tag)">@authentication</a></span>
 	<small>2</small>
   </li>

data/doc/top-level-namespace.html

@@ -6,7 +6,7 @@
 <title>
   Top Level Namespace
   
-    &mdash; Documentation by YARD 0.8.7
+    &mdash; Documentation by YARD 0.8.7.3
   
 </title>
 
@@ -105,7 +105,7 @@
   
     
       <dt class="r1">Includes:</dt>
-      <dd class="r1">PinchHitter, <span class='object_link'><a href="RestBaby.html" title="RestBaby (module)">RestBaby</a></span>, WebMock</dd>
+      <dd class="r1">WebMock::API</dd>
       
     
   
@@ -118,11 +118,9 @@
 <p class="children">
   
     
-      <strong class="modules">Modules:</strong> <span class='object_link'><a href="RestBaby.html" title="RestBaby (module)">RestBaby</a></span>
-    
   
     
-      <strong class="classes">Classes:</strong> <span class='object_link'><a href="MockRestService.html" title="MockRestService (class)">MockRestService</a></span>, <span class='object_link'><a href="PinchRestService.html" title="PinchRestService (class)">PinchRestService</a></span>
+      <strong class="classes">Classes:</strong> <span class='object_link'><a href="MockRestService.html" title="MockRestService (class)">MockRestService</a></span>
     
   
 </p>
@@ -141,12 +139,6 @@
 
 
 
-  
-  
-  <h3 class="inherited">Constants included
-     from <span class='object_link'><a href="RestBaby.html" title="RestBaby (module)">RestBaby</a></span></h3>
-  <p class="inherited"><span class='object_link'><a href="RestBaby.html#VERSION-constant" title="RestBaby::VERSION (constant)">RestBaby::VERSION</a></span></p>
-
 
 
 
@@ -192,7 +184,6 @@
   
   
   
-  
 
   <div id="instance_method_details" class="method_details_list">
     <h2>Instance Method Details</h2>
@@ -235,9 +226,9 @@
 </div>
 
     <div id="footer">
-  Generated on Tue Aug  6 23:42:42 2013 by
+  Generated on Thu Feb 13 23:38:39 2014 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.8.7 (ruby-2.0.0).
+  0.8.7.3 (ruby-2.0.0).
 </div>
 
   </body>

data/features/headers/header_options.feature

@@ -1,6 +1,6 @@
 Feature: Create a basic rest client that can get, put, post, and delete
 
-@extended @get @headers
+@extended @get @headers @wip
 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 +11,7 @@ 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
+@extended @post @headers @wip
 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
@@ -22,24 +22,24 @@ Scenario: client uses an Accept and a Content-Type header for a POST
     | Content-Type | application/json |
     | Accept | application/json |
   And 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
 
-@extended @post @authentication
+@extended @post @authentication @wip
 Scenario: client uses basic authentication
   Given I have a web service
-  And I have "GET" service for "/test"
+  And I have "GET" service for "/test" for user "test" and password "rest"
   And I am a rest client
   And I have basic auth for user "test" and password "rest"
   And I "GET" from the web service
   Then I receive the expected message
 
-@extended @post @authentication
+@extended @post @authentication @wip
 Scenario: client uses a secure web server
   Given I have a secure web service
-  And I have "GET" service for "/test"
+  And I have "GET" service for "/test" for user "test" and password "rest"
   And I am a rest client
   And I have basic auth for user "test" and password "rest"
   And I "GET" from the web service

data/features/print_response.feature

@@ -11,13 +11,6 @@ Scenario: client rest Get
 # And I pause
   When I "GET" from the web service
   Then I receive the expected message
-  And the response prints like the following
-  """
-CODE = 200
-MESSAGE = 
-BODY = {'Answer': 'What did you expect?'}
-  """
-
 
 @put @extended @print
 Scenario: client rest Put
@@ -32,12 +25,6 @@ Scenario: client rest Put
     {'Answer': 'What did you expect?'}
     """
   Then I receive the expected message
-  And the response prints like the following
-  """
-CODE = 200
-MESSAGE = 
-BODY = {'Answer': 'What did you expect?'}
-  """
 
 @post @extended @print
 Scenario: client rest Post
@@ -52,12 +39,6 @@ Scenario: client rest Post
     {'Answer': 'What did you expect?'}
     """
   Then I receive the expected message
-  And the response prints like the following
-  """
-CODE = 200
-MESSAGE = 
-BODY = {'Answer': 'What did you expect?'}
-  """
 
 @delete @extended @print
 Scenario: client rest Delete
@@ -69,9 +50,3 @@ Scenario: client rest Delete
   And I am a rest client
   When I "DELETE" from the web service
   Then I receive the expected message
-  And the response prints like the following
-  """
-CODE = 200
-MESSAGE = 
-BODY = {'Answer': 'What did you expect?'}
-  """

data/features/step_definitions/header_steps.rb

@@ -2,18 +2,23 @@ Given(/^I have a secure web service$/) do
 	@protocol = 'https'
  	@server = FigNewton.server
 	@port = FigNewton.port
-  @mockservice = MockRestService.new(@server, @port, @protocol)
+	@mockservice = MockRestService.new(@server, @port, @protocol)
 end
 
-Given(/^I have "(GET|PUT|POST|DELETE)" service for "(.*?)" with the following headers$/) do |type, path, table|
+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)
 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)
+end
+
 When(/^I have the following headers?$/) do |table|
 	@restbaby.set_headers(table.rows_hash)
 end
 
 Given(/^I have basic auth for user "(.*?)" and password "(.*?)"$/) do |user, password|
-  @restbaby.set_auth(user, password)
+	@restbaby.set_auth(user, password)
 end

data/features/step_definitions/rest_client_steps.rb

@@ -4,7 +4,7 @@ Given(/^I have a web service$/) do
 	@protocol = 'http'
 	@server = FigNewton.server
 	@port = FigNewton.port
-  @mockservice = MockRestService.new(@server, @port, @protocol)
+	@mockservice = MockRestService.new(@server, @port, @protocol)
 end
 
 Given(/^I have "(GET|PUT|POST|DELETE)" service for "(.*?)"$/) do |type, path|
@@ -26,7 +26,6 @@ When(/^I "(GET|DELETE)" from the web service$/) do |type|
 	when 'get'
 		@response = @restbaby.get
 	when 'delete'
-		# @response = @restbaby.delete(@path)
 		@response = @restbaby.delete
 	end
 end
@@ -53,7 +52,3 @@ Then(/^I receive the following$/) do |message|
 	expect(@response.code).to eq('200')
 	expect(@response.body).to eq(message)
 end
-
-Then(/^the response prints like the following$/) do |response|
-  expect(@restbaby.print_last_response).to eq(response)
-end

data/features/support/env.rb

@@ -1,6 +1,5 @@
 require 'rspec-expectations'
 require 'fig_newton'
-require 'pinch_hitter'
 require 'cucumber/rspec/doubles'
 require 'rubygems'
 require 'webmock/cucumber'

data/features/support/mock_rest_service.rb

@@ -20,13 +20,9 @@ class MockRestService
     auth_string = "#{user}:#{password}@" unless (user.nil? || password.nil?)
     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 => {})
-        stub_request(type.downcase.to_sym, "#{@protocol}://#{auth_string}#{@host}:#{@port}#{path}").
+        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).

data/lib/rest_baby/version.rb

@@ -1,3 +1,3 @@
 module RestBaby
-  VERSION = "0.2"
+  VERSION = "0.3"
 end