rubified 0.1.1 → 0.1.2

data/lib/ext/object.rb

@@ -1,5 +1,10 @@
 class Object
-  def to_html
-    to_s
+  def to_html(embedded)
+    str = to_s
+    if str[-1] == "\n"
+      str
+    else
+      str << "\n"
+    end
   end
 end

data/lib/rubified/canvas.rb

@@ -33,23 +33,13 @@ module Rubified
   module Canvas
     # Add a method for a specific XML/HTML tag class.
     def self.add_tag_method(tclass)
-      n = tclass.to_s.split("::").last.downcase
-      #puts n
-=begin
-      define_method(n) do |params={}, &block|
-        # Figure out what class to use by the method name.
-        #puts __method__
-        tagclass = Rubified::Tag.const_get((__method__).capitalize)
-        # Create a new tag then run it
-        tagclass.new(params).to_html(&block)
-      end
-=end
+      n = "tag_" + tclass.to_s.split("::").last.downcase
       eval "
-        def #{n}(params={}, &block)
+        def #{n}(params={}, embedded=false, &block)
           # Determine what class to use by the method name.
           tagclass = #{tclass}
           # Create a new tag then convert it.
-          tagclass.new(params).to_html(&block)
+          tagclass.new(params).to_html(embedded, &block)
         end
        "
     end

data/lib/rubified/tag.rb

@@ -9,26 +9,26 @@ class Rubified::Tag
   end
 
   # The arguments to this method is a hash key of the parameters to the HTML tag.
-  def initialize(params={})
+  def initialize(params={}, embedded=false)
     # The name of the tag, e.g. font
     @tname = self.class.to_s.split("::").last.downcase
     # Any parameters of this tag, e.g. if you have the HTML tag:
     #   <div id="foo" class="bar">
     # then the parameters would be +id+ and +class+.
-    @params = params
+    @params, @embedded = params, embedded
   end
 
   # Dumps this tag to an HTML string.
-  def to_html
+  def to_html(embedded)
     pstring = ""
     @params.each {|key, val| pstring << " #{key}=\"#{val}\""}
-    result = "<#{@tname}#{pstring}>"
+    raw = "<#{@tname}#{pstring}>\n"
     if block_given?
-      result << yield.to_html
+      raw << (yield.to_html(true))
     end
     if self.class::Paired
-      result << "</#{@tname}>"
+      raw << "</#{@tname}>\n"
     end
-    result
+    raw
   end
 end

data/lib/rubified/tags.rb

@@ -3,15 +3,23 @@ tags = {
     :html=>true,
     :head=>true,
     :body=>true,
+    :title=>true,
     :p=>true,
     :div=>true,
     :span=>true,
+    :span=>true,
     :font=>true,
     :b=>true,
     :i=>true,
     :tt=>true,
+    :h1=>true,
+    :h2=>true,
+    :h3=>true,
+    :h4=>true,
 
-    :img=>false
+    :img=>false,
+    :br=>false,
+    :link=>false
 }
 
 tags.each {|tag, paired|

metadata

@@ -2,7 +2,7 @@
 name: rubified
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - J. Wostenberg
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-09 00:00:00 -07:00
+date: 2012-02-11 00:00:00 -07:00
 default_executable: 
 dependencies: []