tkwrapper 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cf6fe96ebab8380076797dfe3f4ed9747d3f3709cc8d58e1bf1c012d28af572
-  data.tar.gz: b0956e96f04f7daf0b6d6f09317e7b2e73d010e866b57f678fa2fd7ba658fd16
+  metadata.gz: a31665aae98cd470f88451d45cd6332030c8fe874e18faa1040bcd42103d9ace
+  data.tar.gz: 93f428a63f6bf0832bf91accfdec1f14715cbfc6de2e9055f29b4cb146da0bf7
 SHA512:
-  metadata.gz: 848528e93f0dabed494f7e234789edc0108b4460b11964bc661c9457aeabcf2a022565461d4ae3d566de853ad2e96ec06b4112c2abf9f1520912c999675c9bd1
-  data.tar.gz: 613ec39818df4edb5714f0eac7f3aac73c7b403ed0a5d2371103a2e5419ec0c8bc763a2ec068b12538e2476cd29f1e0f49622af3cbcdfa7c7a734edc783c5c62
+  metadata.gz: 461b4344678f1d7a374ad6d1d01ffbab5c4865a9c513457c7145b21e9582e9d0922d3666a93adf6ed8f57428c6485b8e693694438db1966a7967c01c0ae6e3fc
+  data.tar.gz: f0a8d152e7aac88206454340c2fbce7e605117a85e2dc0cd550bffc4db9e49d09dd21b4610e52e19a87dc6313ce37b98c9a4bc4e8c44bf033b3f84fe41289833

data/lib/util/hash_recursive.rb

@@ -19,12 +19,9 @@ module Util
     end
   end
 
-  def self.recursive_transform_key_value!(hash, &block)
-    hash.transform_keys! do |key|
-      value = hash[key]
-      next recursive_transform_key_value!(value, &block) if value.is_a?(Hash)
-
-      block.call(key, value)
+  def self.clone_recursive(hash)
+    hash.transform_values do |value|
+      value.is_a?(Hash) ? clone_recursive(value) : value
     end
   end
 end

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: {
@@ -29,9 +37,9 @@ class TkWrapper::Widgets::AutoResizeEntry < TkWrapper::Widgets::Entry
   end
 
   def create_dummy_label_with_same_size(&block)
-    label = Label.new(**config_for_dummy_label)
+    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

@@ -5,7 +5,7 @@ require "#{LIB_DIR}/util/hash_recursive.rb"
 require_relative 'base'
 
 class TkWrapper::Widgets::Base::Configuration
-  attr_accessor :config
+  attr_reader :config
 
   GRID_SPECIAL_VALUES = {
     onecell: {
@@ -20,32 +20,24 @@ 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!(config)
+    @config = parse_and_clone(config)
   end
 
-  def merge!(*configurations)
+  def merge(*configurations)
     configurations = configurations.map do |configuration|
-      next configuration.config if configuration.is_a?(self.class)
+      configuration = configuration.config if configuration.is_a?(self.class)
 
-      parse!(configuration)
+      parse_and_clone(configuration)
     end
 
     Util.merge_recursive!(@config, *configurations)
   end
 
-  def parse!(config)
-    Util.each_recursive(config) do |hash, key, value|
-      next if value.is_a?(Hash)
-
-      hash[key] = parse_value(key, value)
-    end
-
-    config
-  end
-
   def [](key)
     key = key.to_sym
     return self.class.new(@config[key]) if @config[key].is_a?(Hash)
@@ -55,7 +47,13 @@ class TkWrapper::Widgets::Base::Configuration
 
   def []=(key, value)
     key = key.to_sym
-    @config[key] = parse_value(key, value)
+    @config[key] = parse_and_clone(value, key)
+  end
+
+  def parse_and_clone(value, key = nil)
+    return parse_value(key, value) unless value.is_a?(Hash)
+
+    value.each_with_object({}) { |(k, v), h| h[k] = parse_and_clone(v, k) }
   end
 
   def parse_value(key, value)
@@ -114,6 +112,6 @@ class TkWrapper::Widgets::Base::Configuration
   end
 
   def merge_global_configurations(manager, widget)
-    merge!(*manager.configurations(widget))
+    merge(*manager.configurations(widget))
   end
 end

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
@@ -60,6 +68,11 @@ class TkWrapper::Widgets::Base::Widget
     @childs.each { |child| child.build(self) }
   end
 
+  def push(child)
+    @childs.push(child)
+    child.build(self)
+  end
+
   def configure
     @config.merge_global_configurations(manager, self)
     @config.configure_tk_widget(tk_widget)

data/lib/widgets/grid.rb

@@ -4,6 +4,8 @@
 class TkWrapper::Widgets::Grid < TkWrapper::Widgets::Base::Widget
   attr_reader :parent, :matrix
 
+  Widget = TkWrapper::Widgets::Base::Widget
+
   def tk_class
     TkWidgets::Frame
   end
@@ -20,7 +22,7 @@ class TkWrapper::Widgets::Grid < TkWrapper::Widgets::Base::Widget
       row.each_with_index do |cell, col_i|
         next unless cell.is_a?(Widget)
 
-        (cell.config[:grid] ||= {}).merge!({ row: row_i, column: col_i })
+        cell.config.merge({ grid: { row: row_i, column: col_i } })
 
         configure_colspan(cell, row_i, col_i)
         configure_rowspan(cell, row_i, col_i)
@@ -33,7 +35,7 @@ class TkWrapper::Widgets::Grid < TkWrapper::Widgets::Base::Widget
     colspan = cols_after_cell.reduce(1) do |span, content|
       content == :right ? span + 1 : (break span)
     end
-    (cell.config[:grid] ||= {}).merge!({ columnspan: colspan })
+    cell.config.merge({ grid: { columnspan: colspan } })
   end
 
   def configure_rowspan(cell, row_i, col_i)
@@ -41,6 +43,6 @@ class TkWrapper::Widgets::Grid < TkWrapper::Widgets::Base::Widget
     rowspan = rows_after_cell.reduce(1) do |span, row|
       row[col_i] == :bottom ? span + 1 : (break span)
     end
-    (cell.config[:grid] ||= {}).merge!({ rowspan: rowspan })
+    cell.config.merge({ grid: { rowspan: rowspan } })
   end
 end

data/lib/widgets/menu.rb

@@ -29,7 +29,7 @@ class TkWrapper::Widgets::Menu < TkWrapper::Widgets::Base::Widget
   end
 
   def self.create(structure: [], config: {})
-    Menu.new(
+    new(
       config: config,
       childs: structure.map { |entry| create_subentry(entry) }
     )
@@ -44,8 +44,8 @@ class TkWrapper::Widgets::Menu < TkWrapper::Widgets::Base::Widget
 
   def self.create_subentry(entry)
     case entry
-    in { config: config, structure: structure }
-      return Cascade.new config: config, childs: create_subentries(structure)
+    in { config: config, structure: st }
+      return Cascade.new config: config, childs: create_subentries(st)
     else
       return Command.new config: entry
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tkwrapper
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Benjamin Schnitzler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-12 00:00:00.000000000 Z
+date: 2021-12-13 00:00:00.000000000 Z
 dependencies: []
 description:
 email: reception@e.mail.de