dolores-cml 0.5.6 → 0.6.1

data/VERSION

@@ -1 +1 @@
-0.5.6
+0.6.1

data/cml.gemspec

@@ -1,12 +1,15 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{cml}
-  s.version = "0.5.6"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chris Van Pelt"]
-  s.date = %q{2009-09-08}
+  s.date = %q{2009-09-16}
   s.description = %q{CML let's you easily create form elements and custom interfaces for the CrowdFlower Croud Labor platform}
   s.email = %q{vanpelt@doloreslabs.com}
   s.extra_rdoc_files = [
@@ -44,6 +47,7 @@ Gem::Specification.new do |s|
      "spec/fixtures/complex.cml",
      "spec/fixtures/html.cml",
      "spec/fixtures/invalid.cml",
+     "spec/fixtures/script-style.cml",
      "spec/fixtures/segfault.cml",
      "spec/meta_spec.rb",
      "spec/normalize_spec.rb",
@@ -64,7 +68,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/dolores/cml}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.4}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{CML is CrowdFlower Markup Language}
   s.test_files = [
     "spec/complex_spec.rb",

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
     
@@ -105,11 +105,19 @@ module CML
       to_html
     end
     
+    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]}<") }
+      cml
+    end
+    
     def to_html(opts = nil)
       #We convert the entire document and strip root tags / rando empty tags ALA libxml 2.6.32
-      html = convert(opts).to_xhtml.gsub(/<\/?root[^>]*?>|<\/?>/,'')
+      #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]}<") }
+      @cdata.each { |matches| html.sub!(/(<(?:script|style)[^>]*>)</m, "\\1#{matches[2].empty? ? " " : matches[2]}<") }
       wrap(html)
     end
     

data/spec/complex_spec.rb

@@ -57,6 +57,22 @@ describe "CML Complex" do
     @p.to_html
   end
   
+  it "script / styles" do
+    @p = Parser.new(File.read(File.dirname(__FILE__) + "/fixtures/script-style.cml"), {:prefix => "u12345"})
+    @p.to_html.should sorta_match(<<-HTML)
+    <div class="cml" id="u12345"><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;
+    </script>
+    <style type="text/css">
+    a { font: awesome;}
+    </style>
+    </div>
+    HTML
+  end
+  
   it "parses scripts and styles" do
     @p = Parser.new(File.read(File.dirname(__FILE__) + "/fixtures/html.cml"), {:prefix => "u12345"})
     @p.to_html.length.should > 900

data/spec/fixtures/script-style.cml

@@ -0,0 +1,10 @@
+<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;
+</script>
+
+<style type="text/css">
+  a { font:awesome;}
+</style>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dolores-cml
 version: !ruby/object:Gem::Version 
-  version: 0.5.6
+  version: 0.6.1
 platform: ruby
 authors: 
 - Chris Van Pelt
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-08 00:00:00 -07:00
+date: 2009-09-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,6 +82,7 @@ files:
 - spec/fixtures/complex.cml
 - spec/fixtures/html.cml
 - spec/fixtures/invalid.cml
+- spec/fixtures/script-style.cml
 - spec/fixtures/segfault.cml
 - spec/meta_spec.rb
 - spec/normalize_spec.rb
@@ -100,6 +101,7 @@ files:
 - spec/validation_spec.rb
 has_rdoc: false
 homepage: http://github.com/dolores/cml
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -120,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: CML is CrowdFlower Markup Language