undies 3.0.0.rc.2 → 3.0.0.rc.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    undies (3.0.0.rc.2)
+    undies (3.0.0.rc.3)
 
 GEM
   remote: http://rubygems.org/

data/lib/undies/api.rb

@@ -50,19 +50,19 @@ module Undies
     end
 
     def open_element(name, *args)
-      Raw.new(Element::Open.new(name, *args).to_s)
+      Element::Open.new(name, *args)
     end
     alias_method :open_tag, :open_element
     alias_method :element,  :open_element
     alias_method :tag,      :open_element
 
     def closed_element(name, *args)
-      Raw.new(Element::Closed.new(name, *args).to_s)
+      Element::Closed.new(name, *args)
     end
     alias_method :closed_tag, :closed_element
 
     SELF_CLOSING_TAGS.each do |tag|
-      define_method(tag){ |*args| closed_element(tag, *args, &build) }
+      define_method(tag){ |*args| closed_element(tag, *args) }
     end
 
     OPEN_TAGS.each do |tag|
@@ -89,9 +89,7 @@ module Undies
     def __closed_element(name, *args)
       @_undies_io.
         current.
-        element_node(ElementNode.new(
-          @_undies_io, Element::Closed.new(name, *args)
-        )).
+        element_node(ElementNode.new(@_undies_io, Element::Closed.new(name, *args))).
         element
     end
     alias_method :__closed_tag, :__closed_element

data/lib/undies/element.rb

@@ -44,7 +44,6 @@ module Undies
 
   module CSSProxy
 
-    # CSS proxy methods ============================================
     ID_METH_REGEX = /^([^_].+)!$/
     CLASS_METH_REGEX = /^([^_].+)$/
 
@@ -67,7 +66,6 @@ module Undies
         super
       end
     end
-    # ==============================================================
 
   end
 
@@ -86,14 +84,15 @@ module Undies
 
   class Raw < ::String
 
-    # A Raw string is one that is impervious to String#gsub and returns itself
-    # when `to_s` is called.
+    # A Raw string is one that is impervious to String#gsub
+    # and returns itself when `to_s` is called.  Used to circumvent
+    # the default html escaping of markup
 
-    def gsub(*args, &block)
+    def gsub(*args)
       self
     end
 
-    def gsub!(*args, &block)
+    def gsub!(*args)
       nil
     end
 
@@ -135,7 +134,7 @@ module Undies
     end
 
     def to_s
-      "#{__start_tag}#{__content}#{__end_tag}"
+      Raw.new("#{__start_tag}#{__content}#{__end_tag}")
     end
 
     def ==(other)
@@ -193,7 +192,7 @@ module Undies
     def __end_tag; ''; end
 
     def to_s
-      "#{__start_tag}"
+      Raw.new("#{__start_tag}")
     end
 
     def ==(other)

data/lib/undies/element_node.rb

@@ -22,8 +22,8 @@ module Undies
       @start_tag_written = false
     end
 
-    def attrs(*args, &block)
-      @element.__attrs(*args, &block)
+    def attrs(*args)
+      @element.__attrs(*args)
     end
 
     def text(raw)

data/lib/undies/root_node.rb

@@ -19,7 +19,7 @@ module Undies
       @cached = nil
     end
 
-    def attrs(*args, &block)
+    def attrs(*args)
       raise RootAPIError, "can't call '__attrs' at the root node level"
     end
 

data/lib/undies/template.rb

@@ -46,18 +46,21 @@ module Undies
         self.instance_variable_set("@#{k}", v)
       end
 
-      # setup a source stack with the given source
-      source = args.last.kind_of?(Source) ? args.pop : Source.new(Proc.new {})
-      @_undies_source_stack = SourceStack.new(source)
-
       # push a root node onto the IO
       @_undies_io.push!(RootNode.new(@_undies_io)) if @_undies_io.empty?
 
-      # yield to recursivley render the source stack
-      __yield
+      # if given some source, build it
+      if args.last.kind_of?(Source)
+        # setup a source stack with the given source
+        @_undies_source_stack = SourceStack.new(args.pop)
+
+        # yield to recursivley render the source stack
+        __yield
+
+        # flush any elements that need to be built
+        __flush
+      end
 
-      # flush any elements that need to be built
-      __flush
     end
 
   end

data/lib/undies/version.rb

@@ -1,3 +1,3 @@
 module Undies
-  VERSION = "3.0.0.rc.2"
+  VERSION = "3.0.0.rc.3"
 end

data/test/template_test.rb

@@ -96,7 +96,8 @@ class Undies::Template
     desc "using the captured element api methods"
 
     should "capture `element` output as Raw output" do
-      assert_kind_of Undies::Raw, subject.closed_element(:br)
+      assert_kind_of Undies::Element::Closed, subject.closed_element(:br)
+      assert_kind_of Undies::Raw, subject.closed_element(:br).to_s
     end
 
     should "capture `element` output correctly" do
@@ -110,9 +111,9 @@ class Undies::Template
     should "capture and escape data approptiately" do
       elem = subject.open_element(:span, *[
         "stuff & <em>more stuff</em>",
-        subject.strong(subject.i('ITALICS!!'), ' (here)')
+        subject.strong(subject.img.awesome, ' (here)')
       ])
-      assert_equal "<span>stuff &amp; &lt;em&gt;more stuff&lt;&#x2F;em&gt;<strong><i>ITALICS!!</i> (here)</strong></span>", elem.to_s
+      assert_equal "<span>stuff &amp; &lt;em&gt;more stuff&lt;&#x2F;em&gt;<strong><img class=\"awesome\" /> (here)</strong></span>", elem.to_s
     end
 
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: undies
 version: !ruby/object:Gem::Version 
-  hash: 15424113
+  hash: 15424115
   prerelease: 6
   segments: 
   - 3
   - 0
   - 0
   - rc
-  - 2
-  version: 3.0.0.rc.2
+  - 3
+  version: 3.0.0.rc.3
 platform: ruby
 authors: 
 - Kelly Redding
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-18 00:00:00 Z
+date: 2012-04-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :development