dolores-cml 0.6.1 → 0.6.2

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.6.2

data/cml.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cml}
-  s.version = "0.6.1"
+  s.version = "0.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chris Van Pelt"]

data/lib/cml/parser.rb

@@ -5,7 +5,7 @@ module CML
     def initialize(content, opts = {})
       @opts = opts
       #Because nokogiri is munging my CDATA sections, we parse it out ahead of time
-      @cdata = content.scan(/(<(script|style)[^>]*?>)(.*?)(<\/\2)/m)
+      @cdata = content.scan(/(<(script|style)[^>]*?>)(.*?)(<\/\2>)/m)
       @doc = Parser.parse(content)
       @cftags = @doc.xpath("//cml:*[not(ancestor::cml:*)]")
       normalize if opts[:normalize]
@@ -17,7 +17,7 @@ module CML
     def self.parse(content)
       #This sucks, we remove scripts, styles, and close non self closed tags
       #We could potentially add CDATA clauses to them, but this is "easier"
-      xhtml = content.gsub(/(<(script|style)[^>]*?>)(.*?)(<\/\2)/m, "\\1\\4").gsub(/(<(input|link|img|br|hr).*?)\/?>/,'\1/>') #base, basefont, area, meta
+      xhtml = content.gsub(/(<(script|style)[^>]*?>)(.*?)(<\/\2>)/m, "\\1\\4").gsub(/(<(input|link|img|br|hr).*?)\/?>/,'\1/>') #base, basefont, area, meta
       Nokogiri::XML("<root xmlns:cml=\"http://crowdflower.com\">#{xhtml}</root>")
     end
     
@@ -108,7 +108,11 @@ module CML
     def to_cml
       cml = @doc.to_xhtml.gsub(/<\/?root[^>]*?>|<\/?>/,'').gsub(/(<(input|link|img|br|hr).*?)\/?>/,'\1/>')
       #Hack to ensure the next sub doesn't match...
-      @cdata.each { |matches| cml.sub!(/(<(?:script|style)[^>]*>)</m, "\\1#{matches[2].empty? ? " " : matches[2]}<") }
+      @cdata.each do |matches| 
+        html.sub!(/(<(script|style)[^>]*>)<\/\2>/m) do |m|
+          "#{$1}#{matches[2].empty? ? " " : matches[2]}</#{$2}>"
+        end
+      end
       cml
     end
     
@@ -116,8 +120,12 @@ module CML
       #We convert the entire document and strip root tags / rando empty tags ALA libxml 2.6.32
       #We're also adding self closing tags
       html = convert(opts).to_xhtml.gsub(/<\/?root[^>]*?>|<\/?>/,'').gsub(/(<(input|link|img|br|hr).*?)\/?>/,'\1/>') 
-      #Let's re-insert that CDATA
-      @cdata.each { |matches| html.sub!(/(<(?:script|style)[^>]*>)</m, "\\1#{matches[2].empty? ? " " : matches[2]}<") }
+      #Let's re-insert that CDATA, tricky because scripts will sometimes contain single quotes...
+      @cdata.each do |matches| 
+        html.sub!(/(<(script|style)[^>]*>)<\/\2>/m) do |m|
+          "#{$1}#{matches[2].empty? ? " " : matches[2]}</#{$2}>"
+        end
+      end
       wrap(html)
     end
     

data/spec/complex_spec.rb

@@ -64,7 +64,7 @@ describe "CML Complex" do
     <script src="/javascripts/upload.js" type="text/javascript" charset="utf-8"> </script>
 
     <script type="text/javascript">
-    var cool;
+    var cool ='cool\'s';
     </script>
     <style type="text/css">
     a { font: awesome;}

data/spec/fixtures/script-style.cml

@@ -1,10 +1,12 @@
 <script type="text/javascript" src="http://api.maps.yahoo.com/ajaxymap?v=3.8&amp;appid=Knx84fDV34H2VnhVU1DoD7chT1wjJ2r36uf4dZW7Vc5si9sqQRAYU_g8fo7zV.wF"></script>
 <script src="/javascripts/upload.js" type="text/javascript" charset="utf-8"></script>
 
+
 <script type="text/javascript">
-  var cool;
+  var cool = 'cool\'s'
 </script>
-
 <style type="text/css">
-  a { font:awesome;}
+.invisible{
+  a { font: awesome;}
+}
 </style>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dolores-cml
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors: 
 - Chris Van Pelt