rpdoc 0.1.9 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d38555025c1b436ea3d194ed8a19cde8dbf15ea5cc88a56c60f4ad5251ab8677
-  data.tar.gz: c3dab44f8ce28e9ed61a6ddfe18c3ce269be12b14455e903c0bf74be7a68f4da
+  metadata.gz: 8bd4a2fdf6339f7ab5a963d52ad2ccc3950e7edcca3ffbd7882be39e995d1014
+  data.tar.gz: 228c44ebef79a9852e08a736935c9334cb4cd1e8decca079ff5b38c18fa70cee
 SHA512:
-  metadata.gz: 891ef2d38410d4f0fbd8f6d189a35408534fb8586589346af08557bc61382ede5dfd856b17ee67a77124bbf996eb3f8e9f0b39d613ee5573ab294aa555853986
-  data.tar.gz: 0bbdd35bd8ab65d597a8bca5adca8a2d93519b34680a558766ff9c067564cf3c57beb5088fdc8d6f016e9a7ab72567ba0b161d8576aaf12da11ef74ccaba83f1
+  metadata.gz: e8480e75031c7dadda942348f6ec22799ac217ea78202aea5c53131ff67298e83d25d7cb5b4430eb3c6b870e2c4362650023c0883efe8b152eb673fd2ed2ea4d
+  data.tar.gz: 792babfa02d6b6a54b52f42124b3e519bad2ee2c9a63b197073dfa075ede8a1e50523d4e9334af1b5776d5ba64ed97e737878b960449f31415c7873d7506f2db

data/.gitlab-ci.yml

@@ -24,4 +24,4 @@ to_gem:
     - gem build rpdoc.gemspec
     - gem push $GEM_NAME
   only:
-    - master
+    - /release-\d+\.\d+\.\d+(\.\d+)?/

data/CHANGELOG.md

@@ -1,5 +1,15 @@
+## [0.1.12] - 2022-09-06
+- Handle encoding error
+
+## [0.1.11] - 2022-08-09
+- Check encoding names using instance (PR#1)
+
+## [0.1.10] - 2022-07-14
+- Enable form-data request body
+
 ## [0.1.7, 0.1.8, 0.1.9] - 2022-02-14
 - Fix rspec parse zip response bug
+
 ## [0.1.6] - 2022-02-14
 - Update licnese
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rpdoc (0.1.2)
+    rpdoc (0.1.11)
       json_requester (~> 1.0)
 
 GEM
@@ -33,35 +33,19 @@ GEM
     crass (1.0.6)
     diff-lcs (1.4.4)
     erubi (1.10.0)
-    faraday (1.8.0)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      multipart-post (>= 1.2, < 3)
+    faraday (2.3.0)
+      faraday-net_http (~> 2.0)
       ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
+    faraday-net_http (2.0.3)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    json_requester (1.0.3)
+    json_requester (1.0.7)
       faraday (>= 1.0.0)
     loofah (2.12.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
     minitest (5.14.4)
-    multipart-post (2.1.1)
     nokogiri (1.12.5-x86_64-darwin)
       racc (~> 1.4)
     parallel (1.21.0)
@@ -132,4 +116,4 @@ DEPENDENCIES
   rubocop (~> 1.0)
 
 BUNDLED WITH
-   2.2.15
+   2.2.32

data/VERSION.md

@@ -1 +1 @@
-0.1.9
+0.1.12

data/lib/rpdoc/postman_response.rb

@@ -52,7 +52,7 @@ module Rpdoc
         data[:body] = JSON.pretty_generate(JSON.parse(@rspec_response.body)) rescue nil
       else
         body = @rspec_response.body
-        data[:body] = body.encoding.to_s == 'ASCII-8BIT' ? body.force_encoding("ISO-8859-1").encode("UTF-8") : body
+        data[:body] = body.encoding == Encoding::BINARY ? (body.force_encoding(Encoding::ISO_8859_1).encode(Encoding::UTF_8) rescue body) : body
       end
       data
     end
@@ -75,13 +75,14 @@ module Rpdoc
       end.compact
       query_string = @rspec_request.query_string.split('&').map do |string|
         key, value = string.split('=')
+        next if key.nil? || value.nil?
         {
           key: key,
           value: CGI.unescape(value),
           text: 'text'
         }
-      end
-      @original_request_data = {
+      end.compact
+      {
         method: @rspec_request.method,
         header: filter_headers,
         url: {
@@ -90,18 +91,57 @@ module Rpdoc
           path: @rspec_request.path.split('/'),
           query: query_string
         },
-        body: nil
+        body: original_request_data_body
       }
-      @original_request_data[:body] = {
-        mode: 'raw',
-        raw: JSON.pretty_generate(JSON.parse(@rspec_request.headers['RAW_POST_DATA'])),
-        options: {
-          raw: {
-            language: "json"
+    end
+
+    def original_request_data_body
+      if @rspec_request.headers['RAW_POST_DATA'].present?
+        json_body = JSON.pretty_generate(JSON.parse(@rspec_request.headers['RAW_POST_DATA'])) rescue nil
+        {
+          mode: 'raw',
+          raw: json_body || @rspec_request.headers['RAW_POST_DATA'],
+          options: {
+            raw: {
+              language: json_body.present? ? 'json' : 'text'
+            }
           }
         }
-      } if @rspec_request.headers['RAW_POST_DATA'].present?
-      @original_request_data
-    end  
+      elsif @rspec_request.form_data?
+        {
+          mode: 'formdata',
+          formdata: form_data_object_to_array(@rspec_request.request_parameters)
+        }
+      else
+        nil
+      end
+    end
+
+    def form_data_object_to_array(form_data, prefix: nil)
+      array = []
+      form_data.each do |key, value|
+        key = "#{prefix}[#{key}]" if prefix.present?
+        if value.is_a?(Hash)
+          array += form_data_object_to_array(value, prefix: key)
+        elsif value.is_a?(Array)
+          value.each do |item|
+            array += form_data_object_to_array(item, prefix: "#{key}[]")
+          end
+        elsif value.is_a?(ActionDispatch::Http::UploadedFile)
+          array << {
+            key: key,
+            src: value.original_filename,
+            type: 'file'
+          }
+        else
+          array << {
+            key: key,
+            value: value,
+            type: 'text'
+          }
+        end
+      end
+      array
+    end
   end
 end

data/lib/rpdoc/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rpdoc
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.12
 platform: ruby
 authors:
 - yuntai
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-02-14 00:00:00.000000000 Z
+date: 2022-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_requester