ruflet_rails 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ac570f3b6d92f8fc6d21723cc2814c658861c20e8b38d884e389185916d559f
-  data.tar.gz: 02cbfbdc2da5e487af2cd07b2d176066c6a5cd0487a141245ffc84ca0a23ff3f
+  metadata.gz: 91f92e0fef72cbb500ba43ac12d81590bac485bb9cf4642c93563aab2736811f
+  data.tar.gz: 609e6b2720465ca414898482223d561d264ddca837d717e07a2b54c1f874df6f
 SHA512:
-  metadata.gz: de4d8d0a43bda6f2ebbab447c8c25209d44cfabccae8fb584024a355cf1ba464577200737d3cfae692d2e2c52aca294ae13d556de95875dd07d8a407b5a1c8d3
-  data.tar.gz: 1b3a8dd5f338a32c9e91f30a1b0d85cd9618019b2903f931cd27de45cee4717830daeabc44dc6dff01daf9dcf1e503a7bfacff7f8f7f813e4efb06ca6dbb9b02
+  metadata.gz: 1f9e56edf7b86fccf776d7bfc8ee630ce501f42fde7854a9bb4f660a31ef85dfbe0e1a50ebe7a5c09dfe307e80eb88ca561a77d69777006a00810c34770dbba5
+  data.tar.gz: 23792bdae076841ddc0ed099475a25ab4bfd0240a244e90a0d71eb3d011c11c8e67e5610102bf8475a86e35dae2ea2aac6c8f58d1b75c1a8bf23ddf9682da60e

data/lib/ruflet/rails/protocol/local_server.rb

@@ -50,7 +50,7 @@ module Ruflet
           when Ruflet::Protocol::ACTIONS[:update_control], Ruflet::Protocol::ACTIONS[:update_control_props]
             on_update_control(ws, payload)
           when Ruflet::Protocol::ACTIONS[:invoke_control_method]
-            nil
+            on_invoke_control_method(ws, payload)
           else
             raise "Unknown action: #{action.inspect}"
           end
@@ -144,6 +144,11 @@ module Ruflet
           page.apply_client_update(update["id"], update["props"] || {})
         end
 
+        def on_invoke_control_method(ws, payload)
+          page = fetch_page(ws)
+          page.handle_invoke_method_result(Ruflet::Protocol.normalize_invoke_method_result_payload(payload))
+        end
+
         def fetch_page(ws)
           page = @sessions_mutex.synchronize { @sessions[ws.session_key] }
           raise "Session not found" unless page

data/lib/ruflet/rails/protocol/wire_codec.rb

@@ -18,7 +18,7 @@ module Ruflet
             when Float
               "\xcb".b + [value].pack("G")
             when String
-              pack_string(value)
+              binary_string?(value) ? pack_binary(value) : pack_string(value)
             when Symbol
               pack_string(value.to_s)
             when Array
@@ -71,6 +71,23 @@ module Ruflet
             end
           end
 
+          def pack_binary(value)
+            bytes = value.to_s.b
+            len = bytes.bytesize
+
+            if len <= 0xff
+              "\xc4".b + [len].pack("C") + bytes
+            elsif len <= 0xffff
+              "\xc5".b + [len].pack("n") + bytes
+            else
+              "\xc6".b + [len].pack("N") + bytes
+            end
+          end
+
+          def binary_string?(value)
+            value.encoding == Encoding::BINARY || !value.valid_encoding?
+          end
+
           def pack_array(value)
             len = value.length
             head =
@@ -180,8 +197,17 @@ module Ruflet
           end
 
           def read_ext(reader, size)
-            reader.read_i8
-            reader.read_exact(size)
+            type = reader.read_i8
+            data = reader.read_exact(size)
+
+            case type
+            when 1, 2, 4
+              data.dup.force_encoding("UTF-8")
+            when 3
+              data.to_i
+            else
+              data
+            end
           end
         end
 

data/lib/ruflet/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ruflet
-  VERSION = "0.0.6" unless const_defined?(:VERSION)
+  VERSION = "0.0.7" unless const_defined?(:VERSION)
 end

data/lib/ruflet_rails.rb

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
-local_ruflet_lib = File.expand_path("../../ruflet/lib", __dir__)
-if File.directory?(local_ruflet_lib) && !$LOAD_PATH.include?(local_ruflet_lib)
-  $LOAD_PATH.unshift(local_ruflet_lib)
+%w[ruflet_core ruflet].reverse_each do |package|
+  local_package_lib = File.expand_path("../../#{package}/lib", __dir__)
+  if File.directory?(local_package_lib) && !$LOAD_PATH.include?(local_package_lib)
+    $LOAD_PATH.unshift(local_package_lib)
+  end
 end
 
 require "ruflet_core"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruflet_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - AdamMusa
@@ -23,20 +23,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '7.0'
+- !ruby/object:Gem::Dependency
+  name: ruflet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.13
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.13
 - !ruby/object:Gem::Dependency
   name: ruflet_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.11
+        version: 0.0.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.11
+        version: 0.0.13
 description: Rails-first integration package for mounting Ruflet mobile apps in Rails
   routes.
 email: