ruco 0.2.0.beta2 → 0.2.0.beta3

data/spec/ruco/file_store_spec.rb

@@ -16,6 +16,10 @@ describe Ruco::FileStore do
 
   let(:store){ Ruco::FileStore.new(@folder, :keep => 3) }
 
+  it "can get unstored stuff" do
+    store.get('xxx').should == nil
+  end
+
   it "can store stuff" do
     store.set('xxx', 1)
     store.get('xxx').should == 1
@@ -41,4 +45,45 @@ describe Ruco::FileStore do
     store.set('zzz', 1)
     store.get('xxx').should == 1
   end
+
+  it "can cache" do
+    store.cache('x'){ 1 }.should == 1
+    store.cache('x'){ 2 }.should == 1
+  end
+
+  it "can cache false" do
+    store.cache('x'){ false }.should == false
+    store.cache('x'){ 2 }.should == false
+  end
+
+  it "does not cache nil" do
+    store.cache('x'){ nil }.should == nil
+    store.cache('x'){ 2 }.should == 2
+  end
+
+  it "can delete" do
+    store.set('x', 1)
+    store.set('y', 2)
+    store.delete('x')
+    store.get('x').should == nil
+    store.get('y').should == 2
+  end
+
+  it "can delete uncached" do
+    store.set('x', 1)
+    store.delete('z')
+    store.get('x').should == 1
+    store.get('z').should == nil
+  end
+
+  it "can clear" do
+    store.set('x', 1)
+    store.clear
+    store.get('x').should == nil
+  end
+
+  it "can clear unstored" do
+    store.clear
+    store.get('x').should == nil
+  end
 end

data/spec/ruco/screen_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path('spec/spec_helper')
 describe Ruco::Screen do
   describe :curses_style do
     it "is 'normal' for nothing" do
-      Ruco::Screen.curses_style(:normal).should == Curses::A_NORMAL
+      Ruco::Screen.curses_style(:normal).should == 256
     end
 
     it "is red for red" do
@@ -12,7 +12,7 @@ describe Ruco::Screen do
     end
 
     it "is reverse for reverse" do
-      Ruco::Screen.curses_style(:reverse).should == Curses::A_REVERSE
+      Ruco::Screen.curses_style(:reverse).should == 512
     end
 
     it "raises on unknown style" do
@@ -20,5 +20,42 @@ describe Ruco::Screen do
         Ruco::Screen.curses_style(:foo)
       }.should raise_error
     end
+
+    describe 'without colors' do
+      before do
+        Ruco::Screen.class_eval '@@styles = {}' # clear cache
+        $ruco_colors = false
+      end
+
+      after do
+        $ruco_colors = true
+      end
+
+      it "is 'normal' for normal" do
+        Ruco::Screen.curses_style(:normal).should == Curses::A_NORMAL
+      end
+
+      it "is reverse for reverse" do
+        Ruco::Screen.curses_style(:reverse).should == Curses::A_REVERSE
+      end
+
+      it "is normal for unknown style" do
+        Ruco::Screen.curses_style(:foo).should == Curses::A_NORMAL
+      end
+    end
+  end
+
+  describe :html_to_terminal_color do
+    # http://www.mudpedia.org/wiki/Xterm_256_colors
+    [
+      ['#ff0000', 196],
+      ['#00ff00', 46],
+      ['#0000ff', 21],
+      ['#ffffff', 231]
+    ].each do |html,term|
+      it "converts #{html} to #{term}" do
+        Ruco::Screen.html_to_terminal_color(html).should == term
+      end
+    end
   end
 end

data/spec/ruco/syntax_parser_spec.rb

@@ -0,0 +1,74 @@
+require File.expand_path('spec/spec_helper')
+
+describe Ruco::SyntaxParser do
+  def parse(text, languages=['ruby'])
+    Ruco::SyntaxParser.syntax_for_lines(text, languages)
+  end
+
+  describe :parse_lines do
+    it "shows positions for simple lines" do
+      parse(["class Foo","end"]).should == [[
+        ["keyword.control.class.ruby", 0...5],
+        ["entity.name.type.class.ruby", 6...9],
+        ["meta.class.ruby", 0...9]],
+        [["keyword.control.ruby", 0...3]
+      ]]
+    end
+
+    it "shows positions for complicated lines" do
+      parse(["class foo end blob else Foo"]).should == [[
+        ["keyword.control.class.ruby", 0...5],
+        ["entity.name.type.class.ruby", 6...9],
+        ["meta.class.ruby", 0...9],
+        ["keyword.control.ruby", 10...13],
+        ["keyword.control.ruby", 19...23],
+        ["variable.other.constant.ruby", 24...27]
+      ]]
+    end
+
+    it "does not show keywords in strings" do
+      parse(["Bar 'Bar' foo"]).should == [[
+        ["variable.other.constant.ruby", 0...3],
+        ["punctuation.definition.string.begin.ruby", 4...5],
+        ["punctuation.definition.string.end.ruby", 8...9],
+        ["string.quoted.single.ruby", 4...9]
+      ]]
+    end
+
+    it "does not show strings in comments" do
+      parse(["'Bar' # 'Bar'"]).should == [[
+        ["punctuation.definition.string.begin.ruby", 0...1],
+        ["punctuation.definition.string.end.ruby", 4...5],
+        ["string.quoted.single.ruby", 0...5],
+        ["punctuation.definition.comment.ruby", 6...7],
+        ["comment.line.number-sign.ruby", 6...13]
+      ]]
+    end
+
+    it "shows multiline comments" do
+      parse(["=begin","1 : 2","=end"]).should == [
+        [["punctuation.definition.comment.ruby", 0...6], ["comment.block.documentation.ruby", 0...7]],
+        [["comment.block.documentation.ruby", 0...6]],
+        [["punctuation.definition.comment.ruby", 0...4], ["comment.block.documentation.ruby", 0...4]]
+      ]
+    end
+
+    it "continues multiline on last line before closing it" do
+      parse(["%Q{\n\na  }"]).should == [
+        [["punctuation.definition.string.begin.ruby", 0...3], ["string.quoted.double.ruby.mod", 0...4]],
+        [["string.quoted.double.ruby.mod", 0...1]],
+        [["punctuation.definition.string.end.ruby", 3...4], ["string.quoted.double.ruby.mod", 0...4]]
+      ]
+    end
+
+    it "can handle unfound syntaxes" do
+      parse('aaaa', ['fooo']).should == []
+    end
+  end
+
+  describe :syntax_nodes do
+    it "detects languages not present in ultraviolet" do
+      Ruco::SyntaxParser.syntax_node(['html+erb']).should_not == nil
+    end
+  end
+end

data/spec/ruco/tm_theme_spec.rb

@@ -0,0 +1,14 @@
+require File.expand_path('spec/spec_helper')
+
+describe Ruco::TMTheme do
+  let(:theme){ Ruco::TMTheme.new('spec/fixtures/test.tmTheme') }
+
+  it "parses foreground/background" do
+    theme.foreground.should == '#4D4D4C'
+    theme.background.should == '#FFFFFF'
+  end
+
+  it "parses rules" do
+    theme.styles["keyword.operator.class"].should == ['#666969', nil]
+  end
+end

data/spec/spec_helper.rb

@@ -1,8 +1,12 @@
 $LOAD_PATH.unshift 'lib'
+$ruco_colors = true
+
 require 'ruco'
 require 'timeout'
-
 require 'tempfile'
+
+silence_warnings{ Ruco::Editor::Colors::DEFAULT_THEME = 'spec/fixtures/test.tmTheme' }
+
 class Tempfile
   def self.string_as_file(data)
     result = nil
@@ -21,4 +25,4 @@ class Time
     yield
     Time.now.to_f - t
   end
-end
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: ruco
 version: !ruby/object:Gem::Version 
-  hash: 62196359
+  hash: 62196357
   prerelease: 6
   segments: 
   - 0
   - 2
   - 0
   - beta
-  - 2
-  version: 0.2.0.beta2
+  - 3
+  version: 0.2.0.beta3
 platform: ruby
 authors: 
 - Michael Grosser
@@ -21,7 +21,7 @@ date: 2011-09-24 00:00:00 +02:00
 default_executable: ruco
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -32,12 +32,12 @@ dependencies:
         - 9
         - 8
         version: 0.9.8
+  requirement: *id001
   type: :runtime
   name: clipboard
-  version_requirements: *id001
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -46,12 +46,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id002
   type: :runtime
   name: ultraviolet1x
-  version_requirements: *id002
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -60,9 +60,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id003
   type: :runtime
   name: language_sniffer
-  version_requirements: *id003
   prerelease: false
 description: 
 email: michael@grosser.it
@@ -81,6 +81,7 @@ files:
 - bin/ruco
 - lib/ruco.rb
 - lib/ruco/application.rb
+- lib/ruco/array_processor.rb
 - lib/ruco/command_bar.rb
 - lib/ruco/core_ext/array.rb
 - lib/ruco/core_ext/file.rb
@@ -89,6 +90,7 @@ files:
 - lib/ruco/core_ext/range.rb
 - lib/ruco/core_ext/string.rb
 - lib/ruco/editor.rb
+- lib/ruco/editor/colors.rb
 - lib/ruco/editor/history.rb
 - lib/ruco/editor/line_numbers.rb
 - lib/ruco/editor_area.rb
@@ -101,12 +103,19 @@ files:
 - lib/ruco/screen.rb
 - lib/ruco/status_bar.rb
 - lib/ruco/style_map.rb
+- lib/ruco/syntax_parser.rb
 - lib/ruco/text_area.rb
 - lib/ruco/text_field.rb
+- lib/ruco/tm_theme.rb
 - lib/ruco/version.rb
 - lib/ruco/window.rb
+- playground/benchmark_syntax_parser.rb
 - ruco.gemspec
+- spec/fixtures/railscasts.tmTheme
+- spec/fixtures/slow.js
+- spec/fixtures/test.tmTheme
 - spec/ruco/application_spec.rb
+- spec/ruco/array_processor_spec.rb
 - spec/ruco/command_bar_spec.rb
 - spec/ruco/core_ext/array_spec.rb
 - spec/ruco/core_ext/range_spec.rb
@@ -120,7 +129,9 @@ files:
 - spec/ruco/screen_spec.rb
 - spec/ruco/status_bar_spec.rb
 - spec/ruco/style_map_spec.rb
+- spec/ruco/syntax_parser_spec.rb
 - spec/ruco/text_area_spec.rb
+- spec/ruco/tm_theme_spec.rb
 - spec/ruco/window_spec.rb
 - spec/ruco_spec.rb
 - spec/spec_helper.rb
@@ -164,22 +175,5 @@ rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Commandline editor written in ruby
-test_files: 
-- spec/ruco/application_spec.rb
-- spec/ruco/command_bar_spec.rb
-- spec/ruco/core_ext/array_spec.rb
-- spec/ruco/core_ext/range_spec.rb
-- spec/ruco/core_ext/string_spec.rb
-- spec/ruco/editor_spec.rb
-- spec/ruco/file_store_spec.rb
-- spec/ruco/form_spec.rb
-- spec/ruco/history_spec.rb
-- spec/ruco/keyboard_spec.rb
-- spec/ruco/option_accessor_spec.rb
-- spec/ruco/screen_spec.rb
-- spec/ruco/status_bar_spec.rb
-- spec/ruco/style_map_spec.rb
-- spec/ruco/text_area_spec.rb
-- spec/ruco/window_spec.rb
-- spec/ruco_spec.rb
-- spec/spec_helper.rb
+test_files: []
+