January 2009 - macruby-changes - lists.macosforge.org

[789] MacRuby/trunk
by source_changes＠macosforge.org 13 Jan '09

13 Jan '09

Revision: 789 http://trac.macosforge.org/projects/ruby/changeset/789 Author: eloy.de.enige(a)gmail.com Date: 2009-01-13 07:54:09 -0800 (Tue, 13 Jan 2009) Log Message: ----------- Added workarounds for NSCFNumber to Float conversion on the NSRect setters. This is because Numeric is not yet re-implemented on top of NSCFNumber. Modified Paths: -------------- MacRuby/trunk/lib/objc_ext/ns_rect.rb MacRuby/trunk/test-macruby/test_objc_ext.rb Modified: MacRuby/trunk/lib/objc_ext/ns_rect.rb =================================================================== --- MacRuby/trunk/lib/objc_ext/ns_rect.rb 2009-01-13 15:34:04 UTC (rev 788) +++ MacRuby/trunk/lib/objc_ext/ns_rect.rb 2009-01-13 15:54:09 UTC (rev 789) @@ -8,17 +8,17 @@ # Assigns the `x' coordinate on the rects origin instance. def x=(x) - origin.x = x + origin.x = coerce_float(x) end # Returns the `y' coordinate of the rects origin instance. - def x - origin.x + def y + origin.y end # Assigns the `y' coordinate on the rects origin instance. - def x=(x) - origin.x = x + def y=(y) + origin.y = coerce_float(y) end # Returns the `height' of the rects size instance. @@ -28,7 +28,7 @@ # Sets the `height' on the rects size instance. def height=(height) - size.height = height + size.height = coerce_float(height) end # Returns the `width' of the rects size instance. @@ -38,8 +38,16 @@ # Sets the `width' on the rects size instance. def width=(width) - size.width = width + size.width = coerce_float(width) end + + private + + # Needed because atm NSCFNumber to Float conversion does not happen yet. + # In other words, Numeric should be build upon NSCFNumber. + def coerce_float(value) + (value.is_a?(NSCFNumber) ? value.floatValue : value) + end end end end Modified: MacRuby/trunk/test-macruby/test_objc_ext.rb =================================================================== --- MacRuby/trunk/test-macruby/test_objc_ext.rb 2009-01-13 15:34:04 UTC (rev 788) +++ MacRuby/trunk/test-macruby/test_objc_ext.rb 2009-01-13 15:54:09 UTC (rev 789) @@ -1,6 +1,6 @@ #!/usr/bin/env macruby -$: << File.expand_path('../../lib', __FILE__) +$:.unshift(File.expand_path('../../lib', __FILE__)) framework 'Cocoa' require 'test/unit' @@ -54,6 +54,9 @@ it "should assign the height to its size instance with #height=" do @rect.height = 300 assert_equal 300, @rect.height + + @rect.height = NSNumber.numberWithInt(400) + assert_equal 400, @rect.height end it "should return its size instance's width with #width" do @@ -63,6 +66,9 @@ it "should assign the width to its size instance with #width=" do @rect.width = 300 assert_equal 300, @rect.width + + @rect.width = NSNumber.numberWithInt(400) + assert_equal 400, @rect.width end it "should return its origin instance's x coord with #x" do @@ -72,6 +78,9 @@ it "should assign the x coord to its origin instance with #x=" do @rect.x = 200 assert_equal 200, @rect.x + + @rect.x = NSNumber.numberWithInt(300) + assert_equal 300, @rect.x end it "should return its origin instance's y coord with #y" do @@ -81,5 +90,8 @@ it "should assign the y coord to its origin instance with #y=" do @rect.y = 200 assert_equal 200, @rect.y + + @rect.y = NSNumber.numberWithInt(300) + assert_equal 300, @rect.y end end \ No newline at end of file

1 0

[788] MacRuby/trunk
by source_changes＠macosforge.org 13 Jan '09

13 Jan '09

Revision: 788 http://trac.macosforge.org/projects/ruby/changeset/788 Author: eloy.de.enige(a)gmail.com Date: 2009-01-13 07:34:04 -0800 (Tue, 13 Jan 2009) Log Message: ----------- Added accessor methods for x, y, width, height to NSRect. Modified Paths: -------------- MacRuby/trunk/test-macruby/test_objc_ext.rb Added Paths: ----------- MacRuby/trunk/lib/objc_ext/ns_rect.rb Added: MacRuby/trunk/lib/objc_ext/ns_rect.rb =================================================================== --- MacRuby/trunk/lib/objc_ext/ns_rect.rb (rev 0) +++ MacRuby/trunk/lib/objc_ext/ns_rect.rb 2009-01-13 15:34:04 UTC (rev 788) @@ -0,0 +1,47 @@ +class MacRuby + module ObjcExt + module NSRect + # Returns the `x' coordinate of the rects origin instance. + def x + origin.x + end + + # Assigns the `x' coordinate on the rects origin instance. + def x=(x) + origin.x = x + end + + # Returns the `y' coordinate of the rects origin instance. + def x + origin.x + end + + # Assigns the `y' coordinate on the rects origin instance. + def x=(x) + origin.x = x + end + + # Returns the `height' of the rects size instance. + def height + size.height + end + + # Sets the `height' on the rects size instance. + def height=(height) + size.height = height + end + + # Returns the `width' of the rects size instance. + def width + size.width + end + + # Sets the `width' on the rects size instance. + def width=(width) + size.width = width + end + end + end +end + +NSRect.send(:include, MacRuby::ObjcExt::NSRect) \ No newline at end of file Modified: MacRuby/trunk/test-macruby/test_objc_ext.rb =================================================================== --- MacRuby/trunk/test-macruby/test_objc_ext.rb 2009-01-13 14:26:28 UTC (rev 787) +++ MacRuby/trunk/test-macruby/test_objc_ext.rb 2009-01-13 15:34:04 UTC (rev 788) @@ -1,5 +1,8 @@ #!/usr/bin/env macruby +$: << File.expand_path('../../lib', __FILE__) +framework 'Cocoa' + require 'test/unit' class Test::Unit::TestCase class << self @@ -9,23 +12,22 @@ end end -$: << File.expand_path('../../lib', __FILE__) +# These tests should probably move to the macruby part of rubyspec once we get to that point. + require 'objc_ext/ns_user_defaults' -# These tests should probably move to the macruby part of rubyspec once we get to that point. - -class TestNSUserDefaults < Test::Unit::TestCase - it "returns a value for a given key through the #[] reader method" do +class TestNSUserDefaultsExtensions < Test::Unit::TestCase + it "should returns a value for a given key through the #[] reader method" do defaults.setValue('foo', forKey: 'key') assert_equal 'foo', defaults['key'] end - it "assigns a value for a given key through the #[]= writer method" do + it "should assign a value for a given key through the #[]= writer method" do defaults['key'] = 'foo' assert_equal 'foo', defaults.valueForKey('key') end - it "removes an object for a given key with the #delete method" do + it "should remove an object for a given key with the #delete method" do defaults.setValue('foo', forKey: 'key') defaults.delete('key') assert_nil defaults.valueForKey('key') @@ -36,4 +38,48 @@ def defaults NSUserDefaults.standardUserDefaults end +end + +require 'objc_ext/ns_rect' + +class TestNSRectExtensions < Test::Unit::TestCase + def setup + @rect = NSRect.new([100, 100], [200, 200]) + end + + it "should return its size instance's height with #height" do + assert_equal 200, @rect.height + end + + it "should assign the height to its size instance with #height=" do + @rect.height = 300 + assert_equal 300, @rect.height + end + + it "should return its size instance's width with #width" do + assert_equal 200, @rect.width + end + + it "should assign the width to its size instance with #width=" do + @rect.width = 300 + assert_equal 300, @rect.width + end + + it "should return its origin instance's x coord with #x" do + assert_equal 100, @rect.x + end + + it "should assign the x coord to its origin instance with #x=" do + @rect.x = 200 + assert_equal 200, @rect.x + end + + it "should return its origin instance's y coord with #y" do + assert_equal 100, @rect.y + end + + it "should assign the y coord to its origin instance with #y=" do + @rect.y = 200 + assert_equal 200, @rect.y + end end \ No newline at end of file

1 0

[787] MacRuby/trunk/ext/syck/rubyext.c
by source_changes＠macosforge.org 13 Jan '09

13 Jan '09

Revision: 787 http://trac.macosforge.org/projects/ruby/changeset/787 Author: eloy.de.enige(a)gmail.com Date: 2009-01-13 06:26:28 -0800 (Tue, 13 Jan 2009) Log Message: ----------- Updated the error that's raised when a unknown class is found in YAML to be a NameError instead of TypeError. Modified Paths: -------------- MacRuby/trunk/ext/syck/rubyext.c Modified: MacRuby/trunk/ext/syck/rubyext.c =================================================================== --- MacRuby/trunk/ext/syck/rubyext.c 2009-01-13 14:14:02 UTC (rev 786) +++ MacRuby/trunk/ext/syck/rubyext.c 2009-01-13 14:26:28 UTC (rev 787) @@ -1109,9 +1109,7 @@ } else /* workaround for SEGV. real fix please */ { - VALUE msg = rb_str_new2( "invalid subclass: " ); - rb_str_append( msg, subclass ); - rb_raise( rb_eTypeError, RSTRING_PTR(msg) ); + rb_raise( rb_eNameError, "uninitialized constant %s found while instantiating classes from YAML", RSTRING_PTR( subclass ) ); } } break;

1 0

[786] MacRuby/trunk/ext/syck/rubyext.c
by source_changes＠macosforge.org 13 Jan '09

13 Jan '09

Revision: 786 http://trac.macosforge.org/projects/ruby/changeset/786 Author: eloy.de.enige(a)gmail.com Date: 2009-01-13 06:14:02 -0800 (Tue, 13 Jan 2009) Log Message: ----------- Instead of only telling the user that syck was unable to find a valid subclass when transferring, also display the subclass path that it has found to be invalid. Modified Paths: -------------- MacRuby/trunk/ext/syck/rubyext.c Modified: MacRuby/trunk/ext/syck/rubyext.c =================================================================== --- MacRuby/trunk/ext/syck/rubyext.c 2009-01-13 13:22:19 UTC (rev 785) +++ MacRuby/trunk/ext/syck/rubyext.c 2009-01-13 14:14:02 UTC (rev 786) @@ -1109,7 +1109,9 @@ } else /* workaround for SEGV. real fix please */ { - rb_raise( rb_eTypeError, "invalid subclass" ); + VALUE msg = rb_str_new2( "invalid subclass: " ); + rb_str_append( msg, subclass ); + rb_raise( rb_eTypeError, RSTRING_PTR(msg) ); } } break;

1 0

[785] MacRuby/trunk
by source_changes＠macosforge.org 13 Jan '09

13 Jan '09

Revision: 785 http://trac.macosforge.org/projects/ruby/changeset/785 Author: eloy.de.enige(a)gmail.com Date: 2009-01-13 05:22:19 -0800 (Tue, 13 Jan 2009) Log Message: ----------- Reverted speed improvements to syck (YAML) around rb_str_split2 which causes seg faults. Isolated bug in known_bugs_in_c.c Modified Paths: -------------- MacRuby/trunk/ext/syck/rubyext.c MacRuby/trunk/test-macruby/known_bugs.rb Added Paths: ----------- MacRuby/trunk/test-macruby/extconf.rb MacRuby/trunk/test-macruby/known_bugs_in_c.c Modified: MacRuby/trunk/ext/syck/rubyext.c =================================================================== --- MacRuby/trunk/ext/syck/rubyext.c 2009-01-10 05:24:32 UTC (rev 784) +++ MacRuby/trunk/ext/syck/rubyext.c 2009-01-13 13:22:19 UTC (rev 785) @@ -1028,7 +1028,10 @@ syck_const_find(VALUE const_name) { VALUE tclass = rb_cObject; - VALUE tparts = rb_str_split2( const_name, oDoubleColon ); + // This speed improvement currently leads to a SEGV, + // See known_bugs: test_accessing_an_array_created_via_rb_str_split2 + // VALUE tparts = rb_str_split2( const_name, oDoubleColon ); + VALUE tparts = rb_str_split( const_name, "::" ); int i = 0, count; for ( i = 0, count = RARRAY_LEN(tparts); i < count; i++ ) { VALUE tpart = rb_to_id( rb_ary_entry( tparts, i ) ); @@ -1063,7 +1066,10 @@ if ( NIL_P( target_class ) ) { VALUE subclass_parts = rb_ary_new(); - VALUE parts = rb_str_split2( type, oColon ); + // This speed improvement currently leads to a SEGV, + // See known_bugs: test_accessing_an_array_created_via_rb_str_split2 + //VALUE parts = rb_str_split2( type, oColon ); + VALUE parts = rb_str_split( type, ":" ); while ( RARRAY_LEN(parts) > 1 ) { Added: MacRuby/trunk/test-macruby/extconf.rb =================================================================== --- MacRuby/trunk/test-macruby/extconf.rb (rev 0) +++ MacRuby/trunk/test-macruby/extconf.rb 2009-01-13 13:22:19 UTC (rev 785) @@ -0,0 +1,2 @@ +require "mkmf" +create_makefile("known_bugs_in_c") \ No newline at end of file Modified: MacRuby/trunk/test-macruby/known_bugs.rb =================================================================== --- MacRuby/trunk/test-macruby/known_bugs.rb 2009-01-10 05:24:32 UTC (rev 784) +++ MacRuby/trunk/test-macruby/known_bugs.rb 2009-01-13 13:22:19 UTC (rev 785) @@ -1,51 +1,53 @@ #!/usr/local/bin/macruby require "test/unit" -framework 'Cocoa' +#framework 'Cocoa' module KnownBugs - class TestYaml < Test::Unit::TestCase - require "yaml" - class IDontWantToCrash; end - - def test_load_non_native_classes - data = YAML.dump(IDontWantToCrash.new) - assert_nothing_raised { YAML.load(data) } + class TestBugsInC < Test::Unit::TestCase + def setup + dir = File.expand_path('../', __FILE__) + exit(1) unless system("cd #{dir} && macruby extconf.rb && make") + require File.join(dir, 'known_bugs_in_c') end + + def test_accessing_an_array_created_via_rb_str_split2 + KnownBugsInC.test_rb_str_split2("foo:bar", ":") + end end - + class TestKernel < Test::Unit::TestCase module ::Kernel private def is_callable?; true end end - + module ::Kernel def should_be_callable?; true end private :should_be_callable? end - + def test_kernel_methods_made_private_with_keyword assert is_callable? # works end - + def test_kernel_methods_made_private_with_class_method assert should_be_callable? # causes endless loop end end - + class TestDuplicatingInstances < Test::Unit::TestCase # Works - + class Foo; end - + def test_dup_on_an_instance_of_a_pure_ruby_class obj = Foo.new assert_not_equal obj, obj.dup.object_id end - + # Fails - + def test_dup_on_an_instance_of_Object obj = Object.new assert_nothing_raised(NSException) do @@ -53,75 +55,75 @@ assert_not_equal obj.object_id, obj.dup.object_id end end - + def test_dup_on_a_class_instance assert_not_equal Foo.object_id, Foo.dup.object_id end end - + class TestStringFormatting < Test::Unit::TestCase def test_formatting_with_a_Bignum assert_nothing_raised(RangeError) { "%d" % 68727360256 } end end - + class TestIncludingModuleInClass < Test::Unit::TestCase module ClassInstanceMethod def a_class_instance_method; end end - + class ::Class include ClassInstanceMethod end - + def test_class_should_respond_to_methods_included_in_Class assert Class.new.respond_to?(:a_class_instance_method) end end - + class TestIncludingModuleInModule < Test::Unit::TestCase module ModuleInstanceMethod def a_module_instance_method; end end - + class ::Module include ModuleInstanceMethod end - + def test_module_should_respond_to_methods_included_in_Module assert Module.new.respond_to?(:a_module_instance_method) end end - + class TestConstantLookup < Test::Unit::TestCase module Namespace NamespacedConstant = nil class NamespacedClass; end end - + def test_should_not_find_namespaced_constants # works assert_raise(NameError) { NamespacedConstant } end - + def test_should_not_find_namespaced_classes # fails assert_raise(NameError) { NamespacedClass } end end - + class TestRespondTo < Test::Unit::TestCase class RespondTo def respond_to?(method, hidden = false) super end end - + def test_super_implementation assert_nothing_raised(SystemStackError) do RespondTo.new.respond_to?(:object_id) end end end - + class TestBooleanComparison < Test::Unit::TestCase def test_NSCFBoolean_comparison_to_Ruby_bool assert_equal true, NSNumber.numberWithBool(true) Added: MacRuby/trunk/test-macruby/known_bugs_in_c.c =================================================================== --- MacRuby/trunk/test-macruby/known_bugs_in_c.c (rev 0) +++ MacRuby/trunk/test-macruby/known_bugs_in_c.c 2009-01-13 13:22:19 UTC (rev 785) @@ -0,0 +1,17 @@ +#include "ruby/ruby.h" + +static VALUE +known_bug_rb_str_split2(VALUE recv, VALUE str, VALUE sep) +{ + VALUE parts = rb_str_split2(str, sep); + // Accessing the array goes wrong, has it been collected? + // Because at the end of rb_str_split_m the `result' _is_ the array as expected… + return rb_ary_entry(parts, 0); +} + +void Init_known_bugs_in_c() { + VALUE cKnownBugsInC; + + cKnownBugsInC = rb_define_module("KnownBugsInC"); + rb_define_module_function(cKnownBugsInC, "test_rb_str_split2", known_bug_rb_str_split2, 2); +} \ No newline at end of file

1 0

[784] MacRuby/trunk/objc.m
by source_changes＠macosforge.org 10 Jan '09

10 Jan '09

Revision: 784 http://trac.macosforge.org/projects/ruby/changeset/784 Author: lsansonetti(a)apple.com Date: 2009-01-09 21:24:32 -0800 (Fri, 09 Jan 2009) Log Message: ----------- testing a commit from svn Modified Paths: -------------- MacRuby/trunk/objc.m Modified: MacRuby/trunk/objc.m =================================================================== --- MacRuby/trunk/objc.m 2009-01-10 05:01:34 UTC (rev 783) +++ MacRuby/trunk/objc.m 2009-01-10 05:24:32 UTC (rev 784) @@ -186,8 +186,9 @@ GC_ROOT(&ary_ffi_types); } - if (st_lookup(ary_ffi_types, (st_data_t)size, (st_data_t *)&type)) + if (st_lookup(ary_ffi_types, (st_data_t)size, (st_data_t *)&type)) { return type; + } type = (ffi_type *)malloc(sizeof(ffi_type)); @@ -196,8 +197,9 @@ type->type = FFI_TYPE_STRUCT; type->elements = malloc(size * sizeof(ffi_type *)); - for (i = 0; i < size; i++) + for (i = 0; i < size; i++) { type->elements[i] = &ffi_type_uchar; + } st_insert(ary_ffi_types, (st_data_t)size, (st_data_t)type);

1 0

[783] MacRuby/trunk/objc.m
by source_changes＠macosforge.org 10 Jan '09

10 Jan '09

Revision: 783 http://trac.macosforge.org/projects/ruby/changeset/783 Author: lsansonetti(a)apple.com Date: 2009-01-09 21:01:34 -0800 (Fri, 09 Jan 2009) Log Message: ----------- testing a commit from git-svn Modified Paths: -------------- MacRuby/trunk/objc.m Modified: MacRuby/trunk/objc.m =================================================================== --- MacRuby/trunk/objc.m 2009-01-08 10:18:44 UTC (rev 782) +++ MacRuby/trunk/objc.m 2009-01-10 05:01:34 UTC (rev 783) @@ -118,8 +118,9 @@ nested++; } else if (*type == end) { - if (nested == 0) + if (nested == 0) { return type; + } nested--; } }

1 0

[782] MacRuby/trunk/objc.m
by source_changes＠macosforge.org 08 Jan '09

08 Jan '09

Revision: 782 http://trac.macosforge.org/projects/ruby/changeset/782 Author: eloy.de.enige(a)gmail.com Date: 2009-01-08 02:18:44 -0800 (Thu, 08 Jan 2009) Log Message: ----------- Added documentation to rb_objc_define_kvo_setter. Modified Paths: -------------- MacRuby/trunk/objc.m Modified: MacRuby/trunk/objc.m =================================================================== --- MacRuby/trunk/objc.m 2009-01-07 15:13:25 UTC (rev 781) +++ MacRuby/trunk/objc.m 2009-01-08 10:18:44 UTC (rev 782) @@ -3124,6 +3124,16 @@ return NULL; /* we explicitely return NULL because otherwise a special constant may stay on the stack and be returned to Objective-C, and do some very nasty crap, especially if called via -[performSelector:]. */ } +/* + Defines an attribute writer method which conforms to Key-Value Coding. + (See http://developer.apple.com/documentation/Cocoa/Conceptual/KeyValueCoding/Ke…) + + attr_accessor :foo + + Will create the normal accessor methods, plus <tt>setFoo</tt> + + TODO: Does not handle the case were the user might override #foo= +*/ void rb_objc_define_kvo_setter(VALUE klass, ID mid) {

1 0

[781] MacRuby/trunk/test-macruby/known_bugs.rb
by source_changes＠macosforge.org 07 Jan '09

07 Jan '09

Revision: 781 http://trac.macosforge.org/projects/ruby/changeset/781 Author: eloy.de.enige(a)gmail.com Date: 2009-01-07 07:13:25 -0800 (Wed, 07 Jan 2009) Log Message: ----------- Added failing test case about comparing NSCFBoolean instance against Ruby bools. Modified Paths: -------------- MacRuby/trunk/test-macruby/known_bugs.rb Modified: MacRuby/trunk/test-macruby/known_bugs.rb =================================================================== --- MacRuby/trunk/test-macruby/known_bugs.rb 2009-01-07 13:57:21 UTC (rev 780) +++ MacRuby/trunk/test-macruby/known_bugs.rb 2009-01-07 15:13:25 UTC (rev 781) @@ -1,6 +1,7 @@ #!/usr/local/bin/macruby require "test/unit" +framework 'Cocoa' module KnownBugs class TestYaml < Test::Unit::TestCase @@ -120,4 +121,11 @@ end end end + + class TestBooleanComparison < Test::Unit::TestCase + def test_NSCFBoolean_comparison_to_Ruby_bool + assert_equal true, NSNumber.numberWithBool(true) + assert_equal false, NSNumber.numberWithBool(false) + end + end end \ No newline at end of file

1 0

[780] MacRuby/trunk/lib/objc_ext/ns_user_defaults.rb
by source_changes＠macosforge.org 07 Jan '09

07 Jan '09

Revision: 780 http://trac.macosforge.org/projects/ruby/changeset/780 Author: eloy.de.enige(a)gmail.com Date: 2009-01-07 05:57:21 -0800 (Wed, 07 Jan 2009) Log Message: ----------- MacRuby is already defined as a class. Modified Paths: -------------- MacRuby/trunk/lib/objc_ext/ns_user_defaults.rb Modified: MacRuby/trunk/lib/objc_ext/ns_user_defaults.rb =================================================================== --- MacRuby/trunk/lib/objc_ext/ns_user_defaults.rb 2009-01-07 13:49:40 UTC (rev 779) +++ MacRuby/trunk/lib/objc_ext/ns_user_defaults.rb 2009-01-07 13:57:21 UTC (rev 780) @@ -1,4 +1,4 @@ -module MacRuby +class MacRuby module ObjcExt module NSUserDefaults def [](key)

1 0