dolores-cml 0.5.2 → 0.5.4

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.5.4

data/cml.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cml}
-  s.version = "0.5.2"
+  s.version = "0.5.4"
 
   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-07}
+  s.date = %q{2009-09-08}
   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 = [

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
     
@@ -96,8 +96,8 @@ module CML
     end
     
     def wrap(content)
-      #This has to happen if we are outputing html, can go away if we use xhtml
-      #content = content.gsub(/%7B%7B/,'{{').gsub(/%7D%7D/,'}}')
+      #This happens when variables are inside of href's
+      content = content.gsub(/%7B%7B/,'{{').gsub(/%7D%7D/,'}}')
       @opts[:no_wrap] ? content : "<div class=\"cml#{" "+@opts[:class] if @opts[:class]}\" id=\"#{@opts[:prefix]}\">#{content}</div>"
     end
     

data/spec/complex_spec.rb

@@ -85,6 +85,11 @@ describe "CML Complex" do
     }
     </style>
     <script type="text/javascript" charset="utf-8">
+    // query1 = 'compare'
+    // query2 = 'base'
+    if (1 < 1) {
+      var x = 0;
+    }
     var ranking = [null]
     //Some really long comment that doesn't get borked by libxml... don't you dare insert a new line.
     //Why are my && disapearing?

data/spec/fixtures/html.cml

@@ -20,65 +20,15 @@
 <script type="text/javascript" charset="utf-8">
   // query1 = 'compare'
   // query2 = 'base'
-  document.addEvent('domready', function() {
-    
-    var inFrame = ($$('body.in_frame').length > 0);
-    var onWarningPage = ($$('div.missed', 'h3.tainted').length > 0);
-    
-    var results = $('u{{_unit_id}}_div').getElements('.searchresult');
-    var rand = Math.floor(Math.random()*2);
-    var inputValues = ['compare_is_much_better', 'compare_is_a_little_better', 'base_is_a_little_better', 'base_is_much_better']
-    var htmlValues = [
-      'The <b>top</b> result is <b>much better</b> than the bottom one',
-      'The <b>top</b> result is <b>a little better</b> than the bottom one',
-      'The <b>bottom</b> result is <b>a little better</b> than the top one',
-      'The <b>bottom</b> result is <b>much better</b> than the top one',
-      '<b>Both</b> results are <b>not relevant</b> to the search terms <b>at all</b>'
-    ];
-    
-    if (inFrame && !onWarningPage) {
-      if (rand == 0) {
-        // Put base on top
-        results[0].inject(results[1], 'after');
-        inputValues.reverse();
-      }
-    } else {
-      // Fix the text a bit
-      $$('div.missed span').each(function(el) {
-        el.set('text', el.get('text').replace('Compare', 'The top result'));
-        el.set('text', el.get('text').replace('Base', 'The bottom result'));
-        el.set('text', el.get('text').replace(' compare', ' or the top result'));
-        el.set('text', el.get('text').replace(' base', ' or the bottom result'));
-      });
-    }
-   
-    // Fix the input values and labels
-    if ($('u{{_unit_id}}')) {
-      $('u{{_unit_id}}').getElements('input.result_is_better').each(function(input, i) {
-        if (i < inputValues.length) input.set('value', inputValues[i]);
-        input.inject(input.getParent().set('html', htmlValues[i]), 'top');
-      });
-    }
-     
-    $('u{{_unit_id}}_div').getElements('table.srchresult').each(function(el, i) {
-      // Fix a weird bug that got introduced in some circumstances way back in the scraping process
-      var bid_buy = el.getElement('td.bid_buy');
-      if (bid_buy.getChildren().length < 1) {
-        var numBids = Math.floor(Math.random()*15);
-        new Element('p', {'text': numBids+' bids'}).inject(bid_buy);
-      }
-    });
-  
-    // Show the input form
-    $('u{{_unit_id}}_div').setStyle('display', 'block');
-  });
-  
+  if (1 < 1) {
+      var x = 0;
+  }
   var ranking = [null]
   //Some really long comment that doesn't get borked by libxml... don't you dare insert a new line.
   //Why are my && disapearing?
-  if (ranking && !onSomeWarningpage) {
-    //Preserve my curlies
-    var unit_id = {{_unit_id}};
-    var rad = "even inside strings {{awesome}}"
+  if(ranking && !false) {
+  //Preserve my curlies
+  var unit_id = {{_unit_id}};
+  var rad = "even inside strings {{awesome}}"
   }
 </script>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dolores-cml
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.5.4
 platform: ruby
 authors: 
 - Chris Van Pelt
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-07 00:00:00 -07:00
+date: 2009-09-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -100,6 +100,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 +121,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