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

[4396] MacRuby/trunk
by source_changes＠macosforge.org 31 Jul '10

31 Jul '10

Revision: 4396 http://trac.macosforge.org/projects/ruby/changeset/4396 Author: joshua.ballanco(a)apple.com Date: 2010-07-30 17:29:32 -0700 (Fri, 30 Jul 2010) Log Message: ----------- Cast, don't get; would be good to export this too Modified Paths: -------------- MacRuby/trunk/encoding.c MacRuby/trunk/include/ruby/encoding.h Modified: MacRuby/trunk/encoding.c =================================================================== --- MacRuby/trunk/encoding.c 2010-07-30 22:35:50 UTC (rev 4395) +++ MacRuby/trunk/encoding.c 2010-07-31 00:29:32 UTC (rev 4396) @@ -516,7 +516,7 @@ return -1; } else { - int idx = index_of_encoding(rb_enc_get(enc)); + int idx = index_of_encoding((rb_encoding_t *)enc); if (idx >= 0) { return idx; } Modified: MacRuby/trunk/include/ruby/encoding.h =================================================================== --- MacRuby/trunk/include/ruby/encoding.h 2010-07-30 22:35:50 UTC (rev 4395) +++ MacRuby/trunk/include/ruby/encoding.h 2010-07-31 00:29:32 UTC (rev 4396) @@ -123,6 +123,7 @@ rb_encoding *rb_usascii_encoding(void); rb_encoding *rb_locale_encoding(void); rb_encoding *rb_default_external_encoding(void); +rb_encoding *rb_default_internal_encoding(void); int rb_usascii_encindex(void); int rb_ascii8bit_encindex(void); VALUE rb_enc_default_external(void);

1 0

[4395] MacRuby/trunk/include/ruby/encoding.h
by source_changes＠macosforge.org 30 Jul '10

30 Jul '10

Revision: 4395 http://trac.macosforge.org/projects/ruby/changeset/4395 Author: lsansonetti(a)apple.com Date: 2010-07-30 15:35:50 -0700 (Fri, 30 Jul 2010) Log Message: ----------- properly export rb_str_export_to_enc() Modified Paths: -------------- MacRuby/trunk/include/ruby/encoding.h Modified: MacRuby/trunk/include/ruby/encoding.h =================================================================== --- MacRuby/trunk/include/ruby/encoding.h 2010-07-30 08:23:17 UTC (rev 4394) +++ MacRuby/trunk/include/ruby/encoding.h 2010-07-30 22:35:50 UTC (rev 4395) @@ -35,6 +35,7 @@ rb_encoding* rb_enc_check(VALUE,VALUE); VALUE rb_enc_associate_index(VALUE, int); VALUE rb_enc_associate(VALUE, rb_encoding*); +VALUE rb_str_export_to_enc(VALUE str, rb_encoding *enc); void rb_enc_copy(VALUE dst, VALUE src); VALUE rb_enc_str_new(const char*, long, rb_encoding*);

1 0

[4394] MacRuby/trunk/string.c
by source_changes＠macosforge.org 30 Jul '10

30 Jul '10

Revision: 4394 http://trac.macosforge.org/projects/ruby/changeset/4394 Author: lsansonetti(a)apple.com Date: 2010-07-30 01:23:17 -0700 (Fri, 30 Jul 2010) Log Message: ----------- let's reuse some code here Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2010-07-30 08:20:31 UTC (rev 4393) +++ MacRuby/trunk/string.c 2010-07-30 08:23:17 UTC (rev 4394) @@ -6574,7 +6574,5 @@ if (!IS_RSTR(str)) { rb_raise(rb_eArgError, "cannot transcode NSString"); } - return (VALUE)str_transcode(RSTR(str), RSTR(str)->encoding, enc, - TRANSCODE_BEHAVIOR_RAISE_EXCEPTION, - TRANSCODE_BEHAVIOR_RAISE_EXCEPTION, NULL); + return (VALUE)str_simple_transcode(RSTR(str), enc); }

1 0

[4393] MacRuby/trunk
by source_changes＠macosforge.org 30 Jul '10

30 Jul '10

Revision: 4393 http://trac.macosforge.org/projects/ruby/changeset/4393 Author: lsansonetti(a)apple.com Date: 2010-07-30 01:20:31 -0700 (Fri, 30 Jul 2010) Log Message: ----------- adding 2 more frightening MRI methods Modified Paths: -------------- MacRuby/trunk/encoding.c MacRuby/trunk/string.c Modified: MacRuby/trunk/encoding.c =================================================================== --- MacRuby/trunk/encoding.c 2010-07-29 19:08:54 UTC (rev 4392) +++ MacRuby/trunk/encoding.c 2010-07-30 08:20:31 UTC (rev 4393) @@ -560,3 +560,14 @@ assert(idx >= 0 && idx < ENCODINGS_COUNT); return rb_encodings[idx]; } + +VALUE +rb_enc_associate_index(VALUE obj, int idx) +{ + if (TYPE(obj) == T_STRING) { + assert(idx >= 0 && idx < ENCODINGS_COUNT); + rb_str_force_encoding(obj, rb_encodings[idx]); + return obj; + } + rb_raise(rb_eArgError, "cannot set encoding on non-string object"); +} Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2010-07-29 19:08:54 UTC (rev 4392) +++ MacRuby/trunk/string.c 2010-07-30 08:20:31 UTC (rev 4393) @@ -6567,3 +6567,14 @@ RSTR(str)->encoding = enc; return str; } + +VALUE +rb_str_export_to_enc(VALUE str, rb_encoding *enc) +{ + if (!IS_RSTR(str)) { + rb_raise(rb_eArgError, "cannot transcode NSString"); + } + return (VALUE)str_transcode(RSTR(str), RSTR(str)->encoding, enc, + TRANSCODE_BEHAVIOR_RAISE_EXCEPTION, + TRANSCODE_BEHAVIOR_RAISE_EXCEPTION, NULL); +}

1 0

[4392] ControlTower/trunk
by source_changes＠macosforge.org 29 Jul '10

29 Jul '10

Revision: 4392 http://trac.macosforge.org/projects/ruby/changeset/4392 Author: joshua.ballanco(a)apple.com Date: 2010-07-29 12:08:54 -0700 (Thu, 29 Jul 2010) Log Message: ----------- Adding support for X-Sendfile headers Modified Paths: -------------- ControlTower/trunk/lib/control_tower/rack_socket.rb Added Paths: ----------- ControlTower/trunk/sample/body_content.txt ControlTower/trunk/sample/x_sendfile.ru Modified: ControlTower/trunk/lib/control_tower/rack_socket.rb =================================================================== --- ControlTower/trunk/lib/control_tower/rack_socket.rb 2010-07-29 08:26:05 UTC (rev 4391) +++ ControlTower/trunk/lib/control_tower/rack_socket.rb 2010-07-29 19:08:54 UTC (rev 4392) @@ -40,7 +40,7 @@ 'rack.run_once' => false, 'rack.version' => VERSION } resp = nil - x_sendfile_header = "X-Sendfile" + x_sendfile_header = 'X-Sendfile' x_sendfile = nil begin request_data = parse!(connection, env) @@ -48,6 +48,14 @@ request_data['REMOTE_ADDR'] = connection.addr[3] status, headers, body = @app.call(request_data) + # If there's an X-Sendfile header, we'll use sendfile(2) + if headers.has_key?(x_sendfile_header) + x_sendfile = headers[x_sendfile_header] + x_sendfile = ::File.open(x_sendfile, 'r') unless x_sendfile.kind_of? IO + x_sendfile_size = x_sendfile.stat.size + headers['Content-Length'] = x_sendfile_size + end + # Unless somebody's already set it for us (or we don't need it), set the Content-Length unless (status == -1 || (status >= 100 and status <= 199) || @@ -68,9 +76,6 @@ resp = "HTTP/1.1 #{status}\r\n" headers.each do |header, value| - if header == x_sendfile_header - x_sendfile = value - else resp << "#{header}: #{value}\r\n" end resp << "\r\n" @@ -78,8 +83,10 @@ # Start writing the response connection.write resp - # Finish writing out the body - if body.respond_to?(:each) + # Write the body + if x_sendfile + connection.sendfile(x_sendfile, 0, x_sendfile_size) + elsif body.respond_to?(:each) body.each do |chunk| connection.write chunk end Added: ControlTower/trunk/sample/body_content.txt =================================================================== --- ControlTower/trunk/sample/body_content.txt (rev 0) +++ ControlTower/trunk/sample/body_content.txt 2010-07-29 19:08:54 UTC (rev 4392) @@ -0,0 +1 @@ +You should get this as a response... Added: ControlTower/trunk/sample/x_sendfile.ru =================================================================== --- ControlTower/trunk/sample/x_sendfile.ru (rev 0) +++ ControlTower/trunk/sample/x_sendfile.ru 2010-07-29 19:08:54 UTC (rev 4392) @@ -0,0 +1,10 @@ +# NOTE: Your cwd needs to be the sample/ directory when you start ControlTower +class FileSender + def call(env) + headers = { 'Content-Type' => 'text/plain', + 'X-Sendfile' => ::File.expand_path('../body_content.txt', __FILE__) } + [200, headers, "You shouldn't get this body..."] + end +end + +run FileSender.new

1 0

[4391] ControlTower/trunk
by source_changes＠macosforge.org 29 Jul '10

29 Jul '10

Revision: 4391 http://trac.macosforge.org/projects/ruby/changeset/4391 Author: joshua.ballanco(a)apple.com Date: 2010-07-29 01:26:05 -0700 (Thu, 29 Jul 2010) Log Message: ----------- Fix for handling malformed requests Modified Paths: -------------- ControlTower/trunk/bin/control_tower ControlTower/trunk/lib/control_tower/rack_socket.rb ControlTower/trunk/lib/rack/handler/control_tower.rb Modified: ControlTower/trunk/bin/control_tower =================================================================== --- ControlTower/trunk/bin/control_tower 2010-07-28 23:17:04 UTC (rev 4390) +++ ControlTower/trunk/bin/control_tower 2010-07-29 08:26:05 UTC (rev 4391) @@ -8,21 +8,21 @@ # Some default values @options = { :rackup => './config.ru', - :port => '8080', + :port => '3000', :host => '0.0.0.0', :concurrent => false } OptionParser.new do |opts| - opts.on("-R", "--rackup [FILE]", "Rack-up Configuration File") do |rackup| + opts.on("-R", "--rackup FILE", "Rack-up Configuration File") do |rackup| @options[:rackup] = rackup end - opts.on("-p", "--port [SERVER_PORT]", Integer, "Port on which to run the server") do |port| + opts.on("-p", "--port PORT", Integer, "Port on which to run the server (default: 3000)") do |port| @options[:port] = port end - opts.on("-h", "--host [HOSTNAME]", "Hostname for the server") do |host| + opts.on("-a", "--address HOST", "Address to bind server to (default: 0.0.0.0)") do |host| @options[:host] = host end Modified: ControlTower/trunk/lib/control_tower/rack_socket.rb =================================================================== --- ControlTower/trunk/lib/control_tower/rack_socket.rb 2010-07-28 23:17:04 UTC (rev 4390) +++ ControlTower/trunk/lib/control_tower/rack_socket.rb 2010-07-29 08:26:05 UTC (rev 4391) @@ -39,6 +39,9 @@ 'rack.multithread' => @multithread, 'rack.run_once' => false, 'rack.version' => VERSION } + resp = nil + x_sendfile_header = "X-Sendfile" + x_sendfile = nil begin request_data = parse!(connection, env) if request_data @@ -65,6 +68,9 @@ resp = "HTTP/1.1 #{status}\r\n" headers.each do |header, value| + if header == x_sendfile_header + x_sendfile = value + else resp << "#{header}: #{value}\r\n" end resp << "\r\n" @@ -87,8 +93,13 @@ rescue EOFError, Errno::ECONNRESET, Errno::EPIPE, Errno::EINVAL $stderr.puts "Error: Connection terminated!" rescue Object => e - $stderr.puts "Error: Problem transmitting data -- #{e.inspect}" - $stderr.puts e.backtrace.join("\n") + if resp.nil? && !connection.closed? + connection.write "HTTP/1.1 400\r\n\r\n" + else + # We have a response, but there was trouble sending it: + $stderr.puts "Error: Problem transmitting data -- #{e.inspect}" + $stderr.puts e.backtrace.join("\n") + end ensure # We should clean up after our tempfile, if we used one. input = env['rack.input'] Modified: ControlTower/trunk/lib/rack/handler/control_tower.rb =================================================================== --- ControlTower/trunk/lib/rack/handler/control_tower.rb 2010-07-28 23:17:04 UTC (rev 4390) +++ ControlTower/trunk/lib/rack/handler/control_tower.rb 2010-07-29 08:26:05 UTC (rev 4391) @@ -7,6 +7,7 @@ module Handler class ControlTower def self.run(app, options={}) + app = Rack::Chunked.new(Rack::ContentLength.new(app)) server = ::ControlTower::Server.new(app, options) yield server if block_given? server.start

1 0

[4390] MacRuby/trunk/encoding.c
by source_changes＠macosforge.org 28 Jul '10

28 Jul '10

Revision: 4390 http://trac.macosforge.org/projects/ruby/changeset/4390 Author: joshua.ballanco(a)apple.com Date: 2010-07-28 16:17:04 -0700 (Wed, 28 Jul 2010) Log Message: ----------- Implement a few more of the MRI encoding APIs Modified Paths: -------------- MacRuby/trunk/encoding.c Modified: MacRuby/trunk/encoding.c =================================================================== --- MacRuby/trunk/encoding.c 2010-07-28 20:23:22 UTC (rev 4389) +++ MacRuby/trunk/encoding.c 2010-07-28 23:17:04 UTC (rev 4390) @@ -484,6 +484,12 @@ default_external = RENC(encoding); } +rb_encoding * +rb_default_internal_encoding(void) +{ + return (rb_encoding *)default_internal; +} + static int index_of_encoding(rb_encoding_t *enc) { @@ -504,6 +510,27 @@ } int +rb_to_encoding_index(VALUE enc) +{ + if (CLASS_OF(enc) != rb_cEncoding && TYPE(enc) != T_STRING) { + return -1; + } + else { + int idx = index_of_encoding(rb_enc_get(enc)); + if (idx >= 0) { + return idx; + } + else if (NIL_P(enc = rb_check_string_type(enc))) { + return -1; + } + if (!rb_enc_asciicompat(rb_enc_get(enc))) { + return -1; + } + return rb_enc_find_index(StringValueCStr(enc)); + } +} + +int rb_enc_find_index(const char *name) { return index_of_encoding(rb_enc_find(name)); @@ -527,3 +554,9 @@ return index_of_encoding(rb_encodings[ENCODING_ASCII]); } +rb_encoding * +rb_enc_from_index(int idx) +{ + assert(idx >= 0 && idx < ENCODINGS_COUNT); + return rb_encodings[idx]; +}

1 0

[4389] MacRuby/trunk
by source_changes＠macosforge.org 28 Jul '10

28 Jul '10

Revision: 4389 http://trac.macosforge.org/projects/ruby/changeset/4389 Author: lsansonetti(a)apple.com Date: 2010-07-28 13:23:22 -0700 (Wed, 28 Jul 2010) Log Message: ----------- implement some of the MRI encoding index APIs Modified Paths: -------------- MacRuby/trunk/encoding.c MacRuby/trunk/include/ruby/encoding.h Modified: MacRuby/trunk/encoding.c =================================================================== --- MacRuby/trunk/encoding.c 2010-07-28 19:47:07 UTC (rev 4388) +++ MacRuby/trunk/encoding.c 2010-07-28 20:23:22 UTC (rev 4389) @@ -484,3 +484,46 @@ default_external = RENC(encoding); } +static int +index_of_encoding(rb_encoding_t *enc) +{ + if (enc != NULL) { + for (int i = 0; i <ENCODINGS_COUNT; i++) { + if (rb_encodings[i] == enc) { + return i; + } + } + } + return -1; +} + +int +rb_enc_get_index(VALUE obj) +{ + return index_of_encoding(rb_enc_get(obj)); +} + +int +rb_enc_find_index(const char *name) +{ + return index_of_encoding(rb_enc_find(name)); +} + +int +rb_ascii8bit_encindex(void) +{ + return index_of_encoding(rb_encodings[ENCODING_BINARY]); +} + +int +rb_utf8_encindex(void) +{ + return index_of_encoding(rb_encodings[ENCODING_UTF8]); +} + +int +rb_usascii_encindex(void) +{ + return index_of_encoding(rb_encodings[ENCODING_ASCII]); +} + Modified: MacRuby/trunk/include/ruby/encoding.h =================================================================== --- MacRuby/trunk/include/ruby/encoding.h 2010-07-28 19:47:07 UTC (rev 4388) +++ MacRuby/trunk/include/ruby/encoding.h 2010-07-28 20:23:22 UTC (rev 4389) @@ -26,6 +26,9 @@ void rb_enc_set_index(VALUE obj, int encindex); int rb_enc_find_index(const char *name); int rb_to_encoding_index(VALUE); +int rb_ascii8bit_encindex(void); +int rb_utf8_encindex(void); +int rb_usascii_encindex(void); rb_encoding* rb_to_encoding(VALUE); rb_encoding* rb_enc_get(VALUE); rb_encoding* rb_enc_compatible(VALUE,VALUE);

1 0

[4388] MacRubyWebsite/trunk/content/downloads.txt
by source_changes＠macosforge.org 28 Jul '10

28 Jul '10

Revision: 4388 http://trac.macosforge.org/projects/ruby/changeset/4388 Author: lsansonetti(a)apple.com Date: 2010-07-28 12:47:07 -0700 (Wed, 28 Jul 2010) Log Message: ----------- no longer mention Leopard Modified Paths: -------------- MacRubyWebsite/trunk/content/downloads.txt Modified: MacRubyWebsite/trunk/content/downloads.txt =================================================================== --- MacRubyWebsite/trunk/content/downloads.txt 2010-07-28 19:46:49 UTC (rev 4387) +++ MacRubyWebsite/trunk/content/downloads.txt 2010-07-28 19:47:07 UTC (rev 4388) @@ -11,7 +11,7 @@ You can download <a href="http://www.macruby.org/files/MacRuby%200.6.zip">MacRuby 0.6</a> as a standalone binary installer. -Note: this release will only work on Intel machines running Snow Leopard (10.6) or higher. Users on Leopard (10.5) can build the sources. +Note: this release will only work on Intel machines running Snow Leopard (10.6) or higher. h2. Nightly builds

1 0

[4387] MacRubyWebsite/trunk/content/documentation/rubycocoa-to-macruby.txt
by source_changes＠macosforge.org 28 Jul '10

28 Jul '10

Revision: 4387 http://trac.macosforge.org/projects/ruby/changeset/4387 Author: lsansonetti(a)apple.com Date: 2010-07-28 12:46:49 -0700 (Wed, 28 Jul 2010) Log Message: ----------- forgot to commit these small details Modified Paths: -------------- MacRubyWebsite/trunk/content/documentation/rubycocoa-to-macruby.txt Modified: MacRubyWebsite/trunk/content/documentation/rubycocoa-to-macruby.txt =================================================================== --- MacRubyWebsite/trunk/content/documentation/rubycocoa-to-macruby.txt 2010-07-28 19:40:27 UTC (rev 4386) +++ MacRubyWebsite/trunk/content/documentation/rubycocoa-to-macruby.txt 2010-07-28 19:46:49 UTC (rev 4387) @@ -114,8 +114,8 @@ <pre class="commands"> # MacRuby code def saveWorld(planet, fromVillain: badguy, withHero:superhero) - superhero.fight(badguy) - planet.thank(superhero) + superhero.fight(badguy) + planet.thank(superhero) end </pre> @@ -194,14 +194,14 @@ h3. Exception Handling -Though Ruby's @Exception@ class and Objective-C's @NSException@ class are not technically bridged classes, @begin...rescue@ blocks in MacRuby can catch both Ruby @Exceptions@ and Cocoa @NSExceptions@. Conversely, you can catch MacRuby @Exceptions@ with Objective-C's @try@@/@catch@. +Though Ruby's @Exception@ class and Objective-C's @NSException@ class are not technically bridged classes, @begin...rescue@ blocks in MacRuby can catch both Ruby @Exceptions@ and Cocoa @NSExceptions@. Conversely, you can catch MacRuby @Exceptions@ with Objective-C's @@try@/@@catch@. h3. Other Syntactic Extensions The MacRuby team has ported the syntactic extensions present in RubyCocoa for cases when Objective-C idioms differ with Ruby idioms, such as in the case of mutator methods and boolean accessor methods: <pre class="commands"> -layer.setPosition = [100, 100] # Objective-C style +layer.setPosition([100, 100]) # Objective-C style layer.position = [100, 100] # Ruby style; calls the same method the Objective-C one does layer.isHidden # Objective-C style layer.hidden? # Ruby allows the '?' character in method names

1 0