rest_baby 0.6 → 0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86630eb56f0b1daee5aa7f2e7a28776a1e38d3b6
-  data.tar.gz: 6a44e6984e440e831bd7eb9f1ade1dc7834504bb
+  metadata.gz: 025aec7dd8041866fecfa8cf50d579d0e5936a68
+  data.tar.gz: 1e1650c191318c9e9964a35835d866ce8700a570
 SHA512:
-  metadata.gz: 7be630a9887bcbbcc1b9130f3886d9beeb42ead8e1809bedd390a73d0fc0b83447a59a2a80b145dbe7cc35adc2752afac0fb8d3918ded85185656a258c527d6e
-  data.tar.gz: ac1c5a81bc2e75166a60ad9a1a7cc1bc69bd96bea059e2d4329006ebd845b3fc10fe958ce637cb0e2b86112729d56cb90f6262d3944395b34542c63ebf736008
+  metadata.gz: ba7e003cdc97de5bc736cc2e89b56e2385da4553c3a3f9c110ca702a417e37b5d24f2cb39d3bdb288527c9cbbf3edb0b25dcd6dfbe0d267a20d40e0a06fa43f9
+  data.tar.gz: da93cbc88179db54ae4aac3ee9ba75ea40ca777c8e4ac0d3c5b2d4368e9294d95be513509be4225a19682f2a377abc7d12c63acafeb19b272452d264bb30569d

data/ChangeLog

@@ -21,7 +21,11 @@
 === 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
+=== Version 0.6 / 2015-02-01
 * Fixed reference to nokogiri' (~> 0)
 * Fixed all cukes, no more @wip
 * Added rubocop style-checker/lint compliance
+=== Version 0.7 / 2014-02-10
+* Tested debug fix of json printing
+=== Version 0.8 / 2014-02-10
+* Fixed json pretty_print

data/Gemfile.lock

@@ -0,0 +1,68 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.3.7)
+    ast (2.0.0)
+    astrolabe (1.3.0)
+      parser (>= 2.2.0.pre.3, < 3.0)
+    builder (3.2.2)
+    crack (0.4.2)
+      safe_yaml (~> 1.0.0)
+    cucumber (1.3.18)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.1.1)
+    diff-lcs (1.2.5)
+    fig_newton (0.11)
+      yml_reader (>= 0.3)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
+    json (1.8.2)
+    mini_portile (0.6.2)
+    multi_json (1.10.1)
+    multi_test (0.1.1)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    parser (2.2.0.2)
+      ast (>= 1.1, < 3.0)
+    powerpack (0.1.0)
+    rainbow (2.0.0)
+    rspec (3.2.0)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+    rspec-core (3.2.0)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-mocks (3.2.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.1)
+    rubocop (0.29.0)
+      astrolabe (~> 1.3)
+      parser (>= 2.2.0.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.4)
+    ruby-progressbar (1.7.1)
+    safe_yaml (1.0.4)
+    webmock (1.20.4)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+    yml_reader (0.5)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  cucumber
+  fig_newton
+  json
+  nokogiri
+  rspec
+  rubocop
+  webmock

data/features/header_options.feature

@@ -17,8 +17,10 @@ Scenario: client uses an Accept header for a GET
 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
-    | Content-Type | application/json |
-    | Accept       | application/json |
+    | Content-Type    | application/json                        |
+    | Accept          | application/json                        |
+    | Accept-Encoding | gzip;q=1.0,deflate;q=0.6,identity;q=0.3 |
+    | User-Agent      | Ruby                                    |
   And I am a rest client
   When I have the following header 
     | Content-Type | application/json |

data/features/step_definitions/header_steps.rb

@@ -8,7 +8,7 @@ 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_MSG, table.rows_hash)
+  @mockservice.store_msg(type, path, DEFAULT_MSG, table.rows_hash, nil, nil, DEFAULT_RESPONSE)
 end
 
 Given(/^I have "(GET|DELETE)" service for "([^"]*)" for \

data/features/step_definitions/rest_client_steps.rb

@@ -1,4 +1,5 @@
-DEFAULT_MSG = "{\"Answer\": \"What did you expect?\"}"
+DEFAULT_MSG = '{"Answer": "What did you expect?"}'
+DEFAULT_RESPONSE = '{"Question": "What is the meaning of life?"}'
 
 Given(/^I have a web service$/) do
   @protocol = 'http'
@@ -8,25 +9,27 @@ Given(/^I have a web service$/) do
 end
 
 Given(/^I have "(GET|PUT|POST|DELETE)" service for "([^"]*)"$/) do |type, path|
+  @path = path
   if type == 'GET'
-    create_get(type, path)
+    create_get(path)
   else
     @path = path
-    @mockservice.store_msg(type, path, DEFAULT_MSG)
+    @mockservice.store_msg(type, path, DEFAULT_MSG,
+                           {}, nil, nil, DEFAULT_RESPONSE)
   end
 end
 
 Given(/^I have "(GET|PUT|POST|DELETE)" service for "([^"]*)" as follows$/) \
 do |type, path, message|
+  @path = path
   if type == 'GET'
-    create_get(type, path, message)
+    create_get(path, message)
   else
-    @path = path
-    @mockservice.store_msg(type, path, message)
+    @mockservice.store_msg(type, path, DEFAULT_MSG, {}, nil, nil, message)
   end
 end
 
-def create_get(_type, path, message = DEFAULT_MSG)
+def create_get(path, message = DEFAULT_MSG)
   @path = path.split('?')[0]
   if path.split('?').length == 1
     @mockservice.store_msg('GET', @path, message)
@@ -50,7 +53,7 @@ end
 
 When(/^I "(PUT|POST)" to the web service with the following$/) \
 do |type, message|
-  @message = JSON(message)
+  @message = message.strip
   case type.downcase
   when 'put'
     @response = @restbaby.put(@message)
@@ -72,11 +75,6 @@ Then(/^I receive the expected message$/) do
   expect(@response.body).to eq(DEFAULT_MSG)
 end
 
-# Then(/^I receive the following$/) do |message|
-# 	@response.code.should eq('200')
-# 	@response.body.should eq(message)
-# end
-
 Then(/^I receive a message with "([^"]*)"$/) do |message|
   @response.code.should eq('200')
   @response.body.should eq(message)

data/features/support/mock_rest_service.rb

@@ -15,18 +15,19 @@ class MockRestService
     @messages = {}
   end
 
-  def store_msg(type, path, message, headers = {}, user = nil, password = nil)
+  def store_msg(type, path, message, headers = {},
+                user = nil, password = nil, body = nil)
     url = "#{@protocol}://#{auth_string(user, password)}#{@host}:#{@port}#{path}"
     case type.downcase
     when 'get', 'delete'
       WebMock.stub_request(type.downcase.to_sym, url)
         .with(headers: merge_headers(headers))
-        .to_return({ status: 200, body: "#{message}" }, headers: {})
+        .to_return({ status: 200, body: message }, headers: {})
     when 'put', 'post'
-      WebMock.stub_request(:put, url)
+      WebMock.stub_request(type.downcase.to_sym, url)
         .with(body: body,
               headers: merge_headers(headers))
-        .to_return({ status: 200, body: "#{message}" }, headers: {})
+        .to_return({ status: 200, body: message }, headers: {})
     else
       fail "Unsupported type: #{type}"
     end

data/lib/rest_baby/version.rb

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

data/lib/rest_baby.rb

@@ -159,7 +159,7 @@ module RestBaby
       return '[Empty]' if response_body.nil?
       case type
       when 'application/json'
-        JSON.pretty_generate(response_body)
+        pretty_json(response_body)
       when 'application/xml'
         pretty_xml(response_body)
       else
@@ -167,6 +167,11 @@ module RestBaby
       end
     end
 
+    def pretty_json(json)
+      json = JSON(json) unless json.class == Hash
+      JSON.pretty_generate(json)
+    end
+
     def pretty_xml(xml)
       doc = Nokogiri.XML(xml) { |config| config.default_xml.noblanks }
       doc.to_xml(indent: 2)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest_baby
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: '0.8'
 platform: ruby
 authors:
 - Dave McNulla
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -156,6 +156,7 @@ files:
 - ".rubocop.yml"
 - ChangeLog
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile