jets 5.0.10 → 5.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5651514504b0be4ea5ca9eb26c21aba7fc5d0c9a820f1243c089baeb37ad0da
-  data.tar.gz: 9b33a24aead4fa2eae801b0cb60dc4fe300410ecd968ac8f714b6ea71e131244
+  metadata.gz: e0f81036f4a6561d9a79f029ca1362a8f48ad234b5318d97126b4530aee2ea27
+  data.tar.gz: 1051b3344523c20ed370a2602b65de25c71d1bce50a5c7cb67ef9dcbcd97e190
 SHA512:
-  metadata.gz: dddc6401aeedf0a081c1607bebb8115d7e710ca3c0ddd9da02ecb0010430bc8ae10f7cb8abb402b5817c309df3dc2d2aff24e2d57fd5d632b2957679c2e2a8d1
-  data.tar.gz: a56b380644caccf47e8e962929f39b495b083bdacb66e91d97e0f1536415370172bbf41dd0b1589251e810e6e31655cedab50512dca88fa6843f1f8683759ff4
+  metadata.gz: f47b839cb9d3138c110d825a3936f0b823b7317e9f6559de1b199f64bad9820bd7716d04576f16ee27242a82e3090877967a6bc540dbe611afdd065e44deb8ff
+  data.tar.gz: a3bca9d28b17ce9a133b1a35bb01154e35601233ce9630172c5be15fe063e341df8af12d6a534628f8c022ac93093276bb879921e8b69d39b9dcc167cc34195b

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/).
 
+## [5.0.11] - 2024-03-20
+- [#711](https://github.com/rubyonjets/jets/pull/711) Fix controller testing in jets 5 - handling of params and query
+- [#715](https://github.com/rubyonjets/jets/pull/715) remove force_encoding that causes issues for international characters
+
 ## [5.0.10] - 2024-02-08
 - [#706](https://github.com/rubyonjets/jets/pull/706) permit YAML load of Date class
 - [#708](https://github.com/rubyonjets/jets/pull/708) Fix Prewarming

data/lib/jets/overrides/lambda/marshaller.rb

@@ -1,4 +1,4 @@
-require 'json'
+require "json"
 
 # Hack AwsLambda Ruby Runtime to fix .to_json issue collision with ActiveSupport.
 # To reproduce:
@@ -18,24 +18,14 @@ module AwsLambda
       def marshall_response(method_response)
         case method_response
         when StringIO, IO
-          [method_response, 'application/unknown']
+          [method_response, "application/unknown"]
         else
-          # Orignal method calls .to_json but this collides with ActiveSupport's to_json
-          # method_response.to_json # application/json is assumed
-          # https://stackoverflow.com/questions/18067203/ruby-to-json-issue-with-error-illegal-malformed-utf-8
-          if method_response.is_a?(Hash)
-            method_response.deep_transform_values! do |v|
-              if v.respond_to?(:force_encoding) && !v.frozen?
-                v.force_encoding("ISO-8859-1").encode("UTF-8")
-              else
-                v # IE: Integer
-              end
-            end
-          end
+          # Note: Removed previous code which did force_encoding("ISO-8859-1").encode("UTF-8")
+          # It caused issues with international characters.
+          # It does not seem like we need the force_encoding anymore.
           JSON.dump(method_response)
         end
       end
-
     end
   end
 end

data/lib/jets/spec_helpers/controllers.rb

@@ -16,19 +16,18 @@ module Jets::SpecHelpers
     attr_reader :request, :response
     def http_call(method:, path:, **options)
       headers = options.delete(:headers) || {}
+      params_hash = options.delete(:params) || options
       md = path.match(/\?(.*)/)
-      query_string = md ? md[1] : ''
-      query = Rack::Utils.parse_nested_query(query_string)
+      path = path.gsub("?#{md[1]}", '') if md
+      query = md ? Rack::Utils.parse_nested_query(md[1]).merge(params_hash) : params_hash
 
       params = Params.new
       if method.to_sym == :get
         params.body_params = {}
-        params.query_params ||= options.delete(:params) || options
+        params.query_params = query || {}
       else
-        params.body_params = options.delete(:body) || options.delete(:params) || options
+        params.body_params = options.delete(:body) || query
       end
-      params.path_params = params.path_params
-      params.query_params = query
 
       # Note: Do not cache the request object.  Otherwise, it cannot be reused between specs.
       # See: https://community.rubyonjets.com/t/is-jets-spechelpers-controllers-request-being-cached/244/2
@@ -52,4 +51,4 @@ module Jets::SpecHelpers
       Jets.logger = old_logger
     end
   end
-end
+end

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "5.0.10"
+  VERSION = "5.0.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 5.0.10
+  version: 5.0.11
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-02-08 00:00:00.000000000 Z
+date: 2024-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer