dispel 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ed33d439836221d928810d9b299e39403683091
-  data.tar.gz: dda5b216de46c2e5d40274decae00e6e9fd23fb2
+  metadata.gz: 79c60ba642498ac215494cfbee428f1630889047
+  data.tar.gz: 16118c62b8d5a73823ceb455a6ab06caecef8c60
 SHA512:
-  metadata.gz: c6eed6e4a0660ee51c74a60bbc628fe53738582252ee37ff53ef70ccb8601f55b8006c10a5a81390f686f35a3675a479760380c59dbc684ac1f5e78b0d0fc988
-  data.tar.gz: 2d38879e158d5cfbc70d3e58ac7ef0489def7c4bd17fd426025ec0914076be479b52a23cf442fdbfc050320949ff96d8405c4f7551ee49d01f644a4857d0a109
+  metadata.gz: 3edd4d1fa6ea46eca07fc549b2a4d8eef6cf672d115599bf33279ea70c4fab77f37dd16961e09197ce5aaf06efb984c707e7f48d2d6e7b5d58cbea4ec6ae6a31
+  data.tar.gz: 83fea979ec2dd1ff2ef9191466bad84d680cd76ffcbaa699f55172f672aaa7166159d8a1a53d71e2c6119ddf24e5af5dc86277b7e23e3507dfabde1a39385b73

data/lib/dispel/keyboard.rb

@@ -9,25 +9,42 @@ module Dispel
     SEQUENCE_TIMEOUT = 0.005
     NOTHING = (2**32 - 1) # getch returns this as 'nothing' on 1.8 but nil on 1.9.2
     A_TO_Z = ('a'..'z').to_a
+    DEFAULT_INPUT = lambda { Curses.getch }
 
     def self.input(&block)
       @input = block
     end
 
-    def self.output
-      input { Curses.getch } unless @input # keep input replaceable for tests, but default to curses
-
+    def self.output(options={}, &block)
       @sequence = []
       @started = Time.now.to_f
+      timeout = options[:timeout]
+
+      if timeout && SEQUENCE_TIMEOUT > timeout
+        raise "Timeout must be higher then SEQUENCE_TIMEOUT (#{SEQUENCE_TIMEOUT})"
+      end
 
       loop do
+        @now = Time.now.to_f
+        @elapsed = @now - @started
+
         key = fetch_user_input
-        if sequence_finished?
-          sequence_to_keys(@sequence).each{|k| yield k }
+
+        # finish previous sequence
+        if @sequence.any? and @elapsed > SEQUENCE_TIMEOUT
+          sequence_to_keys(@sequence).each(&block)
           @sequence = []
         end
-        next unless key
-        append_to_sequence key
+
+        if key # start new sequence
+          @started = @now
+          @sequence << key
+        elsif timeout and @elapsed > timeout
+          @started = @now
+          yield :timeout
+        else
+          sleep SEQUENCE_TIMEOUT # nothing happening -> sleep a bit to save cpu
+        end
       end
     end
 
@@ -127,19 +144,9 @@ module Dispel
     end
 
     def self.fetch_user_input
-      key = @input.call or return
+      key = (@input || DEFAULT_INPUT).call || NOTHING
       key = key.ord unless IS_18
-      if key >= NOTHING
-        # nothing happening -> sleep a bit to save cpu
-        sleep SEQUENCE_TIMEOUT
-        return
-      end
-      key
-    end
-
-    def self.append_to_sequence(key)
-      @started = Time.now.to_f
-      @sequence << key
+      key if key < NOTHING
     end
 
     def self.bytes_to_string(bytes)
@@ -176,10 +183,6 @@ module Dispel
       127 < byte and byte < 256
     end
 
-    def self.sequence_finished?
-      @sequence.size != 0 and (Time.now.to_f - @started) > SEQUENCE_TIMEOUT
-    end
-
     # paste of multiple \n or \n in text would cause weird indentation
     def self.needs_paste_fix?(sequence)
       sequence.size > 1 and sequence.include?(ENTER)

data/lib/dispel/screen.rb

@@ -35,11 +35,8 @@ module Dispel
       Curses.stdscr.maxy
     end
 
-    def clear_cache
-      @cache.clear
-    end
-
     def draw(view, style_map=[], cursor=[0,0])
+      @cache.clear if dimensions_changed?
       draw_view(view, style_map)
       Curses.setpos(*cursor) # cursor has to always be set or it ends in random position
     end
@@ -80,7 +77,7 @@ module Dispel
           # position at start of line and draw
           Curses.setpos(line_number,0)
           Dispel::StyleMap.styled(line, styles).each do |style, part|
-            Curses.attrset self.class.curses_style(style, color?, options)
+            Curses.attrset curses_style(style)
             Curses.addstr part
           end
 
@@ -97,33 +94,41 @@ module Dispel
       yield # render the line
     end
 
+    def dimensions_changed?
+      current_dimensions = [columns, lines]
+      @old_dimensions != current_dimensions
+      @old_dimensions = current_dimensions
+    end
+
+    def curses_style(style)
+      @style ||= {}
+      @style[style] ||= self.class.curses_style(style, color?, options)
+    end
+
     class << self
-      # TODO maybe instance and simpler caching...
       def curses_style(style, colors, options={})
-        Tools.memoize(:curses_style, style, colors) do
-          if colors
-            foreground = options[:foreground] || '#ffffff'
-            background = options[:background] || '#000000'
-
-            foreground, background = if style == :normal
-              [foreground, background]
-            elsif style == :reverse
-              ['#000000', '#ffffff']
-            else
-              # :red or [:red, :blue]
-              f,b = style
-              [f || foreground, b || background]
-            end
-
-            foreground = html_to_terminal_color(foreground)
-            background = html_to_terminal_color(background)
-            color_id(foreground, background)
-          else # no colors
-            if style == :reverse
-              Curses::A_REVERSE
-            else
-              Curses::A_NORMAL
-            end
+        if colors
+          foreground = options[:foreground] || '#ffffff'
+          background = options[:background] || '#000000'
+
+          foreground, background = if style == :normal
+            [foreground, background]
+          elsif style == :reverse
+            ['#000000', '#ffffff']
+          else
+            # :red or [:red, :blue]
+            f,b = style
+            [f || foreground, b || background]
+          end
+
+          foreground = html_to_terminal_color(foreground)
+          background = html_to_terminal_color(background)
+          color_id(foreground, background)
+        else # no colors
+          if style == :reverse
+            Curses::A_REVERSE
+          else
+            Curses::A_NORMAL
           end
         end
       end
@@ -131,7 +136,8 @@ module Dispel
       # create a new color from foreground+background or reuse old
       # and return color-id
       def color_id(foreground, background)
-        Tools.memoize(:color_id, foreground, background) do
+        @color_ids ||= {}
+        @color_ids[[foreground, background]] ||= begin
           # make a new pair with a unique id
           @@max_color_id ||= 0
           id = (@@max_color_id += 1)

data/lib/dispel/tools.rb

@@ -12,19 +12,19 @@ module Dispel
         result.empty? ? [''] : result
       end
 
-      def memoize(*args)
-        key = args.map(&:to_s).join("-")
-        @memoize ||= {}
-        if @memoize.key?(key)
-          @memoize[key]
-        else
-          @memoize[key] = yield
-        end
-      end
-
       def last_element(range)
         range.exclude_end? ? range.last.pred : range.last
       end
+
+      # http://grosser.it/2010/12/31/ruby-string-indexes-indices-find-all-indexes-in-a-string
+      def indexes(string, needle)
+        found = []
+        current_index = -1
+        while current_index = string.index(needle, current_index+1)
+          found << current_index
+        end
+        found
+      end
     end
   end
 end

data/lib/dispel/version.rb

@@ -1,3 +1,3 @@
 module Dispel
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dispel
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Michael Grosser