hexp 0.4.0.beta1 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7da79589fadbf74a0c0fa19ad9f409ca9f0dc855
-  data.tar.gz: 65e4754146881f1d5a23df35ae4b4f7a964ad886
+  metadata.gz: e1f3d62af18c9ae3a5a4c28fdb30e44a082e58f4
+  data.tar.gz: 4379e67e153aca5cb338f3b1f002c871b8f71010
 SHA512:
-  metadata.gz: 82271f2b2f56f71a71b2897b3668c7dbb2b8283a73df551d4ad6ae790e2cec806fb6901e6253c300f5bf1d2b7a4244bdbb0fde09cf3faf414df00d3fd6d1cc84
-  data.tar.gz: fd56366470868b9c0df687b945e9da1ce17e2d94fbf81b4be38a454810ca684ba1c1d5bcfcee1f28d8fe80b45320b9072bea9b8ed1269b9e93bf1b3dce0272e0
+  metadata.gz: 8c0244e52ce84768cb92828ecdfb0021ebd6a62ae0c72ad3beaeb801f2386f5177f61008055d528b91444896aa26a47baa705269e04cc6baa2939d4c19fabc83
+  data.tar.gz: db32b6b92696bd5953c666d5fcbaeb9190b9d87dac0320487eeade385d92536b98067373aeb3ffad753eb0cff9ee5c2ef25e67f77d71fe730da8b8c8a483627a

data/Changelog.md

@@ -1,6 +1,17 @@
 ### Development
 
-[full diff](http://github.com/plexus/hexp/compare/v0.3.3...master)
+[full diff](http://github.com/plexus/hexp/compare/v0.4.1...master)
+
+### v0.4.1
+
+* Make Hexp::List#+ return a Hexp::List
+* Add Hexp::Node#append as a convenient API for adding child nodes
+* Make Unparser Adamantium-immutable so instances can be included in
+  Adamantiumized objects
+* Skip escaping inside <script> tags
+* Add a "rails integration" (ugh) to play nice with
+  ActiveSupport::SafeBuffer. use `gem 'hexp', require: 'hexp-rails'`
+  in your Gemfile
 
 ### v0.4.0.beta1
 

data/lib/hexp-rails.rb

@@ -0,0 +1,31 @@
+require 'hexp'
+require 'hexp/core_ext/nil' # Opt-in to NilClass#to_hexp
+
+module Hexp
+  # Transparently use Hexp nodes in templates
+  class Node
+    def to_s
+      to_html.html_safe
+    end
+  end
+
+  class List
+    def to_s
+      to_html.html_safe
+    end
+  end
+
+  class TextNode
+    def to_s
+      to_html.html_safe
+    end
+  end
+
+  # Honor ActiveSupport::SafeBuffer's "html_safe" flag
+  class Unparser
+    alias orig_escape_text escape_text
+    def escape_text(text)
+      text.html_safe? ? text : orig_escape_text(text)
+    end
+  end
+end

data/lib/hexp/css_selector.rb

@@ -32,6 +32,7 @@ module Hexp
       #
       # @api private
       def self.included(klass)
+        super
         def klass.[](*members)
           new(members)
         end

data/lib/hexp/list.rb

@@ -87,5 +87,9 @@ module Hexp
     def to_html
       each_with_object('') {|n,s| s << n.to_html}
     end
+
+    def +(other)
+      self.class[*to_ary, *other.to_ary]
+    end
   end
 end

data/lib/hexp/node/children.rb

@@ -96,6 +96,9 @@ module Hexp
         H[tag, attributes, children.map(&blk)]
       end
 
+      def append(*nodes)
+        H[tag, attributes, children + nodes]
+      end
     end
   end
 end

data/lib/hexp/unparser.rb

@@ -1,5 +1,7 @@
 module Hexp
   class Unparser
+    include Adamantium
+
     APOS   = ?'.freeze
     QUOT   = ?".freeze
     LT     = '<'.freeze
@@ -24,46 +26,59 @@ module Hexp
     ESCAPE_TEXT_REGEX      = Regexp.new("[#{ESCAPE_TEXT.keys.join}]")
 
     DEFAULT_OPTIONS = {
-      encoding: Encoding.default_external
+      encoding: Encoding.default_external,
+      no_escape: [:script]
     }
 
+    attr_reader :options
+
     def initialize(options)
       @options = DEFAULT_OPTIONS.merge(options)
     end
 
     def call(node)
-      @buffer = String.new.force_encoding(@options[:encoding])
-      add_node(node)
-      @buffer.freeze
+      buffer = String.new.force_encoding(options[:encoding])
+      add_node(buffer, node)
+      buffer.freeze
     end
 
     private
 
-    def add_node(node)
+    def add_node(buffer, node)
       if node.text?
-        @buffer << escape_text(node)
+        buffer << escape_text(node)
       else
-        add_tag(node.tag, node.attributes, node.children)
+        add_tag(buffer, node.tag, node.attributes, node.children)
       end
     end
 
-    def add_tag(tag, attrs, children)
-      @buffer << LT << tag.to_s
+    def add_tag(buffer, tag, attrs, children)
+      buffer << LT << tag.to_s
       unless attrs.empty?
-        attrs.each {|k,v| add_attr(k,v)}
+        attrs.each {|k,v| add_attr(buffer, k,v)}
+      end
+      buffer << GT
+      add_child_nodes(buffer, tag, children)
+      buffer << LT << FSLASH << tag.to_s << GT
+    end
+
+    def add_child_nodes(buffer, tag, children)
+      # TODO look into the special parsing mode that browsers use inside <script> tags,
+      # at the least we should throw an error if the text contains </script>
+      if options[:no_escape].include?(tag) && children.length == 1 && children.first.text?
+        buffer << children.first
+      else
+        children.each {|node| add_node(buffer, node) }
       end
-      @buffer << GT
-      children.each(&method(:add_node))
-      @buffer << LT << FSLASH << tag.to_s << GT
     end
 
-    def add_attr(key, value)
-      @buffer << SPACE << key << EQ
-      add_attr_value(value)
+    def add_attr(buffer, key, value)
+      buffer << SPACE << key << EQ
+      add_attr_value(buffer, value)
     end
 
-    def add_attr_value(value)
-      @buffer << APOS << value.gsub(ESCAPE_ATTR_APOS_REGEX, ESCAPE_ATTR_APOS) << APOS
+    def add_attr_value(buffer, value)
+      buffer << APOS << value.gsub(ESCAPE_ATTR_APOS_REGEX, ESCAPE_ATTR_APOS) << APOS
     end
 
     def escape_text(text)

data/lib/hexp/version.rb

@@ -1,3 +1,3 @@
 module Hexp
-  VERSION = '0.4.0.beta1'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hexp
 version: !ruby/object:Gem::Version
-  version: 0.4.0.beta1
+  version: 0.4.1
 platform: ruby
 authors:
 - Arne Brasseur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-20 00:00:00.000000000 Z
+date: 2014-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -167,6 +167,7 @@ files:
 - examples/todo.rb
 - examples/widget.rb
 - hexp.gemspec
+- lib/hexp-rails.rb
 - lib/hexp.rb
 - lib/hexp/builder.rb
 - lib/hexp/core_ext/nil.rb
@@ -241,12 +242,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Generate and manipulate HTML documents and nodes.