ruflet 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 959ea77a03c912a7126700df435c3d3a2eaf906cd032cd216967ff7406840d3c
-  data.tar.gz: e47d421f67d39b245c4c6680ae3baa041639abbe92ba716db4d1c5c77efee7a5
+  metadata.gz: 8f114a59fe4013e5313b51fc7b8b3373dfa7120e57422bc33abb2e224f9724d6
+  data.tar.gz: fe0b491c3eff667a72c31521209953a2f7ba8249c1d16f6ec9ac08243099f850
 SHA512:
-  metadata.gz: 5694f803d70cfeea5f9c86ffbbc4ae175332b6e7a7aee60bcc34c4ee3033c18c82b9a615f877bba4d082eb6f64a2ad763a72e60e205729adc262ff4a606a0248
-  data.tar.gz: ce91d9909ab65a24a87ab9f3c9be27e2996bcd5d8974852516e88db87522aeb668532373dd027d31a660798493bf97bb44e0aabcb134a656f203944a3d552820
+  metadata.gz: cbf26f1c4752d3fdd13600ff8b0bd305e3e669165c9cda9d094d4e4687f801adcb1df015230a509c016f8305f195c32459af74eeacdc8829475f62ac8c7af591
+  data.tar.gz: a59f249b3b71255a4b499e8e87c69216c3e61d50c974a786cc1d926b7d502b500effe4161b5c2d8c3c384078ead1cfe1194106c872ca4a17bdafb05f180e36f7

data/lib/ruflet/manifest_compiler.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require "json"
+require "time"
+
+module Ruflet
+  module ManifestCompiler
+    module_function
+
+    def compile_app(app, route: "/")
+      messages = []
+      sender = lambda do |action, payload|
+        messages << { "action" => action, "payload" => payload }
+      end
+
+      page = Ruflet::Page.new(
+        session_id: "manifest",
+        client_details: { "route" => route.to_s.empty? ? "/" : route.to_s },
+        sender: sender
+      )
+
+      app.view(page)
+      page.update
+
+      compacted = compact_messages(messages)
+
+      {
+        "schema" => "ruflet_manifest/v1",
+        "generated_at" => Time.now.utc.iso8601,
+        "route" => page.route || "/",
+        "messages" => compacted
+      }
+    end
+
+    def write_file(path, manifest)
+      File.write(path, JSON.pretty_generate(manifest))
+      path
+    end
+
+    def read_file(path)
+      JSON.parse(File.read(path.to_s))
+    end
+
+    def compact_messages(messages)
+      full_patch_index = nil
+      messages.each_with_index do |message, idx|
+        next unless message["action"] == Ruflet::Protocol::ACTIONS[:patch_control]
+
+        payload = message["payload"] || {}
+        next unless payload["id"] == 1
+
+        patch = payload["patch"]
+        next unless patch.is_a?(Array) && patch.any? { |op| op.is_a?(Array) && op[2] == "views" }
+
+        full_patch_index = idx
+      end
+      return messages if full_patch_index.nil?
+
+      [messages[full_patch_index]]
+    end
+  end
+end

data/lib/ruflet/version.rb

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

data/lib/ruflet.rb

@@ -11,12 +11,6 @@ module Ruflet
   module_function
 
   def run(entrypoint = nil, host: "0.0.0.0", port: 8550, &block)
-    begin
-      require "ruflet_server"
-    rescue LoadError => e
-      raise LoadError, "Ruflet.run requires the 'ruflet_server' gem. Add it to your Gemfile.", e.backtrace
-    end
-
     callback = entrypoint || block
     raise ArgumentError, "Ruflet.run requires a callable entrypoint or block" unless callback.respond_to?(:call)
 
@@ -26,6 +20,12 @@ module Ruflet
       return result unless result == :pass
     end
 
+    begin
+      require "ruflet_server"
+    rescue LoadError => e
+      raise LoadError, "Ruflet.run requires the 'ruflet_server' gem unless a run interceptor handles execution.", e.backtrace
+    end
+
     Server.new(host: host, port: port) do |page|
       callback.call(page)
     end.start

data/lib/ruflet_ui/ruflet/app.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require_relative "../../ruflet/manifest_compiler"
 
 module Ruflet
   class App
@@ -8,6 +9,16 @@ module Ruflet
     end
 
     def run
+      manifest_out = ENV["RUFLET_MANIFEST_OUT"].to_s
+      unless manifest_out.empty?
+        route = ENV["RUFLET_MANIFEST_ROUTE"].to_s
+        route = "/" if route.empty?
+        manifest = Ruflet::ManifestCompiler.compile_app(self, route: route)
+        Ruflet::ManifestCompiler.write_file(manifest_out, manifest)
+        puts manifest_out
+        return manifest_out
+      end
+
       Ruflet.run(host: @host, port: @port) do |page|
         view(page)
       end

data/lib/ruflet_ui/ruflet/colors.rb

@@ -2,8 +2,6 @@
 
 module Ruflet
   module Colors
-    module_function
-
     SEMANTIC_COLORS = {
       PRIMARY: "primary",
       ON_PRIMARY: "onprimary",
@@ -127,14 +125,32 @@ module Ruflet
     end
 
     def all_values
-      @all_values ||= constants(false)
-                      .map { |c| const_get(c) }
-                      .select { |v| v.is_a?(String) }
-                      .uniq
-                      .freeze
+      return @all_values if @all_values
+
+      values = []
+      SEMANTIC_COLORS.each_value { |v| values << v }
+      FIXED_COLORS.each_value { |v| values << v }
+
+      BASE_PRIMARY.each do |base|
+        values << base
+        PRIMARY_SHADES.each do |shade|
+          values << "#{base}#{shade}"
+        end
+      end
+
+      BASE_ACCENT.each do |base|
+        values << "#{base}accent"
+        ACCENT_SHADES.each do |shade|
+          values << "#{base}accent#{shade}"
+        end
+      end
+
+      uniq_map = {}
+      values.each { |v| uniq_map[v] = true }
+      @all_values = uniq_map.keys.freeze
     end
 
-    def normalize_color(color)
+    def self.normalize_color(color)
       return color.to_s if color.is_a?(Symbol)
       return color if color.is_a?(String)
       return color.to_s unless color.respond_to?(:to_s)
@@ -164,15 +180,17 @@ module Ruflet
       "yellow" => "YELLOW"
     }.freeze
 
-    def constant_prefix_for(base_name)
-      BASE_PREFIX.fetch(base_name) { base_name.upcase }
+    def self.constant_prefix_for(base_name)
+      key = base_name.to_s
+      return BASE_PREFIX[key] if BASE_PREFIX.key?(key)
+      key.upcase
     end
 
     SEMANTIC_COLORS.each { |k, v| const_set(k, v) }
     FIXED_COLORS.each { |k, v| const_set(k, v) }
 
     BASE_PRIMARY.each do |base|
-      prefix = constant_prefix_for(base)
+      prefix = self.constant_prefix_for(base)
       const_set(prefix, base)
       PRIMARY_SHADES.each do |shade|
         const_set("#{prefix}_#{shade}", "#{base}#{shade}")
@@ -180,7 +198,7 @@ module Ruflet
     end
 
     BASE_ACCENT.each do |base|
-      prefix = "#{constant_prefix_for(base)}_ACCENT"
+      prefix = "#{self.constant_prefix_for(base)}_ACCENT"
       const_set(prefix, "#{base}accent")
       ACCENT_SHADES.each do |shade|
         const_set("#{prefix}_#{shade}", "#{base}accent#{shade}")
@@ -191,10 +209,26 @@ module Ruflet
       const_set(alias_name, const_get(target))
     end
 
-    constants(false).each do |name|
-      next if respond_to?(name)
-
-      define_singleton_method(name) { const_get(name) }
+    constant_names = []
+    SEMANTIC_COLORS.each_key { |k| constant_names << k }
+    FIXED_COLORS.each_key { |k| constant_names << k }
+    BASE_PRIMARY.each do |base|
+      constant_names << constant_prefix_for(base).to_sym
+      PRIMARY_SHADES.each { |shade| constant_names << "#{constant_prefix_for(base)}_#{shade}".to_sym }
+    end
+    BASE_ACCENT.each do |base|
+      constant_names << "#{constant_prefix_for(base)}_ACCENT".to_sym
+      ACCENT_SHADES.each { |shade| constant_names << "#{constant_prefix_for(base)}_ACCENT_#{shade}".to_sym }
+    end
+    DEPRECATED_ALIASES.each_key { |k| constant_names << k }
+
+    uniq_constants = {}
+    constant_names.each { |n| uniq_constants[n] = true }
+    if respond_to?(:define_singleton_method)
+      uniq_constants.keys.each do |name|
+        next if respond_to?(name)
+        define_singleton_method(name) { const_get(name) }
+      end
     end
   end
 end

data/lib/ruflet_ui/ruflet/control.rb

@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 
-require "securerandom"
+begin
+  require "securerandom"
+rescue LoadError
+  nil
+end
 require_relative "ui/control_registry"
 require_relative "icon_data"
 require_relative "icons/material_icon_lookup"
@@ -17,7 +21,7 @@ module Ruflet
 
     def initialize(type:, id: nil, **props)
       @type = type.to_s.downcase
-      @id = (id || props.delete(:id) || "ctrl_#{SecureRandom.hex(4)}").to_s
+      @id = (id || props.delete(:id) || "ctrl_#{self.class.generate_id}").to_s
       @children = []
       @handlers = {}
       @wire_id = nil
@@ -62,6 +66,16 @@ module Ruflet
 
     private
 
+    class << self
+      def generate_id
+        if defined?(SecureRandom) && SecureRandom.respond_to?(:hex)
+          SecureRandom.hex(4)
+        else
+          format("%08x", rand(0..0xffff_ffff))
+        end
+      end
+    end
+
     def serialize_value(value)
       case value
       when Control

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/icon_data.rb

@@ -1,7 +1,11 @@
 # frozen_string_literal: true
 
-require_relative "icons/material_icon_lookup"
-require_relative "icons/cupertino_icon_lookup"
+begin
+  require_relative "icons/material_icon_lookup"
+  require_relative "icons/cupertino_icon_lookup"
+rescue StandardError
+  nil
+end
 
 module Ruflet
   class IconData
@@ -44,7 +48,8 @@ module Ruflet
         return codepoint
       end
 
-      raw = input.to_s.strip
+      raw = input.to_s
+      raw = raw.strip if raw.respond_to?(:strip)
       return raw if raw.empty?
 
       codepoint = Ruflet::MaterialIconLookup.codepoint_for(raw)

data/lib/ruflet_ui/ruflet/page.rb

@@ -3,7 +3,6 @@
 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"
@@ -12,11 +11,21 @@ require "cgi"
 
 module Ruflet
   class Page
-    include UI::ControlMethods
-
-    PAGE_PROP_KEYS = %w[route title vertical_alignment horizontal_alignment].freeze
+    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
 
@@ -39,12 +48,18 @@ module Ruflet
         id: "_overlay",
         controls: []
       )
+      @services_container = Ruflet::Control.new(
+        type: "service_registry",
+        id: "_services",
+        "_services": []
+      )
       @dialogs_container = Ruflet::Control.new(
         type: "dialogs",
         id: "_dialogs",
         controls: []
       )
       refresh_overlay_container!
+      refresh_services_container!
       refresh_dialogs_container!
     end
 
@@ -123,6 +138,24 @@ module Ruflet
       self
     end
 
+    def services
+      @services_container.props["_services"] ||= []
+    end
+
+    def services=(value)
+      @services_container.props["_services"] = Array(value).compact
+      refresh_services_container!
+      push_services_update!
+      self
+    end
+
+    def add_service(*value)
+      @services_container.props["_services"] = services + value.flatten.compact
+      refresh_services_container!
+      push_services_update!
+      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"])
@@ -149,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
@@ -176,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
@@ -227,6 +228,43 @@ 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
@@ -304,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)
@@ -480,6 +557,23 @@ module Ruflet
       @page_props["_overlay"] = @overlay_container
     end
 
+    def refresh_services_container!
+      @page_props["_services"] = @services_container
+    end
+
+    def push_services_update!
+      refresh_control_indexes!
+
+      if @services_container.wire_id
+        send_message(Protocol::ACTIONS[:patch_control], {
+          "id" => @services_container.wire_id,
+          "patch" => [[0], [0, 0, "_services", serialize_patch_value(@services_container.props["_services"])]]
+        })
+      else
+        send_view_patch
+      end
+    end
+
     def push_dialogs_update!
       refresh_control_indexes!
 
@@ -546,5 +640,14 @@ module Ruflet
       end
       codepoint
     end
+
+    def ensure_url_launcher_service
+      launcher = services.find { |service| service.is_a?(Control) && service.type == "url_launcher" }
+      return launcher if launcher
+
+      launcher = build_widget(:url_launcher)
+      add_service(launcher)
+      launcher
+    end
   end
 end

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

@@ -2,6 +2,7 @@
 
 require_relative "material_control_factory"
 require_relative "cupertino_control_factory"
+require_relative "../control"
 
 module Ruflet
   module UI
@@ -13,9 +14,9 @@ module Ruflet
       def build(type, id: nil, **props)
         normalized_type = type.to_s.downcase
         klass = CLASS_MAP[normalized_type]
-        raise ArgumentError, "Unsupported control type: #{normalized_type}" unless klass
+        return klass.new(id: id, **props) if klass
 
-        klass.new(id: id, **props)
+        Ruflet::Control.new(type: normalized_type, id: id, **props)
       end
     end
   end

data/lib/ruflet_ui/ruflet/ui/controls/cupertino/cupertino_dialog_action_control.rb

@@ -7,6 +7,17 @@ module Ruflet
         def initialize(id: nil, **props)
           super(type: "cupertino_dialog_action", id: id, **props)
         end
+
+        private
+
+        def preprocess_props(props)
+          mapped = props.dup
+          if mapped.key?(:text) || mapped.key?("text")
+            value = mapped.key?(:text) ? mapped.delete(:text) : mapped.delete("text")
+            mapped[:content] = value unless mapped.key?(:content) || mapped.key?("content")
+          end
+          mapped
+        end
       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/cupertino_control_registry.rb

@@ -8,18 +8,32 @@ module Ruflet
         "cupertinobutton" => "CupertinoButton",
         "cupertino_filled_button" => "CupertinoFilledButton",
         "cupertinofilledbutton" => "CupertinoFilledButton",
+        "cupertino_tinted_button" => "CupertinoTintedButton",
+        "cupertinotintedbutton" => "CupertinoTintedButton",
         "cupertino_text_field" => "CupertinoTextField",
         "cupertinotextfield" => "CupertinoTextField",
+        "cupertino_checkbox" => "CupertinoCheckbox",
+        "cupertinocheckbox" => "CupertinoCheckbox",
         "cupertino_switch" => "CupertinoSwitch",
         "cupertinoswitch" => "CupertinoSwitch",
         "cupertino_slider" => "CupertinoSlider",
         "cupertinoslider" => "CupertinoSlider",
+        "cupertino_radio" => "CupertinoRadio",
+        "cupertinoradio" => "CupertinoRadio",
         "cupertino_alert_dialog" => "CupertinoAlertDialog",
         "cupertinoalertdialog" => "CupertinoAlertDialog",
         "cupertino_action_sheet" => "CupertinoActionSheet",
         "cupertinoactionsheet" => "CupertinoActionSheet",
         "cupertino_dialog_action" => "CupertinoDialogAction",
         "cupertinodialogaction" => "CupertinoDialogAction",
+        "cupertino_bottom_sheet" => "CupertinoBottomSheet",
+        "cupertinobottomsheet" => "CupertinoBottomSheet",
+        "cupertino_picker" => "CupertinoPicker",
+        "cupertinopicker" => "CupertinoPicker",
+        "cupertino_date_picker" => "CupertinoDatePicker",
+        "cupertinodatepicker" => "CupertinoDatePicker",
+        "cupertino_timer_picker" => "CupertinoTimerPicker",
+        "cupertinotimerpicker" => "CupertinoTimerPicker",
         "cupertino_navigation_bar" => "CupertinoNavigationBar",
         "cupertinonavigationbar" => "CupertinoNavigationBar"
       }.freeze

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

@@ -71,14 +71,17 @@ module Ruflet
 
       def icon(**props) = build_widget(:icon, **props)
 
-      def image(src = nil, **props)
+      def image(src = nil, src_base64: nil, placeholder_src: nil, **props)
         mapped = props.dup
-        mapped[:src] = src unless src.nil?
+        mapped[:src] = normalize_image_source(src) unless src.nil?
+        mapped[:src] = normalize_image_source(src_base64) if mapped[:src].nil? && !src_base64.nil?
+        mapped[:placeholder_src] = normalize_image_source(placeholder_src) unless placeholder_src.nil?
         build_widget(:image, **mapped)
       end
 
       def app_bar(**props) = build_widget(:appbar, **props)
       def appbar(**props) = app_bar(**props)
+      def url_launcher(**props) = build_widget(:url_launcher, **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)
@@ -100,6 +103,12 @@ module Ruflet
 
       private
 
+      def normalize_image_source(value)
+        return value unless value.is_a?(Array)
+        return value.pack("C*") if value.all? { |v| v.is_a?(Integer) }
+        value
+      end
+
       # Flet container alignment expects a vector-like object ({x:, y:}),
       # not a plain string. Keep common shorthand compatible.
       def normalize_container_props(props)

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

@@ -52,7 +52,55 @@ module Ruflet
         "navigationbar" => "NavigationBar",
         "navigation_bar" => "NavigationBar",
         "navigationbardestination" => "NavigationBarDestination",
-        "navigation_bar_destination" => "NavigationBarDestination"
+        "navigation_bar_destination" => "NavigationBarDestination",
+        "switch" => "Switch",
+        "slider" => "Slider",
+        "dropdown" => "DropdownM2",
+        "dropdownm2" => "DropdownM2",
+        "dropdown_m2" => "DropdownM2",
+        "option" => "Option",
+        "card" => "Card",
+        "banner" => "Banner",
+        "datepicker" => "DatePicker",
+        "date_picker" => "DatePicker",
+        "timepicker" => "TimePicker",
+        "time_picker" => "TimePicker",
+        "filledtonalbutton" => "FilledTonalButton",
+        "filled_tonal_button" => "FilledTonalButton",
+        "outlinedbutton" => "OutlinedButton",
+        "outlined_button" => "OutlinedButton",
+        "listtile" => "ListTile",
+        "list_tile" => "ListTile",
+        "progressbar" => "ProgressBar",
+        "progress_bar" => "ProgressBar",
+        "safearea" => "SafeArea",
+        "safe_area" => "SafeArea",
+        "canvas" => "Canvas",
+        "line" => "Line",
+        "service_registry" => "ServiceRegistry",
+        "url_launcher" => "UrlLauncher",
+        "audio" => "Audio",
+        "video" => "Video",
+        "flashlight" => "Flashlight",
+        "barchart" => "BarChart",
+        "barchartgroup" => "BarChartGroup",
+        "barchartrod" => "BarChartRod",
+        "barchartrodstackitem" => "BarChartRodStackItem",
+        "linechart" => "LineChart",
+        "linechartdata" => "LineChartData",
+        "linechartdatapoint" => "LineChartDataPoint",
+        "piechart" => "PieChart",
+        "piechartsection" => "PieChartSection",
+        "candlestickchart" => "CandlestickChart",
+        "candlestickchartspot" => "CandlestickChartSpot",
+        "radarchart" => "RadarChart",
+        "radarcharttitle" => "RadarChartTitle",
+        "radardataset" => "RadarDataSet",
+        "radardatasetentry" => "RadarDataSetEntry",
+        "scatterchart" => "ScatterChart",
+        "scatterchartspot" => "ScatterChartSpot",
+        "chartaxis" => "ChartAxis",
+        "chartaxislabel" => "ChartAxisLabel"
       }.freeze
 
       EVENT_PROPS = {
@@ -77,6 +125,21 @@ module Ruflet
         on_horizontal_drag_start: "horizontal_drag_start",
         on_horizontal_drag_update: "horizontal_drag_update",
         on_horizontal_drag_end: "horizontal_drag_end",
+        on_tap_down: "tap_down",
+        on_long_press_start: "long_press_start",
+        on_right_pan_start: "right_pan_start",
+        on_event: "event",
+        on_load: "load",
+        on_loaded: "loaded",
+        on_enter_fullscreen: "enter_fullscreen",
+        on_exit_fullscreen: "exit_fullscreen",
+        on_duration_change: "duration_change",
+        on_position_change: "position_change",
+        on_state_change: "state_change",
+        on_seek_complete: "seek_complete",
+        on_complete: "complete",
+        on_track_change: "track_change",
+        on_error: "error",
         on_accept: "accept",
         on_will_accept: "will_accept",
         on_accept_with_details: "accept_with_details",

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
 

data/lib/ruflet_ui.rb

@@ -105,5 +105,7 @@ module Kernel
     Ruflet::DSL
   end
 
-  private(*Ruflet::UI::SharedControlForwarders.instance_methods(false))
+  if Ruflet::UI::SharedControlForwarders.respond_to?(:instance_methods)
+    private(*Ruflet::UI::SharedControlForwarders.instance_methods(false))
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruflet
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - AdamMusa
@@ -19,6 +19,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - lib/ruflet.rb
+- lib/ruflet/manifest_compiler.rb
 - lib/ruflet/version.rb
 - lib/ruflet_protocol.rb
 - lib/ruflet_protocol/ruflet/protocol.rb