April 2010 - macruby-changes - lists.macosforge.org

[3987] ControlTower/branches/gcd-ify
by source_changes＠macosforge.org 30 Apr '10

30 Apr '10

Revision: 3987 http://trac.macosforge.org/projects/ruby/changeset/3987 Author: joshua.ballanco(a)apple.com Date: 2010-04-30 10:26:10 -0700 (Fri, 30 Apr 2010) Log Message: ----------- Added parser ragel file and updated HACKING Modified Paths: -------------- ControlTower/branches/gcd-ify/HACKING.rdoc Added Paths: ----------- ControlTower/branches/gcd-ify/ext/CTParser/http11_parser.rl Modified: ControlTower/branches/gcd-ify/HACKING.rdoc =================================================================== --- ControlTower/branches/gcd-ify/HACKING.rdoc 2010-04-30 10:03:14 UTC (rev 3986) +++ ControlTower/branches/gcd-ify/HACKING.rdoc 2010-04-30 17:26:10 UTC (rev 3987) @@ -7,6 +7,19 @@ developer's list at <macruby-devel(a)lists.macosforge.org>. You can also find more information at the MacRuby website (http://www.macruby.org/) + +== CAUTION! AVERTISSEMENT! VOORZICHTIG! 注意! + +DO NOT EDIT http11_parser.c! THIS FILE IS MACHINE GENERATED CODE. +NE PAS http11_parser.c EDIT! Ce fichier est code machine généré. +EDIT http11_parser.c NIET! Dit bestand wordt MACHINE gegenereerde code. +編集しないのhttp11_parser.c！このファイルを機械生成されたコードです。 + +If you really must, you can recreate http11_parser.c from http11_parser.rl using +Ragel (not included). It would also be acceptable to replace the parser all at +once, but editing it is not likely to ever be a good idea. + + === Debugging ==== Environment variables Added: ControlTower/branches/gcd-ify/ext/CTParser/http11_parser.rl =================================================================== --- ControlTower/branches/gcd-ify/ext/CTParser/http11_parser.rl (rev 0) +++ ControlTower/branches/gcd-ify/ext/CTParser/http11_parser.rl 2010-04-30 17:26:10 UTC (rev 3987) @@ -0,0 +1,157 @@ +/** + * Copyright (c) 2005 Zed A. Shaw + * You can redistribute it and/or modify it under the same terms as Ruby. + */ +#include "parser.h" +#include <stdio.h> +#include <assert.h> +#include <stdlib.h> +#include <ctype.h> +#include <string.h> + +#define LEN(AT, FPC) (FPC - buffer - parser->AT) +#define MARK(M,FPC) (parser->M = (FPC) - buffer) +#define PTR_TO(F) (buffer + parser->F) + +/** Machine **/ + +%%{ + + machine http_parser; + + action mark {MARK(mark, fpc); } + + + action start_field { MARK(field_start, fpc); } + action write_field { + parser->field_len = LEN(field_start, fpc); + } + + action start_value { MARK(mark, fpc); } + action write_value { + if (parser->http_field != NULL) { + parser->http_field(parser->data, PTR_TO(field_start), parser->field_len, PTR_TO(mark), LEN(mark, fpc)); + } + } + action request_method { + if (parser->request_method != NULL) { + parser->request_method(parser->data, PTR_TO(mark), LEN(mark, fpc)); + } + } + action request_uri { + if (parser->request_uri != NULL) { + parser->request_uri(parser->data, PTR_TO(mark), LEN(mark, fpc)); + } + } + action fragment { + if (parser->fragment != NULL) { + parser->fragment(parser->data, PTR_TO(mark), LEN(mark, fpc)); + } + } + + action start_query {MARK(query_start, fpc); } + action query_string { + if (parser->query_string != NULL) { + parser->query_string(parser->data, PTR_TO(query_start), LEN(query_start, fpc)); + } + } + + action http_version { + if (parser->http_version != NULL) { + parser->http_version(parser->data, PTR_TO(mark), LEN(mark, fpc)); + } + } + + action request_path { + if (parser->request_path != NULL) { + parser->request_path(parser->data, PTR_TO(mark), LEN(mark,fpc)); + } + } + + action done { + parser->body_start = fpc - buffer + 1; + if (parser->header_done != NULL) { + parser->header_done(parser->data, fpc + 1, pe - fpc - 1); + } + fbreak; + } + + include http_parser_common "common.rl"; + +}%% + +/** Data **/ +%% write data; + +int thin_http_parser_init(http_parser *parser) { + int cs = 0; + %% write init; + parser->cs = cs; + parser->body_start = 0; + parser->content_len = 0; + parser->mark = 0; + parser->nread = 0; + parser->field_len = 0; + parser->field_start = 0; + + return(1); +} + + +/** exec **/ +size_t thin_http_parser_execute(http_parser *parser, const char *buffer, size_t len, size_t off) { + const char *p, *pe; + int cs = parser->cs; + + assert(off <= len && "offset past end of buffer"); + + p = buffer+off; + pe = buffer+len; + + assert(*pe == '\0' && "pointer does not end on NUL"); + assert(pe - p == len - off && "pointers aren't same distance"); + + + %% write exec; + + parser->cs = cs; + parser->nread += p - (buffer + off); + + assert(p <= pe && "buffer overflow after parsing execute"); + assert(parser->nread <= len && "nread longer than length"); + assert(parser->body_start <= len && "body starts after buffer end"); + assert(parser->mark < len && "mark is after buffer end"); + assert(parser->field_len <= len && "field has length longer than whole buffer"); + assert(parser->field_start < len && "field starts after buffer end"); + + if(parser->body_start) { + /* final \r\n combo encountered so stop right here */ + parser->nread++; + } + + return(parser->nread); +} + +int thin_http_parser_finish(http_parser *parser) +{ + int cs = parser->cs; + + + parser->cs = cs; + + if (thin_http_parser_has_error(parser) ) { + return -1; + } else if (thin_http_parser_is_finished(parser) ) { + return 1; + } else { + return 0; + } +} + +int thin_http_parser_has_error(http_parser *parser) { + return parser->cs == http_parser_error; +} + +int thin_http_parser_is_finished(http_parser *parser) { + return parser->cs == http_parser_first_final; +}

1 0

[3986] ControlTower/branches/gcd-ify/HACKING.rdoc
by source_changes＠macosforge.org 30 Apr '10

30 Apr '10

Revision: 3986 http://trac.macosforge.org/projects/ruby/changeset/3986 Author: joshua.ballanco(a)apple.com Date: 2010-04-30 03:03:14 -0700 (Fri, 30 Apr 2010) Log Message: ----------- Added two known issues to HACKING Modified Paths: -------------- ControlTower/branches/gcd-ify/HACKING.rdoc Modified: ControlTower/branches/gcd-ify/HACKING.rdoc =================================================================== --- ControlTower/branches/gcd-ify/HACKING.rdoc 2010-04-30 09:57:24 UTC (rev 3985) +++ ControlTower/branches/gcd-ify/HACKING.rdoc 2010-04-30 10:03:14 UTC (rev 3986) @@ -15,3 +15,16 @@ Control Tower: * CT_DEBUG: This will turn on debug logging until we get a better logger. + +=== Known Issues + +* Error compiling Regular Expression in Rack::Request + Workaround: Modify line 150 in rack/request.rb like so +- form_vars.sub!(/\0\z/, '') ++ form_vars.slice!(-1) if form_vars[-1] == "\0" + +* Problem with Sinatra > 1.0 using Rack.release + Workaround: Modify line 39 in sinatra/base.rb like so +- if Rack.release < '1.1' ++ if Rack.version < '1.1' +

1 0

[3985] ControlTower/branches/gcd-ify
by source_changes＠macosforge.org 30 Apr '10

30 Apr '10

Revision: 3985 http://trac.macosforge.org/projects/ruby/changeset/3985 Author: joshua.ballanco(a)apple.com Date: 2010-04-30 02:57:24 -0700 (Fri, 30 Apr 2010) Log Message: ----------- Add a HACKING.rdoc Modified Paths: -------------- ControlTower/branches/gcd-ify/ext/CTParser/CTParser.m Added Paths: ----------- ControlTower/branches/gcd-ify/HACKING.rdoc Removed Paths: ------------- ControlTower/branches/gcd-ify/README Added: ControlTower/branches/gcd-ify/HACKING.rdoc =================================================================== --- ControlTower/branches/gcd-ify/HACKING.rdoc (rev 0) +++ ControlTower/branches/gcd-ify/HACKING.rdoc 2010-04-30 09:57:24 UTC (rev 3985) @@ -0,0 +1,17 @@ +== Hacking Control Tower + +Control Tower is still in very early development. It is being developed as part +of the MacRuby project, so be sure to familiarize yourself with MacRuby's +HACKING.rdoc, as all guidelines there apply here as well. If you have any ideas +or suggestions for improvements, please communicate them with the MacRuby +developer's list at <macruby-devel(a)lists.macosforge.org>. You can also find more +information at the MacRuby website (http://www.macruby.org/) + +=== Debugging + +==== Environment variables + +Currently, there is only one environment variable specifically for debugging +Control Tower: + +* CT_DEBUG: This will turn on debug logging until we get a better logger. Deleted: ControlTower/branches/gcd-ify/README =================================================================== --- ControlTower/branches/gcd-ify/README 2010-04-30 09:57:20 UTC (rev 3984) +++ ControlTower/branches/gcd-ify/README 2010-04-30 09:57:24 UTC (rev 3985) @@ -1,31 +0,0 @@ -== Control Tower -Control Tower is a web application server for Rack-based MacRuby applications based on Apple's Grand Central Dispatch libraries. - -It is composed of three major components: A Grand Central Dispatch based networking layer, the Mongrel HTTP parser, and Rack web -application interface. It is currently very much a work in progress! - -=== Installation -From the root directory of the project, run: - - $ rake package - $ sudo macgem install pkg/control_tower-0.1-universal-darwin-10.gem - -=== Usage -There are currently only 4 supported command line options: - -* -R <rackup_config.ru> : Where you specify the Rackup config file to run -* -h <hostname> : Hostname for the server (Control Tower will only respond to requests to this host) -* -p <port> : Port # for the server -* -c : Use this to enable serving requests to a GCD concurrent queue - -=== License -Control Tower is covered by the Ruby license. See COPYING for more details. - -=== Credits -Control Tower's parser was stolen Thin which stole it from Mongrel (http://mongrel.rubyforge.org) originially written by Zed Shaw. -Mongrel Web Server (Mongrel) is copyrighted free software by Zed A. Shaw <zedshaw at zedshaw dot com> You can redistribute it and/or -modify it under the terms of the GPL. - -Thin is copyright Marc-Andre Cournoyer <macournoyer(a)gmail.com> - -Control Tower is copyright (c) 2009-2010, Apple Inc Modified: ControlTower/branches/gcd-ify/ext/CTParser/CTParser.m =================================================================== --- ControlTower/branches/gcd-ify/ext/CTParser/CTParser.m 2010-04-30 09:57:20 UTC (rev 3984) +++ ControlTower/branches/gcd-ify/ext/CTParser/CTParser.m 2010-04-30 09:57:24 UTC (rev 3985) @@ -81,7 +81,8 @@ if (colon_pos.location != NSNotFound) { serverName = [hostString substringToIndex:colon_pos.location]; serverPort = [hostString substringFromIndex:(colon_pos.location + 1)]; - } else { + } + else { serverName = [NSString stringWithString:hostString]; serverPort = @"80"; } @@ -104,7 +105,8 @@ NSMutableString *body = [environment objectForKey:@"rack.input"]; if (body != nil) { [body appendString:[[NSString alloc] initWithBytes:at length:length encoding:NSASCIIStringEncoding]]; - } else { + } + else { NSLog(@"Hmm...you seem to have body data but no where to put it. That's probably an error."); }

1 0

[3984] ControlTower/branches/gcd-ify/TODO
by source_changes＠macosforge.org 30 Apr '10

30 Apr '10

Revision: 3984 http://trac.macosforge.org/projects/ruby/changeset/3984 Author: joshua.ballanco(a)apple.com Date: 2010-04-30 02:57:20 -0700 (Fri, 30 Apr 2010) Log Message: ----------- Added a TODO Added Paths: ----------- ControlTower/branches/gcd-ify/TODO Added: ControlTower/branches/gcd-ify/TODO =================================================================== --- ControlTower/branches/gcd-ify/TODO (rev 0) +++ ControlTower/branches/gcd-ify/TODO 2010-04-30 09:57:20 UTC (rev 3984) @@ -0,0 +1,20 @@ +For 0.1: + +[ ] Logging! + [ ] An ASL-based Logger class + [ ] Request logging (e.g. appache_access.log) + [ ] Error logging (e.g. appache_error.log) + [ ] Debug logging +[ ] Testing! + [ ] Parser test cases + [ ] GET test cases + [ ] POST test cases + [ ] Concurrency testing +[ ] Handle broken request pipes +[ ] Don't reset peer connections +[ ] Protect against malformed Content-Length in headers + +For future: + +[ ] Improve body loading +[ ] Fully-async file upload

1 0

[3983] ControlTower/branches/gcd-ify
by source_changes＠macosforge.org 30 Apr '10

30 Apr '10

Revision: 3983 http://trac.macosforge.org/projects/ruby/changeset/3983 Author: joshua.ballanco(a)apple.com Date: 2010-04-30 02:57:17 -0700 (Fri, 30 Apr 2010) Log Message: ----------- Updated the README Modified Paths: -------------- ControlTower/branches/gcd-ify/README Added Paths: ----------- ControlTower/branches/gcd-ify/README.rdoc Modified: ControlTower/branches/gcd-ify/README =================================================================== --- ControlTower/branches/gcd-ify/README 2010-04-30 08:16:30 UTC (rev 3982) +++ ControlTower/branches/gcd-ify/README 2010-04-30 09:57:17 UTC (rev 3983) @@ -1,9 +1,31 @@ -Control Tower +== Control Tower +Control Tower is a web application server for Rack-based MacRuby applications based on Apple's Grand Central Dispatch libraries. -Copyright (c) 2009-2010, Apple Inc -Author: Joshua Ballanco +It is composed of three major components: A Grand Central Dispatch based networking layer, the Mongrel HTTP parser, and Rack web +application interface. It is currently very much a work in progress! -SYNOPSIS -Control Tower is a Web application server for Rack-based Ruby applications. It -is (or will be) composed of three major components: a networking layer, an HTTP -parser, and a Rack interface. +=== Installation +From the root directory of the project, run: + + $ rake package + $ sudo macgem install pkg/control_tower-0.1-universal-darwin-10.gem + +=== Usage +There are currently only 4 supported command line options: + +* -R <rackup_config.ru> : Where you specify the Rackup config file to run +* -h <hostname> : Hostname for the server (Control Tower will only respond to requests to this host) +* -p <port> : Port # for the server +* -c : Use this to enable serving requests to a GCD concurrent queue + +=== License +Control Tower is covered by the Ruby license. See COPYING for more details. + +=== Credits +Control Tower's parser was stolen Thin which stole it from Mongrel (http://mongrel.rubyforge.org) originially written by Zed Shaw. +Mongrel Web Server (Mongrel) is copyrighted free software by Zed A. Shaw <zedshaw at zedshaw dot com> You can redistribute it and/or +modify it under the terms of the GPL. + +Thin is copyright Marc-Andre Cournoyer <macournoyer(a)gmail.com> + +Control Tower is copyright (c) 2009-2010, Apple Inc Added: ControlTower/branches/gcd-ify/README.rdoc =================================================================== --- ControlTower/branches/gcd-ify/README.rdoc (rev 0) +++ ControlTower/branches/gcd-ify/README.rdoc 2010-04-30 09:57:17 UTC (rev 3983) @@ -0,0 +1,31 @@ +== Control Tower +Control Tower is a web application server for Rack-based MacRuby applications based on Apple's Grand Central Dispatch libraries. + +It is composed of three major components: A Grand Central Dispatch based networking layer, the Mongrel HTTP parser, and Rack web +application interface. It is currently very much a work in progress! + +=== Installation +From the root directory of the project, run: + + $ rake package + $ sudo macgem install pkg/control_tower-0.1-universal-darwin-10.gem + +=== Usage +There are currently only 4 supported command line options: + +* -R <rackup_config.ru> : Where you specify the Rackup config file to run +* -h <hostname> : Hostname for the server (Control Tower will only respond to requests to this host) +* -p <port> : Port # for the server +* -c : Use this to enable serving requests to a GCD concurrent queue + +=== License +Control Tower is covered by the Ruby license. See COPYING for more details. + +=== Credits +Control Tower's parser was stolen Thin which stole it from Mongrel (http://mongrel.rubyforge.org) originially written by Zed Shaw. +Mongrel Web Server (Mongrel) is copyrighted free software by Zed A. Shaw <zedshaw at zedshaw dot com> You can redistribute it and/or +modify it under the terms of the GPL. + +Thin is copyright Marc-Andre Cournoyer <macournoyer(a)gmail.com> + +Control Tower is copyright (c) 2009-2010, Apple Inc

1 0

[3982] ControlTower/branches/gcd-ify
by source_changes＠macosforge.org 30 Apr '10

30 Apr '10

Revision: 3982 http://trac.macosforge.org/projects/ruby/changeset/3982 Author: joshua.ballanco(a)apple.com Date: 2010-04-30 01:16:30 -0700 (Fri, 30 Apr 2010) Log Message: ----------- Initial check-in of the GCD work Modified Paths: -------------- ControlTower/branches/gcd-ify/bin/control_tower ControlTower/branches/gcd-ify/lib/control_tower/rack_socket.rb Modified: ControlTower/branches/gcd-ify/bin/control_tower =================================================================== --- ControlTower/branches/gcd-ify/bin/control_tower 2010-04-30 05:25:10 UTC (rev 3981) +++ ControlTower/branches/gcd-ify/bin/control_tower 2010-04-30 08:16:30 UTC (rev 3982) @@ -9,7 +9,8 @@ @options = { :rackup => './config.ru', :port => '8080', - :host => 'localhost' + :host => 'localhost', + :concurrent => false } OptionParser.new do |opts| @@ -25,7 +26,7 @@ @options[:host] = host end - opts.on("-c", "--[no]-concurrency", "Handle requests concurrently") do |concurrent| + opts.on("-c", "--[no-]concurrency", "Handle requests concurrently") do |concurrent| @options[:concurrent] = concurrent end end.parse! @@ -35,11 +36,6 @@ exit 1 end -unless File.exist? File.expand_path(@options[:rackup]) - puts "We only know how to deal with Rack-up configs for now" - exit 1 -end - # Under construction...everything is development! ENV['RACK_ENV'] = 'development' Modified: ControlTower/branches/gcd-ify/lib/control_tower/rack_socket.rb =================================================================== --- ControlTower/branches/gcd-ify/lib/control_tower/rack_socket.rb 2010-04-30 05:25:10 UTC (rev 3981) +++ ControlTower/branches/gcd-ify/lib/control_tower/rack_socket.rb 2010-04-30 08:16:30 UTC (rev 3982) @@ -5,52 +5,49 @@ module ControlTower class RackSocket - READ_SIZE = 16 * 1024 - RACK_VERSION = 'rack.version'.freeze VERSION = [1,0].freeze def initialize(host, port, server, concurrent) @server = server @socket = TCPServer.new(host, port) @status = :closed # Start closed and give the server time to start - prepare_environment + @concurrent = concurrent - #if concurrent - # @env['rack.multithread'] = true - # @request_queue = Dispatch::Queue.concurrent - #else - # @env['rack.multithread'] = false - # @request_queue = Dispatch::Queue.new('com.apple.ControlTower.rack_socket_queue') - #end - #@request_group = Dispatch::Group.new + if @concurrent + @request_queue = Dispatch::Queue.concurrent + $stdout.puts "Caution: Wake turbulance! Heavy landing on parallel runway." + else + @request_queue = Dispatch::Queue.new('com.apple.ControlTower.rack_socket_queue') + end + @request_group = Dispatch::Group.new end def open @status = :open while (@status == :open) connection = @socket.accept + $stderr.puts "Got a connection: #{connection}(fd:#{connection.to_i})" if ENV['CT_DEBUG'] - # TODO -- Concurrency doesn't quite work yet... - #@request_group.dispatch(@request_queue) do - req_data = parse!(connection, prepare_environment) - data = @server.handle_request(req_data) - data.each do |chunk| - connection.write chunk + @request_queue.async(@request_group) do + parse!(connection, prepare_environment) do |env| + response = @server.handle_request(env) + response.each do |chunk| + connection.write chunk + end end - connection.close - #end + end end end def close - @status = :close + @status = :closed # You get 30 seconds to empty the request queue and get outa here! Dispatch::Source.timer(30, 0, 1, Dispatch::Queue.concurrent) do puts "Timed out waiting for connections to close" exit 1 end - #(a)request_group.wait + @request_group.wait @socket.close end @@ -60,43 +57,51 @@ def prepare_environment { 'rack.errors' => $stderr, 'rack.input' => '', - 'rack.multiprocess' => false, # No multiprocess, yet...probably never + 'rack.multiprocess' => false, # No multiprocess, yet...possibly never 'rack.run_once' => false, - RACK_VERSION => VERSION } + 'rack.multithread' => @concurrent ? true : false, + 'rack.version' => VERSION } end - def parse!(connection, env) + def parse!(connection, env, &block) + connection_queue = Dispatch::Queue.new('com.apple.ControlTower.connection_queue') parser = ::CTParser.new data = "" - headers_done = false + parsing_headers = true content_length = 0 - while (!headers_done || env['rack.input'].bytesize < content_length) do - select([connection], nil, nil, 1) - if headers_done - begin - data = connection.readpartial(READ_SIZE) - env['rack.input'] << data - rescue EOFError - break + Dispatch::Source.new(Dispatch::Source::READ, connection, 0, connection_queue) do |source| + $stderr.puts "#{source.data} bytes incoming" if ENV['CT_DEBUG'] + begin + if parsing_headers + $stderr.puts "Parsing headers..." if ENV['CT_DEBUG'] + data << connection.readpartial(source.data) + nread = parser.parseData(data, forEnvironment: env, startingAt: nread) + if parser.finished + parsing_headers = false + $stderr.puts "Headers done! Content-Length: #{env['CONTENT_LENGTH']}" if ENV['CT_DEBUG'] + content_length = env['CONTENT_LENGTH'].to_i + end + else + $stderr.puts "Reading body" if ENV['CT_DEBUG'] + env['rack.input'] << connection.readpartial(source.data) end - else - data << connection.readpartial(READ_SIZE) - nread = parser.parseData(data, forEnvironment: env, startingAt: nread) - if parser.finished - headers_done = true - content_length = env['CONTENT_LENGTH'].to_i - end + rescue EOFError + content_length = env['rack.input'].bytesize end + + $stderr.puts "Input Length: #{env['rack.input'].bytesize}, Content-Length: #{content_length}" if ENV['CT_DEBUG'] + unless parsing_headers || env['rack.input'].bytesize < content_length + # Rack says "Make that a IO!" + body = Tempfile.new('control-tower-request-body-') + body << env['rack.input'] + body.rewind + env['rack.input'] = body + block.call(env) + $stderr.puts "All done. Canceling source for #{source.handle}(fd:#{source.handle.to_i})" if ENV['CT_DEBUG'] + source.cancel! + end end - - # Rack says "Make that a StringIO!" - body = Tempfile.new('control-tower-request-body-') - body << env['rack.input'] - body.rewind - env['rack.input'] = body - # Returning what we've got... - return env end end end

1 0

[3981] ControlTower/branches/gcd-ify/
by source_changes＠macosforge.org 30 Apr '10

30 Apr '10

Revision: 3981 http://trac.macosforge.org/projects/ruby/changeset/3981 Author: joshua.ballanco(a)apple.com Date: 2010-04-29 22:25:10 -0700 (Thu, 29 Apr 2010) Log Message: ----------- Getting ready to drop in GCD improvements Added Paths: ----------- ControlTower/branches/gcd-ify/

1 0

[3980] MacRuby
by source_changes＠macosforge.org 30 Apr '10

30 Apr '10

Revision: 3980 http://trac.macosforge.org/projects/ruby/changeset/3980 Author: martinlagardette(a)apple.com Date: 2010-04-29 17:06:24 -0700 (Thu, 29 Apr 2010) Log Message: ----------- HotCocoa style > MacRuby style Modified Paths: -------------- MacRuby/branches/0.6/sample-macruby/ViewModelDemo/Superview.rb MacRuby/trunk/sample-macruby/ViewModelDemo/Superview.rb Modified: MacRuby/branches/0.6/sample-macruby/ViewModelDemo/Superview.rb =================================================================== --- MacRuby/branches/0.6/sample-macruby/ViewModelDemo/Superview.rb 2010-04-29 21:13:49 UTC (rev 3979) +++ MacRuby/branches/0.6/sample-macruby/ViewModelDemo/Superview.rb 2010-04-30 00:06:24 UTC (rev 3980) @@ -31,12 +31,12 @@ def moveSubviewToTop(mySubview) # Moves the given subview to the top, for drawing order purposes - addSubview_positioned_relativeTo_(mySubview, NSWindowBelow, subviews.lastObject) + addSubview(mySubview, positioned:NSWindowBelow, relativeTo:subviews.lastObject) end def moveSubviewToIndex(mySubview, i) # An index of 0 will move it behind all others - addSubview_positioned_relativeTo_(mySubview, NSWindowBelow, subviews.objectAtIndex(i)) + addSubview(mySubview, positioned:NSWindowBelow, relativeTo:subviews.objectAtIndex(i)) end def startTimer Modified: MacRuby/trunk/sample-macruby/ViewModelDemo/Superview.rb =================================================================== --- MacRuby/trunk/sample-macruby/ViewModelDemo/Superview.rb 2010-04-29 21:13:49 UTC (rev 3979) +++ MacRuby/trunk/sample-macruby/ViewModelDemo/Superview.rb 2010-04-30 00:06:24 UTC (rev 3980) @@ -31,12 +31,12 @@ def moveSubviewToTop(mySubview) # Moves the given subview to the top, for drawing order purposes - addSubview_positioned_relativeTo_(mySubview, NSWindowBelow, subviews.lastObject) + addSubview(mySubview, positioned:NSWindowBelow, relativeTo:subviews.lastObject) end def moveSubviewToIndex(mySubview, i) # An index of 0 will move it behind all others - addSubview_positioned_relativeTo_(mySubview, NSWindowBelow, subviews.objectAtIndex(i)) + addSubview(mySubview, positioned:NSWindowBelow, relativeTo:subviews.objectAtIndex(i)) end def startTimer

1 0

[3979] MacRuby/trunk/version.h
by source_changes＠macosforge.org 29 Apr '10

29 Apr '10

Revision: 3979 http://trac.macosforge.org/projects/ruby/changeset/3979 Author: lsansonetti(a)apple.com Date: 2010-04-29 14:13:49 -0700 (Thu, 29 Apr 2010) Log Message: ----------- trunk is now 0.7 Modified Paths: -------------- MacRuby/trunk/version.h Modified: MacRuby/trunk/version.h =================================================================== --- MacRuby/trunk/version.h 2010-04-29 21:05:26 UTC (rev 3978) +++ MacRuby/trunk/version.h 2010-04-29 21:13:49 UTC (rev 3979) @@ -1,5 +1,5 @@ #define RUBY_ENGINE "macruby" -#define MACRUBY_VERSION "0.6" +#define MACRUBY_VERSION "0.7" #define RUBY_VERSION "1.9.0" #define RUBY_RELEASE_DATE "2008-06-03"

1 0

[3978] MacRuby/branches/0.6/
by source_changes＠macosforge.org 29 Apr '10

29 Apr '10

Revision: 3978 http://trac.macosforge.org/projects/ruby/changeset/3978 Author: lsansonetti(a)apple.com Date: 2010-04-29 14:05:26 -0700 (Thu, 29 Apr 2010) Log Message: ----------- branching for 0.6 Added Paths: ----------- MacRuby/branches/0.6/ Property changes on: MacRuby/branches/0.6 ___________________________________________________________________ Added: svn:ignore + # Binary files. *.o .ext miniruby markgc macruby *.rbo *.dylib # Generated files. .installed.list doc include/ruby/config.h dtrace.h revision.h parse.c y.tab.c lex.c miniprelude.c node_name.inc prelude.c rbconfig.rb Added: svn:mergeinfo + /MacRuby/branches/icu:3533-3744

1 0