unpoly-rails 3.0.0.rc2 → 3.0.0.rc3

data/lib/unpoly/rails/change/field.rb

@@ -102,7 +102,7 @@ module Unpoly
 
           def parse(raw)
             if raw.present?
-              result = ActiveSupport::JSON.decode(raw)
+              result = Util.json_decode(raw)
             elsif @default
               result = instance_exec(&@default)
             end
@@ -116,7 +116,7 @@ module Unpoly
 
           def stringify(value)
             unless value.nil?
-              ActiveSupport::JSON.encode(value)
+              Util.safe_json_encode(value)
             end
           end
 
@@ -133,7 +133,7 @@ module Unpoly
 
           def parse(raw)
             if raw.present?
-              result = ActiveSupport::JSON.decode(raw)
+              result = Util.json_decode(raw)
             elsif @default
               result = instance_exec(&@default)
             end
@@ -143,7 +143,7 @@ module Unpoly
 
           def stringify(value)
             unless value.nil?
-              ActiveSupport::JSON.encode(value)
+              Util.safe_json_encode(value)
             end
           end
 

data/lib/unpoly/rails/change/layer.rb

@@ -40,14 +40,14 @@ module Unpoly
         # TODO: Docs
         def accept(value = nil)
           overlay? or raise CannotClose, 'Cannot accept the root layer'
-          change.response.headers['X-Up-Accept-Layer'] = value.to_json
+          change.response.headers['X-Up-Accept-Layer'] = Util.safe_json_encode(value)
         end
 
         ##
         # TODO: Docs
         def dismiss(value = nil)
           overlay? or raise CannotClose, 'Cannot dismiss the root layer'
-          change.response.headers['X-Up-Dismiss-Layer'] = value.to_json
+          change.response.headers['X-Up-Dismiss-Layer'] = Util.safe_json_encode(value)
         end
 
         private
@@ -57,4 +57,4 @@ module Unpoly
       end
     end
   end
-end
+end

data/lib/unpoly/rails/change.rb

@@ -243,7 +243,7 @@ module Unpoly
       def title=(new_title)
         # We don't make this a field since it belongs to *this* response
         # and should not survive a redirect.
-        response.headers['X-Up-Title'] = new_title
+        response.headers['X-Up-Title'] = Util.safe_json_encode(new_title)
       end
 
       def after_action

data/lib/unpoly/rails/request_echo_headers.rb

@@ -18,9 +18,13 @@ module Unpoly
       end
 
       private
-      
+
       def set_up_request_echo_headers
-        response.headers['X-Up-Location'] = up.request_url_without_up_params
+        request_url_without_up_params = up.request_url_without_up_params
+        unless request_url_without_up_params == request.original_url
+          response.headers['X-Up-Location'] = up.request_url_without_up_params
+        end
+
         response.headers['X-Up-Method'] = request.method
       end
 

data/lib/unpoly/rails/util.rb

@@ -0,0 +1,25 @@
+module Unpoly
+  module Rails
+    class Util
+      class << self
+
+        def json_decode(string)
+          ActiveSupport::JSON.decode(string)
+        end
+
+        # We build a lot of JSON that goes into HTTP header.
+        # High-ascii characters are not safe to transport over HTTP, but we
+        # can use JSON escape sequences (\u0012) to make them low-ascii.
+        def safe_json_encode(value)
+          json = ActiveSupport::JSON.encode(value)
+          escape_non_ascii(json)
+        end
+
+        def escape_non_ascii(unicode_string)
+          unicode_string.gsub(/[[:^ascii:]]/) { |char| "\\u" + char.ord.to_s(16).rjust(4, "0") }
+        end
+
+      end
+    end
+  end
+end

data/lib/unpoly/rails/version.rb

@@ -4,6 +4,6 @@ module Unpoly
     # The current version of the unpoly-rails gem.
     # This version number is also used for releases of the Unpoly
     # frontend code.
-    VERSION = '3.0.0.rc2'
+    VERSION = '3.0.0.rc3'
   end
 end

data/lib/unpoly-rails.rb

@@ -1,6 +1,7 @@
 require 'memoized'
 require_relative 'unpoly/rails/version'
 require_relative 'unpoly/rails/error'
+require_relative 'unpoly/rails/util'
 require_relative 'unpoly/rails/engine'
 require_relative 'unpoly/rails/request_echo_headers'
 require_relative 'unpoly/rails/request_method_cookie'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unpoly-rails
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc2
+  version: 3.0.0.rc3
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-01 00:00:00.000000000 Z
+date: 2023-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -136,6 +136,7 @@ files:
 - lib/unpoly/rails/error.rb
 - lib/unpoly/rails/request_echo_headers.rb
 - lib/unpoly/rails/request_method_cookie.rb
+- lib/unpoly/rails/util.rb
 - lib/unpoly/rails/version.rb
 homepage: https://github.com/unpoly/unpoly-rails
 licenses: