pppt 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc9f51b1ed7b46d7ab5f597729c1a7e5ccb98397
-  data.tar.gz: 263d333d274808b9f39437ed588393f90524ecf8
+  metadata.gz: f90ebf9bce01e79f124e7a2c2d58561bf22fbaab
+  data.tar.gz: baa9af08d7443cb4444a5777024533a3c8d6a56a
 SHA512:
-  metadata.gz: 398d1a04e6557876d4a9483b101a94f884e92c881da6d319ba3023ff4861990b6f8454bc3250d30f5f89c3d694249ea9b1acee3f274413698f22bd0db3c202e2
-  data.tar.gz: 30b82ea7e50ba994078712f33506e51598912f3681eeba6ed403e116e838ac79abe36bc219c63021baea39a4b0054cfaf4360cb76ccac3e98920a3fe639f3c3a
+  metadata.gz: 621a0b993e1716cdd36e639652bb8940da46a10c2ad73d12612ddabdc0e8770634e374c2206e06146be2d9d1164d19fa481e1f8c1e48b133eb9d42a42701e9c0
+  data.tar.gz: a5cfc7ec844c9a36c536bf979c2b9fb9712ecce83a2f8d5d4a00a0d131c19c68cc73da16691e722e62752a0242b47ad0d90bf919a8bcf38cdb7e0ab22bebfdb2

data/exe/pppt

@@ -14,7 +14,7 @@ class App < Thor
     end
 
     data = YAML.load(open(file))
-    ::Presentation.new(data).run
+    ::Pppt::Presentation.new(data).run
   end
 
   desc 'init', 'create presentation template'

data/lib/pppt/helpers.rb

@@ -1,4 +1,4 @@
-class Helpers
+class Pppt::Helpers
   def self.truncate_screen_width(str, width, suffix = '...')
     i = 0
     str.each_char.inject(0) do |c, x|
@@ -12,7 +12,7 @@ class Helpers
 
   def self.split_screen_width(str, width = 40)
     s = i = r = 0
-    str.each_char.inject([]) do |res, c|
+    str.each_char.each_with_object([]) do |c, res|
       i += c.ascii_only? ? 1 : 2
       r += 1
       next res if i < width
@@ -27,4 +27,10 @@ class Helpers
     hankaku_len = str.each_char.count(&:ascii_only?)
     hankaku_len + (str.size - hankaku_len) * 2
   end
+
+  def self.format_page_number(page)
+    index = page['page'] || '-'
+    title = page['action'] || (page['title'] && " - #{page['title']}") || page['h1'] || page['h2'] || page['h3'] || (page['body'] && "     #{Helpers.truncate_screen_width(page['body'].join(''), 15)}")
+    format('%02s    %s', index, title)
+  end
 end

data/lib/pppt/presentation.rb

@@ -5,9 +5,9 @@ require 'pppt/presentation_pages'
 require 'pppt/presentation_window'
 include Curses
 
-class Presentation
+class Pppt::Presentation
   def initialize(pages)
-    @window = PresentationWindow.new(pages)
+    @window = Pppt::PresentationWindow.new(pages)
     @prev_ch = nil
     Curses.stdscr.keypad(true)
     Curses.noecho

data/lib/pppt/presentation_pages.rb

@@ -1,4 +1,4 @@
-class PresentationPages
+class Pppt::PresentationPages
   attr_reader :data, :size
   def initialize(pages)
     @data = pages

data/lib/pppt/presentation_window.rb

@@ -1,6 +1,6 @@
-class PresentationWindow
+class Pppt::PresentationWindow
   def initialize(data)
-    @pages = PresentationPages.new(data)
+    @pages = Pppt::PresentationPages.new(data)
     @current = 0
     @max = @pages.size
     init_screen
@@ -40,8 +40,8 @@ class PresentationWindow
         w.addstr(' ' * w.maxx)
         w.setpos(vindex, 3)
         w.standout if i == current
-        page_string = page_to_string(page)
-        w.addstr(page_string + (' ' * (w.maxx - Helpers.screen_width(page_string) - 4)))
+        page_number_string = Pppt::Helpers.format_page_number(page)
+        w.addstr(page_number_string + (' ' * (w.maxx - Pppt::Helpers.screen_width(page_number_string) - 4)))
         vindex += 1
         w.standend if i == current
         break if i >= start_point + height
@@ -85,17 +85,10 @@ class PresentationWindow
     w.addstr(Time.now.strftime('%H:%M:%S'))
   end
 
-  # 目次ページでのページ番号の整形
-  def page_to_string(page)
-    index = page['page'] || '-'
-    title = page['action'] || (page['title'] && " - #{page['title']}") || page['h1'] || page['h2'] || page['h3'] || (page['body'] && "     #{Helpers.truncate_screen_width(page['body'].join(''), 15)}")
-    format('%02s    %s', index, title)
-  end
-
   # ページコンテンツを表示する
   def write_element(w, k, v)
     len = 1
-    len = Helpers.screen_width(v) if v.is_a? String
+    len = Pppt::Helpers.screen_width(v) if v.is_a? String
     width = w.maxx - 1
     pad = ' ' * ((width - len) / 2)
     case k
@@ -134,7 +127,7 @@ class PresentationWindow
       v.split("\n").each do |x|
         x.chomp!
         w.setpos((w.maxy / 2) - 2 + vindex, 0)
-        len = Helpers.screen_width(x)
+        len = Pppt::Helpers.screen_width(x)
         pad = ' ' * ((width - len) / 2)
         w.addstr("#{pad}#{x}#{pad}")
         vindex += 1
@@ -152,7 +145,7 @@ class PresentationWindow
       vindex = 5
       w.setpos(vindex, 2)
       v.each do |line|
-        vindex = render_line(w, line, vindex, 1)
+        vindex = render_body_text(w, line, vindex)
       end
     when 'page'
       w.setpos(w.maxy - 2, 0)
@@ -160,18 +153,18 @@ class PresentationWindow
     end
   end
 
-  def render_line(w, lines, vindex, level)
+  def render_body_text(w, lines, vindex, level = 1)
     width = w.maxx - 4
     vi = vindex + 1
     if lines.is_a? Array
       lines.each do |sub_line|
-        vi = render_line(w, sub_line, vi, level + 1)
+        vi = render_body_text(w, sub_line, vi, level + 1)
       end
     else
       sp = ['*', '-', '>'][level - 1]
       indent = ' ' * (level * 2)
       lines.split("\n").each do |x|
-        Helpers.split_screen_width(x, width - (4 + 4 * level)).each do |xl|
+        Pppt::Helpers.split_screen_width(x, width - (4 + 4 * level)).each do |xl|
           w.setpos(vi, 2)
           w.addstr("#{indent}#{sp} #{xl}")
           sp = ' '

data/lib/pppt/version.rb

@@ -1,3 +1,3 @@
 module Pppt
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pppt
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - ma2saka