rxhp 0.1.2 → 0.2.0

data/lib/rxhp/fragment.rb

@@ -5,6 +5,9 @@ module Rxhp
   #
   # Can be used like an array, or if you just need something that acts like
   # an element - this is used internally as the root of all render trees.
+  #
+  # You probably don't want to use this directly, as it doesn't know to
+  # render strings. You might want {HtmlFragment} instead.
   class Fragment < Element
     # Call {#render_children}
     def render options = {}
@@ -12,3 +15,6 @@ module Rxhp
     end
   end
 end
+
+Rxhp::Scope.define_element :fragment, Rxhp::Fragment
+Rxhp::Scope.define_element :frag, Rxhp::Fragment

data/lib/rxhp/html.rb

@@ -1,5 +1,6 @@
 require 'rxhp/data/html/attributes'
 require 'rxhp/data/html/tags'
+require 'rxhp/html_fragment'
 
 module Rxhp
   # Namespace for all HTML-related classes and methods.
@@ -7,28 +8,8 @@ module Rxhp
   # Most of RXhp is for generic trees; everything that is HTML or XML
   # specific is defined here, or in {HtmlElement} and its subclasses.
   module Html
-    # Add a child node.
-    #
-    # @example
-    #   include Rxhp::Html
-    #   p do
-    #     text 'foo'
-    #     text 'bar'
-    #   end
-    def fragment x
-      Rxhp::Scope.current.children.push x
-    end
-    alias :frag :fragment
-    alias :text :fragment
-
-    class <<self
-      def fragment x
-        scope = Rxhp::Scope.current
-        scope.children.push x
-        scope
-      end
-      alias :frag :fragment
-      alias :text :fragment
+    def self.escape text
+      text.gsub('&','&amp;').gsub('<','&lt;').gsub('>','&gt;').gsub('"','&quot;')
     end
   end
 end
@@ -55,3 +36,11 @@ Rxhp::Html::TAGS.each do |tag, data|
     Rxhp::Scope.define_element tag, klass, Rxhp::Html
   end
 end
+
+[
+  :fragment,
+  :frag,
+  :text,
+].each do |name|
+  Rxhp::Scope.define_element name, Rxhp::HtmlFragment, Rxhp::Html
+end

data/lib/rxhp/html_element.rb

@@ -151,7 +151,7 @@ module Rxhp
 
     # Don't pull in ActiveSupport just for this...
     def html_escape s
-      s.gsub('&','&amp;').gsub('<','&lt;').gsub('>','&gt;').gsub('"','&quot;')
+      Rxhp::Html.escape(s)
     end
   end
 end

data/lib/rxhp/html_fragment.rb

@@ -0,0 +1,19 @@
+require 'rxhp/fragment'
+require 'rxhp/html'
+
+module Rxhp
+  # Subclass of fragment that is able to render strings.
+  #
+  # This is available as +Rxhp::Html#fragment+, +#frag+, and +#text+.
+  class HtmlFragment < Fragment
+    def render_string string, options = {}
+      escaped = Rxhp::Html.escape(string)
+      if options[:pretty]
+        indent = ' ' * (options[:indent] * options[:depth])
+        indent + escaped + "\n"
+      else
+        escaped
+      end
+    end
+  end
+end

data/lib/rxhp/scope.rb

@@ -9,25 +9,6 @@ module Rxhp
   # The actual HTML classes are defined in rxhp/html.rb
   #
   module Scope
-    # Helper function to append a child to the current context.
-    #
-    # @example Here's one I made earlier
-    #   inner = body { 'hi' }
-    #   html do
-    #     fragment inner
-    #   end
-    #
-    # @example Multiple +String+ children
-    #   p do
-    #     text 'foo'
-    #     text 'bar'
-    #   end
-    def fragment x
-      Rxhp::Scope.current.children.push x
-    end
-    alias :frag :fragment
-    alias :text :fragment
-
     # The element nesting scope.
     #
     # @example

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rxhp
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-26 00:00:00.000000000Z
+date: 2012-02-05 00:00:00.000000000 +01:00
+default_executable: 
 dependencies: []
 description: An object-oriented validating HTML template system
 email:
@@ -28,11 +29,13 @@ files:
 - lib/rxhp/fragment.rb
 - lib/rxhp/html.rb
 - lib/rxhp/html_element.rb
+- lib/rxhp/html_fragment.rb
 - lib/rxhp/html_self_closing_element.rb
 - lib/rxhp/html_singleton_element.rb
 - lib/rxhp/scope.rb
 - lib/rxhp/tags/html_tag.rb
 - lib/rxhp.rb
+has_rdoc: true
 homepage: https://github.com/fredemmott/rxhp
 licenses: []
 post_install_message: 
@@ -53,9 +56,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: An object-oriented validating HTML template system
 test_files: []
-has_rdoc: