bash-visual 1.0.7 → 1.0.8

data/README.md

@@ -32,14 +32,11 @@ Or install it yourself as:
 require 'bash-visual'
 include Bash_Visual
 
-border_font = Font.new(:std, :blue)
-main_color = Font.new(:bold, :green)
-
-console = Console.new(main_color)
+console = Console.new
 console.clear
 
-console.draw_window(2, 2, 20, 5, 'Example', border_font, Console::BORDER_UTF_DOUBLE)
-console.write_to_position(5, 3, 'Hello World!')
+console.draw_window([3, 3], [18, 5], 'Example') {{font: Font.new(:std, :red)}}
+console.write_to_position 5, 4, 'Hello World!', Font.new(:bold)
 console.position = [0, 8]
 ```
 

data/example/hello_world.rb

@@ -6,6 +6,6 @@ include Bash_Visual
 console = Console.new
 console.clear
 
-console.draw_window [3, 3], [18, 5], 'Example', {font: Font.new(:std, :red)}
+console.draw_window([3, 3], [18, 5], 'Example') {{font: Font.new(:std, :red)}}
 console.write_to_position 5, 4, 'Hello World!', Font.new(:bold)
 console.position = [0, 8]

data/example/painter.rb

@@ -12,7 +12,7 @@ Thread.new {
     5.times {
       x, y          = x+1, y+1
       width, height = width-2, height-2
-      console.draw_border([x, y], [width, height], {font: Font::rand_font})
+      console.draw_border([x, y], [width, height]) {{font: Font::rand_font}}
       sleep 0.08
     }
   }

data/example/scroll.rb

@@ -6,9 +6,6 @@ include Bash_Visual
 console = Console.new
 console.clear
 
-console.draw_window([32, 0] ,[42, 11], 'Vertical scroll')
-console.draw_window([0, 12] ,[73, 6], 'Horizontal scroll')
-
 v_scroll = VerticalScroll.new(
   position: [33, 1],
   size: [39, 9],
@@ -22,6 +19,9 @@ h_scroll = HorizontalScroll.new(
     separator: true
 )
 
+console.draw_window(v_scroll, 'Vertical scroll')
+console.draw_window(h_scroll, 'Horizontal scroll')
+
 phrases =[
     "Bash is a Unix shell",
     "GNU’s Not UNIX",

data/lib/bash-visual/console.rb

@@ -61,13 +61,6 @@ module Bash_Visual
       @font = font
     end
 
-    def lines
-      `tput lines`
-    end
-
-    def cols
-      `tput cols`
-    end
 
     private
     def print string
@@ -81,5 +74,14 @@ module Bash_Visual
       end
     end
 
+    class << self
+      def lines
+        `tput lines`
+      end
+
+      def cols
+        `tput cols`
+      end
+    end
   end
 end

data/lib/bash-visual/horizontal_scroll.rb

@@ -25,7 +25,7 @@ module Bash_Visual
 
       available_area_width, available_area_height = available_area
 
-      msg_block_width =
+      block_width = msg_block_width =
           case
             when @fixed_message_block_size
               @fixed_message_block_size
@@ -35,22 +35,21 @@ module Bash_Visual
               available_area_width
           end
 
-      msg_block_width -= 1 if @separator
+      msg_block_width -= @separator.size if @separator
       msg_block_width = available_area_width if msg_block_width > available_area_width
 
-      #msg_block_height = @adapt ? available_area_height : 1
+      msg_block_height = @adapt ? available_area_height : 1
 
-      message = Scroll.form_block message, [msg_block_width, available_area_height], @fixed_message_block_size
+      message = Scroll.form_block message, [msg_block_width, msg_block_height], @fixed_message_block_size
       if @separator
         message.map! do |row|
-          row = row + DEFAULT_SEPARATOR
+          row + @separator
         end
       end
 
-      msg_block_width += 1
-      write(get_x_position(available_area_width, msg_block_width), @y, message, font)
+      write(get_x_position(available_area_width, block_width), @y, message, font)
 
-      [available_area_width - msg_block_width, available_area_height]
+      [available_area_width - block_width, available_area_height]
     end
   end
 end

data/lib/bash-visual/painter.rb

@@ -19,11 +19,12 @@ module Bash_Visual
         "\u2551", "\u2551",
         "\u255A", "\u2550", "\u255D"]
 
-    # @param [Array] position
-    # @param [Array] size
-    def draw_filled_rectangle(position, size, color = :white)
-      x, y          = *position
-      width, height = *size
+
+
+    # @param [Array] positioning
+    # @param [Integer] color
+    def draw_filled_rectangle(*positioning, color)
+      x, y, width, height = prepare_positioning positioning
       raise 'width,height must be great than 1' if (width < 1 or height < 1)
 
       color = color.background if color.is_a? Font
@@ -40,13 +41,15 @@ module Bash_Visual
       print @builder.write(bash, font)
     end
 
-    # @param [Array] position
-    # @param [Array] size
-    def draw_border(position, size, params = {})
-      x, y          = *position
-      width, height = *size
-      raise 'width,height must be great than 1' if (width < 2 or height < 2)
+    # @param [Array] positioning
+    def draw_border(*positioning, &extra)
+      x, y, width, height = prepare_positioning positioning do |x2, y2, width2, height2|
+        next x2, y2, width2 + 2, height2 + 2
+      end
+
+      raise 'width,height must be great than 2' if (width < 2 or height < 2)
 
+      params = block_given? ? yield : {}
       border = params[:border] ? params[:border] : BORDER_UTF
       font   = params[:font] ? params[:font] : @font
 
@@ -67,15 +70,20 @@ module Bash_Visual
       print @builder.write(bash, font)
     end
 
-    # @param [Array] position
-    # @param [Array] size
+
+    # @param [Array] positioning
     # @param [String] text
-    # @param [Hash] params
-    def draw_window(position, size, text = '', params = {})
-      x, y          = *position
-      width, height = *size
+    def draw_window(*positioning, text, &params)
+
+      x, y, width, height = prepare_positioning positioning do |x2, y2, width2, height2|
+        next x2, y2, width2 + 2, height2 + 2
+      end
+
       raise 'width,height must be great than 2' if (width < 3 or height < 3)
 
+      params = block_given? ? yield : {}
+
+
       wrap   = params[:wrap].nil? ? @@default_window_wrap : params[:wrap]
       border = params[:border] ? params[:border] : BORDER_UTF
       font   = params[:font] ? params[:font] : @font
@@ -84,7 +92,11 @@ module Bash_Visual
       text = if wrap
                wrap_size  = wrap[0].size + wrap[1].size
                text_width = body_width - wrap_size
-               wrap[0] + text.to_s[0, text_width] + wrap[1]
+               if text_width < 0
+                 text.to_s.slice(0, body_width)
+               else
+                 wrap[0] + text.to_s[0, text_width] + wrap[1]
+               end
              else
                text.to_s.slice(0, body_width)
              end
@@ -106,5 +118,27 @@ module Bash_Visual
       bash << @builder.restore_position
       print @builder.write(bash, font)
     end
+
+    private
+    # @param [Array] positioning
+    def prepare_positioning(positioning, &extra)
+      if positioning.size == 2
+        x, y          = positioning[0]
+        width, height = positioning[1]
+      else
+        fixed_object = positioning[0]
+        raise 'Must be FixedObject' unless fixed_object.kind_of?(FixedObject)
+
+        x, y          = fixed_object.position
+        width, height = fixed_object.size
+
+        if block_given?
+          x,y,width,height = yield(x, y, width, height)
+        end
+      end
+
+      return x, y, width, height
+    end
+
   end
 end

data/lib/bash-visual/version.rb

@@ -1,3 +1,3 @@
 module Bash_Visual
-  VERSION = '1.0.7'
+  VERSION = '1.0.8'
 end

data/test/console_test.rb

@@ -7,9 +7,5 @@ class ConsoleTest < Test::Unit::TestCase
 
   include Bash_Visual
 
-  def test_draw_rectangle
-
-
-  end
 
 end

data/test/painter_test.rb

@@ -15,18 +15,44 @@ class PainterTest < Test::Unit::TestCase
     @painter.instance_variable_set(:@builder, builder)
   end
 
-  def test_draw_window
-    @painter.draw_window([1, 1], [10, 10], 'logs')
-    @painter.draw_window([1, 1], [10, 10], 'logs', {font: Font.new(:bold)})
-  end
-
   def test_draw_border
     @painter.draw_border([1, 1], [10, 10])
-    @painter.draw_border([1, 1], [10, 10], {font: Font.new(:bold)})
+    @painter.draw_border([1, 1], [10, 10]) {{font: Font.new(:bold)}}
+
+    scroll = VerticalScroll.new(position: [1,1], size: [1,1])
+    @painter.draw_border scroll
   end
 
   def test_draw_filled_rectangle
-    @painter.draw_filled_rectangle([1, 1], [10, 10])
-    @painter.draw_filled_rectangle([1, 1], [10, 10], :red)
+    @painter.draw_filled_rectangle([1, 1], [10, 10], :white)
+    @painter.draw_filled_rectangle([1, 1], [10, 10], :red) {{font: Font.new(:bold)}}
+
+    scroll = VerticalScroll.new(position: [1,1], size: [1,1])
+    @painter.draw_filled_rectangle scroll, :red
   end
+
+  def test_draw_window_small
+    assert_raise_message "width,height must be great than 2" do
+      @painter.draw_window([0, 0] ,[2, 2], 'W')
+    end
+  end
+
+
+  def test_draw_window
+    scroll = VerticalScroll.new(position: [1,1], size: [1,1])
+
+    @painter.draw_window([0, 0] ,[3, 3], 'Win!')
+
+    @painter.draw_window(scroll, 'scroll 1')
+
+    @painter.draw_window(scroll, 'scroll 2') do
+      {border: Painter::BORDER_UTF_DOUBLE}
+    end
+
+    @painter.draw_window([0, 0] ,[4, 4], 'Win!') do
+      {border: Painter::BORDER_UTF_DOUBLE, font: Font.new(:bold)}
+    end
+
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bash-visual
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-30 00:00:00.000000000 Z
+date: 2012-08-19 00:00:00.000000000 Z
 dependencies: []
 description: Bash visualisation tools
 email:
@@ -23,7 +23,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- bash-visual-1.0.6.gem
 - bash-visual.gemspec
 - example/hello_world.rb
 - example/painter.rb