hexp 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9c632d0e470fa5f4c296f3eea2ae8069eef7b54
-  data.tar.gz: 4d22a65fe1a865974c745846bf2e4f350b807a12
+  metadata.gz: 82cf0421b04b36a3d4d397510dcd90adc0a181d1
+  data.tar.gz: 1f4a2ab57c547894e180ede1c5cb4001b98889cf
 SHA512:
-  metadata.gz: fe5cdf5086cb3c3a44b4a3a5b06ffa8787084865af31d607a253b4ecb8373f5611f270c70f780d1ee1f991f20dab4770aec803b423fe78cf0a665121b3df641c
-  data.tar.gz: bd4927fdc7ab98569707f1ef9966b15ffcb2eed58524212511b9cf62976ada17bc94adda6c86f30fce5c7b2cc8f45d2e1544fdfc27b45970c94ac7e20e9eb5df
+  metadata.gz: 5d6668354d47a11855b83d08178c24e98a05759ef063884f5b6576c17d8ce3cfb058fb15b3ffec3663cd210fa742ba64ae1a36d795661c50ba31faebc80e7d49
+  data.tar.gz: cba13dcce9246705dd2cfcbe03638f93314a850809b5952c89377b04fbcd53dbea599fe4e0b0c3cfa871808ec1aaa951904e9694542832d7a60c9558a62b3138

data/Changelog.md

@@ -1,13 +1,17 @@
 ### Development
 
-[full diff](http://github.com/plexus/hexp/compare/v0.4.4...master)
+[full diff](http://github.com/plexus/hexp/compare/v0.4.5...master)
+
+### v0.4.5
+
+* Bugfix: don't do entity escaping inside :script tags, also not when
+  there's more than one text node as a child element
 
 ### v0.4.4
 
 * Drop the dependency on SASS, use Nokogiri instead for parsing CSS
   selectors
 
-
 ### v0.4.3
 
 Performance improvements

data/hexp.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'concord', '~> 0.0'
 
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'rspec', '~> 3.1'
   gem.add_development_dependency 'benchmark_suite'
   gem.add_development_dependency 'mutant-rspec'
   gem.add_development_dependency 'rspec-its'

data/lib/hexp/unparser.rb

@@ -67,8 +67,8 @@ module Hexp
     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
+      if options[:no_escape].include?(tag) && children.all?(&:text?)
+        children.each {|node| buffer << node }
       else
         children.each {|node| add_node(buffer, node) }
       end

data/lib/hexp/version.rb

@@ -1,3 +1,3 @@
 module Hexp
-  VERSION = '0.4.4'
+  VERSION = '0.4.5'
 end

data/spec/spec_helper.rb

@@ -1,22 +1,19 @@
 # encoding: utf-8
 
-# SimpleCov MUST be started before require 'hexp'
-#
-if ENV['COVERAGE'] == 'true'
-  require 'simplecov'
-  require 'coveralls'
+require 'hexp'
+require 'rspec/its'
 
-  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-    SimpleCov::Formatter::HTMLFormatter,
-    Coveralls::SimpleCov::Formatter
-  ]
-
-  SimpleCov.start do
-    command_name 'spec:unit'
-    add_filter 'hexp/h.rb'
-
-    minimum_coverage 98.5
+RSpec::Matchers.define :dom_eq do |other_dom|
+  match do |dom|
+    Hexp::Nokogiri::Equality.new(dom, other_dom).call
   end
 end
 
-require 'shared_helper'
+RSpec.configure do |rspec|
+  rspec.mock_with :rspec do |configuration|
+    configuration.syntax = :expect
+  end
+  rspec.around(:each) do |example|
+    Timeout.timeout(1, &example)
+  end
+end

data/spec/unit/hexp/unparser_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Hexp::Unparser do
+  let(:unparser) { described_class.new({}) }
+  let(:node) { H[:p, %q{Hello "world", it's great meet & chat >.<}] }
+  let(:html) { unparser.call(node) }
+
+  it 'should escape sensitive characters' do
+    expect(html).to eql '<p>Hello &quot;world&quot;, it&#x27;s great meet &amp; chat &gt;.&lt;</p>'
+  end
+
+  context 'inside a script tag' do
+    let(:node) { H[:script, %q{Hello "world", }, %q{it's great meet & chat >.<}] }
+
+    it 'should not escape' do
+      expect(html).to eql %q{<script>Hello "world", it's great meet & chat >.<</script>}
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hexp
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Arne Brasseur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-15 00:00:00.000000000 Z
+date: 2015-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -70,16 +70,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: benchmark_suite
   requirement: !ruby/object:Gem::Requirement
@@ -182,7 +182,6 @@ files:
 - lib/hexp/unparser.rb
 - lib/hexp/version.rb
 - spec/integration/literal_syntax_spec.rb
-- spec/shared_helper.rb
 - spec/spec_helper.rb
 - spec/unit/hexp/builder_spec.rb
 - spec/unit/hexp/css_selector/attribute_spec.rb
@@ -214,6 +213,7 @@ files:
 - spec/unit/hexp/nokogiri/reader_spec.rb
 - spec/unit/hexp/parse_spec.rb
 - spec/unit/hexp/text_node_spec.rb
+- spec/unit/hexp/unparser_spec.rb
 - spec/unit/hexp_spec.rb
 homepage: https://github.com/plexus/hexp
 licenses:
@@ -235,13 +235,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Generate and manipulate HTML documents and nodes.
 test_files:
 - spec/integration/literal_syntax_spec.rb
-- spec/shared_helper.rb
 - spec/spec_helper.rb
 - spec/unit/hexp/builder_spec.rb
 - spec/unit/hexp/css_selector/attribute_spec.rb
@@ -273,4 +272,5 @@ test_files:
 - spec/unit/hexp/nokogiri/reader_spec.rb
 - spec/unit/hexp/parse_spec.rb
 - spec/unit/hexp/text_node_spec.rb
+- spec/unit/hexp/unparser_spec.rb
 - spec/unit/hexp_spec.rb

data/spec/shared_helper.rb

@@ -1,17 +0,0 @@
-require 'hexp'
-require 'rspec/its'
-
-RSpec::Matchers.define :dom_eq do |other_dom|
-  match do |dom|
-    Hexp::Nokogiri::Equality.new(dom, other_dom).call
-  end
-end
-
-RSpec.configure do |rspec|
-  rspec.mock_with :rspec do |configuration|
-    configuration.syntax = :expect
-  end
-  rspec.around(:each) do |example|
-    Timeout.timeout(1, &example)
-  end
-end