Changeset 83

Timestamp:

10/16/2006 13:39:00 (2 years ago)

Author:

tec

Message:

• lib/markaby/builder.rb: get rid of warnings and clean up formatting
  
• lib/markaby/metaid.rb: get rid of warnings and hide from rdoc
  
• Rakefile: add rake warnings task
  

Location:

trunk

Files:

• Rakefile (modified) (1 diff)
• lib/markaby/builder.rb (modified) (8 diffs)
• lib/markaby/metaid.rb (modified) (1 diff)

trunk/Rakefile

@@ -19 +19 @@
 test_file = "test/test_markaby.rb"
 setup_gem("markaby", VERS,  "Tim Fletcher and _why", summary, [['builder', '>=2.0.0']], test_file)
+
+desc "List any Markaby specific warnings"
+task :warnings do
+  `ruby -w test/test_markaby.rb 2>&1`.split(/\n/).each do |line|
+    next unless line =~ /warning:/
+    next if line =~ /builder-/
+    puts line
+  end
+end

trunk/lib/markaby/builder.rb

@@ -88 +88 @@
       @builder = ::Builder::XmlMarkup.new(:indent => @indent, :target => @streams.last)
       class << @builder
-          attr_accessor :target, :level
-      end
-
-      if block
-        text(capture(&block))
-      end
+        attr_accessor :target, :level
+      end
+
+      text(capture(&block)) if block
     end
 
@@ -153 +151 @@
       end
       if block
-        str = capture &block
+        str = capture(&block)
         block = proc { text(str) }
       end
@@ -212 +210 @@
         end
       end
-      if not @tagset.self_closing.include?(sym) and args.first.respond_to?(:to_hash)
-        block ||= proc{}
-      end
       tag!(sym, *args, &block)
     end
@@ -226 +221 @@
     end
 
+    remove_method :head
+    
     # Builds a head tag.  Adds a <tt>meta</tt> tag inside with Content-Type
     # set to <tt>text/html; charset=utf-8</tt>.
@@ -240 +237 @@
     def xhtml_transitional(&block)
       self.tagset = Markaby::XHTMLTransitional
-      xhtml_html &block
+      xhtml_html(&block)
     end
 
@@ -246 +243 @@
     def xhtml_strict(&block)
       self.tagset = Markaby::XHTMLStrict
-      xhtml_html &block
+      xhtml_html(&block)
     end
 
@@ -259 +256 @@
     def fragment
       stream = @streams.last
-      f1 = stream.length
+      start = stream.length
       yield
-      f2 = stream.length - f1
-      Fragment.new(stream, f1, f2)
+      length = stream.length - start
+      Fragment.new(stream, start, length)
     end
 
@@ -273 +270 @@
   # For a more practical explanation, check out the README.
   class Fragment < ::Builder::BlankSlate
-    def initialize(s, a, b)
-      @s, @f1, @f2 = s, a, b 
-    end
-    def method_missing(*a)
-      unless @str
-        @str = @s[@f1, @f2].to_s  
-        @s[@f1, @f2] = [nil] * @f2
-        @str
-      end
-      @str.send(*a)
+    def initialize(*args)
+      @stream, @start, @length = args
+    end
+    def method_missing(*args)
+      # We can't do @stream.slice!(@start, @length),
+      # as it would invalidate the @starts and @lengths of other Fragment instances.
+      @str = @stream[@start, @length].to_s
+      @stream[@start, @length] = [nil] * @length
+      def self.method_missing(*args, &block)
+        @str.send(*args, &block)
+      end
+      @str.send(*args, &block)
     end
   end

trunk/lib/markaby/metaid.rb

@@ -1 +1 @@
 # metaprogramming assistant -- metaid.rb
-class Object
+class Object # :nodoc:
   # The hidden singleton lurks behind everyone
   def metaclass; class << self; self; end; end
-  def meta_eval &blk; metaclass.instance_eval &blk; end
+  def meta_eval(&blk); metaclass.instance_eval(&blk); end
   
   # Adds methods to a metaclass
-  def meta_def name, &blk
-    meta_eval { define_method name, &blk }
+  def meta_def(name, &blk)
+    meta_eval { define_method(name, &blk) }
   end
   
   # Defines an instance method within a class
-  def class_def name, &blk
-    class_eval { define_method name, &blk }
+  def class_def(name, &blk)
+    class_eval { define_method(name, &blk) }
   end
 end