tkwrapper 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42d786c8eda480c18150ef9b6c3e67fc04c14d2c9ec70a037907dee5a9273264
-  data.tar.gz: b669a2881c794270a80da8332a55393c90a7bb3115273b5c28fc5681fb43faf5
+  metadata.gz: a31665aae98cd470f88451d45cd6332030c8fe874e18faa1040bcd42103d9ace
+  data.tar.gz: 93f428a63f6bf0832bf91accfdec1f14715cbfc6de2e9055f29b4cb146da0bf7
 SHA512:
-  metadata.gz: 1c583155569bc2adf08a5177c35e123e45a69c997ecb3aa70d78841ab4418406a7daa83277c7efe7654585c77932b58094a4bace040d5c9555de30e4e493c9b0
-  data.tar.gz: 63cb56447bc90a44a86251cfc5ef4507a5482063abb2f24a906610d6d23c3ba8cb341bf64a34ae027577ffbf6bb47ab4935e88a7ab56198e39b44e7f2d0cb890
+  metadata.gz: 461b4344678f1d7a374ad6d1d01ffbab5c4865a9c513457c7145b21e9582e9d0922d3666a93adf6ed8f57428c6485b8e693694438db1966a7967c01c0ae6e3fc
+  data.tar.gz: f0a8d152e7aac88206454340c2fbce7e605117a85e2dc0cd550bffc4db9e49d09dd21b4610e52e19a87dc6313ce37b98c9a4bc4e8c44bf033b3f84fe41289833

data/lib/widgets/auto_resize_entry.rb

@@ -5,8 +5,8 @@ class TkWrapper::Widgets::AutoResizeEntry < TkWrapper::Widgets::Entry
   attr_accessor :min_width, :add_width
 
   def initialize(config: {}, childs: [])
-    @min_width = config.delete(:min_width) || 0
-    @add_width = config.delete(:add_width) || 0
+    @min_width = config[:min_width] || 0
+    @add_width = config[:add_width] || 0
     super(config: config, childs: childs)
   end
 
@@ -18,6 +18,14 @@ class TkWrapper::Widgets::AutoResizeEntry < TkWrapper::Widgets::Entry
     resize
   end
 
+  def value=(value)
+    tk_widget.textvariable.value = value
+  end
+
+  def value
+    tk_widget.textvariable.value
+  end
+
   def config_for_dummy_label
     grid_info = TkGrid.info(tk_widget)
     { config: { grid: {
@@ -31,7 +39,7 @@ class TkWrapper::Widgets::AutoResizeEntry < TkWrapper::Widgets::Entry
   def create_dummy_label_with_same_size(&block)
     label = TkWrapper::Widgets::Label.new(**config_for_dummy_label)
     label.build(@parent)
-    label.tk_widget.text = tk_widget.textvariable.value
+    label.tk_widget.text = value
     label.tk_widget.lower
     result = block.call(label)
     label.tk_widget.destroy

data/lib/widgets/base/configuration.rb

@@ -20,7 +20,9 @@ class TkWrapper::Widgets::Base::Configuration
     }
   }.freeze
 
-  NON_TK_OPTIONS = %i[id tk_class tearoff weights menu].freeze
+  NON_TK_OPTIONS = %i[
+    id tk_class tearoff weights menu min_width add_width
+  ].freeze
 
   def initialize(config)
     @config = parse_and_clone(config)

data/lib/widgets/base/manager.rb

@@ -3,30 +3,60 @@
 # manages widgets and their global configurations
 class TkWrapper::Widgets::Base::Manager
   def initialize
-    @configurations = []
-    @modifications = []
+    @configuration_matchers = { regex: {}, map: {} }
+    @modification_matchers = { regex: {}, map: {} }
   end
 
-  def add_configuration(matcher, configuration)
-    @configurations.push([matcher, configuration])
+  def add_configurations(matcher = nil, config = nil, **configs)
+    add_matcher(matcher, config, @configuration_matchers) if config
+
+    configs.each { |mat, cfg| add_matcher(mat, cfg, @configuration_matchers) }
   end
 
   def add_modification(matcher, &callback)
-    @modifications.push([matcher, callback])
+    add_matcher(matcher, callback, @modification_matchers)
   end
 
   def configurations(widget)
-    @configurations.filter_map do |(matcher, config)|
-      config if widget.check_match(matcher)
-    end
+    configs = find_matching_items(widget.ids, @configuration_matchers)
+    configs.map { |config| config[0] }
   end
 
   def execute_modifications(widget)
-    @modifications.each do |(matcher, callback)|
-      next unless (match = widget.check_match(matcher))
+    callbacks = find_matching_items(widget.ids, @modification_matchers)
+    callbacks.each do |callback|
+      callback, match = callback
+      match ? callback.call(widget, match) : callback.call(widget)
+    end
+  end
+
+  private
+
+  def find_matching_items(keys, container)
+    keys.each_with_object([]) do |key, items|
+      items.concat(
+        items_from_map(key, container),
+        items_by_regex(key, container)
+      )
+    end
+  end
+
+  def items_from_map(key, container)
+    (container[:map][key] || []).map { |item| [item, nil] } || []
+  end
+
+  def items_by_regex(key, container)
+    container[:regex].each_with_object([]) do |(matcher, items), merged_items|
+      match = matcher.match(key)
+      merged_items.concat(items.map { |item| [item, match] }) if match
+    end
+  end
 
-      arguments = match.is_a?(MatchData) ? [widget, match] : [widget]
-      callback.call(*arguments)
+  def add_matcher(matcher, item, container)
+    if matcher.is_a?(Regexp)
+      (container[:regex][matcher] ||= []).push(item)
+    else
+      (container[:map][matcher] ||= []).push(item)
     end
   end
 end

data/lib/widgets/base/widget.rb

@@ -18,14 +18,22 @@ class TkWrapper::Widgets::Base::Widget
     @manager ||= TkWrapper::Widgets::Base::Manager.new
   end
 
-  def self.config(matcher, configuration)
-    manager.add_configuration(matcher, configuration)
+  def self.config(matcher = nil, configuration = nil, **configurations)
+    manager.add_configurations(matcher, configuration, **configurations)
   end
 
   def self.modify(matcher, &callback)
     manager.add_modification(matcher, &callback)
   end
 
+  def ids
+    case @id
+    when Array then @id
+    when nil then   []
+    else            [@id]
+    end
+  end
+
   def manager
     TkWrapper::Widgets::Base::Widget.manager
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tkwrapper
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Benjamin Schnitzler