Permalink
Browse files

Make Padrino 100% compat with rubinius!!!

* Fix an issue with haml rendering on rubinius
* Fix an issue with ordered hash on rubinius in our core tests
  • Loading branch information...
DAddYE committed Jun 6, 2011
1 parent 5e134cf commit 4838791fe7a685179630ad4175a099a800f8626c
View
@@ -8,6 +8,8 @@
* Fix Padrino::Reloader with strange constants or paths #565
* Fix Padrino::Reloader reloading also $LOADED_FEATURES deps
* Fix Double loading of boot.rb in rake tasks. #560
* Fix an issue with haml rendering on rubinius
* Fix an issue with ordered hash on rubinius in our core tests
== 0.9.29
@@ -9,6 +9,10 @@
require 'shoulda'
require 'phocus'
# Rubinius at the moment dont handle hashes in the properly order so to prevent

This comment has been minimized.

Show comment
Hide comment
@tmornini

tmornini Jun 6, 2011

This statement is false, and unfairly characterizes Rubinius as broken. I'd guess you wrote it before you understood the issue and forgot to correct it before committing. :-)

@tmornini

tmornini Jun 6, 2011

This statement is false, and unfairly characterizes Rubinius as broken. I'd guess you wrote it before you understood the issue and forgot to correct it before committing. :-)

This comment has been minimized.

Show comment
Hide comment
@DAddYE

DAddYE Jun 6, 2011

Member

Sorry, I written this line before! My apologies :(

@DAddYE

DAddYE Jun 6, 2011

Member

Sorry, I written this line before! My apologies :(

This comment has been minimized.

Show comment
Hide comment
@DAddYE

DAddYE Jun 6, 2011

Member

Fixed here: f991ea5

@DAddYE

DAddYE Jun 6, 2011

Member

Fixed here: f991ea5

# this issue for now we remove wrong values from mimetypes.
Rack::Mime::MIME_TYPES.delete(".xsl") # In this way application/xml respond only to .xml
module Kernel
# Silences the output by redirecting to stringIO
# silence_logger { ...commands... } => "...output..."
@@ -25,8 +29,7 @@ def silence_warnings
yield
ensure
$VERBOSE = old_verbose
end unless respond_to?(:silence_warnings)
end
end
class Class
@@ -31,6 +31,7 @@ def block_is_type?(block)
# @handler.capture_from_template(&block) => "...html..."
#
def capture_from_template(*args, &block)
eval("_hamlout ||= @haml_buffer", block.binding) # this is for rbx
template.capture_haml(*args, &block)
end

2 comments on commit 4838791

@joshbuddy

This comment has been minimized.

Show comment
Hide comment
@joshbuddy

joshbuddy Jun 6, 2011

Contributor

hot.

Contributor

joshbuddy replied Jun 6, 2011

hot.

@nesquena

This comment has been minimized.

Show comment
Hide comment
@nesquena

nesquena Jun 7, 2011

Member

Awesome man nice work!

Member

nesquena replied Jun 7, 2011

Awesome man nice work!

Please sign in to comment.