tp 0.3.0 → 0.3.1

data/Readme.md

@@ -34,7 +34,8 @@ tp slides.md
 
 * Arrow keys
 * Space/Enter/Backspace
-* H,J,K,L (VIM)
+* H,J,K,L
+* W,A,S,D
 * Q to quit
 
 # Paragraphs
@@ -45,12 +46,22 @@ Short paragraphs are centered
 
 Sometimes paragraphs are really really long and might wrap a few lines. It does its best to wrap them logically. Also, they stay left-aligned.
 
+# Paragraphs
+
+There can also be...
+
+...multiple paragraphs.
+
+#
+
+Headers can also be blank
+
 # Contribute
 
-JustinCampbell/tp
+justincampbell/tp
 
 # Thanks!
 
-@JustinCampbell
+@justincampbell
 ```
 

data/lib/tp/presenter.rb

@@ -7,7 +7,7 @@ module TP
     end
 
     def present
-      Screen.suggest 30, 8
+      Screen.suggest slide_deck.width, slide_deck.height
       Keyboard.wait_for_return
 
       loop do

data/lib/tp/slide.rb

@@ -29,6 +29,18 @@ module TP
       body unless bullets
     end
 
+    def width
+      return header.length unless body
+
+      (body.lines.to_a.collect(&:length) + [header.length]).max
+    end
+
+    def height
+      return 1 unless body
+
+      body.lines.count + 2
+    end
+
     private
 
     def lines

data/lib/tp/slide_deck.rb

@@ -56,5 +56,22 @@ module TP
 
       current
     end
+
+    def width
+      slides_without_paragraphs = slides.reject(&:paragraph)
+
+      if slides_without_paragraphs.empty?
+        [slides.collect(&:width).max, 80].min
+      else
+        [
+          slides.collect(&:header).map(&:length).max,
+          slides_without_paragraphs.collect(&:width).max
+        ].max
+      end
+    end
+
+    def height
+      slides.collect(&:height).max
+    end
   end
 end

data/lib/tp/version.rb

@@ -1,3 +1,3 @@
 module TP
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/slides.md

@@ -30,7 +30,13 @@ Short paragraphs are centered
 
 # Paragraphs
 
-Sometimes paragraphs are really really long and might wrap a few lines. It does it's best to wrap them logically. Also, they stay left-aligned.
+Sometimes paragraphs are really really long and might wrap a few lines. It does its best to wrap them logically. Also, they stay left-aligned.
+
+# Paragraphs
+
+There can also be...
+
+...multiple paragraphs.
 
 #
 

data/spec/lib/tp/slide_deck_spec.rb

@@ -10,5 +10,16 @@ describe TP::SlideDeck do
     ]
   }
 
+  its(:height) { should == 4 }
+  its(:width) { should == 12 }
+
+  context "with only really long paragraphs" do
+    let (:slides) {
+      [TP::Slide.new("# First Slide\n\n#{'word ' * 100}")]
+    }
+
+    its(:width) { should == 80 }
+  end
+
   it { slide_deck.frames.count.should == 4 }
 end

data/spec/lib/tp/slide_spec.rb

@@ -19,6 +19,9 @@ describe TP::Slide do
 
     its(:bullets) { should =~ ["Bullet 1", "Bullet 2"] }
     its(:paragraph) { should be_nil }
+
+    its(:width) { should == 11 }
+    its(:height) { should == 4 }
   end
 
   context "with a paragraph" do
@@ -31,6 +34,9 @@ describe TP::Slide do
 
     its(:bullets) { should be_nil }
     its(:paragraph) { should == "This is a paragraph of text" }
+
+    its(:width) { should == 27 }
+    its(:height) { should == 3 }
   end
 
   context "with just a header" do
@@ -43,6 +49,17 @@ describe TP::Slide do
 
     its(:bullets) { should be_nil }
     its(:paragraph) { should be_nil }
+
+    its(:width) { should == 11 }
+    its(:height) { should == 1 }
+  end
+
+  context "with a header longer than the paragraph" do
+    let(:markdown) {
+      "# This is a very long header\n\nand short paragraph"
+    }
+
+    its(:width) { should == 26 }
   end
 
   context "with a blank header" do
@@ -55,6 +72,9 @@ describe TP::Slide do
 
     its(:bullets) { should be_nil }
     its(:paragraph) { should == "First Slide" }
+
+    its(:width) { should == 11 }
+    its(:height) { should == 3 }
   end
 
   context "with trailing newlines" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tp
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors: