ruflet_core 0.0.22 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3e8b0865b88790b85de1ad455a9b262603722e1919b25af614994765794d704
-  data.tar.gz: 8f16bbf7b16594ef9a4ff31d91e7fac5b67d36edd26021f297be09a110da95cf
+  metadata.gz: b7c6e921c44aa57801c14bb2bce64088b8b92b3759d6476a76db284cc74f5e00
+  data.tar.gz: 92970e55579384280481a14a37d76724a0f820be79281f668b462321bb4eb005
 SHA512:
-  metadata.gz: e97396572fb70e02900174cc177dc435159083d844f4f44a6dd9c854543af13eb866cbfd17265ac6c4239f260bc78e171eb02cfd16c564bf1e2d3203241d8661
-  data.tar.gz: e1db85c6c73756534c68018ee32803beda36d50237511e259ba693c269a0c671e0432e4417083b99bad0feb50b984244c16f33eab36d755930c833496fff27fc
+  metadata.gz: 733714ee9e1c916d6c5b4f402163bd7caaa34df1fd4c4f07e0e49dbcb4e324b8287c70fe753d35b376039e02d227810a7856bc5a02cb8920ee51069862533462
+  data.tar.gz: fbf901236bac15ec93b15175e93bc2b49bfb3c17ac26dd0fd453085900d7e180fec4b76fc7b54fca265823f3e1b618cdfc91e1ed12b09e3b59bb5ad21a921c79

data/lib/ruflet/version.rb

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

data/lib/ruflet_ui/ruflet/icons/cupertino/cupertino_icons.rb

@@ -5,46 +5,46 @@ require_relative "../icon_constant_names"
 require_relative "../cupertino_icon_lookup"
 
 module Ruflet
+  # Cupertino icon names, exposed as constants. Materialized on demand for the
+  # same reason as Ruflet::MaterialIcons -- see the note there.
   module CupertinoIcons
     module_function
 
-    ICONS = begin
-      source = Ruflet::CupertinoIconLookup.icon_map
-      if source.empty?
-        {
-          HOME: "house",
-          SEARCH: "search",
-          SETTINGS: "gear",
-          ADD: "add",
-          CLOSE: "clear"
-        }
-      else
-        source.keys.each_with_object({}) do |name, result|
-          text = Ruflet::IconNames.constant_for(name)
-          result[text.upcase.to_sym] = name
-        end
-      end.freeze
-    end
-
-    ICONS.each do |const_name, icon_name|
-      next if const_defined?(const_name, false)
+    FALLBACK_ICONS = {
+      HOME: "house",
+      SEARCH: "search",
+      SETTINGS: "gear",
+      ADD: "add",
+      CLOSE: "clear"
+    }.freeze
 
-      const_set(const_name, icon_name.to_s.downcase)
+    def icons
+      @icons ||= begin
+        source = Ruflet::CupertinoIconLookup.icon_map
+        if source.empty?
+          FALLBACK_ICONS
+        else
+          source.keys.each_with_object({}) do |name, result|
+            text = Ruflet::IconNames.constant_for(name)
+            result[text.upcase.to_sym] = name
+          end
+        end.freeze
+      end
     end
 
     def [](name)
-      key = name.to_s.upcase.to_sym
-      return const_get(key) if const_defined?(key, false)
+      icon = icons[name.to_s.upcase.to_sym]
+      return icon.to_s.downcase unless icon.nil?
 
       Ruflet::CupertinoIconLookup.canonical_name_for(name) || name.to_s
     end
 
     def constants(_inherit = true)
-      ICONS.keys
+      icons.keys
     end
 
     def all
-      ICONS.keys.map { |k| const_get(k) }
+      icons.values.map { |name| name.to_s.downcase }
     end
 
     def random
@@ -52,7 +52,27 @@ module Ruflet
     end
 
     def names
-      ICONS.values
+      icons.values
+    end
+
+    class << self
+      # See Ruflet::MaterialIcons.resolve_constant.
+      def resolve_constant(name)
+        return const_get(name) if const_defined?(name, false)
+        return const_set(:ICONS, icons) if name == :ICONS
+
+        key = name.to_s
+        source = Ruflet::CupertinoIconLookup.icon_map
+        return const_set(name, key.downcase) if source.key?(key)
+
+        icon = icons[name]
+        icon.nil? ? nil : const_set(name, icon.to_s.downcase)
+      end
+
+      def const_missing(name)
+        resolved = resolve_constant(name)
+        resolved.nil? ? super : resolved
+      end
     end
   end
 end

data/lib/ruflet_ui/ruflet/icons/material/material_icons.rb

@@ -5,46 +5,55 @@ require_relative "../icon_constant_names"
 require_relative "../material_icon_lookup"
 
 module Ruflet
+  # Material icon names, exposed as constants: Ruflet::MaterialIcons::HOME.
+  #
+  # The constants are materialized on demand rather than at load. Building all
+  # of them eagerly meant interning ~8,800 symbols, filling a hash with them and
+  # calling const_set ~8,800 times every time the VM opened -- on the embedded
+  # mruby runtime that was the single largest item in application cold start,
+  # and an app typically names a handful of icons. const_missing keeps the
+  # constant syntax working, so nothing at the call site changes.
   module MaterialIcons
     module_function
 
-    ICONS = begin
-      source = Ruflet::MaterialIconLookup.icon_map
-      if source.empty?
-        {
-          HOME: "home",
-          SETTINGS: "settings",
-          SEARCH: "search",
-          ADD: "add",
-          CLOSE: "close"
-        }
-      else
-        source.keys.each_with_object({}) do |name, result|
-          text = Ruflet::IconNames.constant_for(name)
-          result[text.upcase.to_sym] = name
-        end
-      end.freeze
-    end
-
-    ICONS.each do |const_name, icon_name|
-      next if const_defined?(const_name, false)
+    FALLBACK_ICONS = {
+      HOME: "home",
+      SETTINGS: "settings",
+      SEARCH: "search",
+      ADD: "add",
+      CLOSE: "close"
+    }.freeze
 
-      const_set(const_name, icon_name.to_s.downcase)
+    # Constant name -> icon name, e.g. :ACCESS_ALARM => "ACCESS_ALARM". Built on
+    # first use by anything that needs the whole table; single constant lookups
+    # do not need it at all (see const_missing).
+    def icons
+      @icons ||= begin
+        source = Ruflet::MaterialIconLookup.icon_map
+        if source.empty?
+          FALLBACK_ICONS
+        else
+          source.keys.each_with_object({}) do |name, result|
+            text = Ruflet::IconNames.constant_for(name)
+            result[text.upcase.to_sym] = name
+          end
+        end.freeze
+      end
     end
 
     def [](name)
-      key = name.to_s.upcase.to_sym
-      return const_get(key) if const_defined?(key, false)
+      icon = icons[name.to_s.upcase.to_sym]
+      return icon.to_s.downcase unless icon.nil?
 
       Ruflet::MaterialIconLookup.canonical_name_for(name) || name.to_s
     end
 
     def constants(_inherit = true)
-      ICONS.keys
+      icons.keys
     end
 
     def all
-      ICONS.keys.map { |k| const_get(k) }
+      icons.values.map { |name| name.to_s.downcase }
     end
 
     def random
@@ -52,8 +61,34 @@ module Ruflet
     end
 
     def names
-      ICONS.values
+      icons.values
     end
 
+    class << self
+      # Materializes one icon constant, or returns nil when the name is not an
+      # icon. Callers that used to probe with const_defined?(name, false) must
+      # come through here instead: with deferred constants, const_defined? is
+      # false for every icon nobody has referenced yet.
+      def resolve_constant(name)
+        return const_get(name) if const_defined?(name, false)
+
+        # ICONS stayed a public constant for callers that want the whole table.
+        return const_set(:ICONS, icons) if name == :ICONS
+
+        # Most constant names are already a key of the compiled map, so the
+        # common case is one hash hit and never builds the reverse table.
+        key = name.to_s
+        source = Ruflet::MaterialIconLookup.icon_map
+        return const_set(name, key.downcase) if source.key?(key)
+
+        icon = icons[name]
+        icon.nil? ? nil : const_set(name, icon.to_s.downcase)
+      end
+
+      def const_missing(name)
+        resolved = resolve_constant(name)
+        resolved.nil? ? super : resolved
+      end
+    end
   end
 end

data/lib/ruflet_ui.rb

@@ -90,9 +90,8 @@ module Ruflet
       end
 
       def const_missing(name)
-        return @icon_module.const_get(name) if @icon_module.const_defined?(name, false)
-
-        super
+        resolved = @icon_module.resolve_constant(name)
+        resolved.nil? ? super : resolved
       end
     end
 
@@ -106,13 +105,11 @@ module Ruflet
       end
 
       def const_missing(name)
-        if Ruflet::MaterialIcons.const_defined?(name, false)
-          return Ruflet::MaterialIcons.const_get(name)
-        end
+        resolved = Ruflet::MaterialIcons.resolve_constant(name)
+        return resolved unless resolved.nil?
 
-        if Ruflet::CupertinoIcons.const_defined?(name, false)
-          return Ruflet::CupertinoIcons.const_get(name)
-        end
+        resolved = Ruflet::CupertinoIcons.resolve_constant(name)
+        return resolved unless resolved.nil?
 
         super
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruflet_core
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
 platform: ruby
 authors:
 - AdamMusa