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

[623] MacRuby/trunk
by source_changes＠macosforge.org 26 Sep '08

26 Sep '08

Revision: 623 http://trac.macosforge.org/projects/ruby/changeset/623 Author: lsansonetti(a)apple.com Date: 2008-09-25 22:11:32 -0700 (Thu, 25 Sep 2008) Log Message: ----------- reimplemented the finalizing code in -[NSObject finalizer], enabled threaded GC cycles by default, misc fixes Modified Paths: -------------- MacRuby/trunk/gc.c MacRuby/trunk/include/ruby/ruby.h MacRuby/trunk/objc.m MacRuby/trunk/parse.y MacRuby/trunk/thread.c Modified: MacRuby/trunk/gc.c =================================================================== --- MacRuby/trunk/gc.c 2008-09-26 01:28:50 UTC (rev 622) +++ MacRuby/trunk/gc.c 2008-09-26 05:11:32 UTC (rev 623) @@ -1225,9 +1225,6 @@ * are also available via the <code>ObjectSpace</code> module. */ -static void (*old_batch_invalidate)(auto_zone_t *, - auto_zone_foreach_object_t, auto_zone_cursor_t, size_t); - static VALUE run_single_final(VALUE arg) { @@ -1274,41 +1271,50 @@ } static void -__rb_objc_finalize(void *obj, void *data) +rb_obj_imp_finalize(void *obj, SEL sel) { - //printf("finalize %p <%s>\n",obj, class_getName(*(Class *)obj)); + const bool need_protection = GET_THREAD()->thread_id != pthread_self(); + void native_mutex_lock(pthread_mutex_t *lock); + void native_mutex_unlock(pthread_mutex_t *lock); + if (NATIVE((VALUE)obj)) { - static SEL sel = NULL; long flag; + + if (need_protection) { + native_mutex_lock(&GET_THREAD()->vm->global_interpreter_lock); + } flag = rb_objc_remove_flags(obj); - if ((flag & FL_FINALIZE) == FL_FINALIZE) + if ((flag & FL_FINALIZE) == FL_FINALIZE) { rb_call_os_finalizer(obj); - if ((flag & FL_EXIVAR) == FL_EXIVAR) + } + if ((flag & FL_EXIVAR) == FL_EXIVAR) { rb_free_generic_ivar((VALUE)obj); - if (sel == NULL) - sel = sel_registerName("finalize"); - objc_msgSend(obj, sel); + } + if (need_protection) { + native_mutex_unlock(&GET_THREAD()->vm->global_interpreter_lock); + } } else { - if (FL_TEST(obj, FL_FINALIZE)) + bool call_finalize, free_ivar; + + call_finalize = FL_TEST(obj, FL_FINALIZE); + free_ivar = FL_TEST(obj, FL_EXIVAR); + + if (need_protection && (call_finalize || free_ivar)) { + native_mutex_lock(&GET_THREAD()->vm->global_interpreter_lock); + } + if (call_finalize) { rb_call_os_finalizer(obj); - if (FL_TEST(obj, FL_EXIVAR)) + } + if (free_ivar) { rb_free_generic_ivar((VALUE)obj); + } + if (need_protection && (call_finalize || free_ivar)) { + native_mutex_unlock(&GET_THREAD()->vm->global_interpreter_lock); + } } } -static void -rb_objc_batch_invalidate(auto_zone_t *zone, - auto_zone_foreach_object_t foreach, - auto_zone_cursor_t cursor, size_t cursor_size) -{ - foreach(cursor, __rb_objc_finalize, NULL); - /* By incrementing the GC count here we make sure it will also be updated - * when a collection is triggered from the Objective-C world. - */ - _gc_count++; -} - void Init_PreGC(void) { @@ -1325,19 +1331,16 @@ if (getenv("GC_DEBUG")) control->log = AUTO_LOG_COLLECTIONS | AUTO_LOG_REGIONS | AUTO_LOG_UNUSUAL; - old_batch_invalidate = control->batch_invalidate; - control->batch_invalidate = rb_objc_batch_invalidate; + + Method m = class_getInstanceMethod((Class)objc_getClass("NSObject"), sel_registerName("finalize")); + assert(m != NULL); + method_setImplementation(m, (IMP)rb_obj_imp_finalize); } void Init_PostGC(void) { -#if 0 - /* It is better to let Foundation start the dedicated collection thread - * when necessary. - */ objc_startCollectorThread(); -#endif } void Modified: MacRuby/trunk/include/ruby/ruby.h =================================================================== --- MacRuby/trunk/include/ruby/ruby.h 2008-09-26 01:28:50 UTC (rev 622) +++ MacRuby/trunk/include/ruby/ruby.h 2008-09-26 05:11:32 UTC (rev 623) @@ -434,7 +434,7 @@ #endif #define OBJSETUP(obj,c,t) do {\ RBASIC(obj)->flags = (t);\ - RBASIC(obj)->klass = (c);\ + if (c != 0) RBASIC(obj)->klass = (c);\ if (rb_safe_level() >= 3) FL_SET(obj, FL_TAINT);\ } while (0) #define CLONESETUP(clone,obj) do {\ Modified: MacRuby/trunk/objc.m =================================================================== --- MacRuby/trunk/objc.m 2008-09-26 01:28:50 UTC (rev 622) +++ MacRuby/trunk/objc.m 2008-09-26 05:11:32 UTC (rev 623) @@ -1602,26 +1602,25 @@ rb_ruby_to_objc_closure_handler_main(&ctx); } else { -#if 0 - if (GET_VM()->main_thread == GET_THREAD()) { + if (GET_THREAD()->thread_id == pthread_self()) { rb_ruby_to_objc_closure_handler_main(&ctx); } else { + rb_thread_t *rb_thread_wrap_existing_native_thread(rb_thread_id_t id); void native_mutex_lock(pthread_mutex_t *lock); void native_mutex_unlock(pthread_mutex_t *lock); + rb_thread_t *th, *old; + + th = rb_thread_wrap_existing_native_thread(pthread_self()); + native_mutex_lock(&GET_THREAD()->vm->global_interpreter_lock); + old = ruby_current_thread; + ruby_current_thread = th; rb_ruby_to_objc_closure_handler_main(&ctx); native_mutex_unlock(&GET_THREAD()->vm->global_interpreter_lock); + ruby_current_thread = old; } -#else - if (GET_VM()->main_thread == GET_THREAD()) { - rb_ruby_to_objc_closure_handler_main(&ctx); - } - else { - rb_thread_blocking_region(rb_ruby_to_objc_closure_handler_main, &ctx, RB_UBF_DFL, 0); - } -#endif } } Modified: MacRuby/trunk/parse.y =================================================================== --- MacRuby/trunk/parse.y 2008-09-26 01:28:50 UTC (rev 622) +++ MacRuby/trunk/parse.y 2008-09-26 05:11:32 UTC (rev 623) @@ -5112,8 +5112,8 @@ } ruby_sourceline++; parser->line_count++; - lex_pbeg = lex_p = RSTRING_BYTEPTR(v); - lex_pend = lex_p + RSTRING_BYTELEN(v); + lex_pbeg = lex_p = RSTRING_PTR(v); + lex_pend = lex_p + RSTRING_LEN(v); #ifdef RIPPER ripper_flush(parser); #endif @@ -10259,7 +10259,7 @@ parser_initialize(parser); parser->parser_ruby_sourcefile_string = fname; - parser->parser_ruby_sourcefile = RSTRING_BYTEPTR(fname); + parser->parser_ruby_sourcefile = RSTRING_PTR(fname); parser->parser_ruby_sourceline = NIL_P(lineno) ? 0 : NUM2INT(lineno) - 1; return Qnil; Modified: MacRuby/trunk/thread.c =================================================================== --- MacRuby/trunk/thread.c 2008-09-26 01:28:50 UTC (rev 622) +++ MacRuby/trunk/thread.c 2008-09-26 05:11:32 UTC (rev 623) @@ -383,6 +383,56 @@ return 0; } +struct find_thread_ctx { + rb_thread_id_t id; + VALUE thval; +}; + +static int +find_thread(st_data_t key, st_data_t val, void *data) +{ + struct find_thread_ctx *ctx = (struct find_thread_ctx *)data; + if ((rb_thread_id_t)val == ctx->id) { + ctx->thval = (VALUE)key; + return ST_STOP; + } + return ST_CONTINUE; +} + +rb_thread_t * +rb_thread_wrap_existing_native_thread(rb_thread_id_t id) +{ + VALUE thval; + rb_thread_t *th; + struct find_thread_ctx ctx = {id, 0}; + + st_foreach(GET_THREAD()->vm->living_threads, find_thread, (st_data_t)&ctx); + + if (ctx.thval != 0) { + GetThreadPtr(ctx.thval, th); + return th; + } + + thval = rb_thread_alloc(rb_cThread); + + GetThreadPtr(thval, th); + + th->thread_id = id; + + /* setup thread environment */ + th->first_args = Qnil; + th->first_proc = Qfalse; + th->first_func = NULL; + + th->priority = GET_THREAD()->priority; + th->thgroup = GET_THREAD()->thgroup; + + native_mutex_initialize(&th->interrupt_lock); + st_insert(th->vm->living_threads, thval, (st_data_t) th->thread_id); + + return th; +} + static VALUE thread_create_core(VALUE thval, VALUE args, VALUE (*fn)(ANYARGS)) { @@ -3219,6 +3269,8 @@ rb_define_method(cThGroup, "enclosed?", thgroup_enclosed_p, 0); rb_define_method(cThGroup, "add", thgroup_add, 1); + rb_cBarrier = rb_define_class("Barrier", rb_cObject); + { rb_thread_t *th = GET_THREAD(); th->thgroup = th->vm->thgroup_default = rb_obj_alloc(cThGroup);

1 0

[622] MacRuby/trunk/sample-macruby/HotCocoa/calculator/lib/application.rb
by source_changes＠macosforge.org 26 Sep '08

26 Sep '08

Revision: 622 http://trac.macosforge.org/projects/ruby/changeset/622 Author: lsansonetti(a)apple.com Date: 2008-09-25 18:28:50 -0700 (Thu, 25 Sep 2008) Log Message: ----------- fixed typo Modified Paths: -------------- MacRuby/trunk/sample-macruby/HotCocoa/calculator/lib/application.rb Modified: MacRuby/trunk/sample-macruby/HotCocoa/calculator/lib/application.rb =================================================================== --- MacRuby/trunk/sample-macruby/HotCocoa/calculator/lib/application.rb 2008-09-25 06:11:13 UTC (rev 621) +++ MacRuby/trunk/sample-macruby/HotCocoa/calculator/lib/application.rb 2008-09-26 01:28:50 UTC (rev 622) @@ -28,7 +28,7 @@ private def main_window(&block) - @main_window ||= window(:frame => [100, 800, 220, 280], :title => "Calculator", :view => :nolayout, :style => [:titled, :closable, :miniturizable], &block) + @main_window ||= window(:frame => [100, 800, 220, 280], :title => "Calculator", :view => :nolayout, :style => [:titled, :closable, :miniaturizable], &block) end def value

1 0

[621] MacRuby/trunk/lib/hotcocoa/mappings/image_view.rb
by source_changes＠macosforge.org 25 Sep '08

25 Sep '08

Revision: 621 http://trac.macosforge.org/projects/ruby/changeset/621 Author: rich(a)infoether.com Date: 2008-09-24 23:11:13 -0700 (Wed, 24 Sep 2008) Log Message: ----------- scaling image views Modified Paths: -------------- MacRuby/trunk/lib/hotcocoa/mappings/image_view.rb Modified: MacRuby/trunk/lib/hotcocoa/mappings/image_view.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/mappings/image_view.rb 2008-09-25 04:30:37 UTC (rev 620) +++ MacRuby/trunk/lib/hotcocoa/mappings/image_view.rb 2008-09-25 06:11:13 UTC (rev 621) @@ -10,6 +10,12 @@ :button => NSImageFrameButton } + constant :scale, { + :fit => NSScaleToFit, + :none => NSScaleNone, + :proportionally => NSScaleProportionally + } + def init_with_options(image_view, options) image_view.initWithFrame options.delete(:frame) end @@ -28,6 +34,10 @@ setImage(NSImage.alloc.initWithContentsOfFile(file)) end + def scale=(value) + setImageScaling(value) + end + end end

1 0

[620] MacRuby/trunk/lib/hotcocoa/mappings/collection_view.rb
by source_changes＠macosforge.org 25 Sep '08

25 Sep '08

Revision: 620 http://trac.macosforge.org/projects/ruby/changeset/620 Author: rich(a)infoether.com Date: 2008-09-24 21:30:37 -0700 (Wed, 24 Sep 2008) Log Message: ----------- add row and columns helpers Modified Paths: -------------- MacRuby/trunk/lib/hotcocoa/mappings/collection_view.rb Modified: MacRuby/trunk/lib/hotcocoa/mappings/collection_view.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/mappings/collection_view.rb 2008-09-25 01:37:23 UTC (rev 619) +++ MacRuby/trunk/lib/hotcocoa/mappings/collection_view.rb 2008-09-25 04:30:37 UTC (rev 620) @@ -27,6 +27,22 @@ setItemPrototype(item) end + def rows=(value) + setMaxNumberOfRows(value) + end + + def rows + maxNumberOfRows + end + + def columns=(value) + setMaxNumberOfColumns(value) + end + + def columns + maxNumberOfColumns + end + end end

1 0

[619] MacRuby/trunk/objc.m
by source_changes＠macosforge.org 25 Sep '08

25 Sep '08

Revision: 619 http://trac.macosforge.org/projects/ruby/changeset/619 Author: lsansonetti(a)apple.com Date: 2008-09-24 18:37:23 -0700 (Wed, 24 Sep 2008) Log Message: ----------- faster struct accessors Modified Paths: -------------- MacRuby/trunk/objc.m Modified: MacRuby/trunk/objc.m =================================================================== --- MacRuby/trunk/objc.m 2008-09-24 07:28:33 UTC (rev 618) +++ MacRuby/trunk/objc.m 2008-09-25 01:37:23 UTC (rev 619) @@ -2074,108 +2074,7 @@ return Data_Wrap_Struct(recv, NULL, NULL, data); } -static ID -rb_bs_struct_field_ivar_id(void) -{ - const char *frame_str; - char ivar_name[128]; - size_t len; - - frame_str = rb_id2name(rb_frame_this_func()); - len = snprintf(ivar_name, sizeof ivar_name, "@%s", frame_str); - - if (ivar_name[len - 1] == ':') - len--; - if (ivar_name[len - 1] == '=') - len--; - ivar_name[len] = '\0'; - - return rb_intern(ivar_name); -} - static VALUE -rb_bs_struct_get(VALUE recv) -{ - bs_element_boxed_t *bs_boxed = rb_klass_get_bs_boxed(CLASS_OF(recv)); - bs_element_struct_t *bs_struct = (bs_element_struct_t *)bs_boxed->value; - unsigned i; - const char *ivar_id_str; - VALUE *data; - - /* FIXME we should cache the ivar IDs somewhere in the - * bs_element_struct_fields - */ - - ivar_id_str = rb_id2name(rb_bs_struct_field_ivar_id()); - ivar_id_str++; /* skip first '@' */ - - Data_Get_Struct(recv, VALUE, data); - assert(data != NULL); - - for (i = 0; i < bs_struct->fields_count; i++) { - bs_element_struct_field_t *bs_field = - (bs_element_struct_field_t *)&bs_struct->fields[i]; - - if (strcmp(ivar_id_str, bs_field->name) == 0) { - return data[i]; - } - } - - rb_bug("can't find field `%s' in recv `%s'", ivar_id_str, - RSTRING_PTR(rb_inspect(recv))); - - return Qnil; -} - -static VALUE -rb_bs_struct_set(VALUE recv, VALUE value) -{ - bs_element_boxed_t *bs_boxed = rb_klass_get_bs_boxed(CLASS_OF(recv)); - bs_element_struct_t *bs_struct = (bs_element_struct_t *)bs_boxed->value; - unsigned i; - const char *ivar_id_str; - VALUE *data; - size_t pos; - - /* FIXME we should cache the ivar IDs somewhere in the - * bs_element_struct_fields - */ - - ivar_id_str = rb_id2name(rb_bs_struct_field_ivar_id()); - ivar_id_str++; /* skip first '@' */ - - Data_Get_Struct(recv, VALUE, data); - assert(data != NULL); - - for (i = 0, pos = 0; i < bs_struct->fields_count; i++) { - bs_element_struct_field_t *bs_field = - (bs_element_struct_field_t *)&bs_struct->fields[i]; - - if (strcmp(ivar_id_str, bs_field->name) == 0) { - size_t fdata_size; - void *fdata; - VALUE fval; - - fdata_size = rb_objc_octype_to_ffitype(bs_field->type)->size; - fdata = alloca(fdata_size); - - rb_objc_rval_to_ocval(value, bs_field->type, fdata); - rb_objc_ocval_to_rval(fdata, bs_field->type, &fval); - - GC_WB(&data[i], fval); - - return value; - } - pos += rb_objc_octype_to_ffitype(bs_field->type)->size; - } - - rb_bug("can't find field `%s' in recv `%s'", ivar_id_str, - RSTRING_PTR(rb_inspect(recv))); - - return Qnil; -} - -static VALUE rb_bs_struct_to_a(VALUE recv) { bs_element_boxed_t *bs_boxed = rb_klass_get_bs_boxed(CLASS_OF(recv)); @@ -2325,7 +2224,108 @@ return ary; } +static ffi_cif *struct_reader_cif = NULL; +static ffi_cif *struct_writer_cif = NULL; + +struct rb_struct_accessor_context { + bs_element_struct_field_t *field; + int num; +}; + static void +rb_struct_reader_closure_handler(ffi_cif *cif, void *resp, void **args, + void *userdata) +{ + struct rb_struct_accessor_context *ctx; + VALUE recv, *data; + + recv = (*(VALUE **)args)[0]; + Data_Get_Struct(recv, VALUE, data); + assert(data != NULL); + + ctx = (struct rb_struct_accessor_context *)userdata; + *(VALUE *)resp = data[ctx->num]; +} + +static void +rb_struct_writer_closure_handler(ffi_cif *cif, void *resp, void **args, + void *userdata) +{ + struct rb_struct_accessor_context *ctx; + VALUE recv, value, *data, fval; + size_t fdata_size; + void *fdata; + + recv = (*(VALUE **)args)[0]; + value = (*(VALUE **)args)[1]; + Data_Get_Struct(recv, VALUE, data); + assert(data != NULL); + + ctx = (struct rb_struct_accessor_context *)userdata; + + fdata_size = rb_objc_octype_to_ffitype(ctx->field->type)->size; + fdata = alloca(fdata_size); + + rb_objc_rval_to_ocval(value, ctx->field->type, fdata); + rb_objc_ocval_to_rval(fdata, ctx->field->type, &fval); + + GC_WB(&data[ctx->num], fval); + + *(VALUE *)resp = fval; +} + +static void +rb_struct_gen_accessors(VALUE klass, bs_element_struct_field_t *field, int num) +{ + ffi_closure *closure; + struct rb_struct_accessor_context *ctx; + char buf[100]; + + ctx = (struct rb_struct_accessor_context *) + malloc(sizeof(struct rb_struct_accessor_context)); + ctx->field = field; + ctx->num = num; + + if (struct_reader_cif == NULL) { + ffi_type **args; + + struct_reader_cif = (ffi_cif *)malloc(sizeof(ffi_cif)); + args = (ffi_type **)malloc(sizeof(ffi_type *) * 1); + args[0] = &ffi_type_pointer; + if (ffi_prep_cif(struct_reader_cif, FFI_DEFAULT_ABI, 1, + &ffi_type_pointer, args) != FFI_OK) + rb_fatal("can't prepare struct_reader_cif"); + } + closure = (ffi_closure *)malloc(sizeof(ffi_closure)); + if (ffi_prep_closure(closure, struct_reader_cif, + rb_struct_reader_closure_handler, ctx) + != FFI_OK) + rb_fatal("can't prepare struct reader closure"); + + rb_define_method(klass, field->name, (VALUE(*)(ANYARGS))closure, 0); + + if (struct_writer_cif == NULL) { + ffi_type **args; + + struct_writer_cif = (ffi_cif *)malloc(sizeof(ffi_cif)); + args = (ffi_type **)malloc(sizeof(ffi_type *) * 2); + args[0] = &ffi_type_pointer; + args[1] = &ffi_type_pointer; + if (ffi_prep_cif(struct_writer_cif, FFI_DEFAULT_ABI, 2, + &ffi_type_pointer, args) != FFI_OK) + rb_fatal("can't prepare struct_writer_cif"); + } + closure = (ffi_closure *)malloc(sizeof(ffi_closure)); + if (ffi_prep_closure(closure, struct_writer_cif, + rb_struct_writer_closure_handler, ctx) + != FFI_OK) + rb_fatal("can't prepare struct writer closure"); + + snprintf(buf, sizeof buf, "%s=", field->name); + rb_define_method(klass, buf, (VALUE(*)(ANYARGS))closure, 1); +} + +static void setup_bs_boxed_type(bs_element_type_t type, void *value) { bs_element_boxed_t *bs_boxed; @@ -2344,7 +2344,6 @@ if (type == BS_ELEMENT_STRUCT) { bs_element_struct_t *bs_struct = (bs_element_struct_t *)value; - char buf[128]; int i; /* Needs to be lazily created, because the type of some fields @@ -2355,10 +2354,7 @@ if (!bs_struct->opaque) { for (i = 0; i < bs_struct->fields_count; i++) { bs_element_struct_field_t *field = &bs_struct->fields[i]; - rb_define_method(klass, field->name, rb_bs_struct_get, 0); - strlcpy(buf, field->name, sizeof buf); - strlcat(buf, "=", sizeof buf); - rb_define_method(klass, buf, rb_bs_struct_set, 1); + rb_struct_gen_accessors(klass, field, i); } rb_define_method(klass, "to_a", rb_bs_struct_to_a, 0); }

1 0

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

24 Sep '08

Revision: 618 http://trac.macosforge.org/projects/ruby/changeset/618 Author: psychs(a)limechat.net Date: 2008-09-24 00:28:33 -0700 (Wed, 24 Sep 2008) Log Message: ----------- Don't need to require rubygems Modified Paths: -------------- MacRuby/trunk/sample-macruby/GrowlNotifier/growl_block_sample.rb MacRuby/trunk/sample-macruby/GrowlNotifier/growl_delegate_sample.rb Modified: MacRuby/trunk/sample-macruby/GrowlNotifier/growl_block_sample.rb =================================================================== --- MacRuby/trunk/sample-macruby/GrowlNotifier/growl_block_sample.rb 2008-09-23 23:38:18 UTC (rev 617) +++ MacRuby/trunk/sample-macruby/GrowlNotifier/growl_block_sample.rb 2008-09-24 07:28:33 UTC (rev 618) @@ -1,4 +1,3 @@ -require 'rubygems' require 'growl_helpers' class GrowlController < NSObject Modified: MacRuby/trunk/sample-macruby/GrowlNotifier/growl_delegate_sample.rb =================================================================== --- MacRuby/trunk/sample-macruby/GrowlNotifier/growl_delegate_sample.rb 2008-09-23 23:38:18 UTC (rev 617) +++ MacRuby/trunk/sample-macruby/GrowlNotifier/growl_delegate_sample.rb 2008-09-24 07:28:33 UTC (rev 618) @@ -1,4 +1,3 @@ -require 'rubygems' require 'growl' class GrowlController < NSObject

1 0

[617] MacRuby/trunk/lib/hotcocoa/mappings/xml_parser.rb
by source_changes＠macosforge.org 23 Sep '08

23 Sep '08

Revision: 617 http://trac.macosforge.org/projects/ruby/changeset/617 Author: rich(a)infoether.com Date: 2008-09-23 16:38:18 -0700 (Tue, 23 Sep 2008) Log Message: ----------- add file key Modified Paths: -------------- MacRuby/trunk/lib/hotcocoa/mappings/xml_parser.rb Modified: MacRuby/trunk/lib/hotcocoa/mappings/xml_parser.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/mappings/xml_parser.rb 2008-09-23 23:38:00 UTC (rev 616) +++ MacRuby/trunk/lib/hotcocoa/mappings/xml_parser.rb 2008-09-23 23:38:18 UTC (rev 617) @@ -1,13 +1,14 @@ HotCocoa::Mappings.map :xml_parser => :NSXMLParser do def alloc_with_options(options) - url = options.delete(:url) - data = options.delete(:data) - if url + if options[:url] + url = options.delete(:url) url = NSURL.alloc.initWithString(url) if url.is_a?(String) NSXMLParser.alloc.initWithContentsOfURL(url) - elsif data - NSXMLParser.alloc.initWithData(data) + elsif options[:file] + NSXMLParser.alloc.initWithData(NSData.alloc.initWithContentsOfFile(options.delete(:file))) + elsif options[:data] + NSXMLParser.alloc.initWithData(options.delete(:data)) else raise "Must provide either :url or :data when constructing an NSXMLParser" end

1 0

[616] MacRuby/trunk/lib/hotcocoa/mappings/application.rb
by source_changes＠macosforge.org 23 Sep '08

23 Sep '08

Revision: 616 http://trac.macosforge.org/projects/ruby/changeset/616 Author: rich(a)infoether.com Date: 2008-09-23 16:38:00 -0700 (Tue, 23 Sep 2008) Log Message: ----------- refactor app for better reuse Modified Paths: -------------- MacRuby/trunk/lib/hotcocoa/mappings/application.rb Modified: MacRuby/trunk/lib/hotcocoa/mappings/application.rb =================================================================== --- MacRuby/trunk/lib/hotcocoa/mappings/application.rb 2008-09-23 21:54:59 UTC (rev 615) +++ MacRuby/trunk/lib/hotcocoa/mappings/application.rb 2008-09-23 23:38:00 UTC (rev 616) @@ -5,19 +5,23 @@ end def handle_block(application, &block) - begin - require 'lib/menu' - o = Object.new - o.extend HotCocoa - application.menu = o.application_menu - rescue LoadError => e - end + application.load_application_menu block.call(application) application.run end custom_methods do + def load_application_menu + begin + require 'lib/menu' + o = Object.new + o.extend HotCocoa + setMainMenu(o.application_menu) + rescue LoadError => e + end + end + def name=(name) @name = name end

1 0

[615] MacRuby/trunk
by source_changes＠macosforge.org 23 Sep '08

23 Sep '08

Revision: 615 http://trac.macosforge.org/projects/ruby/changeset/615 Author: lsansonetti(a)apple.com Date: 2008-09-23 14:54:59 -0700 (Tue, 23 Sep 2008) Log Message: ----------- make sure #class does not return the CF hidden class for primitive types Modified Paths: -------------- MacRuby/trunk/objc.m MacRuby/trunk/test/ruby/test_objc.rb Modified: MacRuby/trunk/objc.m =================================================================== --- MacRuby/trunk/objc.m 2008-09-23 02:11:48 UTC (rev 614) +++ MacRuby/trunk/objc.m 2008-09-23 21:54:59 UTC (rev 615) @@ -1130,9 +1130,21 @@ /* because Hash.new can accept a block */ return rb_class_new_instance(0, NULL, recv); } - else if (RCLASS_META(klass) && sel == @selector(class)) { - /* because +[NSObject class] returns self */ - return rb_cClass; + else if (sel == @selector(class)) { + if (RCLASS_META(klass)) { + /* because +[NSObject class] returns self */ + return rb_cClass; + } + /* because the CF classes should be hidden */ + else if (klass == rb_cCFString) { + return rb_cNSMutableString; + } + else if (klass == rb_cCFArray) { + return rb_cNSMutableArray; + } + else if (klass == rb_cCFHash) { + return rb_cNSMutableHash; + } } ocrcv = RB2OC(recv); Modified: MacRuby/trunk/test/ruby/test_objc.rb =================================================================== --- MacRuby/trunk/test/ruby/test_objc.rb 2008-09-23 02:11:48 UTC (rev 614) +++ MacRuby/trunk/test/ruby/test_objc.rb 2008-09-23 21:54:59 UTC (rev 615) @@ -90,14 +90,17 @@ assert(o.instance_of?(NSMutableString)) assert(o.instance_of?(String)) assert(o.kind_of?(String)) + assert_equal(String, o.class) o = [42] assert(o.instance_of?(NSMutableArray)) assert(o.instance_of?(Array)) assert(o.kind_of?(Array)) + assert_equal(Array, o.class) o = {42=>42} assert(o.instance_of?(NSMutableDictionary)) assert(o.instance_of?(Hash)) assert(o.kind_of?(Hash)) + assert_equal(Hash, o.class) end class ClassWithNamedArg

1 0

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

23 Sep '08

Revision: 614 http://trac.macosforge.org/projects/ruby/changeset/614 Author: psychs(a)limechat.net Date: 2008-09-22 19:11:48 -0700 (Mon, 22 Sep 2008) Log Message: ----------- Added GrowlNotifier sample Added Paths: ----------- MacRuby/trunk/sample-macruby/GrowlNotifier/ MacRuby/trunk/sample-macruby/GrowlNotifier/growl.rb MacRuby/trunk/sample-macruby/GrowlNotifier/growl_block_sample.rb MacRuby/trunk/sample-macruby/GrowlNotifier/growl_delegate_sample.rb MacRuby/trunk/sample-macruby/GrowlNotifier/growl_helpers.rb Added: MacRuby/trunk/sample-macruby/GrowlNotifier/growl.rb =================================================================== --- MacRuby/trunk/sample-macruby/GrowlNotifier/growl.rb (rev 0) +++ MacRuby/trunk/sample-macruby/GrowlNotifier/growl.rb 2008-09-23 02:11:48 UTC (rev 614) @@ -0,0 +1,156 @@ +framework 'Cocoa' + +module Growl + class Notifier < NSObject + VERSION = '1.0.1' + + 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, + } + + class << self + # Returns the singleton instance of Growl::Notifier with which you register and send your Growl notifications. + def sharedInstance + @sharedInstance ||= alloc.init + end + end + + attr_reader :application_name, :application_icon, :notifications, :default_notifications + attr_accessor :delegate + + # Registers the applications metadata and the notifications, that your application might send, to Growl. + # The +default_notifications+ are notifications that will be enabled by default, the regular +notifications+ are + # optional and should be enabled by the user in the Growl system preferences. + # + # Register the applications name and the notifications that will be used. + # * +default_notifications+ defaults to the regular +notifications+. + # * +application_icon+ defaults to NSApplication.sharedApplication.applicationIconImage. + # + # Growl::Notifier.sharedInstance.register 'FoodApp', ['YourHamburgerIsReady', 'OhSomeoneElseAteIt'] + # + # Register the applications name, the notifications plus the default notifications that will be used and the icon that's to be used in the Growl notifications. + # + # Growl::Notifier.sharedInstance.register 'FoodApp', ['YourHamburgerIsReady', 'OhSomeoneElseAteIt'], ['DefaultNotification], NSImage.imageNamed('GreasyHamburger') + def register(application_name, notifications, default_notifications = nil, application_icon = nil) + @application_name, @application_icon = application_name, (application_icon || NSApplication.sharedApplication.applicationIconImage) + @notifications, @default_notifications = notifications, (default_notifications || notifications) + @callbacks = {} + send_registration! + end + + # Sends a Growl notification. + # + # * +notification_name+ : the name of one of the notifcations that your apllication registered with Growl. See register for more info. + # * +title+ : the title that should be used in the Growl notification. + # * +description+ : the body of the Grow notification. + # * +options+ : specifies a few optional options: + # * <tt>:sticky</tt> : indicates if the Grow notification should "stick" to the screen. Defaults to +false+. + # * <tt>:priority</tt> : sets the priority level of the Growl notification. Defaults to 0. + # * <tt>:icon</tt> : specifies the icon to be used in the Growl notification. Defaults to the registered +application_icon+, see register for more info. + # + # Simple example: + # + # name = 'YourHamburgerIsReady' + # title = 'Your hamburger is ready for consumption!' + # description = 'Please pick it up at isle 4.' + # + # Growl::Notifier.sharedInstance.notify(name, title, description) + # + # Example with optional options: + # + # Growl::Notifier.sharedInstance.notify(name, title, description, :sticky => true, :priority => 1, :icon => NSImage.imageNamed('SuperBigHamburger')) + # + # When you pass notify a block, that block will be used as the callback handler if the Growl notification was clicked. Eg: + # + # Growl::Notifier.sharedInstance.notify(name, title, description, :sticky => true) do + # user_clicked_notification_so_do_something! + # end + def notify(notification_name, title, description, options = {}, &callback) + dict = { + :ApplicationName => @application_name, + :ApplicationPID => pid, + :NotificationName => notification_name, + :NotificationTitle => title, + :NotificationDescription => description, + :NotificationPriority => PRIORITIES[options[:priority]] || options[:priority] || 0 + } + dict[:NotificationIcon] = options[:icon].TIFFRepresentation if options[:icon] + dict[:NotificationSticky] = 1 if options[:sticky] + + context = {} + context[:user_click_context] = options[:click_context] if options[:click_context] + if block_given? + @callbacks[callback.object_id] = callback + context[:callback_object_id] = callback.object_id.to_s + end + dict[:NotificationClickContext] = context unless context.empty? + + notification_center.postNotificationName :GrowlNotification, object:nil, userInfo:dict, deliverImmediately:true + end + + def onReady(notification) + send_registration! + end + + def onClicked(notification) + user_context = nil + if context = notification.userInfo[GROWL_KEY_CLICKED_CONTEXT] + user_context = context[:user_click_context] + if callback_object_id = context[:callback_object_id] + @callbacks.delete(callback_object_id.to_i).call + end + end + + @delegate.growlNotifierClicked_context(self, user_context) if @delegate && @delegate.respond_to?(:growlNotifierClicked_context) + end + + def onTimeout(notification) + user_context = nil + if context = notification.userInfo[GROWL_KEY_CLICKED_CONTEXT] + @callbacks.delete(context[:callback_object_id].to_i) if context[:callback_object_id] + user_context = context[:user_click_context] + end + + @delegate.growlNotifierTimedOut_context(self, user_context) if @delegate && @delegate.respond_to?(:growlNotifierTimedOut_context) + end + + private + + def pid + NSProcessInfo.processInfo.processIdentifier.to_i + end + + def notification_center + NSDistributedNotificationCenter.defaultCenter + end + + def send_registration! + add_observer 'onReady:', GROWL_IS_READY, false + add_observer 'onClicked:', GROWL_NOTIFICATION_CLICKED, true + add_observer 'onTimeout:', GROWL_NOTIFICATION_TIMED_OUT, true + + dict = { + :ApplicationName => @application_name, + :ApplicationIcon => application_icon.TIFFRepresentation, + :AllNotifications => @notifications, + :DefaultNotifications => @default_notifications + } + + notification_center.postNotificationName :GrowlApplicationRegistrationNotification, object:nil, userInfo:dict, deliverImmediately:true + end + + def add_observer(selector, name, prepend_name_and_pid) + name = "#{@application_name}-#{pid}-#{name}" if prepend_name_and_pid + notification_center.addObserver self, selector:selector, name:name, object:nil + end + end +end Added: MacRuby/trunk/sample-macruby/GrowlNotifier/growl_block_sample.rb =================================================================== --- MacRuby/trunk/sample-macruby/GrowlNotifier/growl_block_sample.rb (rev 0) +++ MacRuby/trunk/sample-macruby/GrowlNotifier/growl_block_sample.rb 2008-09-23 02:11:48 UTC (rev 614) @@ -0,0 +1,29 @@ +require 'rubygems' +require 'growl_helpers' + +class GrowlController < NSObject + # Makes the #growl and #sticky_growl shortcut methods available. + include Growl + + HELLO_TYPE = 'Hello message received' + Growl::Notifier.sharedInstance.register('GrowlSample', [HELLO_TYPE]) + + def init + if super + growl HELLO_TYPE, 'Not sticky', 'Hello world' do + puts "Clicked not sticky: #{ Time.now }" + NSApp.terminate(nil) + end + + sticky_growl HELLO_TYPE, 'Sticky', 'Hello world' do + puts "Clicked sticky: #{ Time.now }" + NSApp.terminate(nil) + end + + self + end + end +end + +g = GrowlController.alloc.init +NSApp.run Added: MacRuby/trunk/sample-macruby/GrowlNotifier/growl_delegate_sample.rb =================================================================== --- MacRuby/trunk/sample-macruby/GrowlNotifier/growl_delegate_sample.rb (rev 0) +++ MacRuby/trunk/sample-macruby/GrowlNotifier/growl_delegate_sample.rb 2008-09-23 02:11:48 UTC (rev 614) @@ -0,0 +1,36 @@ +require 'rubygems' +require 'growl' + +class GrowlController < NSObject + HELLO_TYPE = 'Hello message received' + + def init + if super + @g = Growl::Notifier.sharedInstance + @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 ) + @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 Added: MacRuby/trunk/sample-macruby/GrowlNotifier/growl_helpers.rb =================================================================== --- MacRuby/trunk/sample-macruby/GrowlNotifier/growl_helpers.rb (rev 0) +++ MacRuby/trunk/sample-macruby/GrowlNotifier/growl_helpers.rb 2008-09-23 02:11:48 UTC (rev 614) @@ -0,0 +1,25 @@ +require File.expand_path('../growl', __FILE__) + +# Defines a few convenience methods that you can use in your class if you include the Growl module. +# Eg: +# +# class FoodReporter < NSObject +# include Growl +# +# def hamburger_time! +# growl 'YourHamburgerIsReady', 'Your hamburger is ready for consumption!', 'Please pick it up at isle 4.', :priority => 1 do +# throw_it_away_before_user_reaches_counter! +# end +# end +# end +module Growl + # Sends a Growl notification. See Growl::Notifier#notify for more info. + def growl(name, title, description, options = {}, &callback) + Growl::Notifier.sharedInstance.notify name, title, description, options, &callback + end + + # Sends a sticky Growl notification. See Growl::Notifier#notify for more info. + def sticky_growl(name, title, description, options = {}, &callback) + growl name, title, description, options.merge!(:sticky => true), &callback + end +end

1 0