September 2008 - macruby-changes - lists.macosforge.org

[633] MacRuby/trunk/lib/hotcocoa/mappings/text_field.rb
by source_changes＠macosforge.org 28 Sep '08

28 Sep '08

Revision: 633 http://trac.macosforge.org/projects/ruby/changeset/633 Author: rich(a)infoether.com Date: 2008-09-27 20:49:02 -0700 (Sat, 27 Sep 2008) Log Message: ----------- add delegate methdos to text fields Modified Paths: -------------- MacRuby/trunk/lib/hotcocoa/mappings/text_field.rb Modified: MacRuby/trunk/lib/hotcocoa/mappings/text_field.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/mappings/text_field.rb 2008-09-28 01:34:59 UTC (rev 632) +++ MacRuby/trunk/lib/hotcocoa/mappings/text_field.rb 2008-09-28 03:49:02 UTC (rev 633) @@ -23,5 +23,12 @@ end end + + delegating "control:textShouldBeginEditing:", :to => :should_begin_editing?, :parameters => [:textShouldBeginEditing] + delegating "control:textShouldEndEditing:", :to => :should_end_editing?, :parameters => [:textShouldEndEditing] + delegating "controlTextDidBeginEditing:", :to => :did_begin_editing, :parameters => ["controlTextDidBeginEditing.userInfo['NSFieldEditor']"] + delegating "controlTextDidEndEditing:", :to => :did_end_editing, :parameters => ["controlTextDidEndEditing.userInfo['NSFieldEditor']"] + delegating "controlTextDidChange:", :to => :did_change, :parameters => ["controlTextDidChange.userInfo['NSFieldEditor']"] + end

1 0

[632] MacRuby/trunk
by source_changes＠macosforge.org 28 Sep '08

28 Sep '08

Revision: 632 http://trac.macosforge.org/projects/ruby/changeset/632 Author: lsansonetti(a)apple.com Date: 2008-09-27 18:34:59 -0700 (Sat, 27 Sep 2008) Log Message: ----------- fixed Module::class Modified Paths: -------------- MacRuby/trunk/objc.m MacRuby/trunk/test/ruby/test_objc.rb Modified: MacRuby/trunk/objc.m =================================================================== --- MacRuby/trunk/objc.m 2008-09-27 04:43:26 UTC (rev 631) +++ MacRuby/trunk/objc.m 2008-09-28 01:34:59 UTC (rev 632) @@ -1133,7 +1133,7 @@ else if (sel == @selector(class)) { if (RCLASS_META(klass)) { /* because +[NSObject class] returns self */ - return rb_cClass; + return RCLASS_MODULE(recv) ? rb_cModule : rb_cClass; } /* because the CF classes should be hidden */ else if (klass == rb_cCFString) { Modified: MacRuby/trunk/test/ruby/test_objc.rb =================================================================== --- MacRuby/trunk/test/ruby/test_objc.rb 2008-09-27 04:43:26 UTC (rev 631) +++ MacRuby/trunk/test/ruby/test_objc.rb 2008-09-28 01:34:59 UTC (rev 632) @@ -405,4 +405,11 @@ o = TestCallSuperOverridenNew.new(42) assert_equal(42, o.x) end + + def test_class_on_mods + assert_equal(Class, Object.class) + assert_equal(Module, Kernel.class) + assert_equal(Class, Class.new.class) + assert_equal(Module, Module.new.class) + end end

1 0

[631] MacRuby/trunk/sample-macruby/Scripts/growl
by source_changes＠macosforge.org 27 Sep '08

27 Sep '08

Revision: 631 http://trac.macosforge.org/projects/ruby/changeset/631 Author: lsansonetti(a)apple.com Date: 2008-09-26 21:43:26 -0700 (Fri, 26 Sep 2008) Log Message: ----------- adding delegation Modified Paths: -------------- MacRuby/trunk/sample-macruby/Scripts/growl/hotcocoa_growl.rb MacRuby/trunk/sample-macruby/Scripts/growl/hotcocoa_sample.rb Modified: MacRuby/trunk/sample-macruby/Scripts/growl/hotcocoa_growl.rb =================================================================== --- MacRuby/trunk/sample-macruby/Scripts/growl/hotcocoa_growl.rb 2008-09-27 01:06:35 UTC (rev 630) +++ MacRuby/trunk/sample-macruby/Scripts/growl/hotcocoa_growl.rb 2008-09-27 04:43:26 UTC (rev 631) @@ -2,6 +2,8 @@ class Growl include HotCocoa + + attr_accessor :delegate GROWL_IS_READY = 'Lend Me Some Sugar; I Am Your Neighbor!' GROWL_NOTIFICATION_CLICKED = 'GrowlClicked!' @@ -55,13 +57,17 @@ end on_notification(:distributed => true, :named => "#{@app_name}-#{pid}-#{GROWL_NOTIFICATION_CLICKED}") do |n| - puts '@@@ on clicked' - puts n.userInfo[GROWL_CLICKED_CONTEXT_KEY][:user_click_context] + if @delegate and @delegate.respond_to?('growlNotifierClicked:context:') + ctx = n.userInfo[GROWL_CLICKED_CONTEXT_KEY][:user_click_context] + @delegate.growlNotifierClicked(self, context:ctx) + end end on_notification(:distributed => true, :named => "#{@app_name}-#{pid}-#{GROWL_NOTIFICATION_TIMED_OUT}") do |n| - puts '@@@ on timed out' - puts n.userInfo[GROWL_CLICKED_CONTEXT_KEY][:user_click_context] + if @delegate and @delegate.respond_to?('growlNotifierTimedOut:context:') + ctx = n.userInfo[GROWL_CLICKED_CONTEXT_KEY][:user_click_context] + @delegate.growlNotifierTimedOut(self, context:ctx) + end end dic = { Modified: MacRuby/trunk/sample-macruby/Scripts/growl/hotcocoa_sample.rb =================================================================== --- MacRuby/trunk/sample-macruby/Scripts/growl/hotcocoa_sample.rb 2008-09-27 01:06:35 UTC (rev 630) +++ MacRuby/trunk/sample-macruby/Scripts/growl/hotcocoa_sample.rb 2008-09-27 04:43:26 UTC (rev 631) @@ -6,6 +6,7 @@ def init if super @g = Growl.alloc.init + @g.delegate = self @g.register('GrowlSample', [HELLO_TYPE]) @g.notify(HELLO_TYPE, 'Sticky', 'Hello world', :sticky => true, :click_context => Time.now.to_s) @g.notify(HELLO_TYPE, 'Timed out', 'Hello world', :click_context => Time.now.to_s) @@ -14,12 +15,12 @@ end end - def growlNotifierClicked_context(sender, context) + def growlNotifierClicked(sender, context:context) puts "Clicked: #{context}" checkCount end - def growlNotifierTimedOut_context(sender, context) + def growlNotifierTimedOut(sender, context:context) puts "Timed out: #{context}" checkCount end @@ -30,5 +31,5 @@ end end -g = GrowlController.alloc.init +g = GrowlController.new NSApp.run

1 0

[630] MacRuby/trunk/sample-macruby/Scripts/growl/hotcocoa_growl.rb
by source_changes＠macosforge.org 27 Sep '08

27 Sep '08

Revision: 630 http://trac.macosforge.org/projects/ruby/changeset/630 Author: psychs(a)limechat.net Date: 2008-09-26 18:06:35 -0700 (Fri, 26 Sep 2008) Log Message: ----------- use constant Modified Paths: -------------- MacRuby/trunk/sample-macruby/Scripts/growl/hotcocoa_growl.rb Modified: MacRuby/trunk/sample-macruby/Scripts/growl/hotcocoa_growl.rb =================================================================== --- MacRuby/trunk/sample-macruby/Scripts/growl/hotcocoa_growl.rb 2008-09-27 00:59:52 UTC (rev 629) +++ MacRuby/trunk/sample-macruby/Scripts/growl/hotcocoa_growl.rb 2008-09-27 01:06:35 UTC (rev 630) @@ -6,7 +6,7 @@ GROWL_IS_READY = 'Lend Me Some Sugar; I Am Your Neighbor!' GROWL_NOTIFICATION_CLICKED = 'GrowlClicked!' GROWL_NOTIFICATION_TIMED_OUT = 'GrowlTimedOut!' - GROWL_KEY_CLICKED_CONTEXT = 'ClickedContext' + GROWL_CLICKED_CONTEXT_KEY = 'ClickedContext' PRIORITIES = { :emergency => 2, @@ -56,12 +56,12 @@ on_notification(:distributed => true, :named => "#{@app_name}-#{pid}-#{GROWL_NOTIFICATION_CLICKED}") do |n| puts '@@@ on clicked' - puts n.userInfo[:ClickedContext][:user_click_context] + puts n.userInfo[GROWL_CLICKED_CONTEXT_KEY][:user_click_context] end on_notification(:distributed => true, :named => "#{@app_name}-#{pid}-#{GROWL_NOTIFICATION_TIMED_OUT}") do |n| puts '@@@ on timed out' - puts n.userInfo[:ClickedContext][:user_click_context] + puts n.userInfo[GROWL_CLICKED_CONTEXT_KEY][:user_click_context] end dic = {

1 0

[629] MacRuby/trunk/sample-macruby/Scripts/growl/hotcocoa_growl.rb
by source_changes＠macosforge.org 27 Sep '08

27 Sep '08

Revision: 629 http://trac.macosforge.org/projects/ruby/changeset/629 Author: psychs(a)limechat.net Date: 2008-09-26 17:59:52 -0700 (Fri, 26 Sep 2008) Log Message: ----------- tweaked Modified Paths: -------------- MacRuby/trunk/sample-macruby/Scripts/growl/hotcocoa_growl.rb Modified: MacRuby/trunk/sample-macruby/Scripts/growl/hotcocoa_growl.rb =================================================================== --- MacRuby/trunk/sample-macruby/Scripts/growl/hotcocoa_growl.rb 2008-09-27 00:41:51 UTC (rev 628) +++ MacRuby/trunk/sample-macruby/Scripts/growl/hotcocoa_growl.rb 2008-09-27 00:59:52 UTC (rev 629) @@ -3,10 +3,10 @@ class Growl include HotCocoa - GROWL_IS_READY = "Lend Me Some Sugar; I Am Your Neighbor!" - GROWL_NOTIFICATION_CLICKED = "GrowlClicked!" - GROWL_NOTIFICATION_TIMED_OUT = "GrowlTimedOut!" - GROWL_KEY_CLICKED_CONTEXT = "ClickedContext" + GROWL_IS_READY = 'Lend Me Some Sugar; I Am Your Neighbor!' + GROWL_NOTIFICATION_CLICKED = 'GrowlClicked!' + GROWL_NOTIFICATION_TIMED_OUT = 'GrowlTimedOut!' + GROWL_KEY_CLICKED_CONTEXT = 'ClickedContext' PRIORITIES = { :emergency => 2, @@ -68,7 +68,7 @@ :ApplicationName => @app_name, :ApplicationIcon => @app_icon.TIFFRepresentation, :AllNotifications => @notifications, - :DefaultNotifications => @default_notifications + :DefaultNotifications => @default_notifications, } notification :distributed => true, :name => :GrowlApplicationRegistrationNotification, :info => dic end

1 0

[628] MacRuby/trunk/sample-macruby/Scripts/growl
by source_changes＠macosforge.org 27 Sep '08

27 Sep '08

Revision: 628 http://trac.macosforge.org/projects/ruby/changeset/628 Author: psychs(a)limechat.net Date: 2008-09-26 17:41:51 -0700 (Fri, 26 Sep 2008) Log Message: ----------- cleaned up Modified Paths: -------------- MacRuby/trunk/sample-macruby/Scripts/growl/growl.rb MacRuby/trunk/sample-macruby/Scripts/growl/growl_block_sample.rb MacRuby/trunk/sample-macruby/Scripts/growl/growl_delegate_sample.rb MacRuby/trunk/sample-macruby/Scripts/growl/hotcocoa_growl.rb MacRuby/trunk/sample-macruby/Scripts/growl/hotcocoa_sample.rb Modified: MacRuby/trunk/sample-macruby/Scripts/growl/growl.rb =================================================================== --- MacRuby/trunk/sample-macruby/Scripts/growl/growl.rb 2008-09-27 00:35:05 UTC (rev 627) +++ MacRuby/trunk/sample-macruby/Scripts/growl/growl.rb 2008-09-27 00:41:51 UTC (rev 628) @@ -1,7 +1,7 @@ framework 'Cocoa' module Growl - class Notifier < NSObject + class Notifier VERSION = '1.0.1' GROWL_IS_READY = "Lend Me Some Sugar; I Am Your Neighbor!" Modified: MacRuby/trunk/sample-macruby/Scripts/growl/growl_block_sample.rb =================================================================== --- MacRuby/trunk/sample-macruby/Scripts/growl/growl_block_sample.rb 2008-09-27 00:35:05 UTC (rev 627) +++ MacRuby/trunk/sample-macruby/Scripts/growl/growl_block_sample.rb 2008-09-27 00:41:51 UTC (rev 628) @@ -1,6 +1,6 @@ require 'growl_helpers' -class GrowlController < NSObject +class GrowlController # Makes the #growl and #sticky_growl shortcut methods available. include Growl Modified: MacRuby/trunk/sample-macruby/Scripts/growl/growl_delegate_sample.rb =================================================================== --- MacRuby/trunk/sample-macruby/Scripts/growl/growl_delegate_sample.rb 2008-09-27 00:35:05 UTC (rev 627) +++ MacRuby/trunk/sample-macruby/Scripts/growl/growl_delegate_sample.rb 2008-09-27 00:41:51 UTC (rev 628) @@ -1,6 +1,6 @@ require 'growl' -class GrowlController < NSObject +class GrowlController HELLO_TYPE = 'Hello message received' def init Modified: MacRuby/trunk/sample-macruby/Scripts/growl/hotcocoa_growl.rb =================================================================== --- MacRuby/trunk/sample-macruby/Scripts/growl/hotcocoa_growl.rb 2008-09-27 00:35:05 UTC (rev 627) +++ MacRuby/trunk/sample-macruby/Scripts/growl/hotcocoa_growl.rb 2008-09-27 00:41:51 UTC (rev 628) @@ -1,6 +1,6 @@ require 'hotcocoa' -class Growl < NSObject +class Growl include HotCocoa GROWL_IS_READY = "Lend Me Some Sugar; I Am Your Neighbor!" @@ -46,7 +46,7 @@ private def pid - NSProcessInfo.processInfo.processIdentifier.to_i + NSProcessInfo.processInfo.processIdentifier end def register_to_growl! @@ -56,10 +56,12 @@ on_notification(:distributed => true, :named => "#{@app_name}-#{pid}-#{GROWL_NOTIFICATION_CLICKED}") do |n| puts '@@@ on clicked' + puts n.userInfo[:ClickedContext][:user_click_context] end on_notification(:distributed => true, :named => "#{@app_name}-#{pid}-#{GROWL_NOTIFICATION_TIMED_OUT}") do |n| puts '@@@ on timed out' + puts n.userInfo[:ClickedContext][:user_click_context] end dic = { Modified: MacRuby/trunk/sample-macruby/Scripts/growl/hotcocoa_sample.rb =================================================================== --- MacRuby/trunk/sample-macruby/Scripts/growl/hotcocoa_sample.rb 2008-09-27 00:35:05 UTC (rev 627) +++ MacRuby/trunk/sample-macruby/Scripts/growl/hotcocoa_sample.rb 2008-09-27 00:41:51 UTC (rev 628) @@ -1,6 +1,6 @@ require 'hotcocoa_growl' -class GrowlController < NSObject +class GrowlController HELLO_TYPE = 'Hello message received' def init

1 0

[627] MacRuby/trunk/sample-macruby
by source_changes＠macosforge.org 27 Sep '08

27 Sep '08

Revision: 627 http://trac.macosforge.org/projects/ruby/changeset/627 Author: psychs(a)limechat.net Date: 2008-09-26 17:35:05 -0700 (Fri, 26 Sep 2008) Log Message: ----------- moved growl sample into scripts Added Paths: ----------- MacRuby/trunk/sample-macruby/Scripts/growl/ Removed Paths: ------------- MacRuby/trunk/sample-macruby/GrowlNotifier/

1 0

[626] MacRuby/trunk/sample-macruby/GrowlNotifier/hotcocoa_growl.rb
by source_changes＠macosforge.org 27 Sep '08

27 Sep '08

Revision: 626 http://trac.macosforge.org/projects/ruby/changeset/626 Author: psychs(a)limechat.net Date: 2008-09-26 17:27:04 -0700 (Fri, 26 Sep 2008) Log Message: ----------- tweaked Modified Paths: -------------- MacRuby/trunk/sample-macruby/GrowlNotifier/hotcocoa_growl.rb Modified: MacRuby/trunk/sample-macruby/GrowlNotifier/hotcocoa_growl.rb =================================================================== --- MacRuby/trunk/sample-macruby/GrowlNotifier/hotcocoa_growl.rb 2008-09-27 00:25:29 UTC (rev 625) +++ MacRuby/trunk/sample-macruby/GrowlNotifier/hotcocoa_growl.rb 2008-09-27 00:27:04 UTC (rev 626) @@ -31,7 +31,7 @@ :NotificationDescription => desc, :NotificationPriority => PRIORITIES[options[:priority]] || options[:priority] || 0, :ApplicationName => @app_name, - :ApplicationPID => self.class.pid, + :ApplicationPID => pid, } dic[:NotificationIcon] = options[:icon].TIFFRepresentation if options[:icon] dic[:NotificationSticky] = 1 if options[:sticky] @@ -45,7 +45,7 @@ private - def self.pid + def pid NSProcessInfo.processInfo.processIdentifier.to_i end

1 0

[625] MacRuby/trunk/sample-macruby/GrowlNotifier
by source_changes＠macosforge.org 27 Sep '08

27 Sep '08

Revision: 625 http://trac.macosforge.org/projects/ruby/changeset/625 Author: psychs(a)limechat.net Date: 2008-09-26 17:25:29 -0700 (Fri, 26 Sep 2008) Log Message: ----------- added growl sample using hotcocoa Added Paths: ----------- MacRuby/trunk/sample-macruby/GrowlNotifier/hotcocoa_growl.rb MacRuby/trunk/sample-macruby/GrowlNotifier/hotcocoa_sample.rb Added: MacRuby/trunk/sample-macruby/GrowlNotifier/hotcocoa_growl.rb =================================================================== --- MacRuby/trunk/sample-macruby/GrowlNotifier/hotcocoa_growl.rb (rev 0) +++ MacRuby/trunk/sample-macruby/GrowlNotifier/hotcocoa_growl.rb 2008-09-27 00:25:29 UTC (rev 625) @@ -0,0 +1,73 @@ +require 'hotcocoa' + +class Growl < NSObject + include HotCocoa + + GROWL_IS_READY = "Lend Me Some Sugar; I Am Your Neighbor!" + GROWL_NOTIFICATION_CLICKED = "GrowlClicked!" + GROWL_NOTIFICATION_TIMED_OUT = "GrowlTimedOut!" + GROWL_KEY_CLICKED_CONTEXT = "ClickedContext" + + PRIORITIES = { + :emergency => 2, + :high => 1, + :normal => 0, + :moderate => -1, + :very_low => -2, + } + + def register(app_name, notifications, default_notifications=nil, icon=nil) + @app_name = app_name + @app_icon = icon || NSApplication.sharedApplication.applicationIconImage + @notifications = notifications + @default_notifications = default_notifications || notifications + register_to_growl! + end + + def notify(name, title, desc, options={}) + dic = { + :NotificationName => name, + :NotificationTitle => title, + :NotificationDescription => desc, + :NotificationPriority => PRIORITIES[options[:priority]] || options[:priority] || 0, + :ApplicationName => @app_name, + :ApplicationPID => self.class.pid, + } + dic[:NotificationIcon] = options[:icon].TIFFRepresentation if options[:icon] + dic[:NotificationSticky] = 1 if options[:sticky] + + context = {} + context[:user_click_context] = options[:click_context] if options[:click_context] + dic[:NotificationClickContext] = context unless context.empty? + + notification :distributed => true, :name => :GrowlNotification, :info => dic + end + + private + + def self.pid + NSProcessInfo.processInfo.processIdentifier.to_i + end + + def register_to_growl! + on_notification(:distributed => true, :named => GROWL_IS_READY) do |n| + register_to_growl! + end + + on_notification(:distributed => true, :named => "#{@app_name}-#{pid}-#{GROWL_NOTIFICATION_CLICKED}") do |n| + puts '@@@ on clicked' + end + + on_notification(:distributed => true, :named => "#{@app_name}-#{pid}-#{GROWL_NOTIFICATION_TIMED_OUT}") do |n| + puts '@@@ on timed out' + end + + dic = { + :ApplicationName => @app_name, + :ApplicationIcon => @app_icon.TIFFRepresentation, + :AllNotifications => @notifications, + :DefaultNotifications => @default_notifications + } + notification :distributed => true, :name => :GrowlApplicationRegistrationNotification, :info => dic + end +end Property changes on: MacRuby/trunk/sample-macruby/GrowlNotifier/hotcocoa_growl.rb ___________________________________________________________________ Added: svn:eol-style + native Added: MacRuby/trunk/sample-macruby/GrowlNotifier/hotcocoa_sample.rb =================================================================== --- MacRuby/trunk/sample-macruby/GrowlNotifier/hotcocoa_sample.rb (rev 0) +++ MacRuby/trunk/sample-macruby/GrowlNotifier/hotcocoa_sample.rb 2008-09-27 00:25:29 UTC (rev 625) @@ -0,0 +1,34 @@ +require 'hotcocoa_growl' + +class GrowlController < NSObject + HELLO_TYPE = 'Hello message received' + + def init + if super + @g = Growl.alloc.init + @g.register('GrowlSample', [HELLO_TYPE]) + @g.notify(HELLO_TYPE, 'Sticky', 'Hello world', :sticky => true, :click_context => Time.now.to_s) + @g.notify(HELLO_TYPE, 'Timed out', 'Hello world', :click_context => Time.now.to_s) + @count = 2 + self + end + end + + def growlNotifierClicked_context(sender, context) + puts "Clicked: #{context}" + checkCount + end + + def growlNotifierTimedOut_context(sender, context) + puts "Timed out: #{context}" + checkCount + end + + def checkCount + @count -= 1 + NSApp.terminate(nil) if @count == 0 + end +end + +g = GrowlController.alloc.init +NSApp.run Property changes on: MacRuby/trunk/sample-macruby/GrowlNotifier/hotcocoa_sample.rb ___________________________________________________________________ Added: svn:eol-style + native

1 0

[624] MacRuby/trunk/lib/hotcocoa
by source_changes＠macosforge.org 26 Sep '08

26 Sep '08

Revision: 624 http://trac.macosforge.org/projects/ruby/changeset/624 Author: rich(a)infoether.com Date: 2008-09-26 09:39:27 -0700 (Fri, 26 Sep 2008) Log Message: ----------- allow mapping to a class name not just a symbol Modified Paths: -------------- MacRuby/trunk/lib/hotcocoa/delegate_builder.rb MacRuby/trunk/lib/hotcocoa/mappings.rb Modified: MacRuby/trunk/lib/hotcocoa/delegate_builder.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/delegate_builder.rb 2008-09-26 05:11:32 UTC (rev 623) +++ MacRuby/trunk/lib/hotcocoa/delegate_builder.rb 2008-09-26 16:39:27 UTC (rev 624) @@ -12,7 +12,7 @@ end def add_delegated_method(block, selector_name, *parameters) - clear_delegate + clear_delegate if required_methods.empty? increment_method_count bind_block_to_delegate_instance_variable(block) create_delegate_method(selector_name, parameters) Modified: MacRuby/trunk/lib/hotcocoa/mappings.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/mappings.rb 2008-09-26 05:11:32 UTC (rev 623) +++ MacRuby/trunk/lib/hotcocoa/mappings.rb 2008-09-26 16:39:27 UTC (rev 624) @@ -30,7 +30,10 @@ framework = options.delete(:framework) mapped_name = options.keys.first mapped_value = options.values.first - if framework.nil? || Object.const_defined?(mapped_value) + if mapped_value.kind_of?(Class) + m = Mapper.map_instances_of(mapped_value, mapped_name, &block) + mappings[m.builder_method] = m + elsif framework.nil? || Object.const_defined?(mapped_value) m = Mapper.map_instances_of(Object.const_get(mapped_value), mapped_name, &block) mappings[m.builder_method] = m else

1 0