lazibi 0.1.8 → 0.1.9

data/History.txt

@@ -1,3 +1,10 @@
+== 0.1.9 2007-06-19
+
+* Using rails as a regression test code base is rewarding
+* Currently works with ActiveSupport, ActionMailer, ActionPack
+* Unit tests are from rails source code....
+* Sleepy
+
 == 0.1.8 2007-06-19
 
 * Support Here doc by not processing it :/

data/Manifest.txt

@@ -15,11 +15,14 @@ lib/task.rb
 lib/vendor/beautifier.rb
 scripts/rdoc2html
 scripts/txt2html
+test/fixtures/clean/comment_break.txt
 test/fixtures/clean/end_concat.txt
 test/fixtures/clean/long_indent.txt
+test/fixtures/clean/mixed_re.txt
 test/fixtures/clean/only_if.txt
 test/fixtures/clean/re.txt
 test/fixtures/clean/sep_line.txt
+test/fixtures/clean/unless_problem.txt
 test/fixtures/meta/basic_class.txt
 test/fixtures/meta/case.txt
 test/fixtures/meta/class_with_def.txt
@@ -27,22 +30,31 @@ test/fixtures/meta/comment.txt
 test/fixtures/meta/eval_code.txt
 test/fixtures/meta/here_doc.txt
 test/fixtures/meta/inline_end.txt
+test/fixtures/meta/loop.txt
 test/fixtures/meta/middle.txt
+test/fixtures/meta/multi_blocks.txt
 test/fixtures/meta/nested_comment.txt
 test/fixtures/meta/optional_do.txt
 test/fixtures/meta/optional_do_with_nasty_chars.txt
 test/fixtures/meta/partial_method.txt
+test/fixtures/meta/single_method.txt
 test/fixtures/meta/two_methods.txt
 test/fixtures/real/basic_class.txt
 test/fixtures/real/case.txt
 test/fixtures/real/class_with_def.txt
 test/fixtures/real/comment.txt
+test/fixtures/real/comment_break.txt
 test/fixtures/real/end_concat.txt
 test/fixtures/real/eval_code.txt
+test/fixtures/real/general_eval.txt
 test/fixtures/real/here_doc.txt
 test/fixtures/real/inline_end.txt
+test/fixtures/real/javascript.txt
 test/fixtures/real/long_indent.txt
+test/fixtures/real/loop.txt
 test/fixtures/real/middle.txt
+test/fixtures/real/mixed_re.txt
+test/fixtures/real/multi_blocks.txt
 test/fixtures/real/nested_comment.txt
 test/fixtures/real/only_if.txt
 test/fixtures/real/optional_do.txt
@@ -50,7 +62,10 @@ test/fixtures/real/optional_do_with_nasty_chars.txt
 test/fixtures/real/partial_method.txt
 test/fixtures/real/re.txt
 test/fixtures/real/sep_line.txt
+test/fixtures/real/single_method.txt
+test/fixtures/real/strange_syntax_1.txt
 test/fixtures/real/two_methods.txt
+test/fixtures/real/unless_problem.txt
 test/test_helper.rb
 test/test_unit.rb
 website/index.html

data/lib/helper/parser_helper.rb

@@ -19,14 +19,14 @@ module Lazibi
     def begin_keys
       [
         /^module\b/,
-        /(=\s*|^)if\b/,
-        /(=\s*|^)until\b/,
-        /(=\s*|^)for\b/,
-        /(=\s*|^)unless\b/,
-        /(=\s*|^)while\b/,
-        /(=\s*|^)begin\b/,
+        /(=\s*|^|<<\s*)if\b/,
+        /(=\s*|^|<<\s*)until\b/,
+        /(=\s*|^|<<\s*)for\b/,
+        /(=\s*|^|<<\s*)unless\b/,
+        /(=\s*|^|<<\s*)while\b/,
+        /(=\s*|^|<<\s*)begin\b/,
+        /(=\s*|^|<<\s*)loop\b\s*do/,
         /\bcase\b/,
-        /(=\s*|^)loop\b/,
         /^class\b/,
         /^def\b/,
         /\bdo\b/,
@@ -35,12 +35,12 @@ module Lazibi
 
     def middle_keys
       [
-        /\bthen\b/,
+        /^then\b/,
         /^else\b/,
         /^elsif\b/,
         /^ensure\b/,
         /^rescue\b/,
-        /\bwhen\b/
+        /^when\b/
       ]
     end
 

data/lib/lazibi/version.rb

@@ -2,7 +2,7 @@ module Lazibi #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 8
+    TINY  = 9
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/parser.rb

@@ -85,11 +85,13 @@ module Lazibi
         return anchor if get_indent(l) < indent
         if get_indent(l) == indent
           rest = get_rest l
-          if middle_anchor? rest
+          if start_anchor? rest
+            return anchor     
+          elsif end_anchor? rest
+            return false     
+          elsif middle_anchor? rest
             anchor = i + 1
             next
-          elsif end_anchor? rest
-            return false
           else
             return anchor
           end

data/lib/vendor/beautifier.rb

@@ -13,15 +13,15 @@ module Beautifier
 
   $indentExp = [
     /^module\b/,
-    /(=\s*|^)if\b/,
-    /(=\s*|^)until\b/,
-    /(=\s*|^)for\b/,
-    /(=\s*|^)unless\b/,
-    /(=\s*|^)while\b/,
-    /(=\s*|^)begin\b/,
-    /\bcase\b/,
-    /(=\s*|^)loop\b/,
+    /(=\s*|^|<<\s*)if\b/,
+    /(=\s*|^|<<\s*)until\b/,
+    /(=\s*|^|<<\s*)for\b/,
+    /(=\s*|^|<<\s*)unless\b/,
+    /(=\s*|^|<<\s*)while\b/,
+    /(=\s*|^|<<\s*)begin\b/,
+    /(=\s*|^|<<\s*)loop\b/,
     #    /\bthen\b/,
+    /\bcase\b/,
     /^class\b/,
     /^rescue\b/,
     /^def\b/,
@@ -47,6 +47,8 @@ module Beautifier
     /^[^\{]*\}/,
     /^[^\[]*\]/
   ]
+  
+  
 
   def self.makeTab(tab)
     return (tab < 0) ? "":$tabStr * $tabSize * tab
@@ -58,26 +60,41 @@ module Beautifier
     return line + "\n"
   end
 
-  def self.clean_line( line )
+  def self.clean_line( line, leave_comment = false )
 
     # throw out sequences that will
     # only sow confusion
 
     tline = line.dup
-    tline.gsub!(/\/.*?[^\\]\//,"")
-    tline.gsub!(/%r\{.*?\}/,"")
-    tline.gsub!(/%r(.).*?\1/,"")
+
+
+    tline.gsub!(/\/.*?[^\\]\//,"//")
+    
+    tline.gsub!(/#\{.*?\}/,"")
     tline.gsub!(/\\\"/,"'")
     tline.gsub!(/".*?"/,"\"\"")
     tline.gsub!(/'.*?'/,"''")
-    tline.gsub!(/#\{.*?\}/,"")
-
+    
     # more ..
-    tline.gsub!(/%w\{.*?\}/, '')
-    tline.gsub!(/%w\(.*?\)/, '')
-    tline.gsub!(/%w\[.*?\]/, '')
+    tline.gsub!(/%r\{.*?\}/, "''")
+    tline.gsub!(/%r\(.*?\)/, "''")
+    tline.gsub!(/%r\[.*?\]/, "''")
+    tline.gsub!(/%r(.).*?\1/, "''")
+    
+    tline.gsub!(/%w\{.*?\}/, "''")
+    tline.gsub!(/%w\(.*?\)/, "''")
+    tline.gsub!(/%w\[.*?\]/, "''")
+    tline.gsub!(/%w(.).*?\1/, "''")
+    
+    
+    tline.gsub!(/%q\{.*?\}/, "''")
+    tline.gsub!(/%q\(.*?\)/, "''")
+    tline.gsub!(/%q\[.*?\]/, "''")
+    tline.gsub!(/%q(.).*?\1/, "''")
+    
 
-    tline.gsub!(/%w(.).*?\1/, '')
+    
+    tline.gsub!(/#.*$/, '') unless leave_comment
 
     tline
   end
@@ -102,7 +119,7 @@ module Beautifier
     buffer = ''
     new_lines = []
     for line in lines
-      if line =~ /^\s*#/
+      if clean_line(line, true).strip =~ /#/
         if continue
           new_lines << buffer
           new_lines << line
@@ -119,7 +136,7 @@ module Beautifier
           new_lines << buffer
           new_lines << line
           buffer = ''
-        elsif line.strip[-1..-1] == "\\"
+        elsif line.strip[-1..-1] == "\\" 
           continue = true
           buffer += ' ' + line.strip[0...-1].strip
         else
@@ -131,7 +148,7 @@ module Beautifier
       else
         if line.strip == ''
           new_lines << line
-        elsif line.strip[-1..-1] == "\\"
+        elsif line.strip[-1..-1] == "\\" 
           continue = true
           buffer += line.rstrip[0...-1].strip
         else
@@ -143,9 +160,9 @@ module Beautifier
     new_lines.join("\n")
   end
 
-
+    
   def self.valid?( line )
-    not_supported = using_eval?(line) || here_doc?(line)
+    not_supported = using_eval?(line) || here_doc?(line) || special_syntax(line)
     return !not_supported
   end
 
@@ -156,10 +173,30 @@ module Beautifier
   def self.here_doc?( line )
     line =~ /(=\s*<<)|(<<-)/
   end
+
+  def self.special_syntax( line )
+    patterns = [
+      /:\[\]=/,
+      /\beval\b/,
+      /javascript_cdata/
+    ]
+    for p in patterns
+      return true if line =~ p
+    end
     
+    false
+  end
+  
+  def self.valid_before_clean?( line )
+    r = line =~ /#\{[^\{]*#\{.*\}.*\}/
+    r.nil?
+  end
+
+      
   def self.ruby( source )
     invalid = false
-    source = join_sep_line(split_end(source))
+    #source = join_sep_line(split_end(source))
+    source = split_end(source)
     commentBlock = false
     multiLineArray = Array.new
     multiLineStr = ""
@@ -167,7 +204,7 @@ module Beautifier
     dest = ""
     source.split("\n").each do |line|
       # combine continuing lines
-      if(!(line =~ /^\s*#/) && line =~ /[^\\]\\\s*$/)
+      if(!(clean_line(line, true) =~ /\s*#/) && line =~ /[^\\]\\\s*$/)
         multiLineArray.push line
         multiLineStr += line.sub(/^(.*)\\\s*$/,"\\1")
         next
@@ -191,9 +228,10 @@ module Beautifier
         if(!commentLine)
           # throw out sequences that will
           # only sow confusion
+          valid_before = valid_before_clean?( tline )
           tline = clean_line(tline)
-          unless valid?(tline)
-            puts 'Skipped since: ' + tline
+          unless ( valid?(tline) && valid_before )
+            puts '- ' + tline
             invalid = true
             break
           end
@@ -205,8 +243,16 @@ module Beautifier
           end
         end
         if (multiLineArray.length > 0)
+          first_line = true
           multiLineArray.each do |ml|
-            dest += addLine(ml,tab)
+            if first_line
+              dest += addLine(ml,tab)
+              first_line = false
+            elsif ml.strip =~ /^unless/ || ml.strip =~ /^if/
+              dest = dest.chop.rstrip.chop.rstrip + ' ' + ml.strip + "\n"
+            else
+              dest += addLine(ml,tab)
+            end
           end
           multiLineArray.clear
           multiLineStr = ""

data/test/fixtures/clean/comment_break.txt

@@ -0,0 +1,5 @@
+class JavaScriptElementCollectionProxy < JavaScriptCollectionProxy #:nodoc:\
+  def initialize(generator, pattern)
+    super(generator, "$$(#{pattern.to_json})")
+  end
+end

data/test/fixtures/clean/mixed_re.txt

@@ -0,0 +1,7 @@
+bases.collect do |root|
+  expanded_root = File.expand_path(root)
+  next unless %r{\A#{Regexp.escape(expanded_root)}(/|\\)} =~ expanded_path
+end
+
+US_ZONES = /US|Arizona|Indiana|Hawaii|Alaska/ unless defined?(US_ZONES)
+abc

data/test/fixtures/clean/sep_line.txt

@@ -1 +1,11 @@
-abc def
+abc \
+abc\
+abc
+
+abc unless something
+abc
+
+raise ArgumentError, "not directory: #{dir}" unless FileTest.directory? edir
+@dirname = edir
+@last_file = nil
+@last_atime = nil

data/test/fixtures/clean/unless_problem.txt

@@ -0,0 +1,4 @@
+keys.each do |key|
+  unless key.class.to_s == "String" # weird hack to make the tests run when string_ext_test.rb is also running
+  end
+end

data/test/fixtures/meta/loop.txt

@@ -0,0 +1 @@
+loop { yield(scanner.scan(char) || break) }

data/test/fixtures/meta/multi_blocks.txt

@@ -0,0 +1,11 @@
+session_options.each do |opts|
+  next if opts[:if] && !opts[:if].call(request)
+  if opts[:only] && opts[:only].include?(action)
+    options.merge!(opts)
+  elsif opts[:except] && !opts[:except].include?(action)
+    options.merge!(opts)
+  elsif !opts[:only] && !opts[:except]
+    options.merge!(opts)
+
+if options.empty? then options
+else

data/test/fixtures/meta/single_method.txt

@@ -0,0 +1,2 @@
+alias_method :regular_writer, :[]= unless method_defined?(:regular_writer)
+alias_method :regular_update, :update unless method_defined?(:regular_update)

data/test/fixtures/real/comment_break.txt

@@ -0,0 +1,5 @@
+class JavaScriptElementCollectionProxy < JavaScriptCollectionProxy #:nodoc:\
+  def initialize(generator, pattern)
+    super(generator, "$$(#{pattern.to_json})")
+  end
+end

data/test/fixtures/real/general_eval.txt

@@ -0,0 +1 @@
+eval("::#{k}").object_id != k.object_id

data/test/fixtures/real/javascript.txt

@@ -0,0 +1,3 @@
+def javascript_cdata_section(content) #:nodoc:
+  "\n//#{cdata_section("\n#{content}\n//")}\n"
+end

data/test/fixtures/real/loop.txt

@@ -0,0 +1 @@
+loop { yield(scanner.scan(char) || break) }

data/test/fixtures/real/mixed_re.txt

@@ -0,0 +1,7 @@
+bases.collect do |root|
+  expanded_root = File.expand_path(root)
+  next unless %r{\A#{Regexp.escape(expanded_root)}(/|\\)} =~ expanded_path
+end
+
+US_ZONES = /US|Arizona|Indiana|Hawaii|Alaska/ unless defined?(US_ZONES)
+abc

data/test/fixtures/real/multi_blocks.txt

@@ -0,0 +1,14 @@
+session_options.each do |opts|
+  next if opts[:if] && !opts[:if].call(request)
+  if opts[:only] && opts[:only].include?(action)
+    options.merge!(opts)
+  elsif opts[:except] && !opts[:except].include?(action)
+    options.merge!(opts)
+  elsif !opts[:only] && !opts[:except]
+    options.merge!(opts)
+  end
+end
+
+if options.empty? then options
+else
+end

data/test/fixtures/real/sep_line.txt

@@ -1,2 +1,13 @@
 abc \
-   def
+   abc\
+     abc
+
+abc\
+ unless something
+abc
+
+raise ArgumentError, "not directory: #{dir}"\
+unless FileTest.directory? edir
+  @dirname = edir
+  @last_file = nil
+  @last_atime = nil

data/test/fixtures/real/single_method.txt

@@ -0,0 +1,2 @@
+alias_method :regular_writer, :[]= unless method_defined?(:regular_writer)
+alias_method :regular_update, :update unless method_defined?(:regular_update)

data/test/fixtures/real/strange_syntax_1.txt

@@ -0,0 +1,2 @@
+def assert_resource_methods(expected, resource, action_method, method)
+  assert_equal expected.length, resource.send("#{action_method}_methods")[method].size, "#{resource.send("#{action_method}_methods")[method].inspect}"

data/test/fixtures/real/unless_problem.txt

@@ -0,0 +1,4 @@
+keys.each do |key|
+  unless key.class.to_s == "String" # weird hack to make the tests run when string_ext_test.rb is also running
+  end
+end

data/test/test_unit.rb

@@ -55,6 +55,7 @@ class TestLazibi < Test::Unit::TestCase
     assert @r.find_end(@meta[:two_methods].split("\n")[1..-1], 2) == 0
     assert_find :partial_method, 2, 0
     assert_find :middle, 0, 1
+    assert_find :multi_blocks, 0, 7
   end
 
   def test_convert_path
@@ -64,7 +65,7 @@ class TestLazibi < Test::Unit::TestCase
   end
 
   def test_convert_content
-    @meta.keys.reject{|k| ['partial_method', 'inline_end', 'optional_do', 'eval_code', 'here_doc'].include? k.to_s }.each do |k|
+    @meta.keys.reject{|k| ['partial_method', 'inline_end', 'optional_do', 'eval_code', 'here_doc', 'single_method'].include? k.to_s }.each do |k|
       assert_convert k
     end
   end
@@ -82,6 +83,10 @@ class TestLazibi < Test::Unit::TestCase
   def test_skip
     assert_skip :eval_code
     assert_skip :here_doc
+    assert_skip :single_method
+    assert_skip :general_eval
+    assert_skip :javascript
+    assert_skip :strange_syntax_1
   end
 
   def test_beauty
@@ -91,6 +96,12 @@ class TestLazibi < Test::Unit::TestCase
   end
 
 
+  def test_clean
+    assert_clean 'str.gsub(/([^ \/a-zA-Z0-9_.-])/n)', 'str.gsub(//n)'
+    assert_clean '%r{\A#{Regexp.escape(expanded_root)}(/|\\)}', "''"
+  end
+    
+    
   private
   def assert_find( name, indent, end_i )
     assert_equal @r.find_end(@meta[name].split("\n"), indent), end_i
@@ -120,4 +131,8 @@ class TestLazibi < Test::Unit::TestCase
   def assert_skip( name )
     assert_equal Beautifier::ruby(@real[name]), false, name
   end
+    
+  def assert_clean( line, exp )
+    assert_equal Beautifier::clean_line( line ).to_s, exp, line
+  end
 end

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>Welcome to Lazibi</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/lazibi"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/lazibi" class="numbers">0.1.8</a>
+      <a href="http://rubyforge.org/projects/lazibi" class="numbers">0.1.9</a>
     </div>
     <p>
 Lazibi is a preprocessor that allows you to use Python style indentation in

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.3
 specification_version: 1
 name: lazibi
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
+  version: 0.1.9
 date: 2007-06-19 00:00:00 +08:00
 summary: Python like syntax for Ruby
 require_paths: 
@@ -46,11 +46,14 @@ files:
 - lib/vendor/beautifier.rb
 - scripts/rdoc2html
 - scripts/txt2html
+- test/fixtures/clean/comment_break.txt
 - test/fixtures/clean/end_concat.txt
 - test/fixtures/clean/long_indent.txt
+- test/fixtures/clean/mixed_re.txt
 - test/fixtures/clean/only_if.txt
 - test/fixtures/clean/re.txt
 - test/fixtures/clean/sep_line.txt
+- test/fixtures/clean/unless_problem.txt
 - test/fixtures/meta/basic_class.txt
 - test/fixtures/meta/case.txt
 - test/fixtures/meta/class_with_def.txt
@@ -58,22 +61,31 @@ files:
 - test/fixtures/meta/eval_code.txt
 - test/fixtures/meta/here_doc.txt
 - test/fixtures/meta/inline_end.txt
+- test/fixtures/meta/loop.txt
 - test/fixtures/meta/middle.txt
+- test/fixtures/meta/multi_blocks.txt
 - test/fixtures/meta/nested_comment.txt
 - test/fixtures/meta/optional_do.txt
 - test/fixtures/meta/optional_do_with_nasty_chars.txt
 - test/fixtures/meta/partial_method.txt
+- test/fixtures/meta/single_method.txt
 - test/fixtures/meta/two_methods.txt
 - test/fixtures/real/basic_class.txt
 - test/fixtures/real/case.txt
 - test/fixtures/real/class_with_def.txt
 - test/fixtures/real/comment.txt
+- test/fixtures/real/comment_break.txt
 - test/fixtures/real/end_concat.txt
 - test/fixtures/real/eval_code.txt
+- test/fixtures/real/general_eval.txt
 - test/fixtures/real/here_doc.txt
 - test/fixtures/real/inline_end.txt
+- test/fixtures/real/javascript.txt
 - test/fixtures/real/long_indent.txt
+- test/fixtures/real/loop.txt
 - test/fixtures/real/middle.txt
+- test/fixtures/real/mixed_re.txt
+- test/fixtures/real/multi_blocks.txt
 - test/fixtures/real/nested_comment.txt
 - test/fixtures/real/only_if.txt
 - test/fixtures/real/optional_do.txt
@@ -81,7 +93,10 @@ files:
 - test/fixtures/real/partial_method.txt
 - test/fixtures/real/re.txt
 - test/fixtures/real/sep_line.txt
+- test/fixtures/real/single_method.txt
+- test/fixtures/real/strange_syntax_1.txt
 - test/fixtures/real/two_methods.txt
+- test/fixtures/real/unless_problem.txt
 - test/test_helper.rb
 - test/test_unit.rb
 - website/index.html
@@ -100,11 +115,14 @@ extra_rdoc_files:
 - License.txt
 - Manifest.txt
 - README.txt
+- test/fixtures/clean/comment_break.txt
 - test/fixtures/clean/end_concat.txt
 - test/fixtures/clean/long_indent.txt
+- test/fixtures/clean/mixed_re.txt
 - test/fixtures/clean/only_if.txt
 - test/fixtures/clean/re.txt
 - test/fixtures/clean/sep_line.txt
+- test/fixtures/clean/unless_problem.txt
 - test/fixtures/meta/basic_class.txt
 - test/fixtures/meta/case.txt
 - test/fixtures/meta/class_with_def.txt
@@ -112,22 +130,31 @@ extra_rdoc_files:
 - test/fixtures/meta/eval_code.txt
 - test/fixtures/meta/here_doc.txt
 - test/fixtures/meta/inline_end.txt
+- test/fixtures/meta/loop.txt
 - test/fixtures/meta/middle.txt
+- test/fixtures/meta/multi_blocks.txt
 - test/fixtures/meta/nested_comment.txt
 - test/fixtures/meta/optional_do.txt
 - test/fixtures/meta/optional_do_with_nasty_chars.txt
 - test/fixtures/meta/partial_method.txt
+- test/fixtures/meta/single_method.txt
 - test/fixtures/meta/two_methods.txt
 - test/fixtures/real/basic_class.txt
 - test/fixtures/real/case.txt
 - test/fixtures/real/class_with_def.txt
 - test/fixtures/real/comment.txt
+- test/fixtures/real/comment_break.txt
 - test/fixtures/real/end_concat.txt
 - test/fixtures/real/eval_code.txt
+- test/fixtures/real/general_eval.txt
 - test/fixtures/real/here_doc.txt
 - test/fixtures/real/inline_end.txt
+- test/fixtures/real/javascript.txt
 - test/fixtures/real/long_indent.txt
+- test/fixtures/real/loop.txt
 - test/fixtures/real/middle.txt
+- test/fixtures/real/mixed_re.txt
+- test/fixtures/real/multi_blocks.txt
 - test/fixtures/real/nested_comment.txt
 - test/fixtures/real/only_if.txt
 - test/fixtures/real/optional_do.txt
@@ -135,7 +162,10 @@ extra_rdoc_files:
 - test/fixtures/real/partial_method.txt
 - test/fixtures/real/re.txt
 - test/fixtures/real/sep_line.txt
+- test/fixtures/real/single_method.txt
+- test/fixtures/real/strange_syntax_1.txt
 - test/fixtures/real/two_methods.txt
+- test/fixtures/real/unless_problem.txt
 - website/index.txt
 executables: 
 - lazibi