Changeset 54

Timestamp:

05/21/2006 23:01:40 (3 years ago)

Author:

why

Message:

• Rakefile: require builder >= 2.0.0
  
• lib/markaby/builder.rb: form tags weren't caught by method_missing.
  

Location:

branches/xhtml-careful

Files:

• Rakefile (modified) (1 diff)
• lib/markaby/builder.rb (modified) (3 diffs)
• tools/rakehelp.rb (modified) (1 diff)

branches/xhtml-careful/Rakefile

@@ -13 +13 @@
 summary = "Markup as Ruby, write HTML in your native Ruby tongue"
 test_file = "test/test_markaby.rb"
-setup_gem("markaby", "0.5",  "Tim Fletcher and _why", summary, ['builder'], test_file)
+setup_gem("markaby", "0.5",  "Tim Fletcher and _why", summary, [['builder', '>=2.0.0']], test_file)

branches/xhtml-careful/lib/markaby/builder.rb

@@ -168 +168 @@
     # * Otherwise, +sym+ and its arguments are passed to tag!
     def method_missing(sym, *args, &block)
-      if @tagset and (@tagset_plain.include?(sym) or (@tagset_forms.include?(sym) and args.empty?))
+      if @helpers.respond_to?(sym)
+        r = @helpers.send(sym, *args, &block)
+        if @output_helpers
+            fragment { @builder << r }
+        else
+            r
+        end
+      elsif @tagset and @tagset_plain.include?(sym)
         if args.empty? and block.nil?
           return CssProxy.new do |args, block|
@@ -183 +190 @@
       elsif @tagset and @tagset_self_closing.include?(sym)
         tag!(sym, *args)
-      elsif @helpers.respond_to?(sym)
-        r = @helpers.send(sym, *args, &block)
-        if @output_helpers
-            fragment { @builder << r }
-        else
-            r
-        end
       elsif instance_variable_get("@#{sym}")
         instance_variable_get("@#{sym}")
@@ -222 +222 @@
       @tagset_forms = @tagset_tags & FORM_TAGS
       @tagset_self_closing = @tagset_tags & SELF_CLOSING_TAGS
-      @tagset_plain = @tagset_tags - @tagset_forms - @tagset_self_closing
+      @tagset_plain = @tagset_tags - @tagset_self_closing
     end
 

branches/xhtml-careful/tools/rakehelp.rb

@@ -80 +80 @@
         s.extra_rdoc_files = [ "README" ]
         dependencies.each do |dep|
-            s.add_dependency(dep)
+            s.add_dependency(*dep)
         end
         s.files = %w(README Rakefile setup.rb) +