ruflet 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01d8a3779e874187cf24c4373efa47dbb8541c9495e8b54534d1c4028bf0b90c
-  data.tar.gz: 81d1d6959b1d6e144f24e3c6586f35b6c32fc5f971f039b702a607fe3ef1ea15
+  metadata.gz: 8f114a59fe4013e5313b51fc7b8b3373dfa7120e57422bc33abb2e224f9724d6
+  data.tar.gz: fe0b491c3eff667a72c31521209953a2f7ba8249c1d16f6ec9ac08243099f850
 SHA512:
-  metadata.gz: 303761d68b2adda5d36edf77e6270c6668ca166defbc71035df969e012c7539bb6c39b9cd69a20df3ab2c849f1fa20cdb857b663db59eb274bcb36cae206661e
-  data.tar.gz: b0892bfbb584db2187782958b4d67c86ffbf2ed2899974389ac79b89d770d9898f099eef8ec42477d19b8104a4b5496ed7655b2882f4b7e149cd7d5f0a4b2428
+  metadata.gz: cbf26f1c4752d3fdd13600ff8b0bd305e3e669165c9cda9d094d4e4687f801adcb1df015230a509c016f8305f195c32459af74eeacdc8829475f62ac8c7af591
+  data.tar.gz: a59f249b3b71255a4b499e8e87c69216c3e61d50c974a786cc1d926b7d502b500effe4161b5c2d8c3c384078ead1cfe1194106c872ca4a17bdafb05f180e36f7

data/lib/ruflet/version.rb

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

data/lib/ruflet_ui/ruflet/dsl.rb

@@ -5,6 +5,15 @@ require_relative "ui/control_factory"
 
 module Ruflet
   module DSL
+    DURATION_FACTORS_MS = {
+      days: 86_400_000.0,
+      hours: 3_600_000.0,
+      minutes: 60_000.0,
+      seconds: 1_000.0,
+      milliseconds: 1.0,
+      microseconds: 0.001
+    }.freeze
+
     module_function
 
     def _pending_app
@@ -95,6 +104,7 @@ module Ruflet
     def cupertinodialogaction(**props) = _pending_app.cupertinodialogaction(**props)
     def cupertino_navigation_bar(**props) = _pending_app.cupertino_navigation_bar(**props)
     def cupertinonavigationbar(**props) = _pending_app.cupertinonavigationbar(**props)
+    def duration(**parts) = duration_in_milliseconds(parts)
 
     class App
       include UI::ControlMethods
@@ -146,6 +156,10 @@ module Ruflet
         c
       end
 
+      def duration(**parts)
+        DSL.duration(**parts)
+      end
+
       def run
         app_roots = @roots
         page_props = @page_props.dup
@@ -177,6 +191,27 @@ module Ruflet
         "#{type}_#{@seq}"
       end
 
+      def duration_in_milliseconds(parts)
+        DSL.send(:duration_in_milliseconds, parts)
+      end
+
+    end
+
+    def duration_in_milliseconds(parts)
+      return 0 if parts.nil? || parts.empty?
+
+      DURATION_FACTORS_MS.reduce(0.0) do |sum, (key, factor)|
+        sum + read_duration_part(parts, key) * factor
+      end.round
+    end
+
+    def read_duration_part(parts, key)
+      raw = parts[key] || parts[key.to_s]
+      return 0.0 if raw.nil?
+      return raw.to_f if raw.is_a?(Numeric)
+      return raw.to_f if raw.is_a?(String) && raw.match?(/\A-?\d+(\.\d+)?\z/)
+
+      0.0
     end
   end
 end

data/lib/ruflet_ui/ruflet/page.rb

@@ -3,49 +3,29 @@
 require_relative "event"
 require "ruflet_protocol"
 require_relative "control"
-require_relative "ui/control_methods"
 require_relative "ui/widget_builder"
 require_relative "icons/material_icon_lookup"
 require_relative "icons/cupertino_icon_lookup"
-begin
-  require "set"
-rescue LoadError
-  class Set
-    def initialize
-      @index = {}
-    end
-
-    def include?(value)
-      @index.key?(value)
-    end
-
-    def <<(value)
-      @index[value] = true
-      self
-    end
-  end
-end
-
-begin
-  require "cgi"
-rescue LoadError
-  module CGI
-    module_function
-
-    def escape(text)
-      value = text.to_s
-      value.gsub(/[^a-zA-Z0-9_.~-]/) { |ch| "%%%02X" % ch.ord }
-    end
-  end
-end
+require "set"
+require "cgi"
 
 module Ruflet
   class Page
-    include UI::ControlMethods
-
     PAGE_PROP_KEYS = %w[route title vertical_alignment horizontal_alignment scroll].freeze
     DIALOG_PROP_KEYS = %w[dialog snack_bar bottom_sheet].freeze
     BUTTON_TEXT_TYPES = %w[button elevatedbutton textbutton filledbutton].freeze
+    DEPRECATED_PAGE_WIDGET_METHODS = %i[
+      control widget view column center row stack container gesture_detector gesturedetector draggable
+      drag_target dragtarget text button elevated_button elevatedbutton text_button textbutton filled_button
+      filledbutton icon_button iconbutton text_field textfield checkbox radio radio_group radiogroup
+      alert_dialog alertdialog markdown icon image app_bar appbar floating_action_button snack_bar snackbar
+      bottom_sheet bottomsheet tabs tab tab_bar tabbar tab_bar_view tabbarview navigation_bar navigationbar
+      navigation_bar_destination navigationbardestination fab cupertino_button
+      cupertinobutton cupertino_filled_button cupertinofilledbutton cupertino_text_field cupertinotextfield
+      cupertino_switch cupertinoswitch cupertino_slider cupertinoslider cupertino_alert_dialog
+      cupertinoalertdialog cupertino_action_sheet cupertinoactionsheet cupertino_dialog_action
+      cupertinodialogaction cupertino_navigation_bar cupertinonavigationbar
+    ].freeze
 
     attr_reader :session_id, :client_details, :views
 
@@ -104,16 +84,6 @@ module Ruflet
       @page_props["route"] = value
     end
 
-    def scroll
-      @page_props["scroll"]
-    end
-
-    def scroll=(value)
-      v = normalize_value("scroll", value)
-      @page_props["scroll"] = v
-      @view_props["scroll"] = v
-    end
-
     def vertical_alignment
       @page_props["vertical_alignment"] || @view_props["vertical_alignment"]
     end
@@ -163,6 +133,11 @@ module Ruflet
       self
     end
 
+    def views=(value)
+      @views = Array(value).compact
+      self
+    end
+
     def services
       @services_container.props["_services"] ||= []
     end
@@ -181,11 +156,6 @@ module Ruflet
       self
     end
 
-    def views=(value)
-      @views = Array(value).compact
-      self
-    end
-
     def go(route, **query_params)
       @page_props["route"] = build_route(route, query_params)
       dispatch_page_event(name: "route_change", data: @page_props["route"])
@@ -212,22 +182,10 @@ module Ruflet
       add(*builder.children)
     end
 
-    def appbar(**props, &block)
-      return @view_props["appbar"] if props.empty? && !block
-
-      WidgetBuilder.new.appbar(**props, &block)
-    end
-
     def appbar=(value)
       @view_props["appbar"] = value
     end
 
-    def floating_action_button(**props, &block)
-      return @view_props["floating_action_button"] if props.empty? && !block
-
-      WidgetBuilder.new.floating_action_button(**props, &block)
-    end
-
     def floating_action_button=(value)
       @view_props["floating_action_button"] = value
     end
@@ -239,40 +197,20 @@ module Ruflet
       refresh_dialogs_container!
     end
 
-    def snack_bar(**props, &block)
-      return @snack_bar if props.empty? && !block
-
-      super
-    end
-
     def snack_bar=(value)
       @snack_bar = value
       refresh_dialogs_container!
     end
 
-    def snackbar(**props, &block)
-      snack_bar(**props, &block)
-    end
-
     def snackbar=(value)
       self.snack_bar = value
     end
 
-    def bottom_sheet(**props, &block)
-      return @bottom_sheet if props.empty? && !block
-
-      super
-    end
-
     def bottom_sheet=(value)
       @bottom_sheet = value
       refresh_dialogs_container!
     end
 
-    def bottomsheet(**props, &block)
-      bottom_sheet(**props, &block)
-    end
-
     def bottomsheet=(value)
       self.bottom_sheet = value
     end
@@ -290,12 +228,48 @@ module Ruflet
       self
     end
 
+    def invoke(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}"
+      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
+      })
+
+      call_id
+    end
+
+    def launch_url(url, mode: "external_application", web_view_configuration: nil, browser_configuration: nil, web_only_window_name: nil, timeout: 10)
+      launcher = ensure_url_launcher_service
+      invoke(
+        launcher,
+        "launch_url",
+        args: {
+          "url" => url,
+          "mode" => mode,
+          "web_view_configuration" => web_view_configuration,
+          "browser_configuration" => browser_configuration,
+          "web_only_window_name" => web_only_window_name
+        }.compact,
+        timeout: timeout
+      )
+    end
+
+    def can_launch_url(url, timeout: 10)
+      launcher = ensure_url_launcher_service
+      invoke(launcher, "can_launch_url", args: { "url" => url }, timeout: timeout)
+    end
+
     def pop_dialog
       dialog_control = latest_open_dialog
       return nil unless dialog_control
 
       dialog_control.props["open"] = false
-      @dialogs.delete(dialog_control)
       refresh_dialogs_container!
       push_dialogs_update!
       dialog_control
@@ -316,21 +290,7 @@ module Ruflet
       control = resolve_control(control_or_id)
       return self unless control
 
-      visited = Set.new
-      props.each_value { |value| register_embedded_value(value, visited) }
-
-      raw_props = props.dup
-      if BUTTON_TEXT_TYPES.include?(control.type)
-        if raw_props.key?(:text) || raw_props.key?("text")
-          text_value = raw_props.key?(:text) ? raw_props.delete(:text) : raw_props.delete("text")
-          raw_props[:content] = text_value unless raw_props.key?(:content) || raw_props.key?("content")
-        end
-      end
-
-      normalized_control_props = control.send(:normalize_props, raw_props)
-      normalized_control_props.each { |k, v| control.props[k] = v }
-
-      patch = normalize_props(raw_props)
+      patch = normalize_props(props)
       if BUTTON_TEXT_TYPES.include?(control.type) && patch.key?("text")
         patch["content"] = patch.delete("text")
       end
@@ -345,22 +305,6 @@ module Ruflet
       self
     end
 
-    def invoke(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}"
-      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
-      })
-
-      call_id
-    end
-
     def patch_page(control_id, **props)
       update(control_id, **props)
     end
@@ -398,6 +342,45 @@ module Ruflet
       end
     end
 
+    def method_missing(name, *args, &block)
+      method_name = name.to_s
+      prop_name = method_name.delete_suffix("=")
+
+      if method_name.end_with?("=")
+        if DEPRECATED_PAGE_WIDGET_METHODS.include?(prop_name.to_sym)
+          Kernel.warn("[DEPRECATION] `page.#{prop_name}(...)` is no longer supported.")
+          raise NoMethodError, "Use `#{prop_name}(...)` as a free widget helper, then attach with `page.add(...)`."
+        end
+        assign_split_prop(prop_name, normalize_value(prop_name, args.first))
+        return args.first
+      end
+
+      if args.empty? && !block
+        return @page_props[method_name] if @page_props.key?(method_name)
+        return @view_props[method_name] if @view_props.key?(method_name)
+        return instance_variable_get("@#{method_name}") if DIALOG_PROP_KEYS.include?(method_name)
+      end
+
+      if DEPRECATED_PAGE_WIDGET_METHODS.include?(name.to_sym)
+        Kernel.warn("[DEPRECATION] `page.#{name}(...)` is no longer supported.")
+        raise NoMethodError, "Use `#{name}(...)` as a free widget helper, then attach with `page.add(...)`."
+      end
+
+      super
+    end
+
+    def respond_to_missing?(name, include_private = false)
+      method_name = name.to_s
+      prop_name = method_name.delete_suffix("=")
+      DEPRECATED_PAGE_WIDGET_METHODS.include?(name.to_sym) ||
+        DEPRECATED_PAGE_WIDGET_METHODS.include?(prop_name.to_sym) ||
+        method_name.end_with?("=") ||
+        @page_props.key?(method_name) ||
+        @view_props.key?(method_name) ||
+        DIALOG_PROP_KEYS.include?(method_name) ||
+        super
+    end
+
     private
 
     def build_widget(type, **props, &block) = WidgetBuilder.new.control(type, **props, &block)
@@ -489,7 +472,7 @@ module Ruflet
     def resolve_control(control_or_id)
       if control_or_id.respond_to?(:wire_id)
         control_or_id
-      elsif numeric_string?(control_or_id.to_s)
+      elsif control_or_id.to_s.match?(/^\d+$/)
         @wire_index[control_or_id.to_i]
       else
         @control_index[control_or_id.to_s]
@@ -509,32 +492,10 @@ module Ruflet
         return codepoint unless codepoint.nil?
       end
 
-      if value.is_a?(Ruflet::Control)
-        register_control_tree(value, Set.new)
-        return value.to_patch
-      end
-      return serialize_value(value) if value.is_a?(Array) || value.is_a?(Hash)
-
       return value.value if value.is_a?(Ruflet::IconData)
       value.is_a?(Symbol) ? value.to_s : value
     end
 
-    def serialize_value(value)
-      case value
-      when Ruflet::Control
-        register_control_tree(value, Set.new)
-        value.to_patch
-      when Ruflet::IconData
-        value.value
-      when Array
-        value.map { |v| serialize_value(v) }
-      when Hash
-        value.transform_values { |v| serialize_value(v) }
-      else
-        value
-      end
-    end
-
     def build_route(route, query_params = {})
       base = route.to_s
       return base if query_params.nil? || query_params.empty?
@@ -586,12 +547,6 @@ module Ruflet
       key == "icon" || key.end_with?("_icon")
     end
 
-    def numeric_string?(value)
-      return false if value.empty?
-      value.each_byte { |b| return false unless b >= 0x30 && b <= 0x39 }
-      true
-    end
-
     def refresh_dialogs_container!
       dialog_controls = (@dialogs + dialog_slots).uniq
       @dialogs_container.props["controls"] = dialog_controls
@@ -679,25 +634,20 @@ module Ruflet
     end
 
     def resolve_icon_codepoint(value)
-      return nil unless value.is_a?(Integer) || value.is_a?(Symbol) || value.is_a?(String)
-
-      codepoint = nil
-      begin
-        codepoint = Ruflet::MaterialIconLookup.codepoint_for(value)
-      rescue NameError
-        codepoint = nil
+      codepoint = Ruflet::MaterialIconLookup.codepoint_for(value)
+      if codepoint.nil? || codepoint == value
+        codepoint = Ruflet::CupertinoIconLookup.codepoint_for(value)
       end
+      codepoint
+    end
 
-      if codepoint.nil? || (value.is_a?(Integer) && codepoint == value)
-        begin
-          cupertino = Ruflet::CupertinoIconLookup.codepoint_for(value)
-          codepoint = cupertino unless cupertino.nil?
-        rescue NameError
-          codepoint = nil
-        end
-      end
+    def ensure_url_launcher_service
+      launcher = services.find { |service| service.is_a?(Control) && service.type == "url_launcher" }
+      return launcher if launcher
 
-      codepoint
+      launcher = build_widget(:url_launcher)
+      add_service(launcher)
+      launcher
     end
   end
 end

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

@@ -7,6 +7,61 @@ module Ruflet
         def initialize(id: nil, **props)
           super(type: "snackbar", id: id, **props)
         end
+
+        private
+
+        def preprocess_props(props)
+          mapped = props.dup
+          key = if mapped.key?(:duration)
+                  :duration
+                elsif mapped.key?("duration")
+                  "duration"
+                end
+          return mapped unless key
+
+          mapped[key] = normalize_duration_ms(mapped[key])
+          mapped
+        end
+
+        def normalize_duration_ms(value)
+          return value.to_i if value.is_a?(Numeric)
+          return value.to_i if value.is_a?(String) && value.match?(/\A\d+(\.\d+)?\z/)
+
+          parts =
+            if value.is_a?(Hash)
+              value
+            elsif value.respond_to?(:to_h)
+              value.to_h
+            else
+              nil
+            end
+          return value unless parts.is_a?(Hash)
+
+          days = read_number(parts, "days")
+          hours = read_number(parts, "hours")
+          minutes = read_number(parts, "minutes")
+          seconds = read_number(parts, "seconds")
+          milliseconds = read_number(parts, "milliseconds")
+          microseconds = read_number(parts, "microseconds")
+
+          total_ms = 0.0
+          total_ms += days * 86_400_000.0
+          total_ms += hours * 3_600_000.0
+          total_ms += minutes * 60_000.0
+          total_ms += seconds * 1_000.0
+          total_ms += milliseconds
+          total_ms += microseconds / 1000.0
+          total_ms.round
+        end
+
+        def read_number(parts, key)
+          raw = parts[key] || parts[key.to_sym]
+          return 0.0 if raw.nil?
+          return raw.to_f if raw.is_a?(Numeric)
+          return raw.to_f if raw.is_a?(String) && raw.match?(/\A-?\d+(\.\d+)?\z/)
+
+          0.0
+        end
       end
     end
   end

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

@@ -74,6 +74,7 @@ module Ruflet
       def cupertinodialogaction(**props) = control_delegate.cupertinodialogaction(**props)
       def cupertino_navigation_bar(**props) = control_delegate.cupertino_navigation_bar(**props)
       def cupertinonavigationbar(**props) = control_delegate.cupertinonavigationbar(**props)
+      def duration(**parts) = control_delegate.duration(**parts)
 
       private
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruflet
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - AdamMusa