reqres_rspec 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cb8e704a9372b9368d83a6093c9d9f802168a57
-  data.tar.gz: 638db754921305a9460e84f7a02507478c5f4654
+  metadata.gz: af1fa8a421fe25c73ee8379ca80b33acab8ff382
+  data.tar.gz: 3e0618b1ed96673dd43ee51e0b3134e78742a60f
 SHA512:
-  metadata.gz: bbd5064b18e130250a53d46ee21a08683d3e27fb3895c7cd3b532ec57c706e12732ff05fe7fbd8797ff311aa22fb293febb2ebce9f2d3e7da97c22c3f5b16b10
-  data.tar.gz: 20e83cc5274f7279858e637ce2fd1e14d70a481eab18eca72baceaf64dab707887d327c27d834784d23880983d6c2d49864188d279746561ffd78eecc20c2a16
+  metadata.gz: 658df28bd196eedfec20e21a2ce442c28c5ba913c9fc109d8ec4324ad50cc6dea342135faeb2ac27d8ce095eda2cb11b25f6a043a17d193aaf5f8b05d0f9b8b1
+  data.tar.gz: 300c2f6fb90105b4907ad2bdf7e11b48fde67d8b58db1f5df29d7ecfec974cef5399afad19e762aa86e67a329e648d35591d41c3256d00254ecedbaad72f7aa6

data/lib/reqres_rspec/collector.rb

@@ -69,8 +69,8 @@ module ReqresRspec
         if request_params['controller'] && request_params['action']
           description = get_action_description(request_params['controller'], request_params['action'])
           params = get_action_params(request_params['controller'], request_params['action'])
-          query_parameters = request_params.reject { |p| %w[controller action].include? p }
-          backend_parameters = request_params.reject { |p| !%w[controller action].include? p }
+          query_parameters = request_params.reject { |p| %w[controller action format].include? p }
+          backend_parameters = request_params.reject { |p| !%w[controller action format].include? p }
         end
       end
 
@@ -107,6 +107,15 @@ module ReqresRspec
           headers: read_response_headers(response)
         }
       }
+
+      # cleanup query params
+      begin
+        body_hash = JSON.parse(self.records.last[:request][:body])
+        query_hash = self.records.last[:request][:query_parameters]
+        diff = Hash[*((query_hash.size > body_hash.size) ? query_hash.to_a - body_hash.to_a : body_hash.to_a - query_hash.to_a).flatten]
+        self.records.last[:request][:query_parameters] = diff
+      rescue
+      end
     end
 
     def prepare_filename_for(metadata)
@@ -185,7 +194,7 @@ module ReqresRspec
 
       action_line = nil
       lines.each_with_index do |line, index|
-        if line.match /\s*def #{action}/ #  def show
+        if line.match(/\s*def #{action}/) #  def show
           action_line = index
           break
         end
@@ -197,7 +206,7 @@ module ReqresRspec
         while action_line > 0 && was_comment
           action_line -= 1
 
-          if lines[action_line].match /\s*#/
+          if lines[action_line].match(/\s*#/)
             comment_lines << lines[action_line].strip
           else
             was_comment = false
@@ -219,10 +228,10 @@ module ReqresRspec
 
       description = []
       comment_lines.each_with_index do |line, index|
-        if line.match /\s*#\s*@description/ # @description blah blah
+        if line.match(/\s*#\s*@description/) # @description blah blah
           description << line.gsub(/\A\s*#\s*@description/, '').strip
           comment_lines[(index + 1)..-1].each do |multiline|
-            if !multiline.match /\s*#\s*@param/
+            if !multiline.match(/\s*#\s*@param/)
               description << "\n"
               description << multiline.gsub(/\A\s*#\s*/, '').strip
             else
@@ -243,7 +252,7 @@ module ReqresRspec
       comments_raw = []
       has_param = false
       comment_lines.each do |line|
-        if line.match /\s*#\s*@param/ # @param id required Integer blah blah
+        if line.match(/\s*#\s*@param/) # @param id required Integer blah blah
           has_param = true
           comments_raw << ''
         end
@@ -258,7 +267,7 @@ module ReqresRspec
 
       comments = []
       comments_raw.each do |comment|
-        match_data = comment.match /(?<name>[a-z0-9A-Z_\[\]]+)?\s*(?<required>#{PARAM_IMPORTANCES.join('|')})?\s*(?<type>#{PARAM_TYPES.join('|')})?\s*(?<description>.*)/m
+        match_data = comment.match(/(?<name>[a-z0-9A-Z_\[\]]+)?\s*(?<required>#{PARAM_IMPORTANCES.join('|')})?\s*(?<type>#{PARAM_TYPES.join('|')})?\s*(?<description>.*)/m)
 
         if match_data
           comments << {

data/lib/reqres_rspec/templates/spec.erb

@@ -197,10 +197,17 @@
     <code><%= @record[:request][:method] %> <%= @record[:request][:path] %></code>
 
     <h5>Query parameters</h5>
-    <code><%= @record[:request][:query_parameters] if @record[:request][:method] == 'GET' %></code>
+    <% if @record[:request][:query_parameters].empty? %>
+      <code>empty</code>
+    <% else %>
+      <% lines = ::JSON.pretty_generate(@record[:request][:query_parameters]) %>
+      <code>
+        <%= CodeRay.scan(lines, :json).div(line_numbers: :table) %>
+      </code>
+    <% end %>
 
-    <h5><a href="http://curl.haxx.se/docs/manpage.html">CURL</a> Example</h5>
-    <code>TODO</code>
+    <!--<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? %>

data/lib/reqres_rspec/version.rb

@@ -1,3 +1,3 @@
 module ReqresRspec
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reqres_rspec
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - rilian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2014-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderay