tkwrapper 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81c1971220f794d1e17288aac5b75221393727be934288a4993a621c35b3282d
-  data.tar.gz: f2a841f6f3a6a7ee040c85fe0f2081234780bf1ff0bf4aeb70de9cf4c2a75055
+  metadata.gz: abffb1cc7ae4efaf8b26ebdd49acca56837989829713473f21971f8a5f5a9063
+  data.tar.gz: 1e659e3049a41d4aff307f700ac27cc86d014ec844134aa65bc7bd20c2f692db
 SHA512:
-  metadata.gz: 22cf843324096411be2441088df910d723ecc353aa6b54dd64ba5703b2fcd47bec3c2424a38e910fefb187fdcf23ec60dd44640de3f0657a3cb2969e84da016c
-  data.tar.gz: acb296b0e78c570e7d80ba96d91c4ebf62ecfd1ce7c97fac088546d599e0468a23dafac325ee14ae9fa0d4d08a9c8c70e5972df849346a05d8e2ac3ee9fb1154
+  metadata.gz: efbad85fe488198ff115feac31872163da0da8b796ef0a21babf33d21976e14da0f809a93a502cbfc0f9225e4446e30c1b567680af2b3c7e7eae862cf0b5f64b
+  data.tar.gz: 7d0addd32901d46c6d0175219ee83dd4478f699bc05ec7804f0a76dac02b1950a11f7a22dafa494996961bc8f25582c1f6be4f36c3cf19c9b3a3e5050cb0df9f

data/lib/tkwrapper.rb

@@ -2,7 +2,12 @@
 
 LIB_DIR = __dir__
 
-module TkWrapper end
+module TkWrapper
+  module Util
+    module Tk
+    end
+  end
+end
 
 require_relative 'widgets/widgets'
 

data/lib/util/tk/finder.rb

@@ -2,42 +2,32 @@
 
 require "#{LIB_DIR}/widgets/base/manager"
 require "#{LIB_DIR}/widgets/base/matcher"
-require_relative 'tk'
+require "#{LIB_DIR}/widgets/base/matches"
 
 class TkWrapper::Util::Tk::Finder
+  Match   = TkWrapper::Widgets::Base::Match
   Matcher = TkWrapper::Widgets::Base::Matcher
+  Matches = TkWrapper::Widgets::Base::Matches
 
-  def initialize(widgets: nil)
+  def initialize(widgets: nil, lookup: nil)
+    @lookup = lookup
     @widgets = widgets
   end
 
-  def each_widget_match(widgets, matchers, &block)
-    widgets.each do |widget|
-      widget.ids.each do |id|
-        matchers.each do |matcher|
-          (match = matcher.match(id, widget)) && block.call(match)
-        end
-      end
+  def iter(comparators, widgets = @widgets, lookup = @lookup)
+    Enumerator.new do |y|
+      comparators = each_widget_lookup_match(lookup, comparators) { |m| y << m }
+      each_widget_comparator_match(widgets, comparators) { |m| y << m }
     end
   end
 
-  def find(comparators, widgets = @widgets)
-    matchers = create_value_matchers(comparators)
-
-    each_widget_match(widgets, matchers) do |match|
-      return match.widget if match
-    end
+  def find(comparators, widgets = @widgets, lookup = @lookup)
+    iter(comparators, widgets, lookup, &:itself).first
   end
 
-  def find_all(comparators, widgets = @widgets)
-    matchers = create_value_matchers(comparators)
-    matches = TkWrapper::Widgets::Base::Matches.new
-
-    each_widget_match(widgets, matchers) do |match|
-      matches.push(match)
-    end
-
-    matches
+  def find_all(comparators, widgets = @widgets, lookup = @lookup)
+    it = iter(comparators, widgets, lookup, &:itself)
+    it.each_with_object(Matches.new) { |match, matches| matches.push(match) }
   end
 
   private
@@ -46,4 +36,30 @@ class TkWrapper::Util::Tk::Finder
     comparators = [comparators] unless comparators.is_a?(Array)
     comparators.map { |comparator| Matcher.new(comparator: comparator) }
   end
+
+  def each_widget_lookup_match(lookup, comparators, &block)
+    return comparators unless lookup
+
+    comparators.filter do |comparator|
+      next true unless [String, Symbol].include?(comparator.class)
+
+      (lookup[comparator] || []).each do |widget|
+        block.call(Match.new(comparator, widget: widget))
+      end
+
+      false
+    end
+  end
+
+  def each_widget_comparator_match(widgets, comparators, &block)
+    matchers = create_value_matchers(comparators)
+
+    widgets.each do |widget|
+      widget.ids.each do |id|
+        matchers.each do |matcher|
+          (match = matcher.match(id, widget)) && block.call(match)
+        end
+      end
+    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(**args)
-    @min_width = args[:config][:min_width] || 0
-    @add_width = args[:config][:add_width] || 0
+    @min_width = args.dig(:config, :min_width) || 0
+    @add_width = args.dig(:config, :add_width) || 0
     super(**args)
   end
 
@@ -27,7 +27,7 @@ class TkWrapper::Widgets::AutoResizeEntry < TkWrapper::Widgets::Entry
   end
 
   def resize
-    max_width = @cell.bbox[2]
+    max_width = [@cell.bbox[2], 0].max
     text_width = @font.measure(value)
     new_width = [[@min_width, text_width + @add_width].max, max_width].min
     tk_widget.width = 0

data/lib/widgets/base/comparator_item_store.rb

@@ -10,8 +10,12 @@ class TkWrapper::Widgets::Base::ComparatorItemStore
     @comparator_map = {} # for lookup using comparisons by Matcher class
   end
 
+  def map_key?(key)
+    [String, Symbol].include?(key)
+  end
+
   def push(key, *items)
-    if [String, Symbol].include?(key)
+    if map_key?(key)
       (@key_map[key] ||= []).concat(items)
     else
       (@comparator_map[key] ||= []).concat(items)
@@ -25,6 +29,11 @@ class TkWrapper::Widgets::Base::ComparatorItemStore
     end
   end
 
+  def [](key)
+    items = map_key?(key) ? @key_map[key] : @comparator_map[key]
+    items&.length == 1 ? items.first : items
+  end
+
   private
 
   def items_from_key_map(id)

data/lib/widgets/base/manager.rb

@@ -1,13 +1,18 @@
 # frozen_string_literal: true
 
 require_relative 'comparator_item_store'
+require_relative 'widget_store'
 
 class TkWrapper::Widgets::Base::Manager
   ComparatorItemStore = TkWrapper::Widgets::Base::ComparatorItemStore
+  WidgetStore = TkWrapper::Widgets::Base::WidgetStore
+
+  attr_reader :widgets
 
   def initialize
     @configurations = ComparatorItemStore.new
     @modifications = ComparatorItemStore.new
+    @widgets = WidgetStore.new
   end
 
   def add_configurations(matcher = nil, configuration = nil, **configurations)

data/lib/widgets/base/matches.rb

@@ -31,4 +31,8 @@ class TkWrapper::Widgets::Base::Matches
     else        @matches[key]
     end
   end
+
+  def first
+    @matches.first&.[](1)
+  end
 end

data/lib/widgets/base/widget.rb

@@ -49,6 +49,7 @@ class TkWrapper::Widgets::Base::Widget
     @config.merge(*@manager.configurations(self)) if @manager
     self.configure if configure
     @manager&.execute_modifications(self)
+    @manager&.widgets&.push(self)
     @childs.each { |child| child.build(self, manager: @manager) }
   end
 

data/lib/widgets/base/widget_store.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require "#{LIB_DIR}/util/tk/finder"
+require_relative 'comparator_item_store'
+
+class TkWrapper::Widgets::Base::WidgetStore
+  extend Forwardable
+
+  def_delegators :@finder, :find, :find_all, :iter
+
+  def initialize
+    @lookup = {}
+    @finder = TkWrapper::Util::Tk::Finder.new(widgets: self, lookup: @lookup)
+  end
+
+  def push(widget)
+    widget.ids.each do |id|
+      (@lookup[id] ||= []).push(widget)
+    end
+  end
+
+  def each(&block)
+    @lookup.each_value do |widgets|
+      widgets.each { |widget| block.call(widget) }
+    end
+  end
+
+  def [](key)
+    @lookup[key].size == 1 ? @lookup[key].first : @lookup[key]
+  end
+
+  private
+
+  def map_key?(key)
+    [String, Symbol].include?(key)
+  end
+end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: tkwrapper
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Benjamin Schnitzler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-16 00:00:00.000000000 Z
-dependencies: []
+date: 2021-12-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: tk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
 description:
 email: reception@e.mail.de
 executables: []
@@ -33,6 +47,7 @@ files:
 - lib/widgets/base/matcher.rb
 - lib/widgets/base/matches.rb
 - lib/widgets/base/widget.rb
+- lib/widgets/base/widget_store.rb
 - lib/widgets/entry.rb
 - lib/widgets/frame.rb
 - lib/widgets/grid.rb