tk 0.2.0 → 0.3.0

data/lib/tkextlib/treectrl/tktreectrl.rb

@@ -1420,31 +1420,23 @@ class Tk::TreeCtrl
     marquee_visible()
   end
 
-  #def notify_bind(obj, event, cmd=Proc.new, *args)
-  #  _bind([@path, 'notify', 'bind', obj], event, cmd, *args)
-  #  self
-  #end
-  def notify_bind(obj, event, *args)
+  def notify_bind(obj, event, *args, &block)
     # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
+    if TkComm._callback_entry?(args[0]) || !block
       cmd = args.shift
     else
-      cmd = Proc.new
+      cmd = block
     end
     _bind([@path, 'notify', 'bind', obj], event, cmd, *args)
     self
   end
 
-  #def notify_bind_append(obj, event, cmd=Proc.new, *args)
-  #  _bind_append([@path, 'notify', 'bind', obj], event, cmd, *args)
-  #  self
-  #end
-  def notify_bind_append(obj, event, *args)
+  def notify_bind_append(obj, event, *args, &block)
     # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
-    if TkComm._callback_entry?(args[0]) || !block_given?
+    if TkComm._callback_entry?(args[0]) || !block
       cmd = args.shift
     else
-      cmd = Proc.new
+      cmd = block
     end
     _bind_append([@path, 'notify', 'bind', obj], event, cmd, *args)
     self
@@ -1475,7 +1467,7 @@ class Tk::TreeCtrl
 
   def notify_install(pattern, percents_cmd=nil, &b)
     pattern = "<#{pattern}>"
-    percents_cmd = Proc.new(&b) if !percents_cmd && b
+    percents_cmd = b if !percents_cmd && b
     if percents_cmd
       procedure(tk_send('notify', 'install', pattern, percents_cmd))
     else
@@ -1484,7 +1476,7 @@ class Tk::TreeCtrl
   end
 
   def notify_install_detail(event, detail, percents_cmd=nil, &b)
-    percents_cmd = Proc.new(&b) if !percents_cmd && b
+    percents_cmd = b if !percents_cmd && b
     if percents_cmd
       tk_send('notify', 'install', 'detail', event, detail, percents_cmd)
     else
@@ -1493,7 +1485,7 @@ class Tk::TreeCtrl
   end
 
   def notify_install_event(event, percents_cmd=nil, &b)
-    percents_cmd = Proc.new(&b) if !percents_cmd && b
+    percents_cmd = b if !percents_cmd && b
     if percents_cmd
       tk_send('notify', 'install', 'event', event, percents_cmd)
     else
@@ -1733,7 +1725,7 @@ end
 class Tk::TreeCtrl::Column < TkObject
   TreeCtrlColumnID_TBL = TkCore::INTERP.create_table
 
-  (TreeCtrlColumnID = ['treectrl_column'.freeze, TkUtil.untrust('00000')]).instance_eval{
+  (TreeCtrlColumnID = ['treectrl_column'.freeze, '00000']).instance_eval{
     @mutex = Mutex.new
     def mutex; @mutex; end
     freeze
@@ -1839,7 +1831,7 @@ end
 class Tk::TreeCtrl::Element < TkObject
   TreeCtrlElementID_TBL = TkCore::INTERP.create_table
 
-  (TreeCtrlElementID = ['treectrl_element'.freeze, TkUtil.untrust('00000')]).instance_eval{
+  (TreeCtrlElementID = ['treectrl_element'.freeze, '00000']).instance_eval{
     @mutex = Mutex.new
     def mutex; @mutex; end
     freeze
@@ -2277,7 +2269,7 @@ end
 class Tk::TreeCtrl::Style < TkObject
   TreeCtrlStyleID_TBL = TkCore::INTERP.create_table
 
-  (TreeCtrlStyleID = ['treectrl_style'.freeze, TkUtil.untrust('00000')]).instance_eval{
+  (TreeCtrlStyleID = ['treectrl_style'.freeze, '00000']).instance_eval{
     @mutex = Mutex.new
     def mutex; @mutex; end
     freeze

data/lib/tkextlib/vu/pie.rb

@@ -118,7 +118,7 @@ end
 class Tk::Vu::PieSlice
   SliceID_TBL = TkCore::INTERP.create_table
 
-  (Pie_Slice_ID = ['vu:pie'.freeze, TkUtil.untrust('00000')]).instance_eval{
+  (Pie_Slice_ID = ['vu:pie'.freeze, '00000']).instance_eval{
     @mutex = Mutex.new
     def mutex; @mutex; end
     freeze

data/sample/binding_sample.rb

@@ -38,8 +38,8 @@ class Button_clone < TkLabel
               })
   end
 
-  def command(cmd = Proc.new)
-    @command = cmd
+  def command(cmd = nil, &block)
+    @command = cmd || block
   end
 
   def invoke

data/sample/cmd_res_test.rb

@@ -9,7 +9,7 @@ cmd2 = TkOptionDB.new_proc_class(:ZZZ, [:show_msg, :bye_msg], 3, false, cmd1)
 cmd3 = TkOptionDB.new_proc_class(:ZZZ, [:show_msg, :bye_msg], 3, false, b)
 cmd4 = TkOptionDB.new_proc_class(:BTN_CMD, [:show_msg, :bye_msg], 3){
   def self.__check_proc_string__(str)
-    "{|arg| print [arg, $SAFE].inspect, ': '; Proc.new#{str}.call(arg)}"
+    "{|arg| print arg.inspect, ': '; Proc.new#{str}.call(arg)}"
   end
 }
 cmd1.show_msg('cmd1')

data/sample/demos-en/widget

@@ -582,10 +582,10 @@ end
 
 # Pseudo-Toplevel support
 module PseudoToplevel_Evaluable
-  def pseudo_toplevel_eval(body = Proc.new)
+  def pseudo_toplevel_eval(body = nil, &block)
     Thread.current[:TOPLEVEL] = self
     begin
-      body.call
+      (body || block).call
     ensure
       Thread.current[:TOPLEVEL] = nil
     end
@@ -605,25 +605,25 @@ module PseudoToplevel_Evaluable
 end
 
 class Object
-  alias __method_missing__ method_missing
-  private :__method_missing__
-
-  def method_missing(id, *args)
-    begin
-      has_top = (top = Thread.current[:TOPLEVEL]) &&
-                   top.respond_to?(:pseudo_toplevel_evaluable?) &&
-                   top.pseudo_toplevel_evaluable? &&
-                   top.respond_to?(id)
-    rescue Exception => e
-      has_top = false
-    end
+  include(Module.new do
+    private
+    def method_missing(id, *args)
+      begin
+        has_top = (top = Thread.current[:TOPLEVEL]) &&
+                     top.respond_to?(:pseudo_toplevel_evaluable?) &&
+                     top.pseudo_toplevel_evaluable? &&
+                     top.respond_to?(id)
+      rescue Exception => e
+        has_top = false
+      end
 
-    if has_top
-      top.__send__(id, *args)
-    else
-      __method_missing__(id, *args)
+      if has_top
+        top.__send__(id, *args)
+      else
+        super
+      end
     end
-  end
+  end)
 end
 
 class Proc
@@ -649,10 +649,10 @@ class Proc
 end
 
 def proc(&b)
-  Proc.new(&b)
+  b
 end
 def lambda(&b)
-  Proc.new(&b)
+  b
 end
 
 def _null_binding

data/sample/demos-jp/widget

@@ -639,10 +639,10 @@ end
 
 # 疑似トップレベルサポート
 module PseudoToplevel_Evaluable
-  def pseudo_toplevel_eval(body = Proc.new)
+  def pseudo_toplevel_eval(body = nil, &block)
     Thread.current[:TOPLEVEL] = self
     begin
-      body.call
+      (body || block).call
     ensure
       Thread.current[:TOPLEVEL] = nil
     end
@@ -706,10 +706,10 @@ class Proc
 end
 
 def proc(&b)
-  Proc.new(&b)
+  b
 end
 def lambda(&b)
-  Proc.new(&b)
+  b
 end
 
 def _null_binding

data/sample/multi-ip_sample.rb

@@ -80,9 +80,6 @@ safe_slave1.eval_proc(cmd, 'safe1')      # label -> .w00016
 safe_slave2.eval_proc(cmd, 'safe2')      # label -> .w00020
 cmd.call('master')                       # label -> .w00024
 
-#second_master = MultiTkIp.new(&cmd)
-#second_master = MultiTkIp.new(:safe=>2){p [:second_master, $SAFE]}
-
 TkTimer.new(2000, -1, proc{p ['safe1', safe_slave1.deleted?]}).start
 TkTimer.new(2000, -1, proc{p ['safe2', safe_slave2.deleted?]}).start
 TkTimer.new(2000, -1, proc{p ['trusted', trusted_slave.deleted?]}).start

data/sample/multi-ip_sample2.rb

@@ -13,7 +13,7 @@ cmd = proc{|s|
 
   TkButton.new(:text=>'b1: p self', :command=>proc{p self}).pack(:fill=>:x)
   sleep s
-  TkButton.new(:text=>'b2: p $SAFE', :command=>proc{p $SAFE}).pack(:fill=>:x)
+  TkButton.new(:text=>'b2: p 0', :command=>proc{p 0}).pack(:fill=>:x)
   sleep s
   TkButton.new(:text=>'b3: p MultiTkIp.ip_name',
                :command=>proc{p MultiTkIp.ip_name}).pack(:fill=>:x)

data/sample/resource.en

@@ -7,7 +7,7 @@
 *BtnFrame.Button.foreground: red
 *hello.text: HELLO
 *quit.text: QUIT
-*BTN_CMD.show_msg: {|arg| print "($SAFE=#{$SAFE}) ";\
+*BTN_CMD.show_msg: {|arg| print "(0) ";\
                           print "Hello!! This is a sample of #{arg}.";\
-                          print "(<<< $SAFE=#{$SAFE})\n"}
-*BTN_CMD.bye_msg:  {print "($SAFE=#{$SAFE} >>>) Good-bye��(<<< $SAFE=#{$SAFE})\n"}
+                          print "(<<< 0)\n"}
+*BTN_CMD.bye_msg:  {print "(0 >>>) Good-bye��(<<< 0)\n"}

data/sample/resource.ja

@@ -7,7 +7,7 @@
 *BtnFrame.Button.foreground: red
 *hello.text: こんにちは
 *quit.text: 終了
-*BTN_CMD.show_msg: {|arg| print "($SAFE=#{$SAFE} >>>) ";\
+*BTN_CMD.show_msg: {|arg| print "(0 >>>) ";\
                           print "こんにちは！！ #{arg} のサンプルです．";\
-                          print "(<<< $SAFE=#{$SAFE})\n"}
-*BTN_CMD.bye_msg:  {print "($SAFE=#{$SAFE} >>>) さようなら．(<<< $SAFE=#{$SAFE})\n"}
+                          print "(<<< 0)\n"}
+*BTN_CMD.bye_msg:  {print "(0 >>>) さようなら．(<<< 0)\n"}

data/sample/tcltklib/sample1.rb

@@ -293,7 +293,7 @@ class Test1
   def test_checkbutton(ip, parent)
     checkbutton, global, pack = ip.commands().values_at(
       "checkbutton", "global", "pack")
-    t1, b1, cb = inittoplevel(ip, parent, "checkbutton")
+    t1, b1, _ = inittoplevel(ip, parent, "checkbutton")
 
     ## checkbutton
 
@@ -616,7 +616,7 @@ print "start\n"
 ip = []
 
 # インタプリタ, ウィジェット等の生成.
-for i in 1 .. n
+for _ in 1 .. n
   ip.push(Test1.new())
 end
 

data/sample/tkballoonhelp.rb

@@ -84,8 +84,8 @@ class Tk::RbWidget::BalloonHelp<TkLabel
     end
   end
 
-  def command(cmd = Proc.new)
-    @command = cmd
+  def command(cmd = nil, &block)
+    @command = cmd || block
     self
   end
 

data/sample/tkextlib/tkHTML/ss.rb

@@ -84,9 +84,6 @@ EOD
                                 :scriptcommand=>proc{|*args|
                                   script_cmd(*args)
                                 },
-                                :appletcommand=>proc{|*args|
-                                  applet_cmd(*args)
-                                },
                                 :hyperlinkcommand=>proc{|*args|
                                   hyper_cmd(*args)
                                 },
@@ -385,9 +382,6 @@ EOD
                                    :scriptcommand=>proc{|*args|
                                      script_cmd(*args)
                                    },
-                                   :appletcommand=>proc{|*args|
-                                     applet_cmd(*args)
-                                   },
                                    :hyperlinkcommand=>proc{|*args|
                                      hyper_cmd(*args)
                                    },

data/sample/tkmulticolumnlist.rb

@@ -412,8 +412,8 @@ class TkMultiColumnList < TkText
   end
 
   # set title cmds
-  def titlecommand(idx, cmd=Proc.new)
-    @title_cmd[idx] = cmd
+  def titlecommand(idx, cmd=nil, &block)
+    @title_cmd[idx] = cmd || block
   end
 
   # call title cmds

data/sample/tkmultilistframe.rb

@@ -421,8 +421,8 @@ class TkMultiListFrame < TkListbox
   end
 
   # set title cmds
-  def titlecommand(idx, cmd=Proc.new)
-    @title_cmd[idx] = cmd
+  def titlecommand(idx, cmd=nil, &block)
+    @title_cmd[idx] = cmd || block
   end
 
   # call title cmds

data/sample/tkoptdb.rb

@@ -23,15 +23,13 @@ if __FILE__ == $0 || !TkCore::INTERP.safe?
 end
 
 # 'show_msg' and 'bye_msg' procedures can be defined on BTN_CMD resource.
-# Those procedures are called under $SAFE==2
 cmd = TkOptionDB.new_proc_class(:BTN_CMD, [:show_msg, :bye_msg], 3) {
   # If you want to check resource string (str),
   # please define __check_proc_string__(str) like this.
   class << self
     def __check_proc_string__(str)
-      print "($SAFE=#{$SAFE} >>>) check!! str.tainted?::#{str.tainted?}"
-      str.untaint
-      print "==>#{str.tainted?} (<<< $SAFE=#{$SAFE}): "
+      print "(0 >>>) check!! str.tainted?::false"
+      print "==>#{false} (<<< 0): "
       str
     end
     private :__check_proc_string__
@@ -43,16 +41,16 @@ TkFrame.new(:class=>'BtnFrame'){|f|
   pack(:padx=>5, :pady=>5)
   TkButton.new(:parent=>f, :widgetname=>'hello'){
     command proc{
-      print "($SAFE=#{$SAFE} >>>) : "
+      print "(0 >>>) : "
       cmd.show_msg(TkOptionDB.inspect)
-      print "(<<< $SAFE=#{$SAFE})"
+      print "(<<< 0)"
     }
     pack(:fill=>:x, :padx=>10, :pady=>10)
   }
   TkButton.new(:command=>proc{
-                 print "($SAFE=#{$SAFE} >>>) : "
+                 print "(0 >>>) : "
                  cmd.bye_msg
-                 print "(<<< $SAFE=#{$SAFE} ) : "
+                 print "(<<< 0) : "
                  exit
                },
                :parent=>f, :widgetname=>'quit'){
@@ -65,16 +63,16 @@ BtnFrame.new{|f|
   pack(:padx=>5, :pady=>5)
   TkButton.new(:parent=>f, :widgetname=>'hello'){
     command proc{
-      print "($SAFE=#{$SAFE} >>>) : "
+      print "(0 >>>) : "
       cmd.show_msg(TkOptionDB.inspect)
-      print "(<<< $SAFE=#{$SAFE})"
+      print "(<<< 0)"
     }
     pack(:fill=>:x, :padx=>10, :pady=>10)
   }
   TkButton.new(:command=>proc{
-                 print "($SAFE=#{$SAFE} >>>) : "
+                 print "(0 >>>) : "
                  cmd.bye_msg
-                 print "(<<< $SAFE=#{$SAFE})"
+                 print "(<<< 0)"
                  exit
                },
                :parent=>f, :widgetname=>'quit'){
@@ -87,16 +85,16 @@ TkFrame.new(:class=>'BtnFrame2'){|f|
   pack(:padx=>5, :pady=>5)
   TkButton.new(:parent=>f, :widgetname=>'hello'){
     command proc{
-      print "($SAFE=#{$SAFE} >>>) : "
+      print "(0 >>>) : "
       cmd.show_msg(TkOptionDB.inspect)
-      print "(<<< $SAFE=#{$SAFE})"
+      print "(<<< 0)"
     }
     pack(:fill=>:x, :padx=>10, :pady=>10)
   }
   TkButton.new(:command=>proc{
-                 print "($SAFE=#{$SAFE} >>>) : "
+                 print "(0 >>>) : "
                  cmd.bye_msg
-                 print "(<<< $SAFE=#{$SAFE})"
+                 print "(<<< 0)"
                  exit
                },
                :parent=>f, :widgetname=>'quit'){

data/tk.gemspec

@@ -1,13 +1,13 @@
 Gem::Specification.new do |spec|
   spec.name          = "tk"
-  spec.version       = "0.2.0"
-  spec.authors       = ["SHIBATA Hiroshi", "Nobuyoshi Nakada"]
-  spec.email         = ["hsbt@ruby-lang.org", "nobu@ruby-lang.org"]
+  spec.version       = "0.3.0"
+  spec.authors       = ["SHIBATA Hiroshi", "Nobuyoshi Nakada", "Jeremy Evans"]
+  spec.email         = ["hsbt@ruby-lang.org", "nobu@ruby-lang.org", "code@jeremyevans.net"]
 
   spec.summary       = %q{Tk interface module using tcltklib.}
   spec.description   = %q{Tk interface module using tcltklib.}
   spec.homepage      = "https://github.com/ruby/tk"
-  spec.license       = "2-clause BSDL"
+  spec.license       = "BSD-2-Clause"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: tk
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - SHIBATA Hiroshi
 - Nobuyoshi Nakada
+- Jeremy Evans
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-01 00:00:00.000000000 Z
+date: 2020-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -57,6 +58,7 @@ description: Tk interface module using tcltklib.
 email:
 - hsbt@ruby-lang.org
 - nobu@ruby-lang.org
+- code@jeremyevans.net
 executables: []
 extensions:
 - ext/tk/extconf.rb
@@ -66,7 +68,6 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - BSDL
-- ChangeLog.tkextlib
 - Gemfile
 - LICENSE.txt
 - MANUAL_tcltklib.eng
@@ -431,11 +432,9 @@ files:
 - lib/tktext.rb
 - lib/tkvirtevent.rb
 - lib/tkwinpkg.rb
-- old-README.tcltklib.ja
 - sample/24hr_clock.rb
 - sample/binding_sample.rb
 - sample/bindtag_sample.rb
-- sample/binstr_usage.rb
 - sample/btn_with_frame.rb
 - sample/cd_timer.rb
 - sample/cmd_res_test.rb
@@ -671,10 +670,8 @@ files:
 - sample/optobj_sample.rb
 - sample/propagate.rb
 - sample/remote-ip_sample.rb
-- sample/remote-ip_sample2.rb
 - sample/resource.en
 - sample/resource.ja
-- sample/safe-tk.rb
 - sample/scrollframe.rb
 - sample/tcltklib/batsu.gif
 - sample/tcltklib/lines0.tcl
@@ -1108,7 +1105,6 @@ files:
 - sample/tkmulticolumnlist.rb
 - sample/tkmultilistbox.rb
 - sample/tkmultilistframe.rb
-- sample/tkoptdb-safeTk.rb
 - sample/tkoptdb.rb
 - sample/tkrttimer.rb
 - sample/tksleep_sample.rb
@@ -1117,13 +1113,11 @@ files:
 - sample/tktimer.rb
 - sample/tktimer2.rb
 - sample/tktimer3.rb
-- sample/tktree.rb
-- sample/tktree.tcl
 - sample/ttk_wrapper.rb
 - tk.gemspec
 homepage: https://github.com/ruby/tk
 licenses:
-- 2-clause BSDL
+- BSD-2-Clause
 metadata:
   msys2_mingw_dependencies: tk
 post_install_message: 
@@ -1141,8 +1135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Tk interface module using tcltklib.