ruflet 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f114a59fe4013e5313b51fc7b8b3373dfa7120e57422bc33abb2e224f9724d6
-  data.tar.gz: fe0b491c3eff667a72c31521209953a2f7ba8249c1d16f6ec9ac08243099f850
+  metadata.gz: 50d9722e6751b03441e1b205a2c52c7dd2e24d3a20c9b65aa75bd18e0b07b99d
+  data.tar.gz: b4cf12770851ef43aee2331aabb1a57f0bf521ed6fbc769fe61d6beb0378eaef
 SHA512:
-  metadata.gz: cbf26f1c4752d3fdd13600ff8b0bd305e3e669165c9cda9d094d4e4687f801adcb1df015230a509c016f8305f195c32459af74eeacdc8829475f62ac8c7af591
-  data.tar.gz: a59f249b3b71255a4b499e8e87c69216c3e61d50c974a786cc1d926b7d502b500effe4161b5c2d8c3c384078ead1cfe1194106c872ca4a17bdafb05f180e36f7
+  metadata.gz: d35da0d4a41493d8a6dced4aac0a6ab8491aef7588c2ef69dd42e12255921fbf9d62008a9c31f717a1eac7e4b44ce73b6e4d01769a07775803a60c58f6b96530
+  data.tar.gz: dbaff1a82f3dcdb9a4d5fbb1a06e9620282560a52ec3032b08ef8008809592656dcae0fa0dede4fc0f7a37b8b9e742066304b7713df85cbb2dfc41be856696e1

data/lib/ruflet/version.rb

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

data/lib/ruflet_ui/ruflet/dsl.rb

@@ -40,6 +40,8 @@ module Ruflet
     def center(**props, &block) = _pending_app.center(**props, &block)
     def row(**props, &block) = _pending_app.row(**props, &block)
     def stack(**props, &block) = _pending_app.stack(**props, &block)
+    def grid_view(**props, &block) = _pending_app.grid_view(**props, &block)
+    def gridview(**props, &block) = _pending_app.gridview(**props, &block)
     def container(**props, &block) = _pending_app.container(**props, &block)
     def gesture_detector(**props, &block) = _pending_app.gesture_detector(**props, &block)
     def gesturedetector(**props, &block) = _pending_app.gesturedetector(**props, &block)
@@ -58,6 +60,7 @@ module Ruflet
     def iconbutton(**props) = _pending_app.iconbutton(**props)
     def app_bar(**props) = _pending_app.app_bar(**props)
     def appbar(**props) = _pending_app.appbar(**props)
+    def clipboard(**props) = _pending_app.clipboard(**props)
     def text_button(**props) = _pending_app.text_button(**props)
     def textbutton(**props) = _pending_app.textbutton(**props)
     def filled_button(**props) = _pending_app.filled_button(**props)
@@ -137,7 +140,7 @@ module Ruflet
 
       def control(type, **props, &block)
         mapped_props = props.dup
-        prop_children = mapped_props.delete(:controls) || mapped_props.delete("controls")
+        prop_children = extract_children_prop(mapped_props)
 
         id = mapped_props.delete(:id)&.to_s || next_id(type)
         c = Ruflet::UI::ControlFactory.build(type.to_s, id: id, **normalize_props(mapped_props))
@@ -186,6 +189,13 @@ module Ruflet
         hash.transform_keys(&:to_s).transform_values { |v| v.is_a?(Symbol) ? v.to_s : v }
       end
 
+      def extract_children_prop(props)
+        props.delete(:children) ||
+          props.delete("children") ||
+          props.delete(:controls) ||
+          props.delete("controls")
+      end
+
       def next_id(type)
         @seq += 1
         "#{type}_#{@seq}"

data/lib/ruflet_ui/ruflet/page.rb

@@ -8,6 +8,8 @@ require_relative "icons/material_icon_lookup"
 require_relative "icons/cupertino_icon_lookup"
 require "set"
 require "cgi"
+require "thread"
+require "timeout"
 
 module Ruflet
   class Page
@@ -51,13 +53,16 @@ module Ruflet
       @services_container = Ruflet::Control.new(
         type: "service_registry",
         id: "_services",
-        "_services": []
+        "_services": [],
+        "_internals": { "uid" => Ruflet::Control.generate_id }
       )
       @dialogs_container = Ruflet::Control.new(
         type: "dialogs",
         id: "_dialogs",
         controls: []
       )
+      @invoke_waiters = {}
+      @invoke_waiters_mutex = Mutex.new
       refresh_overlay_container!
       refresh_services_container!
       refresh_dialogs_container!
@@ -265,6 +270,45 @@ module Ruflet
       invoke(launcher, "can_launch_url", args: { "url" => url }, timeout: timeout)
     end
 
+    def set_clipboard(value, timeout: 10)
+      clipboard = ensure_clipboard_service
+      invoke(clipboard, "set", args: { "data" => value.to_s }, timeout: timeout)
+    end
+
+    def get_clipboard(timeout: 10)
+      clipboard = ensure_clipboard_service
+      invoke(clipboard, "get", timeout: timeout)
+    end
+
+    def set_clipboard_files(files, timeout: 10)
+      clipboard = ensure_clipboard_service
+      invoke(clipboard, "set_files", args: { "files" => Array(files).map(&:to_s) }, timeout: timeout)
+    end
+
+    def get_clipboard_files(timeout: 10)
+      clipboard = ensure_clipboard_service
+      invoke(clipboard, "get_files", timeout: timeout)
+    end
+
+    def set_clipboard_image(value, timeout: 10)
+      clipboard = ensure_clipboard_service
+      invoke(clipboard, "set_image", args: { "data" => value }, timeout: timeout)
+    end
+
+    def get_clipboard_image(timeout: 10)
+      clipboard = ensure_clipboard_service
+      invoke(clipboard, "get_image", timeout: timeout)
+    end
+
+    def handle_invoke_method_result(payload)
+      call_id = payload["call_id"].to_s
+      waiter = @invoke_waiters_mutex.synchronize { @invoke_waiters[call_id] }
+      return false unless waiter
+
+      waiter << payload
+      true
+    end
+
     def pop_dialog
       dialog_control = latest_open_dialog
       return nil unless dialog_control
@@ -295,7 +339,16 @@ module Ruflet
         patch["content"] = patch.delete("text")
       end
 
-      patch_ops = patch.map { |k, v| [0, 0, k, v] }
+      # Keep runtime control tree aligned with incremental patches.
+      if patch.key?("controls")
+        control.children.clear
+        Array(patch["controls"]).each { |child| control.children << child if child.is_a?(Control) }
+      end
+
+      visited = Set.new
+      patch.each_value { |value| register_embedded_value(value, visited) }
+
+      patch_ops = patch.map { |k, v| [0, 0, k, serialize_patch_value(v)] }
 
       send_message(Protocol::ACTIONS[:patch_control], {
         "id" => control.wire_id,
@@ -383,6 +436,31 @@ module Ruflet
 
     private
 
+    def invoke_and_wait(control_or_id, method_name, args: nil, timeout: 10)
+      control = resolve_control(control_or_id)
+      return nil unless control
+
+      call_id = "call_#{Ruflet::Control.generate_id}"
+      waiter = Queue.new
+      @invoke_waiters_mutex.synchronize { @invoke_waiters[call_id] = waiter }
+
+      send_message(Protocol::ACTIONS[:invoke_control_method], {
+        "control_id" => control.wire_id,
+        "call_id" => call_id,
+        "name" => method_name.to_s,
+        "args" => args,
+        "timeout" => timeout
+      })
+
+      response = Timeout.timeout(timeout.to_f) { waiter.pop }
+      error = response["error"]
+      raise RuntimeError, error if error && !error.to_s.empty?
+
+      response["result"]
+    ensure
+      @invoke_waiters_mutex.synchronize { @invoke_waiters.delete(call_id) } if call_id
+    end
+
     def build_widget(type, **props, &block) = WidgetBuilder.new.control(type, **props, &block)
 
     def split_props(props)
@@ -482,6 +560,7 @@ module Ruflet
     def normalize_props(hash)
       hash.each_with_object({}) do |(k, v), result|
         key = k.to_s
+        key = "controls" if key == "children"
         result[key] = normalize_value(key, v)
       end
     end
@@ -649,5 +728,14 @@ module Ruflet
       add_service(launcher)
       launcher
     end
+
+    def ensure_clipboard_service
+      clipboard = services.find { |service| service.is_a?(Control) && service.type == "clipboard" }
+      return clipboard if clipboard
+
+      clipboard = build_widget(:clipboard)
+      add_service(clipboard)
+      clipboard
+    end
   end
 end

data/lib/ruflet_ui/ruflet/ui/controls/material/grid_view_control.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Ruflet
+  module UI
+    module Controls
+      class GridViewControl < Ruflet::Control
+        def initialize(id: nil, **props)
+          super(type: "gridview", id: id, **props)
+        end
+      end
+    end
+  end
+end

data/lib/ruflet_ui/ruflet/ui/material_control_factory.rb

@@ -6,6 +6,7 @@ require_relative "controls/material/container_control"
 require_relative "controls/material/column_control"
 require_relative "controls/material/row_control"
 require_relative "controls/material/stack_control"
+require_relative "controls/material/grid_view_control"
 require_relative "controls/material/gesture_detector_control"
 require_relative "controls/material/draggable_control"
 require_relative "controls/material/drag_target_control"
@@ -44,6 +45,8 @@ module Ruflet
         "column" => Controls::ColumnControl,
         "row" => Controls::RowControl,
         "stack" => Controls::StackControl,
+        "gridview" => Controls::GridViewControl,
+        "grid_view" => Controls::GridViewControl,
         "container" => Controls::ContainerControl,
         "gesturedetector" => Controls::GestureDetectorControl,
         "gesture_detector" => Controls::GestureDetectorControl,

data/lib/ruflet_ui/ruflet/ui/material_control_methods.rb

@@ -27,6 +27,8 @@ module Ruflet
 
       def row(**props, &block) = build_widget(:row, **props, &block)
       def stack(**props, &block) = build_widget(:stack, **props, &block)
+      def grid_view(**props, &block) = build_widget(:gridview, **props, &block)
+      def gridview(**props, &block) = grid_view(**props, &block)
       def container(**props, &block) = build_widget(:container, **normalize_container_props(props), &block)
       def gesture_detector(**props, &block) = build_widget(:gesturedetector, **props, &block)
       def gesturedetector(**props, &block) = gesture_detector(**props, &block)
@@ -82,6 +84,7 @@ module Ruflet
       def app_bar(**props) = build_widget(:appbar, **props)
       def appbar(**props) = app_bar(**props)
       def url_launcher(**props) = build_widget(:url_launcher, **props)
+      def clipboard(**props) = build_widget(:clipboard, **props)
       def floating_action_button(**props) = build_widget(:floatingactionbutton, **props)
       def floatingactionbutton(**props) = floating_action_button(**props)
       def tabs(**props, &block) = build_widget(:tabs, **props, &block)

data/lib/ruflet_ui/ruflet/ui/material_control_registry.rb

@@ -8,6 +8,8 @@ module Ruflet
         "column" => "Column",
         "row" => "Row",
         "stack" => "Stack",
+        "gridview" => "GridView",
+        "grid_view" => "GridView",
         "view" => "View",
         "container" => "Container",
         "checkbox" => "Checkbox",
@@ -79,6 +81,7 @@ module Ruflet
         "line" => "Line",
         "service_registry" => "ServiceRegistry",
         "url_launcher" => "UrlLauncher",
+        "clipboard" => "Clipboard",
         "audio" => "Audio",
         "video" => "Video",
         "flashlight" => "Flashlight",

data/lib/ruflet_ui/ruflet/ui/shared_control_forwarders.rb

@@ -10,6 +10,8 @@ module Ruflet
       def center(**props, &block) = control_delegate.center(**props, &block)
       def row(**props, &block) = control_delegate.row(**props, &block)
       def stack(**props, &block) = control_delegate.stack(**props, &block)
+      def grid_view(**props, &block) = control_delegate.grid_view(**props, &block)
+      def gridview(**props, &block) = control_delegate.gridview(**props, &block)
       def container(**props, &block) = control_delegate.container(**props, &block)
       def gesture_detector(**props, &block) = control_delegate.gesture_detector(**props, &block)
       def gesturedetector(**props, &block) = control_delegate.gesturedetector(**props, &block)
@@ -44,6 +46,7 @@ module Ruflet
       def fab(content = nil, **props) = control_delegate.fab(content, **props)
       def app_bar(**props) = control_delegate.app_bar(**props)
       def appbar(**props) = control_delegate.appbar(**props)
+      def clipboard(**props) = control_delegate.clipboard(**props)
       def floating_action_button(**props) = control_delegate.floating_action_button(**props)
       def floatingactionbutton(**props) = control_delegate.floatingactionbutton(**props)
       def tabs(**props, &block) = control_delegate.tabs(**props, &block)

data/lib/ruflet_ui/ruflet/ui/widget_builder.rb

@@ -19,7 +19,7 @@ module Ruflet
 
     def control(type, **props, &block)
       mapped_props = props.dup
-      prop_children = mapped_props.delete(:controls) || mapped_props.delete("controls")
+      prop_children = extract_children_prop(mapped_props)
 
       node = UI::ControlFactory.build(type, **mapped_props)
       if block
@@ -44,5 +44,12 @@ module Ruflet
     def build_widget(type, **props, &block) = control(type, **props, &block)
 
     private
+
+    def extract_children_prop(props)
+      props.delete(:children) ||
+        props.delete("children") ||
+        props.delete(:controls) ||
+        props.delete("controls")
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruflet
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - AdamMusa
@@ -60,6 +60,7 @@ files:
 - lib/ruflet_ui/ruflet/ui/controls/material/filled_button_control.rb
 - lib/ruflet_ui/ruflet/ui/controls/material/floating_action_button_control.rb
 - lib/ruflet_ui/ruflet/ui/controls/material/gesture_detector_control.rb
+- lib/ruflet_ui/ruflet/ui/controls/material/grid_view_control.rb
 - lib/ruflet_ui/ruflet/ui/controls/material/icon_button_control.rb
 - lib/ruflet_ui/ruflet/ui/controls/material/icon_control.rb
 - lib/ruflet_ui/ruflet/ui/controls/material/image_control.rb