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

[3080] MacRuby/trunk/string.c
by source_changes＠macosforge.org 07 Dec '09

07 Dec '09

Revision: 3080 http://trac.macosforge.org/projects/ruby/changeset/3080 Author: lsansonetti(a)apple.com Date: 2009-12-06 19:32:54 -0800 (Sun, 06 Dec 2009) Log Message: ----------- potentially fix 10.5 build Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2009-12-07 01:49:48 UTC (rev 3079) +++ MacRuby/trunk/string.c 2009-12-07 03:32:54 UTC (rev 3080) @@ -3522,6 +3522,14 @@ * "1,2,,3,4,,".split(',', -4) #=> ["1", "2", "", "3", "4", "", ""] */ +#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 +static inline bool +CFStringIsSurrogateHighCharacter(UniChar character) +{ + return ((character >= 0xD800UL) && (character <= 0xDBFFUL) ? true : false); +} +#endif + static VALUE rb_str_split_m(VALUE str, SEL sel, int argc, VALUE *argv) {

1 0

[3079] MacRuby/trunk/vm.cpp
by source_changes＠macosforge.org 07 Dec '09

07 Dec '09

Revision: 3079 http://trac.macosforge.org/projects/ruby/changeset/3079 Author: neeracher(a)apple.com Date: 2009-12-06 17:49:48 -0800 (Sun, 06 Dec 2009) Log Message: ----------- Don't omit test for : Modified Paths: -------------- MacRuby/trunk/vm.cpp Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2009-12-07 01:47:17 UTC (rev 3078) +++ MacRuby/trunk/vm.cpp 2009-12-07 01:49:48 UTC (rev 3079) @@ -1646,6 +1646,10 @@ memcpy(token, &selname[token_beg], token_len); token[token_len] = '\0'; + if (strchr(token, ':') != NULL) { + return false; + } + #if 1 // token must start with a capital character. return isupper(token[0]); @@ -1654,11 +1658,9 @@ if (!isupper(token[0])) { return false; } + // Decapitalize the token and look if it's a valid KVO attribute. token[0] = tolower(token[0]); - if (strchr(token, ':') != NULL) { - return false; - } SEL sel = sel_registerName(token); return class_getInstanceMethod(klass, sel) != NULL; #endif

1 0

[3078] MacRuby/trunk
by source_changes＠macosforge.org 07 Dec '09

07 Dec '09

Revision: 3078 http://trac.macosforge.org/projects/ruby/changeset/3078 Author: neeracher(a)apple.com Date: 2009-12-06 17:47:17 -0800 (Sun, 06 Dec 2009) Log Message: ----------- Fix KVC bugs Modified Paths: -------------- MacRuby/trunk/vm.cpp Removed Paths: ------------- MacRuby/trunk/spec/macruby/tags/macruby/core/kvc_tags.txt Deleted: MacRuby/trunk/spec/macruby/tags/macruby/core/kvc_tags.txt =================================================================== --- MacRuby/trunk/spec/macruby/tags/macruby/core/kvc_tags.txt 2009-12-06 23:58:16 UTC (rev 3077) +++ MacRuby/trunk/spec/macruby/tags/macruby/core/kvc_tags.txt 2009-12-07 01:47:17 UTC (rev 3078) @@ -1,6 +0,0 @@ -fails:An ordered collection being accessed through NSKeyValueCoding can be manipulated through index accessors -fails:An ordered collection being accessed through NSKeyValueCoding can be manipulated through index accessors (w/ replace) -fails:An ordered collection being accessed through NSKeyValueCoding can be manipulated through index set accessors -fails:An ordered collection being accessed through NSKeyValueCoding can be manipulated through index set accessors (w/ replace) -fails:An unordered collection being accessed through NSKeyValueCoding can be manipulated through object accessors -fails:An unordered collection being accessed through NSKeyValueCoding can be manipulated through set accessors Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2009-12-06 23:58:16 UTC (rev 3077) +++ MacRuby/trunk/vm.cpp 2009-12-07 01:47:17 UTC (rev 3078) @@ -1624,7 +1624,7 @@ // ^#{begin}(.+)#{end}$ -> token const size_t begin_len = strlen(begin); const size_t end_len = strlen(end); - unsigned int token_beg = 0, token_end = 0; + unsigned int token_beg = 0, token_end = selsize; if (begin_len > 0) { if (strncmp(selname, begin, begin_len) != 0 || selsize <= begin_len) { return false; @@ -1646,11 +1646,14 @@ memcpy(token, &selname[token_beg], token_len); token[token_len] = '\0'; +#if 1 // token must start with a capital character. + return isupper(token[0]); +#else + // token must start with a capital character. if (!isupper(token[0])) { return false; } - // Decapitalize the token and look if it's a valid KVO attribute. token[0] = tolower(token[0]); if (strchr(token, ':') != NULL) { @@ -1658,6 +1661,7 @@ } SEL sel = sel_registerName(token); return class_getInstanceMethod(klass, sel) != NULL; +#endif } static inline void

1 0

[3077] MacRuby/trunk/spec/macruby/core/kvc_spec.rb
by source_changes＠macosforge.org 06 Dec '09

06 Dec '09

Revision: 3077 http://trac.macosforge.org/projects/ruby/changeset/3077 Author: neeracher(a)apple.com Date: 2009-12-06 15:58:16 -0800 (Sun, 06 Dec 2009) Log Message: ----------- Refactor unordered classes Modified Paths: -------------- MacRuby/trunk/spec/macruby/core/kvc_spec.rb Modified: MacRuby/trunk/spec/macruby/core/kvc_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/kvc_spec.rb 2009-12-06 23:52:16 UTC (rev 3076) +++ MacRuby/trunk/spec/macruby/core/kvc_spec.rb 2009-12-06 23:58:16 UTC (rev 3077) @@ -107,21 +107,6 @@ end end -def manipulateUnorderedCollection(w) - 3.upto(4) {|n| w.mutableSetValueForKey("kvcUnorderedCollection").addObject(n)} - w.mutableSetValueForKey("kvcUnorderedCollection").addObjectsFromArray([1,2]) - w.mutableSetValueForKey("kvcUnorderedCollection").unionSet(NSSet.setWithArray([5,6])) - w.valueForKey("kvcUnorderedCollection").isEqualToSet(NSSet.setWithArray((1..6).to_a)).should == true - - w.mutableSetValueForKey("kvcUnorderedCollection").removeObject(1) - w.mutableSetValueForKey("kvcUnorderedCollection").intersectSet(NSSet.setWithArray([1,3,4,5,7])) - w.mutableSetValueForKey("kvcUnorderedCollection").minusSet(NSSet.setWithArray([5,7])) - w.valueForKey("kvcUnorderedCollection").isEqualToSet(NSSet.setWithArray([3,4])).should == true - - w.mutableSetValueForKey("kvcUnorderedCollection").removeAllObjects - w.valueForKey("kvcUnorderedCollection").isEqualToSet(NSSet.set).should == true -end - class WholeSetWrapper < SetWrapper def kvcUnorderedCollection @wrapped @@ -132,7 +117,7 @@ end end -class ObjectSetWrapper < SetWrapper +class AccessSetWrapper < SetWrapper def countOfKvcUnorderedCollection @wrapped.count end @@ -144,7 +129,9 @@ def memberOfKvcUnorderedCollection(o) @wrapped.member(o) end +end +class ObjectSetWrapper < AccessSetWrapper def addKvcUnorderedCollectionObject(o) @wrapped.addObject(o) end @@ -154,19 +141,7 @@ end end -class SetSetWrapper < SetWrapper - def countOfKvcUnorderedCollection - @wrapped.count - end - - def enumeratorOfKvcUnorderedCollection - @wrapped.objectEnumerator - end - - def memberOfKvcUnorderedCollection(o) - @wrapped.member(o) - end - +class SetSetWrapper < AccessSetWrapper def addKvcUnorderedCollection(c) @wrapped.unionSet(c) end @@ -180,6 +155,21 @@ end end +def manipulateUnorderedCollection(w) + 3.upto(4) {|n| w.mutableSetValueForKey("kvcUnorderedCollection").addObject(n)} + w.mutableSetValueForKey("kvcUnorderedCollection").addObjectsFromArray([1,2]) + w.mutableSetValueForKey("kvcUnorderedCollection").unionSet(NSSet.setWithArray([5,6])) + w.valueForKey("kvcUnorderedCollection").isEqualToSet(NSSet.setWithArray((1..6).to_a)).should == true + + w.mutableSetValueForKey("kvcUnorderedCollection").removeObject(1) + w.mutableSetValueForKey("kvcUnorderedCollection").intersectSet(NSSet.setWithArray([1,3,4,5,7])) + w.mutableSetValueForKey("kvcUnorderedCollection").minusSet(NSSet.setWithArray([5,7])) + w.valueForKey("kvcUnorderedCollection").isEqualToSet(NSSet.setWithArray([3,4])).should == true + + w.mutableSetValueForKey("kvcUnorderedCollection").removeAllObjects + w.valueForKey("kvcUnorderedCollection").isEqualToSet(NSSet.set).should == true +end + describe "A scalar being accessed through NSKeyValueCoding" do it "can be manipulated" do w = ScalarWrapper.new

1 0

[3076] MacRuby/trunk/spec/macruby
by source_changes＠macosforge.org 06 Dec '09

06 Dec '09

Revision: 3076 http://trac.macosforge.org/projects/ruby/changeset/3076 Author: neeracher(a)apple.com Date: 2009-12-06 15:52:16 -0800 (Sun, 06 Dec 2009) Log Message: ----------- Spec for unordered collections Modified Paths: -------------- MacRuby/trunk/spec/macruby/core/kvc_spec.rb MacRuby/trunk/spec/macruby/tags/macruby/core/kvc_tags.txt Modified: MacRuby/trunk/spec/macruby/core/kvc_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/kvc_spec.rb 2009-12-06 22:17:35 UTC (rev 3075) +++ MacRuby/trunk/spec/macruby/core/kvc_spec.rb 2009-12-06 23:52:16 UTC (rev 3076) @@ -13,84 +13,63 @@ class ArrayWrapper def initialize @wrapped = NSMutableArray.alloc.init - @callLog = Hash.new(0) end - - def logCall(symbol) - @callLog[symbol] += 1 - end - - def callLog - @callLog - end end class WholeArrayWrapper < ArrayWrapper def kvcOrderedCollection - logCall(:kvcOrderedCollection) @wrapped end def setKvcOrderedCollection(newValue) - logCall(:setKvcOrderedCollection) @wrapped = newValue.mutableCopy end end class IndexedArrayWrapper < ArrayWrapper def countOfKvcOrderedCollection - logCall(:countOfKvcOrderedCollection) @wrapped.size end def objectInKvcOrderedCollectionAtIndex(idx) - logCall(:objectInKvcOrderedCollectionAtIndex) @wrapped[idx] end def insertObject(o, inKvcOrderedCollectionAtIndex:idx) - logCall(:insertObjectinKvcOrderedCollectionAtIndex) @wrapped.insertObject(o, atIndex:idx) end def removeObjectFromKvcOrderedCollectionAtIndex(idx) - logCall(:removeObjectFromKvcOrderedCollectionAtIndex) @wrapped.removeObjectAtIndex(idx) end end class RIndexedArrayWrapper < IndexedArrayWrapper def replaceObjectInKvcOrderedCollectionAtIndex(idx, withObject:o) - logCall(:replaceObjectInKvcOrderedCollectionAtIndexWithObject) @wrapped[idx] = o end end class IndexSetArrayWrapper < ArrayWrapper def countOfKvcOrderedCollection - logCall(:countOfKvcOrderedCollection) - @wrapped.size + @wrapped.count end def kvcOrderedCollectionAtIndexes(idx) - logCall(:kvcOrderedCollectionAtIndexes) @wrapped.objectsAtIndexes(idx) end def insertKvcOrderedCollection(o, atIndexes:idx) - logCall(:insertKvcOrderedCollectionAtIndexes) @wrapped.insertObjects(o, atIndexes:idx) end def removeKvcOrderedCollectionAtIndexes(idx) - logCall(:removeKvcOrderedCollectionAtIndexes) @wrapped.removeObjectsAtIndexes(idx) end end class RIndexSetArrayWrapper < IndexSetArrayWrapper def replaceKvcOrderedCollectionAtIndexes(idx, withKvcOrderedCollection:o) - logCall(:replaceKvcOrderedCollectionAtIndexesWithKvcOrderedCollection) @wrapped.replaceObjectsAtIndexes(idx, withObjects:o) end end @@ -122,6 +101,85 @@ w.valueForKey("kvcOrderedCollection").should == [] end +class SetWrapper + def initialize + @wrapped = NSMutableSet.alloc.init + end +end + +def manipulateUnorderedCollection(w) + 3.upto(4) {|n| w.mutableSetValueForKey("kvcUnorderedCollection").addObject(n)} + w.mutableSetValueForKey("kvcUnorderedCollection").addObjectsFromArray([1,2]) + w.mutableSetValueForKey("kvcUnorderedCollection").unionSet(NSSet.setWithArray([5,6])) + w.valueForKey("kvcUnorderedCollection").isEqualToSet(NSSet.setWithArray((1..6).to_a)).should == true + + w.mutableSetValueForKey("kvcUnorderedCollection").removeObject(1) + w.mutableSetValueForKey("kvcUnorderedCollection").intersectSet(NSSet.setWithArray([1,3,4,5,7])) + w.mutableSetValueForKey("kvcUnorderedCollection").minusSet(NSSet.setWithArray([5,7])) + w.valueForKey("kvcUnorderedCollection").isEqualToSet(NSSet.setWithArray([3,4])).should == true + + w.mutableSetValueForKey("kvcUnorderedCollection").removeAllObjects + w.valueForKey("kvcUnorderedCollection").isEqualToSet(NSSet.set).should == true +end + +class WholeSetWrapper < SetWrapper + def kvcUnorderedCollection + @wrapped + end + + def setKvcUnorderedCollection(newValue) + @wrapped = newValue.mutableCopy + end +end + +class ObjectSetWrapper < SetWrapper + def countOfKvcUnorderedCollection + @wrapped.count + end + + def enumeratorOfKvcUnorderedCollection + @wrapped.objectEnumerator + end + + def memberOfKvcUnorderedCollection(o) + @wrapped.member(o) + end + + def addKvcUnorderedCollectionObject(o) + @wrapped.addObject(o) + end + + def removeKvcUnorderedCollectionObject(o) + @wrapped.removeObject(o) + end +end + +class SetSetWrapper < SetWrapper + def countOfKvcUnorderedCollection + @wrapped.count + end + + def enumeratorOfKvcUnorderedCollection + @wrapped.objectEnumerator + end + + def memberOfKvcUnorderedCollection(o) + @wrapped.member(o) + end + + def addKvcUnorderedCollection(c) + @wrapped.unionSet(c) + end + + def removeKvcUnorderedCollection(c) + @wrapped.minusSet(c) + end + + def intersectKvcUnorderedCollection(c) + @wrapped.intersectSet(c) + end +end + describe "A scalar being accessed through NSKeyValueCoding" do it "can be manipulated" do w = ScalarWrapper.new @@ -134,45 +192,42 @@ it "can be manipulated through whole-array accessors" do w = WholeArrayWrapper.new manipulateOrderedCollection(w) - w.callLog[:kvcOrderedCollection].should >= 16 - w.callLog[:setKvcOrderedCollection].should >= 12 end it "can be manipulated through index accessors" do w = IndexedArrayWrapper.new manipulateOrderedCollection(w) - w.callLog[:countOfKvcOrderedCollection].should > 0 - w.callLog[:objectInKvcOrderedCollectionAtIndex].should > 0 - w.callLog[:insertObjectinKvcOrderedCollectionAtIndex].should > 0 - w.callLog[:removeObjectFromKvcOrderedCollectionAtIndex].should > 0 end it "can be manipulated through index accessors (w/ replace)" do w = RIndexedArrayWrapper.new manipulateOrderedCollection(w) - w.callLog[:countOfKvcOrderedCollection].should > 0 - w.callLog[:objectInKvcOrderedCollectionAtIndex].should > 0 - w.callLog[:insertObjectinKvcOrderedCollectionAtIndex].should > 0 - w.callLog[:removeObjectFromKvcOrderedCollectionAtIndex].should > 0 - w.callLog[:replaceObjectInKvcOrderedCollectionAtIndexWithObject].should > 0 end it "can be manipulated through index set accessors" do w = IndexSetArrayWrapper.new manipulateOrderedCollection(w) - w.callLog[:countOfKvcOrderedCollection].should > 0 - w.callLog[:kvcOrderedCollectionAtIndexes].should > 0 - w.callLog[:insertKvcOrderedCollectionAtIndexes].should > 0 - w.callLog[:removeKvcOrderedCollectionAtIndexes].should > 0 end it "can be manipulated through index set accessors (w/ replace)" do w = RIndexSetArrayWrapper.new manipulateOrderedCollection(w) - w.callLog[:countOfKvcOrderedCollection].should > 0 - w.callLog[:kvcOrderedCollectionAtIndexes].should > 0 - w.callLog[:insertKvcOrderedCollectionAtIndexes].should > 0 - w.callLog[:removeKvcOrderedCollectionAtIndexes].should > 0 - w.callLog[:replaceKvcOrderedCollectionAtIndexesWithKvcOrderedCollection].should > 0 end end + +describe "An unordered collection being accessed through NSKeyValueCoding" do + it "can be manipulated through whole-array accessors" do + w = WholeSetWrapper.new + manipulateUnorderedCollection(w) + end + + it "can be manipulated through object accessors" do + w = ObjectSetWrapper.new + manipulateUnorderedCollection(w) + end + + it "can be manipulated through set accessors" do + w = SetSetWrapper.new + manipulateUnorderedCollection(w) + end +end Modified: MacRuby/trunk/spec/macruby/tags/macruby/core/kvc_tags.txt =================================================================== --- MacRuby/trunk/spec/macruby/tags/macruby/core/kvc_tags.txt 2009-12-06 22:17:35 UTC (rev 3075) +++ MacRuby/trunk/spec/macruby/tags/macruby/core/kvc_tags.txt 2009-12-06 23:52:16 UTC (rev 3076) @@ -2,3 +2,5 @@ fails:An ordered collection being accessed through NSKeyValueCoding can be manipulated through index accessors (w/ replace) fails:An ordered collection being accessed through NSKeyValueCoding can be manipulated through index set accessors fails:An ordered collection being accessed through NSKeyValueCoding can be manipulated through index set accessors (w/ replace) +fails:An unordered collection being accessed through NSKeyValueCoding can be manipulated through object accessors +fails:An unordered collection being accessed through NSKeyValueCoding can be manipulated through set accessors

1 0

[3075] MacRuby/trunk/spec/macruby
by source_changes＠macosforge.org 06 Dec '09

06 Dec '09

Revision: 3075 http://trac.macosforge.org/projects/ruby/changeset/3075 Author: neeracher(a)apple.com Date: 2009-12-06 14:17:35 -0800 (Sun, 06 Dec 2009) Log Message: ----------- Spec for ordered collections Added Paths: ----------- MacRuby/trunk/spec/macruby/core/kvc_spec.rb MacRuby/trunk/spec/macruby/tags/macruby/core/kvc_tags.txt Added: MacRuby/trunk/spec/macruby/core/kvc_spec.rb =================================================================== --- MacRuby/trunk/spec/macruby/core/kvc_spec.rb (rev 0) +++ MacRuby/trunk/spec/macruby/core/kvc_spec.rb 2009-12-06 22:17:35 UTC (rev 3075) @@ -0,0 +1,178 @@ +require File.dirname(__FILE__) + "/../spec_helper" + +class ScalarWrapper + def kvcScalar + @wrapped + end + + def setKvcScalar(v) + @wrapped = v + end +end + +class ArrayWrapper + def initialize + @wrapped = NSMutableArray.alloc.init + @callLog = Hash.new(0) + end + + def logCall(symbol) + @callLog[symbol] += 1 + end + + def callLog + @callLog + end +end + +class WholeArrayWrapper < ArrayWrapper + def kvcOrderedCollection + logCall(:kvcOrderedCollection) + @wrapped + end + + def setKvcOrderedCollection(newValue) + logCall(:setKvcOrderedCollection) + @wrapped = newValue.mutableCopy + end +end + +class IndexedArrayWrapper < ArrayWrapper + def countOfKvcOrderedCollection + logCall(:countOfKvcOrderedCollection) + @wrapped.size + end + + def objectInKvcOrderedCollectionAtIndex(idx) + logCall(:objectInKvcOrderedCollectionAtIndex) + @wrapped[idx] + end + + def insertObject(o, inKvcOrderedCollectionAtIndex:idx) + logCall(:insertObjectinKvcOrderedCollectionAtIndex) + @wrapped.insertObject(o, atIndex:idx) + end + + def removeObjectFromKvcOrderedCollectionAtIndex(idx) + logCall(:removeObjectFromKvcOrderedCollectionAtIndex) + @wrapped.removeObjectAtIndex(idx) + end +end + +class RIndexedArrayWrapper < IndexedArrayWrapper + def replaceObjectInKvcOrderedCollectionAtIndex(idx, withObject:o) + logCall(:replaceObjectInKvcOrderedCollectionAtIndexWithObject) + @wrapped[idx] = o + end +end + +class IndexSetArrayWrapper < ArrayWrapper + def countOfKvcOrderedCollection + logCall(:countOfKvcOrderedCollection) + @wrapped.size + end + + def kvcOrderedCollectionAtIndexes(idx) + logCall(:kvcOrderedCollectionAtIndexes) + @wrapped.objectsAtIndexes(idx) + end + + def insertKvcOrderedCollection(o, atIndexes:idx) + logCall(:insertKvcOrderedCollectionAtIndexes) + @wrapped.insertObjects(o, atIndexes:idx) + end + + def removeKvcOrderedCollectionAtIndexes(idx) + logCall(:removeKvcOrderedCollectionAtIndexes) + @wrapped.removeObjectsAtIndexes(idx) + end +end + +class RIndexSetArrayWrapper < IndexSetArrayWrapper + def replaceKvcOrderedCollectionAtIndexes(idx, withKvcOrderedCollection:o) + logCall(:replaceKvcOrderedCollectionAtIndexesWithKvcOrderedCollection) + @wrapped.replaceObjectsAtIndexes(idx, withObjects:o) + end +end + +def manipulateOrderedCollection(w) + 1.upto(2) {|n| w.mutableArrayValueForKey("kvcOrderedCollection").addObject(n)} + w.mutableArrayValueForKey("kvcOrderedCollection").addObjectsFromArray([7,8]) + 4.downto(3) {|n| w.mutableArrayValueForKey("kvcOrderedCollection").insertObject(n, atIndex:2)} + w.mutableArrayValueForKey("kvcOrderedCollection").insertObjects([5,6], + atIndexes:NSIndexSet.indexSetWithIndexesInRange(NSRange.new(4, 2))) + w.valueForKey("kvcOrderedCollection").should == (1..8).to_a + + w.mutableArrayValueForKey("kvcOrderedCollection").replaceObjectAtIndex(1, withObject:20) + w.mutableArrayValueForKey("kvcOrderedCollection").replaceObjectsAtIndexes( + NSIndexSet.indexSetWithIndex(3), withObjects:[40]) + w.mutableArrayValueForKey("kvcOrderedCollection").replaceObjectsInRange( + NSRange.new(5,2), withObjectsFromArray:[60,70]) + w.valueForKey("kvcOrderedCollection").should == [1, 20, 3, 40, 5, 60, 70, 8] + + w.mutableArrayValueForKey("kvcOrderedCollection").removeObjectAtIndex(1) + w.mutableArrayValueForKey("kvcOrderedCollection").removeObjectIdenticalTo(40) + w.mutableArrayValueForKey("kvcOrderedCollection").removeObjectsAtIndexes( + NSIndexSet.indexSetWithIndex(3)) + w.mutableArrayValueForKey("kvcOrderedCollection").removeObjectsInRange( + NSRange.new(3, 1)) + w.valueForKey("kvcOrderedCollection").should == [1, 3, 5, 8] + + w.mutableArrayValueForKey("kvcOrderedCollection").removeAllObjects + w.valueForKey("kvcOrderedCollection").should == [] +end + +describe "A scalar being accessed through NSKeyValueCoding" do + it "can be manipulated" do + w = ScalarWrapper.new + w.setValue(7, forKey:"kvcScalar") + w.valueForKey("kvcScalar").should == 7 + end +end + +describe "An ordered collection being accessed through NSKeyValueCoding" do + it "can be manipulated through whole-array accessors" do + w = WholeArrayWrapper.new + manipulateOrderedCollection(w) + w.callLog[:kvcOrderedCollection].should >= 16 + w.callLog[:setKvcOrderedCollection].should >= 12 + end + + it "can be manipulated through index accessors" do + w = IndexedArrayWrapper.new + manipulateOrderedCollection(w) + w.callLog[:countOfKvcOrderedCollection].should > 0 + w.callLog[:objectInKvcOrderedCollectionAtIndex].should > 0 + w.callLog[:insertObjectinKvcOrderedCollectionAtIndex].should > 0 + w.callLog[:removeObjectFromKvcOrderedCollectionAtIndex].should > 0 + end + + it "can be manipulated through index accessors (w/ replace)" do + w = RIndexedArrayWrapper.new + manipulateOrderedCollection(w) + w.callLog[:countOfKvcOrderedCollection].should > 0 + w.callLog[:objectInKvcOrderedCollectionAtIndex].should > 0 + w.callLog[:insertObjectinKvcOrderedCollectionAtIndex].should > 0 + w.callLog[:removeObjectFromKvcOrderedCollectionAtIndex].should > 0 + w.callLog[:replaceObjectInKvcOrderedCollectionAtIndexWithObject].should > 0 + end + + it "can be manipulated through index set accessors" do + w = IndexSetArrayWrapper.new + manipulateOrderedCollection(w) + w.callLog[:countOfKvcOrderedCollection].should > 0 + w.callLog[:kvcOrderedCollectionAtIndexes].should > 0 + w.callLog[:insertKvcOrderedCollectionAtIndexes].should > 0 + w.callLog[:removeKvcOrderedCollectionAtIndexes].should > 0 + end + + it "can be manipulated through index set accessors (w/ replace)" do + w = RIndexSetArrayWrapper.new + manipulateOrderedCollection(w) + w.callLog[:countOfKvcOrderedCollection].should > 0 + w.callLog[:kvcOrderedCollectionAtIndexes].should > 0 + w.callLog[:insertKvcOrderedCollectionAtIndexes].should > 0 + w.callLog[:removeKvcOrderedCollectionAtIndexes].should > 0 + w.callLog[:replaceKvcOrderedCollectionAtIndexesWithKvcOrderedCollection].should > 0 + end +end Added: MacRuby/trunk/spec/macruby/tags/macruby/core/kvc_tags.txt =================================================================== --- MacRuby/trunk/spec/macruby/tags/macruby/core/kvc_tags.txt (rev 0) +++ MacRuby/trunk/spec/macruby/tags/macruby/core/kvc_tags.txt 2009-12-06 22:17:35 UTC (rev 3075) @@ -0,0 +1,4 @@ +fails:An ordered collection being accessed through NSKeyValueCoding can be manipulated through index accessors +fails:An ordered collection being accessed through NSKeyValueCoding can be manipulated through index accessors (w/ replace) +fails:An ordered collection being accessed through NSKeyValueCoding can be manipulated through index set accessors +fails:An ordered collection being accessed through NSKeyValueCoding can be manipulated through index set accessors (w/ replace)

1 0

[3074] MacRuby/trunk/vm.cpp
by source_changes＠macosforge.org 04 Dec '09

04 Dec '09

Revision: 3074 http://trac.macosforge.org/projects/ruby/changeset/3074 Author: emoy(a)apple.com Date: 2009-12-03 18:40:54 -0800 (Thu, 03 Dec 2009) Log Message: ----------- Fix crash: macruby -e 'NSArray.arrayWithObject("a").addObject("b")' due to backtrace failing, and returning Qnil, which was previous passed to RSTRING_PTR. Modified Paths: -------------- MacRuby/trunk/vm.cpp Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2009-12-03 11:07:07 UTC (rev 3073) +++ MacRuby/trunk/vm.cpp 2009-12-04 02:40:54 UTC (rev 3074) @@ -3573,7 +3573,7 @@ VALUE bt = rb_vm_call(exc, sel_registerName("backtrace"), 0, NULL, false); - const long count = RARRAY_LEN(bt); + const long count = (bt != Qnil ? RARRAY_LEN(bt) : 0); if (count > 0) { for (long i = 0; i < count; i++) { const char *bte = RSTRING_PTR(RARRAY_AT(bt, i));

1 0

[3073] MacRuby/trunk/sample-macruby/Scripts/search_to_pdf.rb
by source_changes＠macosforge.org 03 Dec '09

03 Dec '09

Revision: 3073 http://trac.macosforge.org/projects/ruby/changeset/3073 Author: mattaimonetti(a)gmail.com Date: 2009-12-03 03:07:07 -0800 (Thu, 03 Dec 2009) Log Message: ----------- added a script example that fetches some google results and capture them in PDF format Added Paths: ----------- MacRuby/trunk/sample-macruby/Scripts/search_to_pdf.rb Added: MacRuby/trunk/sample-macruby/Scripts/search_to_pdf.rb =================================================================== --- MacRuby/trunk/sample-macruby/Scripts/search_to_pdf.rb (rev 0) +++ MacRuby/trunk/sample-macruby/Scripts/search_to_pdf.rb 2009-12-03 11:07:07 UTC (rev 3073) @@ -0,0 +1,145 @@ +#!/usr/local/bin/macruby + +# Copyright (c) 2009 Matt Aimonetti +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. + +# example script that fetches the top 5 results from google and capture the pages in PDF format. +# inspired by http://github.com/tomafro/macruby-snapper +# +# usage: +# $ ./search_to_pdf.rb "Matt Aimonetti" + +framework 'Cocoa' +framework 'WebKit' + +require 'json' +require 'net/http' +require 'uri' +require 'cgi' + +class Application + + def initialize + NSApplication.sharedApplication.delegate = self + end + + def urls_for(keyword) + search_url = "http://ajax.googleapis.com/ajax/services/search/web?v=1.0&maxResults=10&q=#…" + raw_results = Net::HTTP.get(URI.parse(search_url)) + results = JSON.parse(raw_results) + results['responseData']['results'].map{|r| r['url']} + end + + def capture(url) + view = BrowserView.new + puts "capturing #{url}" + start_time = Time.now + view.fetch(url) + while !view.captured? + if timed_out?(start_time) + puts "Request timed out... moving on!" + break + else + NSRunLoop.currentRunLoop.runUntilDate NSDate.date + end + end + end + + def timed_out?(start_time) + (Time.now.to_i - start_time.to_i) > 30 + end + +end + +class BrowserView + attr_accessor :view, :config, :url + + def initialize + @view = WebView.alloc.initWithFrame([0, 0, 1024, 768]) + @captured = false + window = NSWindow.alloc.initWithContentRect([0, 0, 1024, 768], + styleMask:NSBorderlessWindowMask, + backing:NSBackingStoreBuffered, + defer:false) + + window.contentView = view + # Use the screen stylesheet, rather than the print one. + view.mediaStyle = 'screen' + view.customUserAgent = 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_2; en-us) AppleWebKit/531.21.8 (KHTML, like Gecko) Version/4.0.4 Safari/531.21.10' + # Make sure we don't save any of the prefs that we change. + view.preferences.autosaves = false + # Set some useful options. + view.preferences.shouldPrintBackgrounds = true + view.preferences.javaScriptCanOpenWindowsAutomatically = false + view.preferences.allowsAnimatedImages = false + # Make sure we don't get a scroll bar. + view.mainFrame.frameView.allowsScrolling = false + view.frameLoadDelegate = self + end + + def captured? + @captured + end + + def fetch(url) + @url = url + page_url = NSURL.URLWithString(url) + view.mainFrame.loadRequest NSURLRequest.requestWithURL(page_url) + end + + def webView(view, didFinishLoadForFrame:frame) + save + end + + def webView(view, didFailLoadWithError:error, forFrame:frame) + puts "Failed to take snapshot: #{error.localizedDescription}" + NSApplication.sharedApplication.terminate nil + end + + def webView(view, didFailProvisionalLoadWithError:error, forFrame:frame) + puts "Failed to take snapshot: #{error.localizedDescription}" + NSApplication.sharedApplication.terminate nil + end + + def save + filename = url.gsub('http://', '').gsub('/', '-') + '.pdf' + filepath = File.expand_path("#{File.dirname(__FILE__)}/#{filename}") + puts "saving #{filepath}" + docView = view.mainFrame.frameView.documentView + width = docView.bounds.size.width + height = docView.bounds.size.height + docView.window.contentSize = [width, height] + docView.frame = view.bounds + docView.needsDisplay = true + docView.displayIfNeeded + docView.lockFocus + docView.dataWithPDFInsideRect(docView.bounds).writeToFile(filepath, atomically:true) + @captured = true + docView.unlockFocus + end + +end + +keyword = ARGV.shift || "MacRuby" +app = Application.new +app.urls_for(keyword).each do |url| + app.capture(url) +end +NSApplication.sharedApplication.terminate(nil) \ No newline at end of file Property changes on: MacRuby/trunk/sample-macruby/Scripts/search_to_pdf.rb ___________________________________________________________________ Added: svn:executable + *

1 0

[3072] MacRuby/trunk/string.c
by source_changes＠macosforge.org 02 Dec '09

02 Dec '09

Revision: 3072 http://trac.macosforge.org/projects/ruby/changeset/3072 Author: psychs(a)limechat.net Date: 2009-12-02 14:31:07 -0800 (Wed, 02 Dec 2009) Log Message: ----------- str.split('') should split into characters Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2009-12-02 02:25:59 UTC (rev 3071) +++ MacRuby/trunk/string.c 2009-12-02 22:31:07 UTC (rev 3072) @@ -3578,16 +3578,39 @@ if (awk_split || spat_string) { CFRange search_range; CFCharacterSetRef charset = NULL; + long spat_len = 0; if (spat == Qnil) { charset = CFCharacterSetGetPredefined( kCFCharacterSetWhitespaceAndNewline); } + else { + spat_len = RSTRING_LEN(spat); + } search_range = CFRangeMake(0, clen); do { CFRange result_range; CFRange substr_range; if (spat != Qnil) { - if (!CFStringFindWithOptions((CFStringRef)str, + if (spat_len == 0) { + if (search_range.location + 1 < clen && search_range.length > 0) { + result_range.location = search_range.location + 1; + result_range.length = 0; + UniChar c = CFStringGetCharacterAtIndex((CFStringRef)str, + search_range.location); + if (CFStringIsSurrogateHighCharacter(c)) { + if (result_range.location + 1 < clen) { + ++result_range.location; + } + else { + break; + } + } + } + else { + break; + } + } + else if (!CFStringFindWithOptions((CFStringRef)str, (CFStringRef)spat, search_range, 0,

1 0

[3071] MacRuby/trunk/vm.cpp
by source_changes＠macosforge.org 02 Dec '09

02 Dec '09

Revision: 3071 http://trac.macosforge.org/projects/ruby/changeset/3071 Author: lsansonetti(a)apple.com Date: 2009-12-01 18:25:59 -0800 (Tue, 01 Dec 2009) Log Message: ----------- <rdar://problem/7319776> Insert into KVO array member fails Modified Paths: -------------- MacRuby/trunk/vm.cpp Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2009-12-01 21:36:04 UTC (rev 3070) +++ MacRuby/trunk/vm.cpp 2009-12-02 02:25:59 UTC (rev 3071) @@ -1617,6 +1617,49 @@ } } +static bool +kvo_sel(Class klass, const char *selname, const size_t selsize, + const char *begin, const char *end) +{ + // ^#{begin}(.+)#{end}$ -> token + const size_t begin_len = strlen(begin); + const size_t end_len = strlen(end); + unsigned int token_beg = 0, token_end = 0; + if (begin_len > 0) { + if (strncmp(selname, begin, begin_len) != 0 || selsize <= begin_len) { + return false; + } + token_beg = begin_len; + } + if (end_len > 0) { + const char *p = strstr(selname, end); + if (p == NULL || p + end_len != selname + selsize) { + return false; + } + token_end = p - selname; + } + const size_t token_len = token_end - token_beg; + char token[100]; + if (token_len > sizeof(token)) { + return false; + } + memcpy(token, &selname[token_beg], token_len); + token[token_len] = '\0'; + + // token must start with a capital character. + if (!isupper(token[0])) { + return false; + } + + // Decapitalize the token and look if it's a valid KVO attribute. + token[0] = tolower(token[0]); + if (strchr(token, ':') != NULL) { + return false; + } + SEL sel = sel_registerName(token); + return class_getInstanceMethod(klass, sel) != NULL; +} + static inline void resolve_method_type(char *buf, const size_t buflen, Class klass, Method m, SEL sel, const unsigned int oc_arity) @@ -1642,17 +1685,47 @@ } } else { - // Generate an automatic signature, using 'id' (@) for all - // arguments. If the method name starts by 'set', we use 'void' - // (v) for the return value, otherwise we use 'id' (@). - assert(oc_arity < buflen); - buf[0] = strncmp(sel_getName(sel), "set", 3) == 0 ? 'v' : '@'; - buf[1] = '@'; - buf[2] = ':'; - for (unsigned int i = 3; i < oc_arity; i++) { - buf[i] = '@'; + // Generate an automatic signature. We do check for KVO selectors + // which require a customized signature, otherwise we do generate + // one that assumes that the return value and all arguments are + // objects ('@'). + const char *selname = sel_getName(sel); + const size_t selsize = strlen(selname); + + if (kvo_sel(klass, selname, selsize, "countOf", "")) { + strncpy(buf, "i@:", buflen); } - buf[oc_arity] = '\0'; + else if (kvo_sel(klass, selname, selsize, "objectIn", "AtIndex:")) { + strncpy(buf, "@@:i", buflen); + } + else if (kvo_sel(klass, selname, selsize, "insertObject:in", + "AtIndex:")) { + strncpy(buf, "v@:@i", buflen); + } + else if (kvo_sel(klass, selname, selsize, "removeObjectFrom", + "AtIndex:")) { + strncpy(buf, "v@:i", buflen); + } + else if (kvo_sel(klass, selname, selsize, "replaceObjectIn", + "AtIndex:withObject:")) { + strncpy(buf, "v@:i@", buflen); + + } +#if 0 // TODO + else if (kvo_sel(klass, selname, selsize, "get", ":range:")) { + } +#endif + else { + assert(oc_arity < buflen); + + buf[0] = strncmp(selname, "set", 3) == 0 ? 'v' : '@'; + buf[1] = '@'; + buf[2] = ':'; + for (unsigned int i = 3; i < oc_arity; i++) { + buf[i] = '@'; + } + buf[oc_arity] = '\0'; + } } } else {

1 0