Changeset 78

Timestamp:

08/30/2006 13:45:02 (2 years ago)

Author:

tec

Message:

• lib/markaby/rails.rb: make render_markaby helper work
  
• lib/markaby/builder.rb: better
  

Location:

trunk/lib/markaby

Files:

• builder.rb (modified) (1 diff)
• rails.rb (modified) (1 diff)

trunk/lib/markaby/builder.rb

@@ -187 +187 @@
       elsif ::Builder::XmlMarkup.instance_methods.include?(sym.to_s) 
         @builder.__send__(sym, *args, &block)
-      elsif instance_variable_get("@#{sym}")
+      elsif instance_variables.include?("@#{sym}")
         instance_variable_get("@#{sym}")
       elsif @tagset.nil?

trunk/lib/markaby/rails.rb

@@ -8 +8 @@
     # Use this method in your controllers to output Markaby directly from inside.
     def render_markaby(options = {}, &block)
-      render options.merge({ :text => Builder.new(nil, self, &block).to_s })
+      render options.merge({ :text => Builder.new({}, self, &block).to_s })
     end
   end