tkwrapper 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 957efe49807e9800759aa22439bc99f5ea4ef0ec620bc7ea0b7d549474839a7a
-  data.tar.gz: f654e23817c14ce6e59d67e7893f55c33c9168686faf66cbf0a96f955f4e7c6e
+  metadata.gz: 81c1971220f794d1e17288aac5b75221393727be934288a4993a621c35b3282d
+  data.tar.gz: f2a841f6f3a6a7ee040c85fe0f2081234780bf1ff0bf4aeb70de9cf4c2a75055
 SHA512:
-  metadata.gz: 4891b05ca78bff3d2119b6b4d8ba0be178836d1cdd7475e07ddc3be19100d766e0ca0d9878d4afc9be330ffbf3ea008914d4f4432b0e3eff2df8cc02534b74f4
-  data.tar.gz: 3ece495be24159cefde0ca65899c3022b181a3bb0d92e40727a9cbc2ca4494d376504a58313190a94fbf4dc8751949873753ec1c2313d9db4cc28fb29174a466
+  metadata.gz: 22cf843324096411be2441088df910d723ecc353aa6b54dd64ba5703b2fcd47bec3c2424a38e910fefb187fdcf23ec60dd44640de3f0657a3cb2969e84da016c
+  data.tar.gz: acb296b0e78c570e7d80ba96d91c4ebf62ecfd1ce7c97fac088546d599e0468a23dafac325ee14ae9fa0d4d08a9c8c70e5972df849346a05d8e2ac3ee9fb1154

data/lib/tkwrapper.rb

@@ -7,5 +7,6 @@ module TkWrapper end
 require_relative 'widgets/widgets'
 
 module TkWrapper
+  Manager = TkWrapper::Widgets::Base::Manager
   Widget = TkWrapper::Widgets::Base::Widget
 end

data/lib/util/tk/finder.rb

@@ -21,7 +21,7 @@ class TkWrapper::Util::Tk::Finder
     end
   end
 
-  def find_widget(comparators, widgets = @widgets)
+  def find(comparators, widgets = @widgets)
     matchers = create_value_matchers(comparators)
 
     each_widget_match(widgets, matchers) do |match|
@@ -29,7 +29,7 @@ class TkWrapper::Util::Tk::Finder
     end
   end
 
-  def find_all_widgets(comparators, widgets = @widgets)
+  def find_all(comparators, widgets = @widgets)
     matchers = create_value_matchers(comparators)
     matches = TkWrapper::Widgets::Base::Matches.new
 

data/lib/widgets/auto_resize_entry.rb

@@ -4,14 +4,14 @@ class TkWrapper::Widgets::AutoResizeEntry < TkWrapper::Widgets::Entry
   # auto resizes on user input, only works if in the grid geometry manager of tk
   attr_accessor :min_width, :add_width
 
-  def initialize(config: {}, childs: [], id: nil)
-    @min_width = config[:min_width] || 0
-    @add_width = config[:add_width] || 0
-    super(config: config, childs: childs, id: id)
+  def initialize(**args)
+    @min_width = args[:config][:min_width] || 0
+    @add_width = args[:config][:add_width] || 0
+    super(**args)
   end
 
-  def build(parent, configure: true)
-    super(parent, configure: configure)
+  def build(parent, **args)
+    super(parent, **args)
     parent.tk_widget.bind('Configure') { resize }
     tk_widget.textvariable = TkVariable.new unless tk_widget.textvariable
     tk_widget.textvariable.trace('write') { resize }

data/lib/widgets/base/configuration.rb

@@ -21,7 +21,7 @@ class TkWrapper::Widgets::Base::Configuration
   }.freeze
 
   NON_TK_OPTIONS = %i[
-    id tk_class tearoff weights menu min_width add_width
+    tk_class tearoff weights menu min_width add_width
   ].freeze
 
   def initialize(config)
@@ -112,6 +112,8 @@ class TkWrapper::Widgets::Base::Configuration
   end
 
   def merge_global_configurations(manager, widget)
+    return unless manager
+
     merge(*manager.configurations(widget))
   end
 end

data/lib/widgets/base/manager.rb

@@ -37,4 +37,11 @@ class TkWrapper::Widgets::Base::Manager
       end
     end
   end
+
+  def configure(widget)
+    widget.config.merge(*configurations(widget))
+  end
+
+  alias modify add_modification
+  alias config add_configurations
 end

data/lib/widgets/base/widget.rb

@@ -1,11 +1,6 @@
-# frozen_string_literal: true
-
-require 'tk'
-
-require "#{LIB_DIR}/tk_extensions"
-require "#{LIB_DIR}/util/tk/font"
 require "#{LIB_DIR}/util/tk/cell"
 require "#{LIB_DIR}/util/tk/finder"
+require "#{LIB_DIR}/tk_extensions"
 
 require_relative 'base'
 
@@ -14,54 +9,20 @@ class TkWrapper::Widgets::Base::Widget
   include TkExtensions
   include Enumerable
 
-  def_delegator :@finder, :find_widget, :find
-  def_delegator :@finder, :find_all_widgets, :find_all
+  def_delegators :@finder, :find, :find_all
 
   attr_accessor :config
-  attr_reader :parent, :ids, :cell, :childs
+  attr_reader :parent, :ids, :cell, :childs, :manager
 
   def tk_class() end
 
-  def self.manager
-    @manager ||= TkWrapper::Widgets::Base::Manager.new
-  end
-
-  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 manager
-    TkWrapper::Widgets::Base::Widget.manager
-  end
-
-  def each(&block)
-    nodes_to_walk = [self]
-    until nodes_to_walk.empty?
-      node = nodes_to_walk.pop
-      block.call(node)
-      nodes_to_walk = node.childs + nodes_to_walk
-    end
-  end
-
-  def initialize(config: {}, childs: [], id: nil)
+  def initialize(config: {}, childs: [], manager: nil, ids: [])
     @cell = TkWrapper::Util::Tk::Cell.new(self)
     @finder = TkWrapper::Util::Tk::Finder.new(widgets: self)
     @config = TkWrapper::Widgets::Base::Configuration.new(config)
     @childs = childs.is_a?(Array) ? childs : [childs]
-    @ids = []
-    add_ids(id)
-    add_ids(config[:id])
-  end
-
-  def add_ids(ids)
-    return unless ids
-
-    ids = [ids] unless ids.is_a?(Array)
-    @ids.concat(ids)
+    @manager = manager
+    @ids = ids.is_a?(Array) ? ids : [ids]
   end
 
   def create_tk_widget(parent)
@@ -80,41 +41,33 @@ class TkWrapper::Widgets::Base::Widget
     (@tk_widget = create_tk_widget(parent)) || parent&.tk_widget
   end
 
-  def build(parent, configure: true)
+  def build(parent, configure: true, manager: nil)
     @parent = parent
     tk_widget # creates the widget if possible and not yet created
     @font = TkWrapper::Util::Tk::Font.new(tk_widget)
+    @manager ||= manager
+    @config.merge(*@manager.configurations(self)) if @manager
     self.configure if configure
-    manager.execute_modifications(self)
-    @childs.each { |child| child.build(self) }
-  end
-
-  def push(child)
-    @childs.push(child)
-    child.build(self)
+    @manager&.execute_modifications(self)
+    @childs.each { |child| child.build(self, manager: @manager) }
   end
 
   def configure
-    @config.merge_global_configurations(manager, self)
     @config.configure_tk_widget(tk_widget)
     @config.configure_tearoff
   end
 
-  def modify(matchers, &callback)
-    items = find_all(matchers)
-
-    callback.call(items)
+  def each(&block)
+    nodes_to_walk = [self]
+    until nodes_to_walk.empty?
+      node = nodes_to_walk.pop
+      block.call(node)
+      nodes_to_walk = node.childs + nodes_to_walk
+    end
   end
 
-  def modify_each(matchers, &callback)
-    items = find_all(matchers)
-
-    return unless items
-
-    with_match = items[0].is_a?(Array)
-
-    items.each do |item|
-      with_match ? callback.call(item[0], item[1]) : callback.call(item)
-    end
+  def push(child)
+    @childs.push(child)
+    child.build(self)
   end
 end

data/lib/widgets/grid.rb

@@ -10,8 +10,8 @@ class TkWrapper::Widgets::Grid < TkWrapper::Widgets::Base::Widget
     TkWidgets::Frame
   end
 
-  def initialize(config: {}, childs: [], id: nil)
-    super(config: config, childs: childs, id: id)
+  def initialize(**arguments)
+    super(**arguments)
     @childs.map! { |row| row.is_a?(Array) ? row : [row] }
     configure_cells_for_grid
     @childs.flatten! && @childs.select! { |cell| cell.is_a?(Widget) }

data/lib/widgets/menu.rb

@@ -5,8 +5,8 @@ class TkWrapper::Widgets::Menu < TkWrapper::Widgets::Base::Widget
     TkWidgets::TkMenu
   end
 
-  def build(parent)
-    super(parent)
+  def build(parent, **args)
+    super(parent, **args)
     parent.tk_widget['menu'] = tk_widget
   end
 
@@ -15,15 +15,18 @@ class TkWrapper::Widgets::Menu < TkWrapper::Widgets::Base::Widget
       TkWidgets::TkMenu
     end
 
-    def build(parent)
-      super(parent, configure: false)
+    def build(parent, **args)
+      args[:configure] = false
+      super(parent, **args)
       @config[:menu] = tk_widget
       parent.tk_widget.add :cascade, **@config.config
     end
   end
 
   class Command < TkWrapper::Widgets::Base::Widget
-    def build(parent)
+    def build(parent, **args)
+      args[:configure] = false
+      super(parent, **args)
       parent.tk_widget.add :command, **@config.config
     end
   end

metadata

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