burp_cms 1.3.12 → 1.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d1011991b02c12d1fe3ea6b3c52c1b48f285776
-  data.tar.gz: f7ca5b10fb752fe0e9e91d6a0d031fef35808712
+  metadata.gz: 730ca90334c6ad1ab3b78bbe3fe4ffb85c80f158
+  data.tar.gz: 974e91faf4a38b7a7b71a7e175f25b9502dfdfb9
 SHA512:
-  metadata.gz: 8b745012106bfdcd0f3ea0e58e1dc6fff3cf99a9f798d6fcd5cfe505d4757dda72cbd50efcbf3e77ff3f33a82a3abcb2bc45b54274339a5088e261ffa99cdabe
-  data.tar.gz: 6dd53e24bed82c17fc0bf7ed55dc44010863975eaa73029d18591b31f9108379376eabdd44111e74da9e38c091ccf6acb713eec30e5aaa07014be66bf600eab1
+  metadata.gz: 8c33ee90f26d1a6529500ea0e0f66939245ace6b1fa408f3f3b5d57af4941645d31eaf626bc4b614d3c944c2c763a725bec7725e21cb1bbca073632a6d278b97
+  data.tar.gz: 29f106d57a0904933f2342ed24f170d5779bd43123b2b11584c07fec30b86c8b767a1287db4911db784d9ccd84040cf1df6aea2bfbc63f80b1fe86eaa49dbf31

data/app/assets/packages/burp/editing/js/jquery.html2markdown.js

@@ -27,12 +27,30 @@ function getBeforePadding(element,padding) {
   return padding;
 } 
 
+function removeTralingWhiteSpace(element) {
+  if(element && element.nodeType === 3) {
+    element.data = element.data.replace(/\s+$/,'');
+  }
+}
+
+function removeStartingWhiteSpace(element) {
+  if(element && element.nodeType === 3) {
+    element.data = element.data.replace(/^\s+/,'');
+  }
+}
+
+function shouldSkip(element) {
+  return $(element).get(0).attributes.length > 0;
+}
+
 function Html2Markdown(value) {
   var dom = $("<div id=\"root\"></div>");
   dom.append(value);
   
   dom.find("> hr").each(function() {
-    $(this).replaceWith(getBeforePadding(this,"\n\n") + "---" + getAfterPadding(this,"\n\n"));
+    if(!shouldSkip(this)) {
+      $(this).replaceWith(getBeforePadding(this,"\n\n") + "---" + getAfterPadding(this,"\n\n"));
+    }
   });
   
   dom.find("em > strong").each(function() {
@@ -40,7 +58,9 @@ function Html2Markdown(value) {
   });
   
   dom.find("> p > em, > em, > ul > li > em").each(function() {
-    $(this).replaceWith("_"+$(this).html()+"_"); 
+    if(!shouldSkip(this)) {
+      $(this).replaceWith("_"+$(this).html()+"_"); 
+    }
   });
   
   
@@ -56,22 +76,43 @@ function Html2Markdown(value) {
   });
   
   dom.find("ul").each(function() {
-    $(this).find('li').each(function() {
-      $(this).replaceWith("- "+$(this).html()+getAfterPadding(this,"\n"));
-    });
+    if(!shouldSkip(this)) {  
+      $(this).contents().each(function() {
+        if(this.nodeType === 3) {
+          $(this).remove();
+        }
+      });
+    
+      $(this).find('li').each(function() {
+        removeTralingWhiteSpace($(this).get(0).previousSibling);
+        $(this).replaceWith(getBeforePadding(this,"\n") + "- "+$(this).html() + getAfterPadding(this,"\n"));
+      });
     
-    $(this).replaceWith(getBeforePadding(this,"\n\n") + $(this).html() + getAfterPadding(this,"\n\n"));
+      $(this).replaceWith(getBeforePadding(this,"\n\n") + $(this).html() + getAfterPadding(this,"\n\n"));
+    }
   });
   
   dom.find("ol").each(function() {
-    $(this).find('li').each(function(index,value) {
-      $(this).replaceWith((index+1)+". "+$(this).html()+getAfterPadding(this,"\n"));
-    });
-    $(this).replaceWith(getBeforePadding(this,"\n\n")+$(this).html());
+    if(!shouldSkip(this)) {    
+      
+      $(this).contents().each(function() {
+        if(this.nodeType === 3) {
+          $(this).remove();
+        }
+      });
+      
+      $(this).find('li').each(function(index,value) {
+        removeTralingWhiteSpace($(this).get(0).previousSibling);
+        $(this).replaceWith(getBeforePadding(this,"\n")+(index+1)+". "+$(this).html()+getAfterPadding(this,"\n"));
+      });
+      $(this).replaceWith(getBeforePadding(this,"\n\n")+$(this).html());
+    }
   });
   
   dom.find('blockquote').each(function() {
-    $(this).replaceWith("> "+$.trim($(this).html()).replace(/\n{2,20}/g,"\n\n").replace(/\n/g,'\n> ').replace(/> \n/g,">\n"));
+    if(!shouldSkip(this)) {  
+      $(this).replaceWith("> "+$.trim($(this).html()).replace(/\n{2,20}/g,"\n\n").replace(/\n/g,'\n> ').replace(/> \n/g,">\n"));
+    }
   });
   
   $.each(["h1",'h2','h3','h4','h5'],function(index,value) {
@@ -84,6 +125,11 @@ function Html2Markdown(value) {
     
     dom.find("> "+value).each(function() {
       
+      // Remove any auto ids
+      if($(this).attr("id") === $(this).html().toLowerCase().replace(/[^\w]+/g, '-')) {
+        $(this).removeAttr("id");
+      }
+      
       if($(this).get(0).attributes.length === 0) {      
         $(this).find("> strong").each(function() {
           $(this).replaceWith("**"+$(this).html()+"**"); 

data/lib/burp/version.rb

@@ -1,3 +1,3 @@
 module Burp
-  VERSION = "1.3.12"
+  VERSION = "1.3.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: burp_cms
 version: !ruby/object:Gem::Version
-  version: 1.3.12
+  version: 1.3.13
 platform: ruby
 authors:
 - Darwin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-19 00:00:00.000000000 Z
+date: 2013-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: burp_cms
@@ -374,6 +374,48 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.4
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.12'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement