rpdoc 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 963515874d698d5e0dc7a13f81ac47cfb669022c84e91561cab91c0a23963774
-  data.tar.gz: ac8543e04985d09166790d1f4604478995788cd10a5f38d95ba8b9e1637e6599
+  metadata.gz: 43e4c8339b0e0c0284081a6fc379ba6c7f32cd2da141e183f9016ed043d5652c
+  data.tar.gz: 2e30093e3e338f2668fb44b18e94d907062fd1fa01c943c8f1c33c10cf4fb0bb
 SHA512:
-  metadata.gz: 1ca60eac1301f3aa5d320effbbb1065ed0a78374fc897793841ade037abce37a5d45ae6ae74bdbf4e94b222a2fb8d70cedfaa9fc4078a5cda646ee285d7ef8d9
-  data.tar.gz: be9d0823c2ff93d0709b523534e9705fcd0ad5048cc4af92fc05f9f096d5cec36300bce1b3c8087fe06845e166efef6c2a996c5936dc591ba13e5e63e9b7f204
+  metadata.gz: 2e396d921816259e7055d7b78338c163a3d5f00e022487ef1517f10ae2fbd957a0a1148d0d1a87e03d1cab2ca39dd6cd11343946c9ded6fb5c731b9344270ea4
+  data.tar.gz: d97e2ff1940687757a3576705f548678da23152c7e6ffbd0264ef958e69b0e83534801f70b833758ac4aa557cd665a7fd9952d77229fc9eeda25daab3dc69dae

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.2.2] - 2024-06-28
+- Fix push_and_update strategy bug.
+
+## [0.2.1] - 2024-04-11
+- Fix `rspec_response_identifier` option bug.
+- Fix path bug for redirected requests and `push_and_update` strategy.
+
 ## [0.2.0] - 2024-04-02
 - Add `rspec_root`, `rspec_response_allow_headers`, and `rspec_response_identifier` options to configuration.
 - Add public method `merge!` for PostmanCollection.

data/VERSION.md

@@ -1 +1 @@
-0.2.0
+0.2.2

data/lib/rpdoc/configuration.rb

@@ -66,7 +66,7 @@ module Rpdoc
     def valid?
       return true unless @rpdoc_enable && @rpdoc_auto_push
       return false if @postman_apikey.nil?
-      return false unless RSPEC_RESPONSE_IDENTIFIERS.include?(@rspec_response_identifier.to_sym)
+      return false unless RSPEC_RESPONSE_IDENTIFIERS.include?(@rspec_response_identifier&.to_sym)
       return false unless RPDOC_AUTO_PUSH_STRATEGIES.include?(@rpdoc_auto_push_strategy.to_sym)
       return false if @rpdoc_auto_push_strategy == :push_and_update && @collection_uid.nil?
       return false if @rpdoc_folder_ordering.present? && (RPDOC_FOLDER_ORDERING.exclude?(@rpdoc_folder_ordering) || !@rpdoc_folder_ordering.is_a?(Array))

data/lib/rpdoc/postman_collection.rb

@@ -39,7 +39,7 @@ module Rpdoc
       remote_collection = PostmanCollection.new(data: remote_collection_data)
       remote_collection.clean_generated_responses!
       remote_collection.merge!(self)
-      @requester.http_send(:put, path, remote_collection.data, headers)
+      @requester.http_send(:put, path, remote_collection.data, headers, content_type_charset: nil)
     end
 
     def save(path: nil)
@@ -144,7 +144,7 @@ module Rpdoc
               item_hash[from_item_name][:description] = from_item[:description]
               insert_generated_responses_into(item_hash[from_item_name][:item], from_collection_items: from_item[:item].to_a)
             elsif from_item.has_key?(:response) && item_hash[from_item_name].has_key?(:response)
-              item_hash[from_item_name][:request][:description] = from_item[:request][:description]
+              item_hash[from_item_name][:request] = from_item[:request].deep_dup
               item_hash[from_item_name][:response] += from_item[:response].deep_dup
             else
               collection_items << from_item.deep_dup

data/lib/rpdoc/postman_response.rb

@@ -84,13 +84,15 @@ module Rpdoc
           text: 'text'
         }
       end.compact
+
+      original_path = @rspec_request.original_fullpath.split('?').first # use original_fullpath instead of path to avoid request being redirected
       {
         method: @rspec_request.method,
         header: filter_headers,
         url: {
-          raw: "#{@configuration.rspec_server_host}#{@rspec_request.path}",
+          raw: "#{@configuration.rspec_server_host}#{original_path}",
           host: [@configuration.rspec_server_host],
-          path: @rspec_request.path.split('/'),
+          path: original_path.split('/'),
           query: query_string
         },
         body: original_request_data_body

data/lib/rpdoc/version.rb

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

data/rpdoc.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'json_requester', '~> 1.0'
+  spec.add_dependency 'json_requester', '~> 1.1.1'
   spec.add_dependency 'activesupport', '~> 6.1'
 
   spec.add_development_dependency 'railties', '~> 6.1.4'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rpdoc
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - yuntai
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-04-02 00:00:00.000000000 Z
+date: 2024-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_requester
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement