tkwrapper 1.0.2 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: adff2bad961cbadb878bb2abbe0a6fbc94ff538889b6460dedea974821743874
-  data.tar.gz: f2ef0b44bc561ebe718e68197348974d6c85973dfe9a2f95f73a8b30229c7450
+  metadata.gz: 42d786c8eda480c18150ef9b6c3e67fc04c14d2c9ec70a037907dee5a9273264
+  data.tar.gz: b669a2881c794270a80da8332a55393c90a7bb3115273b5c28fc5681fb43faf5
 SHA512:
-  metadata.gz: '0032648213c0a318b02756bf63dbef4e6375f3af1554c94cb369c858a0ed2be7c2f17456493429e5f32ed62b65ad1710f63599d3ae98f1a585596f52ecc612c7'
-  data.tar.gz: 0c737c6ebe8f1d06ae6061f8666066663abb41ee4be1317be3e2701da815f892ede6fca30db77ddf17adff726e99f6ebdc765c6f33ceb57fdeb6d13e5dac7f34
+  metadata.gz: 1c583155569bc2adf08a5177c35e123e45a69c997ecb3aa70d78841ab4418406a7daa83277c7efe7654585c77932b58094a4bace040d5c9555de30e4e493c9b0
+  data.tar.gz: 63cb56447bc90a44a86251cfc5ef4507a5482063abb2f24a906610d6d23c3ba8cb341bf64a34ae027577ffbf6bb47ab4935e88a7ab56198e39b44e7f2d0cb890

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/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: {
@@ -23,29 +23,19 @@ class TkWrapper::Widgets::Base::Configuration
   NON_TK_OPTIONS = %i[id tk_class tearoff weights menu].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 +45,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 +110,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/widget.rb

@@ -60,6 +60,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

@@ -22,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)
@@ -35,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)
@@ -43,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

metadata

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