parade 0.8.2 → 0.9.0

data/lib/parade/renderers/html_with_rouge.rb

@@ -0,0 +1,26 @@
+require 'redcarpet'
+require 'rouge'
+require 'rouge/plugins/redcarpet'
+
+module Parade
+  module Renderers
+    class HTMLWithRouge < Redcarpet::Render::XHTML
+      include Rouge::Plugins::Redcarpet
+
+      def self.render(content)
+        markdown = Redcarpet::Markdown.new(Renderers::HTMLWithRouge,
+          :fenced_code_blocks => true,
+          :no_intra_emphasis => true,
+          :autolink => true,
+          :strikethrough => true,
+          :lax_html_blocks => true,
+          :superscript => true,
+          :hard_wrap => true,
+          :tables => true,
+          :xhtml => true)
+        markdown.render(content)
+      end
+
+    end
+  end
+end

data/lib/parade/slide_pre_renderers.rb

@@ -1,4 +1,4 @@
-require_relative 'renderers/html_with_pygments'
+require_relative 'renderers/html_with_rouge'
 
 module Parade
 
@@ -14,6 +14,6 @@ module Parade
     end
   end
 
-  SlidePreRenderers.register Renderers::HTMLwithPygments
+  SlidePreRenderers.register Renderers::HTMLWithRouge
 
 end

data/lib/parade/version.rb

@@ -1,3 +1,3 @@
 module Parade
-  VERSION = '0.8.2'
+  VERSION = '0.9.0'
 end

data/lib/public/css/ghf_marked.css

@@ -4,7 +4,7 @@ pre, code {
 	color: black;
 }
 
-.highlight pre, pre {
+pre.highlight pre, pre.highlight, pre {
 	background-color:#f8f8f8;
 /*  border:1px solid #ccc;*/
 	font-size:20px;
@@ -16,7 +16,7 @@ pre, code {
 	padding:6px 10px;
 }
 
-.highlight pre pre.command, .highlight pre pre.result {
+pre.highlight pre.command, pre.highlight pre.result {
   margin: 0px;
   border-radius:0px;
   -moz-border-radius:0px;
@@ -25,7 +25,7 @@ pre, code {
 	border:0px solid #ccc;
 }
 
-.highlight pre pre.result {
+pre.highlight pre.result {
   color: #444;
 }
 
@@ -111,70 +111,70 @@ ul li, ol li
 .shadow {
 	-webkit-box-shadow:0 5px 15px #000;
 	-moz-box-shadow:0 5px 15px #000;
-	box-shadow:0 5px 15px #000;		
+	box-shadow:0 5px 15px #000;
 }
 
 
 
 /* Pygments coloring */
-.highlight .c{color:#998;font-style:italic;}
-.highlight .err{color:#a61717;background-color:#e3d2d2;}
-.highlight .k{font-weight:bold;}
-.highlight .o{font-weight:bold;}
-.highlight .cm{color:#998;font-style:italic;}
-.highlight .cp{color:#999;font-weight:bold;}
-.highlight .c1{color:#998;font-style:italic;}
-.highlight .cs{color:#999;font-weight:bold;font-style:italic;}
-.highlight .gd{color:#000;background-color:#fdd;}
-.highlight .gd .x{color:#000;background-color:#faa;}
-.highlight .ge{font-style:italic;}
-.highlight .gr{color:#a00;}
-.highlight .gh{color:#999;}
-.highlight .gi{color:#000;background-color:#dfd;}
-.highlight .gi .x{color:#000;background-color:#afa;}
-.highlight .go{color:#888;}
-.highlight .gp{color:#555;}
-.highlight .gs{font-weight:bold;}
-.highlight .gu{color:#800080;font-weight:bold;}
-.highlight .gt{color:#a00;}
-.highlight .kc{font-weight:bold;}
-.highlight .kd{font-weight:bold;}
-.highlight .kn{font-weight:bold;}
-.highlight .kp{font-weight:bold;}
-.highlight .kr{font-weight:bold;}
-.highlight .kt{color:#458;font-weight:bold;}
-.highlight .m{color:#099;}
-.highlight .s{color:#d14;}
-.highlight .na{color:#008080;}
-.highlight .nb{color:#0086B3;}
-.highlight .nc{color:#458;font-weight:bold;}
-.highlight .no{color:#008080;}
-.highlight .ni{color:#800080;}
-.highlight .ne{color:#900;font-weight:bold;}
-.highlight .nf{color:#900;font-weight:bold;}
-.highlight .nn{color:#555;}
-.highlight .nt{color:#000080;}
-.highlight .nv{color:#008080;}
-.highlight .ow{font-weight:bold;}
-.highlight .w{color:#bbb;}
-.highlight .mf{color:#099;}
-.highlight .mh{color:#099;}
-.highlight .mi{color:#099;}
-.highlight .mo{color:#099;}
-.highlight .sb{color:#d14;}
-.highlight .sc{color:#d14;}
-.highlight .sd{color:#d14;}
-.highlight .s2{color:#d14;}
-.highlight .se{color:#d14;}
-.highlight .sh{color:#d14;}
-.highlight .si{color:#d14;}
-.highlight .sx{color:#d14;}
-.highlight .sr{color:#009926;}
-.highlight .s1{color:#d14;}
-.highlight .ss{color:#990073;}
-.highlight .bp{color:#999;}
-.highlight .vc{color:#008080;}
-.highlight .vg{color:#008080;}
-.highlight .vi{color:#008080;}
-.highlight .il{color:#099;}
+pre.highlight .c{color:#998;font-style:italic;}
+pre.highlight .err{color:#a61717;background-color:#e3d2d2;}
+pre.highlight .k{font-weight:bold;}
+pre.highlight .o{font-weight:bold;}
+pre.highlight .cm{color:#998;font-style:italic;}
+pre.highlight .cp{color:#999;font-weight:bold;}
+pre.highlight .c1{color:#998;font-style:italic;}
+pre.highlight .cs{color:#999;font-weight:bold;font-style:italic;}
+pre.highlight .gd{color:#000;background-color:#fdd;}
+pre.highlight .gd .x{color:#000;background-color:#faa;}
+pre.highlight .ge{font-style:italic;}
+pre.highlight .gr{color:#a00;}
+pre.highlight .gh{color:#999;}
+pre.highlight .gi{color:#000;background-color:#dfd;}
+pre.highlight .gi .x{color:#000;background-color:#afa;}
+pre.highlight .go{color:#888;}
+pre.highlight .gp{color:#555;}
+pre.highlight .gs{font-weight:bold;}
+pre.highlight .gu{color:#800080;font-weight:bold;}
+pre.highlight .gt{color:#a00;}
+pre.highlight .kc{font-weight:bold;}
+pre.highlight .kd{font-weight:bold;}
+pre.highlight .kn{font-weight:bold;}
+pre.highlight .kp{font-weight:bold;}
+pre.highlight .kr{font-weight:bold;}
+pre.highlight .kt{color:#458;font-weight:bold;}
+pre.highlight .m{color:#099;}
+pre.highlight .s{color:#d14;}
+pre.highlight .na{color:#008080;}
+pre.highlight .nb{color:#0086B3;}
+pre.highlight .nc{color:#458;font-weight:bold;}
+pre.highlight .no{color:#008080;}
+pre.highlight .ni{color:#800080;}
+pre.highlight .ne{color:#900;font-weight:bold;}
+pre.highlight .nf{color:#900;font-weight:bold;}
+pre.highlight .nn{color:#555;}
+pre.highlight .nt{color:#000080;}
+pre.highlight .nv{color:#008080;}
+pre.highlight .ow{font-weight:bold;}
+pre.highlight .w{color:#bbb;}
+pre.highlight .mf{color:#099;}
+pre.highlight .mh{color:#099;}
+pre.highlight .mi{color:#099;}
+pre.highlight .mo{color:#099;}
+pre.highlight .sb{color:#d14;}
+pre.highlight .sc{color:#d14;}
+pre.highlight .sd{color:#d14;}
+pre.highlight .s2{color:#d14;}
+pre.highlight .se{color:#d14;}
+pre.highlight .sh{color:#d14;}
+pre.highlight .si{color:#d14;}
+pre.highlight .sx{color:#d14;}
+pre.highlight .sr{color:#009926;}
+pre.highlight .s1{color:#d14;}
+pre.highlight .ss{color:#990073;}
+pre.highlight .bp{color:#999;}
+pre.highlight .vc{color:#008080;}
+pre.highlight .vg{color:#008080;}
+pre.highlight .vi{color:#008080;}
+pre.highlight .il{color:#099;}
 

data/lib/public/js/parade-code-execution.js

@@ -8,9 +8,9 @@ window.CodeExecutor = Spine.Class.create({
     },this));
   },
   visibleCodeBlocks: function() {
-    return { ruby : $('.execute .sh_ruby pre:visible'),
-      js : $('.execute .sh_javascript pre:visible'),
-      coffee : $('.execute .sh_coffeescript pre:visible') }
+    return { ruby : $('.execute .ruby pre:visible'),
+      js : $('.execute .javascript pre:visible'),
+      coffee : $('.execute .coffeescript pre:visible') }
   },
   executeVisibleCode: function() {
 
@@ -104,17 +104,17 @@ $(document).ready(function() {
   codeExecutor = new CodeExecutor;
   codeViewer = new CodeViewer;
 
-  $('.execute .sh_javascript pre').live("click", function() {
+  $('.execute pre.javascript').live("click", function() {
     var code = $(this).text();
     $.publish('code:execute',{ lang: 'js', code: code, elem: $(this) });
   });
 
-  $('.execute .sh_ruby pre').live("click", function() {
+  $('.execute pre.ruby').live("click", function() {
     var code = $(this).text();
     $.publish('code:execute',{ lang: 'ruby', code: code, elem: $(this) });
   });
 
-  $('.execute .sh_coffeescript pre').live("click", function() {
+  $('.execute pre.coffeescript').live("click", function() {
     var code = $(this).text();
     $.publish('code:execute',{ lang: 'coffee', code: code, elem: $(this) });
   });

data/lib/templates/config.ru.erb

@@ -1,4 +1,2 @@
 require "parade"
-require 'rubypython'
-RubyPython.configure :python_exe => 'python2.6'
 run Parade::Server.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parade
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -125,37 +125,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.4.0
 - !ruby/object:Gem::Dependency
-  name: rubypython
+  name: rouge
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.5.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.5.1
-- !ruby/object:Gem::Dependency
-  name: pygments.rb
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.15
 - !ruby/object:Gem::Dependency
   name: css_parser
   requirement: !ruby/object:Gem::Requirement
@@ -235,7 +219,7 @@ files:
 - lib/parade/parsers/slides_file_content_parser.rb
 - lib/parade/renderers/columns_renderer.rb
 - lib/parade/renderers/command_line_renderer.rb
-- lib/parade/renderers/html_with_pygments.rb
+- lib/parade/renderers/html_with_rouge.rb
 - lib/parade/renderers/inline_images.rb
 - lib/parade/renderers/special_paragraph_renderer.rb
 - lib/parade/renderers/update_image_paths.rb
@@ -329,7 +313,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: The best damn presentation software a developer could ever love.

data/lib/parade/renderers/html_with_pygments.rb

@@ -1,42 +0,0 @@
-require 'redcarpet'
-require 'pygments.rb'
-
-module Parade
-  module Renderers
-    class HTMLwithPygments < Redcarpet::Render::XHTML
-
-      #
-      # When rendering the markdown, the code should be rendered using the
-      # Pygments highlight which corresponds to the ghf_marked.css
-      #
-      # Additionally a class `sh_javascript` or `sh_ruby` is added that will
-      # assist in providing a system to provide live interactive elements
-      # through the javascript defined in `parade.js`.
-      #
-      # @param [String] code the fenced code to be highlighted
-      # @param [String] language the name of the fenced code
-      #
-      def block_code(code, language)
-        syntax_highlighted_html = Pygments.highlight code, :lexer => language,
-          :options => {:encoding => 'utf-8'}
-
-        syntax_highlighted_html.gsub('class="highlight"',"class=\"highlight sh_#{language}\"")
-      end
-
-      def self.render(content)
-        markdown = Redcarpet::Markdown.new(Renderers::HTMLwithPygments,
-          :fenced_code_blocks => true,
-          :no_intra_emphasis => true,
-          :autolink => true,
-          :strikethrough => true,
-          :lax_html_blocks => true,
-          :superscript => true,
-          :hard_wrap => true,
-          :tables => true,
-          :xhtml => true)
-        markdown.render(content)
-      end
-
-    end
-  end
-end