scarlet 0.1.0 → 0.1.1

data/README.textile

@@ -31,6 +31,7 @@ h3. Step 3 – Create and save your slideshow file with Textile in the previousl
 
 <pre>
 !SLIDE cover
+!TITLE Welcome to Scarlet!
 
 h1. Scarlet
 
@@ -64,6 +65,7 @@ In the previously created folder:
 h2. Contributors
 
 * *Matias Korhonen*: PDF and LaTeX generation
+* *Blake Smith*: Slide titles and bug fixes
 
 h2. Special Thanks
 

data/lib/scarlet/formatters/html.rb

@@ -6,7 +6,7 @@ module Scarlet::Formatters
     
     def text
       process_code do |code, language, before, after|
-        before + "<notextile><div class=\"code\">" + Scarlet::Highlighter.run(code, :format => "html", :lexer => language) + "</div></notextile>" + after
+        "#{before}<notextile><div class=\"code\">" + Scarlet::Highlighter.run(code, :format => "html", :lexer => language) + "</div></notextile>#{after}"
       end
       
       RedCloth.new(slide.text).to_html

data/lib/scarlet/slide.rb

@@ -1,6 +1,6 @@
 module Scarlet
   class Slide
-    attr_accessor :classes, :text
+    attr_accessor :classes, :text, :title
     attr_reader :identifier
     
     def initialize
@@ -15,4 +15,4 @@ module Scarlet
       @text = formatter.new(self).text
     end
   end
-end
+end

data/lib/scarlet/slideshow.rb

@@ -32,7 +32,9 @@ module Scarlet
         enumerable.lines.each do |line|
           if line.include? "!SLIDE"
             slides << Scarlet::Slide.new
-            slides.last.classes = line.delete("!SLIDE").strip
+            slides.last.classes = line.gsub("!SLIDE", "").strip
+          elsif line.include? "!TITLE"
+            slides.last.title = line.gsub("!TITLE", "").strip
           else
             next if slides.empty?
             slides.last.text << line
@@ -41,4 +43,4 @@ module Scarlet
         return slides
       end
   end
-end
+end

data/lib/scarlet/templates/html/default.erb

@@ -18,7 +18,7 @@
 		<div id="track">
 			<% for slide in @slides %>
 				<div class="<%= slide.classes %>">
-					<div id="<%= slide.identifier %>" class="content">
+          <div title="<%= slide.title %>" id="<%= slide.identifier %>" class="content">
 						<%= slide.text %>
 					</div>
 				</div>
@@ -26,4 +26,4 @@
 		</div>
 	</div>
 </body>
-</html>
+</html>

data/lib/scarlet/templates/html/javascripts/slides.js

@@ -22,6 +22,13 @@
     if ($(newSlide).size() < 1) { return false; }
     document.location.hash = '#' + idx;
   }
+
+  var setTitle = function(idx) {
+    var newSlide = '#slide-' + idx;
+    var value = $(newSlide).attr("title");
+    if (value == "") { $('title').html("Slides"); }
+    else { $('title').html(value); }
+  }
   
   var setSlideDimensions = function() {
     var dimensions = slideDimensions();
@@ -86,6 +93,7 @@
       } else {
         setIndex(getIndex() + dir);
       }
+      setTitle(getIndex());
     }
   }
   
@@ -103,6 +111,7 @@
   $(document).bind('click', clickMove);
   $(document).ready(function() {
     setIndex(getIndex() || 0);
+    setTitle(getIndex() || 0);
     $(this).trigger('hash.changed');
     if (document.location.search.indexOf('notes') == 1) {
       $('.notes').show();

data/spec/scarlet/slide.rb

@@ -0,0 +1,46 @@
+require File.join(File.dirname(__FILE__), "/../spec_helper")
+
+module Scarlet
+  describe Slide do
+    context "defining slide classes" do
+      context "the class is missing" do
+        it "should be empty" do
+          text = <<-EOF
+            !SLIDE
+            Slide 1
+          EOF
+          slideshow = Slideshow.new(text)
+          slideshow.slides.first.classes.should be_empty
+        end
+      end
+      
+      context "one class is specified" do
+        it "should have one class" do
+          text = <<-EOF
+            !SLIDE myclass
+            Slide 1
+          EOF
+          slideshow = Slideshow.new(text)
+          slideshow.slides.first.classes.should == "myclass"
+        end
+      end
+      
+      context "three classes are specified" do
+        it "should have the three classes" do
+          text = <<-EOF
+            !SLIDE class1 class2 class3
+            Slide 1
+          EOF
+          slideshow = Slideshow.new(text)
+          slideshow.slides.first.classes.should == "class1 class2 class3"
+        end
+      end
+    end
+    
+    context "slide identifiers" do
+      it "should add slide identifiers automatically and incrementally" do
+        pending
+      end
+    end
+  end
+end

data/spec/scarlet/slideshow.rb

@@ -0,0 +1,38 @@
+require File.join(File.dirname(__FILE__), "/../spec_helper")
+
+module Scarlet
+  describe Slideshow do
+    context "slicing text into slides" do
+      it "should ignore text before the first slide" do
+        text = <<-EOF
+          Some comments about the slides
+          !SLIDE
+          Slide 1
+        EOF
+        slideshow = Slideshow.new(text)
+        slideshow.slides.count.should == 1
+      end
+      
+      context "the text has no slide declarations" do
+        it "should not create any slides" do
+          text = ""
+          slideshow = Slideshow.new(text)
+          slideshow.slides.count.should == 0
+        end
+      end
+      
+      context "the text has two slides" do
+        it "should create two slides" do
+          text = <<-EOF
+            !SLIDE
+            Slide 1
+            !SLIDE
+            Slide 2
+          EOF
+          slideshow = Slideshow.new(text)
+          slideshow.slides.count.should == 2
+        end
+      end      
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,3 @@
+$: << File.join(File.dirname(__FILE__), "/../lib") 
+require 'spec' 
+require 'scarlet'

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: scarlet
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Joao Carlos Cardoso
@@ -9,39 +14,54 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-20 00:00:00 +02:00
+date: 2010-05-17 00:00:00 +03:00
 default_executable: scarlet
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: open4
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 6
         version: 0.9.6
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: RedCloth
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 4
+        - 2
+        - 2
         version: 4.2.2
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rtex
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 1
+        - 1
         version: 2.1.1
-    version: 
+  type: :runtime
+  version_requirements: *id003
 description: Generates XHTML slideshows from text files using Textile for markup. Does syntax highlighting if Pygments is installed.
 email: mail@joao-carlos.com
 executables: 
@@ -77,6 +97,9 @@ files:
 - lib/scarlet/templates/latex/default.erb
 - LICENSE
 - README.textile
+- spec/scarlet/slide.rb
+- spec/scarlet/slideshow.rb
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/jcxplorer/scarlet
 licenses: []
@@ -87,23 +110,29 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: scarlet
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Slideshow Generator with Textile
-test_files: []
-
+test_files: 
+- spec/scarlet/slide.rb
+- spec/scarlet/slideshow.rb
+- spec/spec_helper.rb