termnote 1.1.0 → 1.5.0

data/README.md

@@ -9,7 +9,7 @@ require 'termnote'
 include TermNote
 
 show.add chapter title: "Hello, World"
-show.add code language: "Ruby", source: <<-SOURCE
+show.add code language: "ruby", source: <<-SOURCE
   puts "Hello, world!"
 SOURCE
 show.start
@@ -63,6 +63,36 @@ Usage is pretty simple, there are 4 types of slides:
 You can change the way things are printed out by overriding the classes for
 your specific presentation, but only if you do things programatically.
 
+Ruby Usage Examples
+=============
+
+**Add a title slide**
+
+```ruby
+show.add chapter title: "Title Slide"
+```
+
+**Add a text slide**
+
+```ruby
+show.add text title: "Content Title", content: "content blob"
+```
+
+**Add a list slide**
+
+```ruby
+show.add list title: "title", items: ["item 1", "item 2", "item 3"]
+```
+
+**Add a slide with code**
+
+```ruby
+show.add code langauge: "ruby", source: <<-SOURCE
+  def method
+    awesome = true
+  end
+SOURCE
+```
 
 Contributing
 ============

data/example/slideshow1.yaml

@@ -14,12 +14,11 @@ content: |
 
   -- Henry Ford
 ---
-type: list
-title: Materials
-items:
-  - Paper
-  - Pencil
-  - Heart
+type: text
+content: |
+  * Be assertive
+  * Don't let anyone down!
+  * Be yourself!
 ---
 type: console
 binary: irb

data/lib/termnote.rb

@@ -1,5 +1,5 @@
 require 'io/console'
-require 'colored'
+require 'smart_colored/extend'
 require 'pygments'
 require 'yaml'
 require_relative 'termnote/version'

data/lib/termnote/pane.rb

@@ -1,7 +1,7 @@
+require_relative 'pane/helpers'
 require_relative 'pane/chapter'
-require_relative 'pane/code'
-require_relative 'pane/list'
 require_relative 'pane/text'
+require_relative 'pane/code'
 require_relative 'pane/console'
 
 module TermNote
@@ -27,15 +27,24 @@ module TermNote
     end
 
     def space
-      "\n" * (height / 2)
+     "\n" * (height / 2)
     end
 
     def formated_rows
-      rows.map { |row| gutter + row }.join("\n")
+      @output ||= rows.map(&method(:guttered_row)).join("\n")
+    end
+
+    def guttered_row(row)
+      raise ArgumentError, "content was larger than screen" if gutter_width(row) < 0
+      gutter(row) + row
+    end
+
+    def gutter(row)
+      " " * gutter_width(row)
     end
 
-    def gutter
-      " " * (width / 10)
+    def gutter_width(row)
+      (width / 2.0).floor - (row.width / 2.0).ceil
     end
   end
 end

data/lib/termnote/pane/chapter.rb

@@ -2,6 +2,7 @@ module TermNote
   module Pane
     class Chapter
       include Pane
+      include Helpers::Title
 
       attr_accessor :title, :subtitle
 
@@ -11,25 +12,17 @@ module TermNote
       end
 
       def rows
-        if subtitle
-          title_rows + subtitle_rows
-        else
-          title_rows
-        end
+        subtitle ? title_row + subtitle_row : title_row
       end
 
       private
 
-      def title_rows
-        title.split('').each_slice(80).map do |row|
-          row.join.center(width).bold
-        end
+      def subtitle_row
+        wrapped_title(subtitle).map &method(:subtitle_row_format)
       end
 
-      def subtitle_rows
-        subtitle.split('').each_slice(80).map do |row|
-          row.join.center(width)
-        end
+      def subtitle_row_format(row)
+        row.join
       end
     end
   end

data/lib/termnote/pane/code.rb

@@ -19,6 +19,15 @@ module TermNote
       def highlighted
         Pygments.highlight source, formatter: 'terminal256', lexer: language
       end
+
+      def gutter_width(row)
+        width * 0.25
+      end
+
+      def space
+        newlines = height > rows.size ? (height - rows.size) / 2 : 0
+        "\n" * newlines
+      end
     end
   end
 end

data/lib/termnote/pane/helpers.rb

@@ -0,0 +1,10 @@
+require_relative 'helpers/title'
+require_relative 'helpers/content'
+
+module TermNote
+  module Pane
+    module Helpers
+
+    end
+  end
+end

data/lib/termnote/pane/helpers/content.rb

@@ -0,0 +1,17 @@
+module TermNote
+  module Pane
+    module Helpers
+      module Content
+        private
+
+        def content_row
+          wrapped_content(content)
+        end
+
+        def wrapped_content(content)
+          content.split("\n")
+        end
+      end
+    end
+  end
+end

data/lib/termnote/pane/helpers/title.rb

@@ -0,0 +1,21 @@
+module TermNote
+  module Pane
+    module Helpers
+      module Title
+        private
+
+        def title_row
+          wrapped_title(title).map &method(:title_row_format)
+        end
+
+        def title_row_format(row)
+          row.join.bold
+        end
+
+        def wrapped_title(title)
+          title.split('').each_slice(80)
+        end
+      end
+    end
+  end
+end

data/lib/termnote/pane/text.rb

@@ -2,6 +2,8 @@ module TermNote
   module Pane
     class Text
       include Pane
+      include Helpers::Title
+      include Helpers::Content
 
       attr_accessor :title, :content
 
@@ -10,10 +12,14 @@ module TermNote
         @content = options[:content] || options['content']
       end
 
+      private
+
       def rows
-        "#{title.center(width).bold}\n\n#{content}".split("\n").map do |row|
-          row.center(width)
-        end
+        title ? title_row + content_row : content_row
+      end
+
+      def gutter_width(row)
+        width * 0.25
       end
     end
   end

data/lib/termnote/show.rb

@@ -3,7 +3,7 @@ module TermNote
     attr_accessor :panes
 
     def initialize
-      @panes = []
+      @panes ||= []
     end
 
     def add(pane)
@@ -45,7 +45,7 @@ module TermNote
     end
 
     def header
-      "[#{position}/#{total}] - #{panes.first.title}\n".bold
+      "[#{position + 1}/#{total}] - #{panes.first.title}\n".bold
     end
 
     private

data/lib/termnote/version.rb

@@ -1,3 +1,3 @@
 module TermNote
-  VERSION = "1.1.0"
+  VERSION = "1.5.0"
 end

data/termnote.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_runtime_dependency 'colored', '~> 1.2'
+  gem.add_runtime_dependency 'smart_colored', '~> 1.1'
   gem.add_runtime_dependency 'pygments.rb', '~> 0.3'
   gem.add_development_dependency 'yard'
   gem.add_development_dependency 'kramdown'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: termnote
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,16 +9,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-14 00:00:00.000000000 Z
+date: 2012-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: colored
+  name: smart_colored
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: pygments.rb
   requirement: !ruby/object:Gem::Requirement
@@ -92,7 +92,6 @@ files:
 - bin/termnote
 - example/chapter.png
 - example/code.png
-- example/list.png
 - example/running.png
 - example/slideshow1.yaml
 - example/text.png
@@ -102,7 +101,9 @@ files:
 - lib/termnote/pane/chapter.rb
 - lib/termnote/pane/code.rb
 - lib/termnote/pane/console.rb
-- lib/termnote/pane/list.rb
+- lib/termnote/pane/helpers.rb
+- lib/termnote/pane/helpers/content.rb
+- lib/termnote/pane/helpers/title.rb
 - lib/termnote/pane/text.rb
 - lib/termnote/show.rb
 - lib/termnote/version.rb
@@ -121,7 +122,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 197848977520802502
+      hash: 1175875945885039062
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -130,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 197848977520802502
+      hash: 1175875945885039062
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/lib/termnote/pane/list.rb

@@ -1,22 +0,0 @@
-module TermNote
-  module Pane
-    class List
-      include Pane
-
-      attr_accessor :title, :items
-
-      def initialize(options)
-        @title = options[:title] || options['title']
-        @items = options[:items] || options['items']
-      end
-
-      def rows
-        items.map { |item| "* #{item}" }.unshift title.bold + "\n"
-      end
-
-      def gutter
-        " " * (width * 0.5)
-      end
-    end
-  end
-end