wirb 0.2.4 → 0.2.5

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== 0.2.5
+* Fix wrong \\ escaping
+* Fix stupid rescue bug (no more wirb crashes)
+
 == 0.2.3 / 0.2.4
 * Support for rubygems-test <gem-testers.org>
 

data/README.rdoc

@@ -1,7 +1,5 @@
 == Wavy Interactive Ruby
-*Wirb* colorizes your inspected Ruby objects. It is based on Wirble[http://pablotron.org/software/wirble/], but only provides result highlighting.
-
-It fixes some displaying bugs and extends the original tokenizer.
+*Wirb* colorizes your inspected Ruby objects. It is based on Wirble[http://pablotron.org/software/wirble/], but only provides and improves result highlighting.
 
 == Install
 Install the gem with:
@@ -16,19 +14,20 @@ Add to your <tt>~/.irbrc</tt>
   Wirb.start
 
 == Improvements and fixed Wirble bugs
-* Basic support for regexes (Wirble displayed them as keywords)
-* Support for generic objects, especially sets and enumerators
-* Fixes some symbol bugs (e.g. :+, :*, ...)
 * Does not change the inspect value (e.g. ranges with 4 instead of 3 dots)
+* Basic support for regexes
+* Fixes some symbol bugs (e.g. :+, :*, ...)
+* Support for generic objects, especially sets and enumerators
 * Comes with tests
 * Can be used without irb
+* Supports 1.8, 1.9, jruby, rbx
 
 == Customize
 The color schema can be changed with:
 
   Wirb.schema = { :comma => :purple, ... }
 
-Wirb color schemas are (almost) compatible with those from the original Wirble, but there are many extensions. Take a look at wirb/schema.rb or </tt>Wirb.schema</tt> for a list of available token descriptions. See wirb/colors.rb or <tt>Wirb::COLORS</tt> for the available colors.
+Wirb color schemas are (almost) compatible with those from the original Wirble, but there are many extensions. Take a look at wirb/schema.rb or <tt>Wirb.schema</tt> for a list of available token descriptions. See wirb/colors.rb or <tt>Wirb::COLORS</tt> for the available colors.
 
 Color schemas wanted! You've got a good looking alternative color schema? Please post it on the wiki[https://github.com/janlelis/wirb/wiki/schemas], it may be bundled with a next version ;)
 

data/lib/wirb/tokenizer.rb

@@ -61,13 +61,20 @@ class << Wirb
         when '.'      then push_state[:range,    :repeat]
         when /\s/     then pass[:whitespace, c]
         when ','      then pass[:comma, ',']
-        when '>'      then pass[:refers, '=>'] if lc == '='
+        when '>'
+          if lc == '='
+            if get_state[:hash]
+              pass[:refers, '=>']
+            else # FIXME remove this buggy <=> cheat
+              pass[:symbol, '=>']
+            end
+          end
         when '('
           if nc =~ /[0-9-]/
             push_state[:rational, :repeat]
           else
             push_state[:object_description, :repeat]
-            open_brackets = 0 # TODO also count ()?
+            open_brackets = 0
           end
  
         when '{'
@@ -126,8 +133,9 @@ class << Wirb
         when /[^"., }\])=]/
           @token << c
         else
-          if  ( c == '=' && !(nc == '>' && lc != '<' ) ) ||
-              ( c == ']' && lc == '[' )
+          if c == ']' && lc == '['
+            @token << c
+          elsif c == '=' && nc != '>' # FIXME: spaceship error
             @token << c
           else
             pass[:symbol_prefix, ':']
@@ -136,7 +144,7 @@ class << Wirb
         end
 
       when :symbol_string
-        if c == '"' && lc != '\\'
+        if c == '"' && ( !( @token =~ /\\+$/; $& ) || $&.size % 2 == 0 ) # see string
           pass[:open_symbol_string, '"']
           pass_state[:remove]
           pop_state[]
@@ -146,8 +154,8 @@ class << Wirb
         end
 
       when :string
-        if c == '"' && lc != '\\'
-          pass[:open_string, '"']
+        if c == '"' && ( !( @token =~ /\\+$/; $& ) || $&.size % 2 == 0 ) # allow escaping of " and
+          pass[:open_string, '"']                                        # work around \\
           pass_state[:remove]
           pass[:close_string, '"']
         else
@@ -155,7 +163,7 @@ class << Wirb
         end
 
       when :regexp
-        if c == '/' && lc != '\\'
+        if c == '/' && ( !( @token =~ /\\+$/; $& ) || $&.size % 2 == 0 ) # see string
           pass[:open_regexp, '/']
           pass_state[:remove]
           pass[:close_regexp, '/']
@@ -318,7 +326,7 @@ class << Wirb
     end
   rescue
     # p$!, $!.backtrace[0]
-    pass[:default, str.gsub(/^#{@passed}/, '')]
+    pass[:default, str.sub(@passed, '')]
   end
 end
 

data/lib/wirb/version.rb

@@ -1,3 +1,3 @@
 module Wirb
-  VERSION = '0.2.4'
+  VERSION = '0.2.5'
 end

data/spec/tokenizer_nested_spec.rb

@@ -3,7 +3,7 @@ require 'set'
 describe tokenizer(__FILE__) do
   after :each do check_value end
 
-  please do check [2,'sdf',:hallosfe, /34jf3/, [[[[]]]], {{5=> "4"} => {Set.new => binding}}]
+  please do check [2,'sdf',:hallosfe, /34jf3/, [[[[]]]], {{5=> "4"} => {Set.new => Object.new}}]
     tokens.should be_like [
       [:open_array, "["],
       [:number, "2"],
@@ -52,7 +52,7 @@ describe tokenizer(__FILE__) do
       [:close_object, ">"],
       [:refers, "=>"],
       [:open_object, "#<"],
-      [:object_class, "Binding"],
+      [:object_class, "Object"],
       [:object_description_prefix, ":"],
       [:object_addr, OBJECT_ID],
       [:close_object, ">"],

data/spec/tokenizer_string_spec.rb

@@ -8,4 +8,28 @@ describe tokenizer(__FILE__) do
   please do check '"quote"'
     tokens.should == [[:open_string, '"'], [:string, "\\\"quote\\\""], [:close_string, '"']]
   end
+
+  please do check "\\"
+    tokens.should == [
+      [:open_string, "\""],
+      [:string, "\\\\"],
+      [:close_string, "\""],
+    ]
+  end
+
+  please do check "\\\\"
+    tokens.should == [
+      [:open_string, "\""],
+      [:string, "\\\\\\\\"],
+      [:close_string, "\""],
+    ]
+  end
+
+  please do check "\\\"X"
+    tokens.should == [
+      [:open_string, "\""],
+      [:string, "\\\\\\\"X"],
+      [:close_string, "\""],
+    ]
+  end
 end

data/spec/tokenizer_symbol_spec.rb

@@ -37,7 +37,9 @@ describe tokenizer(__FILE__) do
       [:comma, ","],
       [:whitespace, " "],
       [:symbol_prefix, ":"],
-      [:symbol, "<=>"],
+      # [:symbol, "<=>"], # FIXME
+      [:symbol, "<"],
+      [:symbol, "=>"],
       [:comma, ","],
       [:whitespace, " "],
       [:symbol_prefix, ":"],
@@ -81,7 +83,7 @@ describe tokenizer(__FILE__) do
     ]
   end
 
-  please do check [[:hallo],{:'hallo'=>:'test'}, {:'hallo='=>:'test='}]
+  please do check [[:hallo],{:'hallo'=>:'test'}, {:'hallo='=>:'test='}, {:'<'=>9}]
     tokens.should == [
       [:open_array, "["],
       [:open_array, "["],
@@ -106,6 +108,14 @@ describe tokenizer(__FILE__) do
       [:symbol_prefix, ":"],
       [:symbol, "test="],
       [:close_hash, "}"],
+      [:comma, ","],
+      [:whitespace, " "],
+      [:open_hash, "{"],
+      [:symbol_prefix, ":"],
+      [:symbol, "<"],
+      [:refers, "=>"],
+      [:number, "9"],
+      [:close_hash, "}"],
       [:close_array, "]"],
     ]
   end

data/wirb.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
   s.description =  "Colorizes your irb results. It's based on Wirble but only provides result highlighting. Just call Wirb.start and enjoy the colors ;)."
   s.required_rubygems_version = '>= 1.3.6'
   s.required_ruby_version     = '>= 1.8.7'
-  s.files = Dir.glob(%w[{lib,test,spec}/**/*.rb bin/* [A-Z]*.{txt,rdoc} ext/**/*.{rb,c} **/deps.rip]) + %w{Rakefile wirb.gemspec .gemtest}
-  s.extra_rdoc_files = ["README.rdoc", "COPYING"]
+  s.files = Dir.glob(%w[{lib,test,spec}/**/*.rb bin/* [A-Z]*.{txt,rdoc} ext/**/*.{rb,c}]) + %w{Rakefile wirb.gemspec .gemtest}
+  s.extra_rdoc_files = ["README.rdoc", "COPYING.txt"]
   s.license = 'MIT'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rspec-core'

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: wirb
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 4
-  version: 0.2.4
+  prerelease: 
+  version: 0.2.5
 platform: ruby
 authors: 
 - Jan Lelis
@@ -14,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-03 00:00:00 +01:00
-default_executable: 
+date: 2011-05-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -25,8 +20,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id001
@@ -38,8 +31,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id002
@@ -51,8 +42,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 9
         version: "9"
   type: :development
   version_requirements: *id003
@@ -64,7 +53,7 @@ extensions: []
 
 extra_rdoc_files: 
 - README.rdoc
-- COPYING
+- COPYING.txt
 files: 
 - lib/wirb.rb
 - lib/wirb/schema.rb
@@ -87,13 +76,12 @@ files:
 - spec/tokenizer_object_spec.rb
 - spec/tokenizer_nested_spec.rb
 - spec/tokenizer_string_spec.rb
+- COPYING.txt
 - README.rdoc
 - CHANGELOG.rdoc
 - Rakefile
 - wirb.gemspec
 - .gemtest
-- COPYING
-has_rdoc: true
 homepage: http://github.com/janlelis/wirb
 licenses: 
 - MIT
@@ -107,25 +95,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 8
-      - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.1
 signing_key: 
 specification_version: 3
 summary: Colorizes your irb results.