rpdoc 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f03cfd2f4d8be54605de03a2c0516cc3948183a93ea74f492df9a4759324bed
-  data.tar.gz: c38f408b3d95a7317d4cf0ff3e82c0ec0de0ec62cb16e502058419f068070c55
+  metadata.gz: d8f234d1015e23861e910744f7ada506266c634096c6f577e49d6fc6af11301b
+  data.tar.gz: a57bf4be6484e6f313260fc425b5ad41c1b1cd02c62e2de4a59f107cb9590aec
 SHA512:
-  metadata.gz: ade5344d6a36274c2ec3837b083356a946e07dc3bde14d55dc837e79f83b42d607d0b349553eaaca80e0a2e198e5b8919c4f72d0a3229692c2c291b0f31b0af7
-  data.tar.gz: 00f59e9bc5f197f2ca930c6f26ba1219e1a2d6c8eb503c430c00a17bb0cc102bcbc2992799eaed0a358c5c07ea6dd87328abddd57f340d0067cffbde8cd75f5f
+  metadata.gz: 30be6db46768982228147275570ab650c77ae1f60d399fa93d8b10e9464c6f4d190eaca3d5001b43d9ed66bfbdd52110b0dc7f2c99c96c2c138430e0e2489de7
+  data.tar.gz: 5a82d9b23f537e680eb9460d2dcabe307953d47c93264aca310bf8dcc0ee42cd6840e714abfbe8bac13ad76f834659dc32812ed3daa05e903850da097a85f7a5

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## [0.1.4] - 2021-12-22
+- Fix rspec parsing bugs
+
 ## [0.1.3] - 2021-11-09
 - Add require 'rspec/rails' if RSpec::Rails exists
 

data/VERSION.md

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/rpdoc/postman_collection.rb

@@ -40,10 +40,6 @@ module Rpdoc
 
     private
 
-    def collection_data
-      @collection_data ||= @original_collection.present? ? @original_collection.deeper_merge(collection_from_rspec, merge_hash_arrays: true) : collection_from_rspec
-    end
-
     def generated_collection_data
       {
         collection: {

data/lib/rpdoc/postman_response.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'cgi'
+
 module Rpdoc
   class PostmanResponse
     attr_reader :data
@@ -38,15 +40,17 @@ module Rpdoc
     def response_data
       headers = @rspec_response.header.map { |key, value| {key: key, value: value} }
       headers << rspec_location_header
-      {
+      data = {
         name: @rspec_example.metadata[:rpdoc_example_name],
         originalRequest: original_request_data,
         status: @rspec_response.status.to_s,
         code: @rspec_response.code.to_i,
         _postman_previewlanguage: "json",
         header: headers,
-        body: JSON.pretty_generate(JSON.parse(@rspec_response.body))
+        body: nil
       }
+      data[:body] = JSON.pretty_generate(JSON.parse(@rspec_response.body)) rescue nil if @rspec_response.headers['Content-Type'].include?('application/json')
+      data
     end
 
     def rspec_location_header
@@ -65,6 +69,14 @@ module Rpdoc
           value: @rspec_request.headers[header]
         }
       end.compact
+      query_string = @rspec_request.query_string.split('&').map do |string|
+        key, value = string.split('=')
+        {
+          key: key,
+          value: CGI.unescape(value),
+          text: 'text'
+        }
+      end
       @original_request_data = {
         method: @rspec_request.method,
         header: filter_headers,
@@ -72,7 +84,7 @@ module Rpdoc
           raw: "#{@configuration.rspec_server_host}#{@rspec_request.path}",
           host: [@configuration.rspec_server_host],
           path: @rspec_request.path.split('/'),
-          variable: [],
+          query: query_string
         },
         body: nil
       }

data/lib/rpdoc/rpdoc.rake

@@ -0,0 +1,8 @@
+namespace :rpdoc do
+  desc 'push collection to the Postman server'
+  task :push => :environment do
+    postman_collection = Rpdoc::PostmanCollection.new
+    postman_collection.save
+    postman_collection.send(Rpdoc.configuration.rpdoc_auto_push_strategy) if Rpdoc.configuration.rpdoc_auto_push
+  end
+end

data/lib/rpdoc/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Rpdoc
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rpdoc
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - yuntai
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-09 00:00:00.000000000 Z
+date: 2021-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_requester
@@ -107,6 +107,7 @@ files:
 - lib/rpdoc/helper.rb
 - lib/rpdoc/postman_collection.rb
 - lib/rpdoc/postman_response.rb
+- lib/rpdoc/rpdoc.rake
 - lib/rpdoc/version.rb
 - rpdoc.gemspec
 homepage: https://github.com/kdan-mobile-software-ltd/rpdoc