parade 0.10.1 → 0.10.2

data/lib/parade/commands/html_output.rb

@@ -26,7 +26,7 @@ module Parade
         if File.directory? filepath
           root_path = filepath
           root_node = Parsers::PresentationDirectoryParser.parse filepath, :root_path => ".",
-            :parade_file => (Array(options['parade_file']) + [ "parade", "parade.json" ]).compact.uniq
+            :parade_file => (Array(options['parade_file']) + [ "parade" ]).compact.uniq
         else
           root_path = File.dirname filepath
           root_node = Parsers::PresentationFileParser.parse filepath, :root_path => root_path

data/lib/parade/parsers/dsl.rb

@@ -86,6 +86,34 @@ module Parade
         current_section.add_template template_name, File.join(options[:current_path], template_file)
       end
 
+      #
+      # This is used by the DSL to specify any additional CSS Classes specific
+      # to the section. All slides within the section will receive these
+      # additional CSS Classes when the slide is rendered
+      #
+      # @example Specifying the css classes in multiple different ways
+      #
+      #     section "Iteration 0" do
+      #       css_classes "blue-background"
+      #       slides "iteration-zero.md"
+      #     end
+      #     section "Iteration 1" do
+      #       css_classes [ "blue-background" ]
+      #       slides "iteration-zero.md"
+      #     end
+      #     section "Iteration WonderWoman" do
+      #       css_classes "blue-background", "red-font", "white-borders"
+      #       slides "iteration-zero.md"
+      #     end
+      #     section "Iteration Spiderman" do
+      #       css_classes "blue-background red-spandex web-spitters"
+      #       slides "iteration-zero.md"
+      #     end
+      #
+      def css_classes(*css_classes)
+        current_section.css_classes = css_classes.flatten.map { |css_class| css_class.split(" ") }.flatten
+      end
+
       #
       # This is used by the DSL to specify the resources used by the presentation
       #
@@ -93,6 +121,7 @@ module Parade
         current_section.add_resource File.join(options[:current_path], resource_filepath)
       end
 
+
       #
       # Sets the current sections theme to the specified theme
       # @note this will only work at the top level section of the presentation

data/lib/parade/parsers/presentation_file_parser.rb

@@ -1,24 +1,18 @@
 require_relative 'dsl_file_parser'
-require_relative 'json_file_parser'
 
 module Parade
   module Parsers
-    
+
     #
     # The Presentation File Parser allows for the JSON formatted file or the
     # DSL formatted files. The determination of which to use is solely based
     # on the file extension.
-    # 
+    #
     class PresentationFileParser
 
       def self.parse(filepath,options = {})
         options = options.merge(:current_path => File.dirname(filepath))
-        
-        if File.extname(filepath) == ".json"
-          JsonFileParser.parse(filepath,options)
-        else
-          DslFileParser.parse(filepath,options)
-        end
+        DslFileParser.parse(filepath,options)
       end
 
     end

data/lib/parade/renderers/columns_renderer.rb

@@ -26,40 +26,58 @@ module Parade
       end
 
       def render(content)
-
         html = Nokogiri::XML.fragment(content)
-        html.css(".content.#{css_class}").each do |slide|
 
-          columns = []
-          slop = []
+        #for each element with the class 'content.css_class'
+        html.css(".content.#{css_class}").each do |slide|
 
-          chunks = slide.children.chunk {|child| child.name == html_element }
+          #chunk and mark nods that are html_element as columns
+          chunks = chunk_children_by_element(slide, html_element)
 
+          #remove the current children
           slide.children = ""
 
+          #append the container grid count..size.. thing
           slide['class'] += " container_#{segments}"
           current_column = slide
 
-          column_count = chunks.find_all {|is_column,contents| is_column }.count
+          #get the number of elements that are html_element
+          column_count = chunks.find_all {|is_column, contents| is_column }.count
 
           chunks.each do |is_column,contents|
 
             if is_column
-              slide.add_child current_column unless current_column == slide
-              current_column = Nokogiri::XML::Node.new('div',html)
-              current_column['class'] = "grid_#{ segments / column_count }"
+              current_column = new_column_div(html, column_count)
             end
 
             contents.each {|content| current_column.add_child content }
-          end
+            slide.add_child current_column unless current_column == slide
 
-          slide.add_child current_column
+          end
 
         end
 
         html.to_s
 
       end
+
+      private
+
+      def chunk_children_by_element slide, html_element
+        chunks = slide.children.chunk {|child| child.name == html_element }
+      end
+
+      def new_column_div(html, column_count)
+        column = Nokogiri::XML::Node.new('div',html)
+        column['class'] = grid_class(column_count)
+
+        column
+      end
+
+      def grid_class column_count
+        "grid_#{ segments / column_count }"
+      end
+
     end
 
   end

data/lib/parade/renderers/content_with_caption_renderer.rb

@@ -0,0 +1,87 @@
+module Parade
+  module Renderers
+
+    #
+    # With the given HTML content, search for the CSS class for the HTML element
+    # and when found the first of the elements will be contained in a smaller
+    # column on the left and the remaining elements will be contained in
+    # a larger container on the right.
+    #
+    class ContentWithCaptionRenderer
+
+      attr_accessor :css_class
+      attr_accessor :html_element
+      #attr_accessor :segments
+
+      #
+      # @example Creating a ContentWithCaptionRenderer
+      #
+      # Creation of a column renderer that will look for slides with the class
+      # 'content-with-caption', and create a smaller column with the first of
+      # the h2 elements on the left and a larger column on the right that
+      # contains all remaining h2 elements
+      #
+      #     ContentWithCaptionElement.new(:css_class => 'content-with-caption',:html_element => "h2",:segments => 12)
+      #
+      def initialize(params={})
+        params.each {|k,v| send("#{k}=",v) if respond_to? "#{k}=" }
+      end
+
+      def render(content)
+        html = Nokogiri::XML.fragment(content)
+
+        html.css(".content.#{css_class}").each do |slide|
+
+          chunks = chunk_children_by_element(slide, html_element)
+
+          slide.children = ""
+
+          slide['class'] += " columns container_12"
+          current_column = slide
+          is_first_h2 = true
+          is_second_h2 = true
+
+          column_count = chunks.find_all {|is_column, contents| is_column }.count
+
+          chunks.each do |is_column,contents|
+
+            if is_column && is_first_h2
+              current_column = new_column_div(html, 4)
+              is_first_h2 = false
+            elsif is_column && is_second_h2
+              current_column = new_column_div(html, 8)
+              is_second_h2 = false
+            end
+
+            contents.each {|content| current_column.add_child content }
+            slide.add_child current_column unless current_column == slide
+
+          end
+
+        end
+
+        html.to_s
+
+      end
+
+      private
+
+      def chunk_children_by_element slide, html_element
+        chunks = slide.children.chunk {|child| child.name == html_element }
+      end
+
+      def new_column_div(html, column_span)
+        column = Nokogiri::XML::Node.new('div',html)
+        column['class'] = grid_class(column_span)
+
+        column
+      end
+
+      def grid_class column_span
+        "grid_#{ column_span}"
+      end
+
+    end
+
+  end
+end

data/lib/parade/section.rb

@@ -44,6 +44,15 @@ module Parade
     #   root section.
     attr_accessor :section
 
+    # Set the additional css classes that will be applied to all the slides
+    # within the section.
+    attr_writer :css_classes
+
+    # @return [Array<String>] returns an array of css classes names
+    def css_classes
+      @css_classes || []
+    end
+
     #
     # Append sections to this section.
     #

data/lib/parade/server.rb

@@ -27,7 +27,7 @@ module Parade
     end
 
     set :presentation_file, 'parade'
-    set :default_presentation_files, [ 'parade', 'parade.json' ]
+    set :default_presentation_files, [ 'parade' ]
 
 
     #
@@ -220,6 +220,10 @@ module Parade
       erb :print
     end
 
+    not_found do
+      erb :not_found
+    end
+
   end
 
 end

data/lib/parade/slide.rb

@@ -70,7 +70,7 @@ module Parade
 
     # @return [String] the CSS classes for the slide
     def slide_classes
-      [ title.downcase.gsub(' ','-') ] + content_classes
+      [ title.downcase.gsub(' ','-') ] + section_classes + content_classes
     end
 
     # @return [String] the CSS classes for the content section of the slide
@@ -78,6 +78,11 @@ module Parade
       metadata.classes
     end
 
+    # @return [String] the CSS classes specifed at the section level
+    def section_classes
+      section.css_classes
+    end
+
     # @return [String] the transition style for the slide
     def transition
       metadata.transition || "none"

data/lib/parade/slide_post_renderers.rb

@@ -1,6 +1,7 @@
 require_relative 'renderers/command_line_renderer'
 require_relative 'renderers/special_paragraph_renderer'
 require_relative 'renderers/columns_renderer'
+require_relative 'renderers/content_with_caption_renderer'
 
 module Parade
 
@@ -22,5 +23,7 @@ module Parade
     html_element: "h2", segments: 12)
   SlidePostRenderers.register Renderers::ColumnsRenderer.new(css_class: 'comparison',
     html_element: "h2", segments: 12)
+  SlidePostRenderers.register Renderers::ContentWithCaptionRenderer.new(css_class: 'content-with-caption',
+  html_element: "h2")
 
 end

data/lib/parade/version.rb

@@ -1,3 +1,3 @@
 module Parade
-  VERSION = '0.10.1'
+  VERSION = '0.10.2'
 end

data/lib/public/css/themes/default.css

@@ -63,7 +63,6 @@ pre { margin: 1em 40px; padding: .25em; }
 }
 
 #debugInfo { margin-left: 30px; }
-#notesInfo { margin-left: 30px; display: none }
 
 #help {
     background: #9f9;

data/lib/public/css/themes/hayfield.css

@@ -0,0 +1,58 @@
+/* customr css and js files included at the top level of your presentation will
+ * will be included in your presentation */
+
+body {
+  box-sizing: border-box;
+  color: #2f5d2f;
+  background: #489060;
+  font-size: 16px;
+  font-family: Helvetica, Arial, sans-serif;
+  line-height: 1.5;
+  -webkit-font-smoothing: antialiased;
+}
+
+
+h1{
+  color: #183018;
+  font-family: 'Lucida Console', Tahoma, fantasy;
+  font-weight: bold;
+  background: #A8C060;
+}
+
+h2{
+  color: #183018;
+  font-family: 'Lucida Console', Tahoma, fantasy;
+  border-bottom: 1px dotted #183018;
+}
+
+a{
+  color: #F5582F;
+}
+
+a:hover {
+  color: #FF0033;
+}
+
+.slide {
+  background-color: #F7F794;
+}
+
+#footer {
+  background: #183018;
+  color: #b5e853;
+}
+
+blockquote {
+  background-color: #D8D878;
+  color: #376e49;
+  border-left: 4px solid #489060;
+}
+
+.highlight.text,
+.highlight.ruby,
+.highlight.javascript,
+.highlight.shell,
+.highlight.shell pre.command,
+.highlight.shell pre.result {
+  background-color: #fdfde3;
+}

data/lib/public/css/themes/minimal.css

@@ -0,0 +1,144 @@
+body {
+  font-size: 100%;
+  font-family: Helvetica, Arial, sans-serif;
+  background: #333;
+  overflow:hidden;
+  margin:0;
+  padding:0;
+}
+
+h1,h2,h3 { font-weight: bold; letter-spacing: -0.05em; text-align: center; }
+h1 { font-size: 5em; }
+h2 { font-size: 2.5em; }
+h3 { font-size: 2em; }
+
+pre {
+  margin: 1em 40px;
+  padding: .25em;
+}
+
+pre, pre.highlight, pre.highlight pre {
+  background-color: #eee;
+  font-size: 20px;
+  line-height: 26px;
+  overflow: auto;
+  border-radius: 3px;
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  padding: 6px 10px;
+}
+
+
+a, a code {
+  color: #4183C4;
+  text-decoration: none;
+}
+
+blockquote {
+  border-left: 4px solid #ddd;
+  color: black;
+  font-style: oblique;
+  padding-left: 11px;
+  margin: 14px 0;
+}
+
+.content > blockquote {
+  font-size: 200%;
+  margin: 2em;
+}
+
+.content > p {
+  font-size: 2em;
+  line-height: 1.25em;
+}
+
+.bullets > ul > li {
+  font-size: .75em;
+  padding: .25em;
+  text-align: left;
+  margin-left: 10%;
+  list-style-type: disc;
+}
+
+.smbullets > ul > li {
+  font-size: .70em;
+  padding: .10em;
+  text-align: left;
+  margin-left: 10%;
+  list-style-type: disc;
+}
+
+#preso, .slide {
+  background: #fff;
+  width: 1024px;
+  height: 768px;
+  margin-left:auto;
+  margin-right:auto;
+  overflow:hidden;
+  -webkit-box-shadow:0 0 25px rgba(0,0,0,0.35);
+  -moz-box-shadow:0 0 25px rgba(0,0,0,0.35);
+  box-shadow:0 0 25px rgba(0,0,0,0.35);
+}
+
+#footer {
+  background: rgba(221,221,221,0.75);
+  color:#333;
+  padding: 2px 5px;
+  width: 1014px;
+  height: 20px;
+  line-height:20px;
+  font-size:14px;
+  position:relative;
+  top:-24px;
+  margin:0 auto;
+  -webkit-border-top-left-radius: 3px;
+  -webkit-border-top-right-radius: 3px;
+  -moz-border-radius-topleft: 3px;
+  -moz-border-radius-topright: 3px;
+  border-top-left-radius: 3px;
+  border-top-right-radius: 3px;
+  z-index: 2147483647;
+}
+
+#pauseScreen {
+  background: rgba(0, 0, 0, 0.85);
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  top: 0px;
+  left: 0px;
+  display: none;
+  margin: auto;
+  color: white;
+  font-size: 2em;
+  padding: 1em;
+  z-index: 2147483647;
+  text-align: center;
+}
+
+#debugInfo { margin-left: 30px; }
+
+#help {
+  background: #9f9;
+  position: absolute;
+  right: 80px;
+  display: none;
+  z-index: 2147483647;
+}
+
+#help table tr td.key {
+  text-align: right;
+  border-right: 2px solid #8b8;
+  padding-right: 4px;
+  font-weight: bold;
+}
+
+.content.columns h2, .content.comparison h2 {
+  padding-bottom: 10px;
+  border-bottom: 2px solid black;
+}
+
+.notes { display: none }
+.hidden { position:absolute; top:0; left:-9999px; width:1px; height:1px; overflow:hidden; }
+.offscreen { position:absolute; top:0; left:-9999px; overflow:hidden; }
+.buttonNav { display: none }