rxhp 0.0.1 → 0.1.0

data/lib/rxhp/attribute_validator.rb

@@ -2,9 +2,6 @@ require 'rxhp/error'
 
 module Rxhp
   module AttributeValidator
-    class ValidationError < Rxhp::ScriptError
-    end
-
     class UnacceptableAttributeError < ValidationError
       attr_reader :element, :attribute, :value
       def initialize element, attribute, value
@@ -63,17 +60,41 @@ module Rxhp
         matcher.any? { |x| match? x, name, value }
       when Hash
         matcher.any? do |name_matcher, value_matcher|
-          name_match = match?(name_matcher, name, nil)
-          value_match = match?(value_matcher, value, nil)
-          name_match && value_match
+          name_match = match_value?(name_matcher, name_from_symbol(name))
+          if name_match
+            match_value?(value_matcher, value)
+          else
+            false
+          end
         end
+      else
+        match_value? matcher, name
+      end
+    end
+
+    def self.match_value? matcher, value
+      if matcher == String
+        return (value.is_a? String) || (value.is_a? Symbol)
+      end
+
+      case matcher
+      when Array
+        matcher.any? {|x| match_value?(x, value) }
       when Symbol
-        matcher.to_s.gsub('_', '-') == name
+        name_from_symbol(matcher) == value
       else
-        matcher === name
+        if value.is_a? Symbol
+          (matcher === value.to_s) || (matcher === name_from_symbol(value))
+        else
+          matcher === value
+        end
       end
     end
 
+    def self.name_from_symbol symbol
+      symbol.to_s.gsub('_', '-')
+    end
+
     def self.included(klass)
       klass.extend(ClassMethods)
       class << klass
@@ -90,7 +111,7 @@ module Rxhp
         alias :require_attribute :require_attributes
 
         def accept_all_attributes
-          attribute_matches.push Object
+          accept_attributes Object
         end
       end
 

data/lib/rxhp/composable_element.rb

@@ -12,8 +12,8 @@ module Rxhp
   class ComposableElement < Rxhp::Element
     include Rxhp::AttributeValidator
 
-    def initialize *args
-      super *args
+    def validate!
+      super
       validate_attributes!
     end
 
@@ -23,7 +23,7 @@ module Rxhp
     # This calls compose, provides the 'yield' magic, and callls render on
     # the output.
     def render options = {}
-      validate_attributes!
+      validate!
       self.compose do
         # Allow 'yield' to embed all children
         self.children.each do |child|

data/lib/rxhp/element.rb

@@ -14,12 +14,26 @@ module Rxhp
     def initialize attributes = {}
       @attributes = attributes
       @children = Array.new
+      validate!
     end
 
     def children?
       !children.empty?
     end
 
+    def valid?
+      begin
+        validate!
+        true
+      rescue Rxhp::ValidationError
+        false
+      end
+    end
+
+    def validate!
+      # no-op
+    end
+
     # Return a flat HTML string for this element and all its' decendants.
     #
     # You probably don't want to implement this yourself - interesting
@@ -41,18 +55,7 @@ module Rxhp
     def render_children options = {}
       return if children.empty?
 
-      out = String.new
-      children.each do |child|
-        case child
-        when Element
-          out += child.render(options)
-        when String
-          out += self.render_string(child, options)
-        else
-          out += self.render_string(child.to_s, options)
-        end
-      end
-      out
+      flattened_children.map{ |child| render_child(child, options) }.join
     end
 
     # Fill default options
@@ -66,5 +69,44 @@ module Rxhp
         :indent => 2,
       }.merge(options)
     end
+
+    private
+
+    def render_child child, options
+      case child
+      when Element
+        child.render(options)
+      when String
+        self.render_string(child, options)
+      when Enumerable
+        child.map{ |grandchild| render_child(grandchild, options) }.join
+      else
+        self.render_string(child.to_s, options)
+      end
+    end
+
+    def flattened_children
+      no_frags = []
+      children.each do |node|
+        if node.is_a? Rxhp::Fragment
+          no_frags += node.children
+        else
+          no_frags.push node
+        end
+      end
+
+      previous = nil
+      no_consecutive_strings = []
+      no_frags.each do |node|
+        if node.is_a?(String) && previous.is_a?(String)
+          previous << node
+        else
+          no_consecutive_strings.push node
+          previous = node
+        end
+      end
+
+      no_consecutive_strings
+    end
   end
 end

data/lib/rxhp/error.rb

@@ -4,4 +4,7 @@ module Rxhp
 
   class ScriptError < ::ScriptError
   end
+
+  class ValidationError < Rxhp::ScriptError
+  end
 end

data/lib/rxhp/html.rb

@@ -11,7 +11,9 @@ module Rxhp
 
     class <<self
       def fragment x
-        Rxhp::Scope.current.children.push x
+        scope = Rxhp::Scope.current
+        scope.children.push x
+        scope
       end
       alias :frag :fragment
       alias :text :fragment

data/lib/rxhp/html_element.rb

@@ -30,21 +30,21 @@ module Rxhp
     accept_attributes Rxhp::Html::GLOBAL_ATTRIBUTES
     accept_attributes Rxhp::Html::GLOBAL_EVENT_HANDLERS
 
-    def initialize *args
-      super *args
-      validate_attributes!
-    end
-
     def tag_name
       raise NotImplementedError.new
     end
 
+    def validate!
+      super
+      validate_attributes!
+    end
+
     # Render the element.
     #
     # Pays attention to the formatter type, doctype, pretty print options,
     # etc.
     def render options = {}
-      validate_attributes!
+      validate!
       options = fill_options(options)
 
       open = render_open_tag(options)
@@ -53,14 +53,15 @@ module Rxhp
 
       if options[:pretty]
         indent = ' ' * (options[:indent] * options[:depth])
-        out = "%s%s\n" % [indent, open]
-        out += inner if inner
-        out += "%s%s\n" % [indent, close] if close && !close.empty?
+        out = indent.dup
+        out << open << "\n"
+        out << inner if inner
+        out << indent << close << "\n" if close && !close.empty?
         out
       else
         out = open
-        out += inner if inner
-        out += close if close
+        out << inner if inner
+        out << close if close
         out
       end
     end
@@ -98,17 +99,20 @@ module Rxhp
       out = '<' + tag_name
       unless attributes.empty?
         attributes.each do |name,value|
+          name = name.to_s.gsub('_', '-') if name.is_a? Symbol
+          value = value.to_s.gsub('_', '-') if value.is_a? Symbol
+
           case value
           when false
             next
           when true
             if options[:format] == Rxhp::XHTML_FORMAT
-              out += ' ' + name.to_s + '="' + name.to_s + '"'
+              out += ' ' + name + '="' + name + '"'
             else
               out += ' ' + name
             end
           else
-            out += ' ' + name.to_s + '="' + html_escape(value.to_s) + '"'
+            out += ' ' + name.to_s + '="' + html_escape(value) + '"'
           end
         end
       end

data/lib/rxhp/html_singleton_element.rb

@@ -11,11 +11,12 @@ module Rxhp
   # - people don't expect to see them
   # - in XHTML, the opening tag will have been self closing.
   class HtmlSingletonElement < HtmlElement
-    def render *args
-      unless children.empty?
-        raise Rxhp::ScriptError.new('Singleton element has children')
-      end
-      super *args
+    class HasChildrenError < Rxhp::ValidationError
+    end
+
+    def validate!
+      super
+      raise HasChildrenError.new unless children.empty?
     end
 
     protected

data/lib/rxhp/scope.rb

@@ -66,12 +66,8 @@ module Rxhp
 
         # Append non-block children
         if children
-          if children.is_a? Array
-            children.each do |child|
-              element.children.push child
-            end
-          else
-            element.children.push children # well, child
+          children.each do |child|
+            element.children.push child
           end
         end
 
@@ -82,8 +78,9 @@ module Rxhp
                 "In a block, use the 'text' method to include Strings"
               )
             end
-            nil
           end
+          element.validate! if element.respond_to?(:validate!)
+          nil
         end
         element
       end

metadata

@@ -1,23 +1,33 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rxhp
-version: !ruby/object:Gem::Version
-  version: 0.0.1
+version: !ruby/object:Gem::Version 
+  hash: 27
   prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 0
+  version: 0.1.0
 platform: ruby
-authors:
+authors: 
 - Fred Emmott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-21 00:00:00.000000000Z
+
+date: 2012-01-22 00:00:00 Z
 dependencies: []
+
 description: An object-oriented validating HTML template system
-email:
+email: 
 - rxhp-gem@fredemmott.co.uk
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/rxhp/attribute_validator.rb
 - lib/rxhp/composable_element.rb
 - lib/rxhp/constants.rb
@@ -35,26 +45,36 @@ files:
 - lib/rxhp.rb
 homepage: https://github.com/fredemmott/rxhp
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: An object-oriented validating HTML template system
 test_files: []
+