@@ -1,2 +1,7 @@ -require 'haml' +begin + require File.join(File.dirname(__FILE__), 'lib', 'haml') # From here +rescue LoadError + require 'haml' # From gem +end + Haml.init_rails(binding) vendor/plugins/haml/init.rb @@ -48,6 +48,7 @@ class ActiveResource::Base #ckh interpretation of http://dev.rubyonrails.org/ticket/8566 def load(attributes) + return attributes if attributes && attributes.kind_of?(String) raise ArgumentError, "expected an attributes Hash, got #{attributes.inspect}" unless attributes.is_a?(Hash) @prefix_options, attributes = split_options(attributes) attributes.each do |key, value| vendor/plugins/sponger/lib/rails_patches.rb 4062eb4938d1aff54c5cd1968a27636d1077004d ckhsponge chris@spongecell.com http://github.com/ckhsponge/remindblast/commit/43258891195ea83d43b131b7809e130d4ffbde2a 43258891195ea83d43b131b7809e130d4ffbde2a 2008-10-24T15:39:03-07:00 2008-10-24T15:39:03-07:00 patch change and haml load f542dfb4c5891d9269b3d794c533f90f047b0973 ckhsponge chris@spongecell.com