wirb 0.2.1 → 0.2.2

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== 0.2.2
+* Always return inspected string (even when errors happen) and endless-loop protection
+* Recognize active record class descriptions
+
 == 0.2.1
 * Fix 1.8 Rational after requiring 'mathn'
 * Return of string if tokenizer throws an error

data/lib/wirb.rb

@@ -1,7 +1,4 @@
-module Wirb
-  VERSION = '0.2.1'
-end
-
+require File.dirname(__FILE__) + '/wirb/version'
 require File.dirname(__FILE__) + '/wirb/colors'
 require File.dirname(__FILE__) + '/wirb/schema'
 require File.dirname(__FILE__) + '/wirb/tokenizer'
@@ -26,10 +23,15 @@ class << Wirb
   end
 
   # Colorize a result string
-  def colorize_result(str, custom_schema = schema)
-    tokenize(str).map{ |kind, token|
+  def colorize_result(string, custom_schema = schema)
+    check = ''
+    colorful = tokenize(string).map do |kind, token|
+      check << token
       colorize_string token, custom_schema[kind]
-    }.join
+    end.join
+
+    # always display the correct inspect string!
+    check == string ? colorful : string
   end
 
   # Colorize results in irb/ripl (or whatever might be supported in future)

data/lib/wirb/tokenizer.rb

@@ -8,7 +8,8 @@ class << Wirb
 
     chars = str.split(//)
 
-    @state, @token, @passed, i  =  [], '', '', 0
+    @state, @token, i  =  [], '', 0
+    @passed, snapshot  =  '', nil # exception handling
 
     # helpers
     pass_custom_state = lambda{ |kind, *options|
@@ -57,11 +58,17 @@ class << Wirb
         when /[A-Z]/  then push_state[:class,    :repeat]
         when /[a-z]/  then push_state[:keyword,  :repeat]
         when /[0-9-]/ then push_state[:number,   :repeat]
-        when '('      then push_state[:rational, :repeat]
-        when '.'      then push_state[:range, :repeat]
+        when '.'      then push_state[:range,    :repeat]
         when /\s/     then pass[:whitespace, c]
         when ','      then pass[:comma, ',']
         when '>'      then pass[:refers, '=>'] if lc == '='
+        when '('
+          if nc =~ /[0-9-]/
+            push_state[:rational, :repeat]
+          else
+            push_state[:object_description, :repeat]
+            open_brackets = 0 # TODO also count ()?
+          end
  
         when '{'
           if get_state[:set]
@@ -300,13 +307,17 @@ class << Wirb
       #   raise "unknown state #{@state[-1]} #{@state.inspect}"
       end
 
-      # TODO infinite recursion detection
-
       # next round :)
-      i += 1 unless @repeat
+      if !@repeat
+        i += 1
+      elsif snapshot && Marshal.load(snapshot) == [@state, @token, llc, lc, c, nc] # loop protection
+        raise 'Wirb Bug :/'
+      end
+
+      snapshot = Marshal.dump([@state, @token, llc, lc, c, nc])
     end
   rescue
-    # p$!
+    # p$!, $!.backtrace[0]
     pass[:default, str.gsub(/^#{@passed}/, '')]
   end
 end

data/lib/wirb/version.rb

@@ -0,0 +1,3 @@
+module Wirb
+  VERSION = '0.2.2'
+end

data/wirb.gemspec

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 require 'rubygems' unless defined? Gem
-require File.dirname(__FILE__) + "/lib/wirb"
+require File.dirname(__FILE__) + "/lib/wirb/version"
  
 Gem::Specification.new do |s|
   s.name        = "wirb"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Jan Lelis
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-28 00:00:00 +01:00
+date: 2011-01-29 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -33,6 +33,7 @@ files:
 - lib/wirb/tokenizer.rb
 - lib/wirb/wp.rb
 - lib/wirb/colors.rb
+- lib/wirb/version.rb
 - lib/wirb/irb.rb
 - README.rdoc
 - CHANGELOG.rdoc