reqres_rspec 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ae933f710a7d0f2d94ede0720c9a23cdfc03fc8
-  data.tar.gz: 5642b23a4cdb3b15dfb684a56efd01b93f9c1e73
+  metadata.gz: 01c69919cded3fc726e8b5f548c0b46788a2fcaa
+  data.tar.gz: 6b70f035c8406224f4ba64fcd041e5f1996b269b
 SHA512:
-  metadata.gz: dc223b883e456fcb6d1a195df35920b8003f00517c0934d37c12553c6880c16a755b61868e2b5d3b28e312ce3a6321098091bd620023c14ead2f5cd62a314ec2
-  data.tar.gz: b30f31e8fc315f6b96cf335a731c5ee096629d3c9ac315dd25d75338a5377b9b7374f2956c6ac8f5bf2e503bb1eab8cd3570c57c4e71bd3fd37a80fe7300b762
+  metadata.gz: 68b3d8736b6376b5e31982fa011e36ce023023ad6f00809bddeeb40408df4a670183992115bdb5c714a28ee5d81121eafd1200e4305c63450c387e2b04698ac7
+  data.tar.gz: a359888d091f877c69e8bee6f39c78d86fba3faa08911b32c7bc6f8f547d91317b6d000f7db4002edca3e9e849a850287e0a98a57832824b0fa1a1ac790c1a75

data/lib/reqres_rspec/collector.rb

@@ -34,6 +34,7 @@ module ReqresRspec
       ORIGINAL_SCRIPT_NAME
       HTTP_COOKIE
       HTTP_ORIGIN
+      RAW_POST_DATA
     ]
 
     def initialize
@@ -80,12 +81,12 @@ module ReqresRspec
           content_length: request.content_length,
           content_type: request.content_type,
           headers: read_request_headers(request),
-          accept: request.accept,
+          accept: request.accept
         },
         response: {
           code: response.status,
           body: response.body,
-          headers: read_response_headers(response),
+          headers: read_response_headers(response)
         }
       }
     end
@@ -186,6 +187,7 @@ module ReqresRspec
           description << line.gsub(/\A\s*#\s*@description/, '').strip
           comment_lines[(index + 1)..-1].each do |multiline|
             if !multiline.match /\s*#\s*@param/
+              description << "\n"
               description << multiline.gsub(/\A\s*#\s*/, '').strip
             else
               break
@@ -202,38 +204,40 @@ module ReqresRspec
     def get_action_params(controller, action)
       comment_lines = get_action_comments(controller, action)
 
-      text_params = []
+      comments_raw = []
       has_param = false
       comment_lines.each do |line|
         if line.match /\s*#\s*@param/ # @param id required Integer blah blah
           has_param = true
-          text_params << ''
+          comments_raw << ''
         end
         if has_param
-          line = line.gsub(/\A\s*#\s*@param/, '').strip
+          #text_params.last << "\n"
+          line = line.gsub(/\A\s*#\s*@param/, '')
           line = line.gsub(/\A\s*#\s*/, '').strip
-          text_params.last << line
+
+          comments_raw.last << "\n" unless comments_raw.last.blank?
+          comments_raw.last << line
         end
       end
 
-      params = []
-
-      text_params.each do |param|
-        match_data = param.match /(?<name>[a-z0-9A-Z_\[\]]+)?\s*(?<required>required)?\s*(?<type>Integer|Boolean|String|Text|Float|Date|DateTime|File)?\s*(?<description>.*)/
+      comments = []
+      comments_raw.each do |comment|
+        match_data = comment.match /(?<name>[a-z0-9A-Z_\[\]]+)?\s*(?<required>required|optional)?\s*(?<type>Integer|Boolean|String|Text|Float|Date|DateTime|File|Array)?\s*(?<description>.*)/m
 
         if match_data
-          params << {
+          comments << {
             name: match_data[:name],
             required: match_data[:required],
             type: match_data[:type],
-            description: match_data[:description],
+            description: match_data[:description]
           }
         else
-          params << { description: param }
+          comments << { description: comment }
         end
       end
 
-      params
+      comments
     end
   end
 end

data/lib/reqres_rspec/version.rb

@@ -1,3 +1,3 @@
 module ReqresRspec
-  VERSION = '0.0.19'
+  VERSION = '0.0.20'
 end

data/lib/reqres_rspec/writers/templates/spec.erb

@@ -154,7 +154,9 @@
       <a id="<%= @index %>"></a><%= @index %>. <%= @record[:title] %>
     </h3>
 
-    <p><%= @record[:description] %></p>
+    <p>
+      <%= @record[:description].gsub("\n", '<br>'.html_safe) %>
+    </p>
 
     <code><%= @record[:request][:method] %> <%= @record[:request_path] %></code>
 
@@ -171,7 +173,7 @@
             <tr>
               <td><%= param[:name] %> <i class="required"><%= param[:required] %></i></td>
               <td><%= param[:type] %></td>
-              <td><%= param[:description] %></td>
+              <td><%= param[:description].gsub("\n", '<br>'.html_safe) %></td>
             </tr>
           <% end %>
         </table>
@@ -194,13 +196,22 @@
     <h5><a href="http://curl.haxx.se/docs/manpage.html">CURL</a> Example</h5>
     <code>TODO</code>
 
+    <h5>Body</h5>
     <% if @record[:request][:body].present? %>
-      <h5>Body</h5>
-      <ol>
-        <% @record[:request][:body].split("\n").each do |line| %>
-          <li style="word-break:&;"><%= line %></li>
-        <% end %>
-      </ol>
+      <% lines = begin
+        JSON.pretty_generate(
+          JSON.parse(
+            @record[:request][:body]
+          )
+        )
+      rescue
+        @record[:request][:body]
+      end %>
+      <code>
+        <%= CodeRay.scan(lines, :json).div(line_numbers: :table) %>
+      </code>
+    <% else %>
+      <code>empty</code>
     <% end %>
 
     <h4>Response</h4>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reqres_rspec
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - rilian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-31 00:00:00.000000000 Z
+date: 2014-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderay