burp_cms 1.3.8 → 1.3.9

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 69640b78009a3ef7f7ce44e6200c2d1e22b88fd5
+  data.tar.gz: 362bf1d918fcf70b7463e0a59a7d441ecbead81d
+SHA512:
+  metadata.gz: 7bb555fbcfc93e2e20736a38177d625b03d944158e2a2265960f4821f3b6b1713066c6c2916831f685a14a41a8442d64ea6cc6acc0228b8615b5159e73b9a9c0
+  data.tar.gz: cb0fc29aa1944da612f0cb92042394965ebe23dc3c7f516d3bbee6baebf57b73361596ec07218aa28f1af97024e0ae25f8e492d0e95eb8d9a9d634dc0701b1e6

data/Rakefile

@@ -19,7 +19,7 @@ require 'burp/version'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "burp_cms"
-  # gem.homepage = "http://github.com/bjornblomqvist/burp"
+  gem.homepage = "http://github.com/bjornblomqvist/burp"
   gem.license = "LGPL3"
   gem.summary = %Q{ A CMS that tryes hard to not get in your way! }
   gem.description = %Q{ A CMS that tryes hard to not get in your way! }

data/app/assets/packages/burp/editing/js/content-decorator.js

@@ -1,5 +1,5 @@
 /*global
-  marked MD5
+  marked
 */
 (function($) {
   
@@ -17,7 +17,6 @@
   
   function ContentDecorator(element, options) {
     this.element = $(element);
-    this.parking = $('<div style="display: none;"></div>');
 
     if (typeof(options) === 'object') {
       this.onUpdate = options['update'];
@@ -166,6 +165,7 @@
               }
               
               $("#gallery").removeClass('delete-active');
+              $(document).trigger("image-drop-done.burp");
             }
           });
           
@@ -283,10 +283,14 @@
         }
       });
       
-      $(this.element).park('.movable');
       this.element.html("");
       this.element.append(tempElement.children());
-      $(this.element).unpark();
+      
+      initializeMovable(this, this.element.find('img'), function(element, positionClass) { 
+        $(element).removeClass('left center right');
+        $(element).addClass(positionClass);
+        return element;
+      });
     },
     
     makeDroppable: function(elements, createCallback) {

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

@@ -0,0 +1,106 @@
+
+function getAfterPadding(element,padding) {
+  var next = $(element).get(0).nextSibling;
+  if(!next) {
+    padding = "";
+  } else if(next.nodeType === 3) {
+    if(next.data.match(/^(\t| )*\n(\t| )*\n/)) {
+      padding = "";
+    } else if(next.data.match(/^(\t| )*\n/) && padding.length > 1) {
+      padding = "\n";
+    }
+  }
+  return padding;
+}
+
+function getBeforePadding(element,padding) {
+  var previous = $(element).get(0).previousSibling;
+  if(!previous) {
+    padding = "";
+  } else if(previous.nodeType === 3) {
+    if(previous.data.match(/\n(\t| )*\n(\t| )*$/)) {
+      padding = "";
+    } else if(previous.data.match(/\n(\t| )*$/) && padding.length > 1) {
+      padding = "\n";
+    }
+  }
+  return padding;
+} 
+
+function Html2Markdown(value) {
+  var dom = $("<div id=\"root\"></div>");
+  dom.append(value);
+  
+  dom.find("> hr").each(function() {
+    $(this).replaceWith("---");
+  });
+  
+  dom.find("em > strong").each(function() {
+    $(this).replaceWith("**"+$(this).html()+"**"); 
+  });
+  
+  dom.find("> p > em, > em, > ul > li > em").each(function() {
+    $(this).replaceWith("_"+$(this).html()+"_"); 
+  });
+  
+  
+  
+  dom.find("> strong, > p > strong, > ul > li > strong").each(function() {
+    $(this).replaceWith("**"+$(this).html()+"**"); 
+  });
+  
+  dom.find("> p, blockquote > p").each(function() {
+    if($(this).get(0).attributes.length === 0) {
+      $(this).replaceWith(getBeforePadding(this,"\n\n")+$(this).html()+getAfterPadding(this,"\n\n"));
+    }
+  });
+  
+  dom.find("ul").each(function() {
+    $(this).find('li').each(function() {
+      $(this).replaceWith("- "+$(this).html()+getAfterPadding(this,"\n"));
+    });
+    $(this).replaceWith(getBeforePadding(this,"\n\n")+$(this).html());
+  });
+  
+  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());
+  });
+  
+  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"));
+  });
+  
+  $.each(["h1",'h2','h3','h4','h5'],function(index,value) {
+    
+    var hashes = "";
+    var i = 0;
+    for(; i <= index;i++) {
+      hashes += "#";
+    }
+    
+    dom.find("> "+value).each(function() {
+      
+      if($(this).get(0).attributes.length === 0) {      
+        $(this).find("> strong").each(function() {
+          $(this).replaceWith("**"+$(this).html()+"**"); 
+        });
+      
+        $(this).find("> em").each(function() {
+          $(this).replaceWith("_"+$(this).html()+"_"); 
+        });
+      
+        var newLine = "\n\n";
+        if($(this).next().length === 0) {
+          newLine = "";
+        }
+      
+        $(this).replaceWith(getBeforePadding(this,"\n\n")+hashes+" "+$.trim($(this).html()) + newLine); 
+      }
+    });
+  });
+  
+  return dom.html().replace(/^&gt;/mg,'>').replace(/^&lt;/mg,'<').replace(/\n{2,20}/g,"\n\n");
+}

data/app/assets/packages/burp/editing/js/main.js

@@ -1,5 +1,5 @@
 /*global
-    snippets CodeMirror ContentDecorator qq
+    snippets CodeMirror ContentDecorator qq Html2Markdown
 */
 
 $(function() {
@@ -51,36 +51,37 @@ $(function() {
     }
   }
   
+  function loadHTML() {
+     
+     var element = snippets().snippets[snippetName].elements().clone();
+     element.find('.markdown').each(function() {
+       $(this).removeClass('markdown');
+       if($(this).attr('class') === "") {
+         $(this).removeAttr('class');
+       }
+     });
+     
+     element.find('script[type="text/dont-run-javascript"]').each(function() {
+       $(this).attr("type",'text/javascript');
+     });
+     
+     element.find('img.movable').each(function() {
+       $(this).removeClass('movable ui-draggable ui-droppable');
+     });
+     
+     editor.setValue(Html2Markdown(element.children()));
+  }
+  
   function loadSnippet() {
      var path = window.burp_path || window.location.pathname;
      if(path === "/") {
        path = "/$root";
      }
-
-     $.ajax("/burp/pages/"+path,{
-       cache:false,
-       dataType:'json',
-       success:function(data) {
-         if(data === null) {
-           // No page yet so our code needs a bit help
-           data = {};
-         }
-
-         // We default to the html
-         var value = originalHtml;
-         if(data.misc && data.misc.markdown && data.misc.markdown[snippetName]) {
-           value = data.misc.markdown[snippetName];
-         } else if(data.snippets[snippetName]) {
-           value = data.snippets[snippetName];
-         }
-
-         originalValue = value;
-         editor.setValue(value);
-         editor.clearHistory();
-
-         update(editor.getValue());
-       }
-     });
+     
+     loadHTML();
+     editor.clearHistory();
+     update(editor.getValue());
+     originalValue = editor.getValue();
    }
   
   function loadFiles() {
@@ -176,8 +177,15 @@ $(function() {
     $.adminDock.title('');
     $.adminDock.footer.addButton({ icon: 'picture', text: "Pictures", showModule: $('#gallery') });
     $.adminDock.footer.addButton({ icon: 'edit', text: "Edit text", showModule: $('#myContentEditor'), show: function() {
+      loadHTML();
       editor.refresh();
     } });
+    
+    
+    $(document).on('image-drop-done.burp', function() {
+      loadHTML();
+      editor.refresh();
+    });
 
     var snippet_names = [];
     $.each(snippets().snippets,function(name,snippet) {
@@ -255,8 +263,6 @@ $(function() {
           data = data || {snippets:{}};
           
           data.snippets[snippetName] = contentDecorator.getHtml();
-          data.misc = data.misc || {markdown:{}};
-          data.misc.markdown[snippetName] = contentDecorator.getMarkdown();
 
           $.ajax("/burp/pages/"+path,{
             type:"post",

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

@@ -4,9 +4,8 @@
 //= require jquery.ui.droppable
 //= require ../gritter/gritter.js
 //= require ../../javascripts/burp/lib/fileupload.js
-//= require ./editing/js/md5.js
 //= require ./editing/js/marked.js
-//= require ./editing/js/stay.js
+//= require ./editing/js/jquery.html2markdown.js
 //= require ./editing/js/admin-dock.js
 //= require ./editing/js/content-decorator.js
 //= require ./editing/dep/CodeMirror-2.3/lib/codemirror.js

data/app/controllers/burp/pages_controller.rb

@@ -77,7 +77,6 @@ module Burp
   
         @page.title = params[:page][:title] if params[:page][:title]
         @page.path = params[:page][:path] if params[:page][:path]
-        @page.misc = params[:page][:misc] if params[:page][:misc]
         
         if params[:page][:snippets]
           @page.snippets = {}

data/app/models/burp/page_model.rb

@@ -8,7 +8,7 @@ module Burp
     include ActiveModel::Conversion
     extend ActiveModel::Naming
 
-    attr_accessor :path, :title, :snippets, :misc
+    attr_accessor :path, :title, :snippets
   
     validates_presence_of :path, :message => "You must enter a path"
     validates :path, :format => { :with => /^\//, :message => "Must start with a slash" }
@@ -49,7 +49,7 @@ module Burp
       
         page_data = File.exist?("#{on_disk_path}/page.json") ? JSON.parse(File.read("#{on_disk_path}/page.json")) : {}
       
-        PageModel.new(:snippets => data,:title => page_data['title'],:misc => page_data['misc'],:path => path, :original_path => path)
+        PageModel.new(:snippets => data,:title => page_data['title'], :path => path, :original_path => path)
       else
         nil
       end
@@ -110,7 +110,7 @@ module Burp
     def save_metadata
     
       File.open("#{on_disk_path}/page.json","w:utf-8") do |file|
-        file.write(JSON.pretty_generate({:title => title,:misc => misc}))
+        file.write(JSON.pretty_generate({:title => title}))
       end
     
     end

data/config/cucumber.yml

@@ -3,10 +3,10 @@ rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
 rerun_opts = rerun.to_s.strip.empty? ? "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
 std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} --strict --color --tags ~@wip"
 %>
-default: --drb --port 4012 <%= std_opts %> features --guess -r ./features
-pretty: --drb  --color --port 4012 features --guess -r ./features
-wip: --drb --port 4012 --color --tags @wip --wip features --guess -r ./features
+default: --port 4012 <%= std_opts %> features --guess -r ./features
+pretty:  --color --port 4012 features --guess -r ./features
+wip: --port 4012 --color --tags @wip --wip features --guess -r ./features
 rerun: <%= rerun_opts %> --format rerun --out rerun.txt --strict --tags ~@wip --guess -r ./features
-autotest: --color --drb --port 4012 --format pretty --guess -r ./features
-autotest-all: --color --format pretty --tags @auto --drb --port 4012 --guess -r ./features
-current: --drb --port 4012 --tags @current --guess -r ./features --format pretty --strict
+autotest: --color --port 4012 --format pretty --guess -r ./features
+autotest-all: --color --format pretty --tags @auto --port 4012 --guess -r ./features
+current: --port 4012 --tags @current --guess -r ./features --format pretty --strict

data/lib/burp/version.rb

@@ -1,3 +1,3 @@
 module Burp
-  VERSION = "1.3.8"
+  VERSION = "1.3.9"
 end