ruco 0.2.0.beta11 → 0.2.0.beta12

data/VERSION

@@ -1 +1 @@
-0.2.0.beta11
+0.2.0.beta12

data/lib/ruco/core_ext/object.rb

@@ -95,4 +95,11 @@ class Object
       }
     end
   end
+
+  # Memoize class methods
+  def cmemoize(*method_names)
+    (class << self; self; end).class_eval do
+      memoize(*method_names)
+    end
+  end
 end

data/lib/ruco/editor/colors.rb

@@ -41,9 +41,8 @@ module Ruco
         language = @options[:language]
         possible_languages = [language.name.downcase, language.lexer]
 
-        @syntax_info ||= {}
         lines.map do |line|
-          @syntax_info[line] ||= SyntaxParser.syntax_for_lines([line], possible_languages).first
+          SyntaxParser.syntax_for_line(line, possible_languages)
         end
       end
 

data/lib/ruco/screen.rb

@@ -92,48 +92,45 @@ module Ruco
     end
 
     def self.curses_style(style)
-      @@styles[style] ||= begin
-        if $ruco_colors
-          foreground = $ruco_foreground || '#ffffff'
-          background = $ruco_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
+      if $ruco_colors
+        foreground = $ruco_foreground || '#ffffff'
+        background = $ruco_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
+        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
+    cmemoize :curses_style
 
     # create a new color from foreground+background or reuse old
     # and return color-id
     def self.color_id(foreground, background)
-      @@color_ids ||= {}
-      @@color_ids[[foreground, background]] ||= begin
-        # make a new pair with a unique id
-        @@max_color_id ||= 0
-        id = (@@max_color_id += 1)
-        unless defined? RSpec # stops normal text-output, do not use in tests
-          Curses::init_pair(id, foreground, background)
-        end
-        Curses.color_pair(id)
+      # make a new pair with a unique id
+      @@max_color_id ||= 0
+      id = (@@max_color_id += 1)
+      unless defined? RSpec # stops normal text-output, do not use in tests
+        Curses::init_pair(id, foreground, background)
       end
+      Curses.color_pair(id)
     end
+    cmemoize :color_id
 
     COLOR_SOURCE_VALUES = 256
     COLOR_TARGET_VALUES = 5

data/lib/ruco/syntax_parser.rb

@@ -6,6 +6,11 @@ module Ruco
       'html+erb' => 'html_rails',
     }
 
+    def self.syntax_for_line(line, languages)
+      syntax_for_lines([line], languages).first
+    end
+    cmemoize :syntax_for_line
+
     def self.syntax_for_lines(lines, languages)
       if syntax = syntax_node(languages)
         processor = syntax.parse(lines.join("\n"),  Ruco::ArrayProcessor.new)
@@ -16,18 +21,16 @@ module Ruco
     end
 
     def self.syntax_node(languages)
-      @@syntax_node ||= {}
-      @@syntax_node[languages] ||= begin
-        found = nil
-        fallbacks = languages.map{|l| TEXTPOW_CONVERT[l] }.compact
+      found = nil
+      fallbacks = languages.map{|l| TEXTPOW_CONVERT[l] }.compact
 
-        (languages + fallbacks).detect do |language|
-          syntax = File.join(Textpow.syntax_path, "#{language}.syntax")
-          found = Textpow::SyntaxNode.load(syntax) if File.exist?(syntax)
-        end
-
-        found
+      (languages + fallbacks).detect do |language|
+        syntax = File.join(Textpow.syntax_path, "#{language}.syntax")
+        found = Textpow::SyntaxNode.load(syntax) if File.exist?(syntax)
       end
+
+      found
     end
+    cmemoize :syntax_node
   end
 end

data/ruco.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruco}
-  s.version = "0.2.0.beta11"
+  s.version = "0.2.0.beta12"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-10-03}
+  s.date = %q{2011-10-04}
   s.default_executable = %q{ruco}
   s.email = %q{michael@grosser.it}
   s.executables = ["ruco"]

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: ruco
 version: !ruby/object:Gem::Version 
-  hash: 62196373
+  hash: 62196379
   prerelease: 6
   segments: 
   - 0
   - 2
   - 0
   - beta
-  - 11
-  version: 0.2.0.beta11
+  - 12
+  version: 0.2.0.beta12
 platform: ruby
 authors: 
 - Michael Grosser
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-03 00:00:00 +02:00
+date: 2011-10-04 00:00:00 +02:00
 default_executable: ruco
 dependencies: 
 - !ruby/object:Gem::Dependency