lazibi 0.1.11 → 0.1.12

data/History.txt

@@ -1,3 +1,12 @@
+== 0.1.12 2007-06-21
+
+* Bugs
+  * inline block do; end fix
+  * Mix " and / inline fix
+* Features
+  * Passed RSpec test ( manually disabled optional_do filter for spec )
+  * Passed redMine test
+
 == 0.1.11 2007-06-20
 
 * Bugs

data/Manifest.txt

@@ -23,6 +23,7 @@ lib/vendor/beautifier.rb
 scripts/rdoc2html
 scripts/txt2html
 test/fixtures/clean/comment_break.txt
+test/fixtures/clean/complex_string.txt
 test/fixtures/clean/end_concat.txt
 test/fixtures/clean/long_indent.txt
 test/fixtures/clean/mixed_re.txt
@@ -38,6 +39,7 @@ test/fixtures/meta/comment.txt
 test/fixtures/meta/comment_after_end.txt
 test/fixtures/meta/eval_code.txt
 test/fixtures/meta/here_doc.txt
+test/fixtures/meta/inline_do_end.txt
 test/fixtures/meta/inline_end.txt
 test/fixtures/meta/loop.txt
 test/fixtures/meta/middle.txt
@@ -55,10 +57,12 @@ test/fixtures/real/comment.txt
 test/fixtures/real/comment_after_end.txt
 test/fixtures/real/comment_after_end_expected.txt
 test/fixtures/real/comment_break.txt
+test/fixtures/real/complex_string.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_do_end.txt
 test/fixtures/real/inline_end.txt
 test/fixtures/real/javascript.txt
 test/fixtures/real/long_indent.txt

data/lib/helper/task_helper.rb

@@ -49,5 +49,9 @@ module Lazibi
       offset = 'meta'.size + 1
       path[offset..-1]
     end
+      
+    def clean_block(line)
+      line.gsub /do.*?end/, ''
+    end
   end
 end

data/lib/lazibi/version.rb

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

data/lib/parser.rb

@@ -59,8 +59,9 @@ module Lazibi
         lines.each_index do |index|
           # run through filters
           l = filter_for_to_rb(lines, index, filters)
-
-          if start_anchor?(get_rest(l))
+          
+          safe_l = clean_block(clean_line(get_rest(l)))
+          if start_anchor? safe_l
             relative_index_for_end = find_end( lines[index..-1], get_indent(l))
             unless relative_index_for_end
               progress += 1

data/lib/vendor/beautifier.rb

@@ -64,35 +64,30 @@ module Beautifier
 
     # throw out sequences that will
     # only sow confusion
-
+    # " \"" << "#{base}/#{path}".gsub(/["?<>\*]/, '') << "\""
     tline = line.dup.sub /[;]*$/, ''
 
 
-    tline.gsub!(/\/.*?[^\\]\//,"//")
+
 
     tline.gsub!(/#\{.*?\}/,"")
     tline.gsub!(/\\\"/,"'")
+    
+    # deal with nested syntax
+    
+    tline.gsub!(/"\/*?"/,"\"\"")
+    tline.gsub!(/\/.*?[^\\]\//,"//")
+    
+    # again
     tline.gsub!(/".*?"/,"\"\"")
     tline.gsub!(/'.*?'/,"''")
+    tline.gsub!(/`.*?`/,"''")
 
     # more ..
-    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!(/%[qwsrx]\{.*?\}/, "''")
+    tline.gsub!(/%[qwsrx]\(.*?\)/, "''")
+    tline.gsub!(/%[qwsrx]\[.*?\]/, "''")
+    tline.gsub!(/%[qwsrx](.).*?\1/, "''")
 
     tline.gsub!(/#.*$/, '') unless leave_comment
 

data/test/fixtures/clean/complex_string.txt

@@ -0,0 +1,3 @@
+def target(path)
+  " \"" << "#{base}/#{path}".gsub(/["?<>\*]/, '') << "\""
+end

data/test/fixtures/meta/inline_do_end.txt

@@ -0,0 +1,2 @@
+it "should fail when no description given" do
+  lambda { describe do; end }.should raise_error(ArgumentError)

data/test/fixtures/real/complex_string.txt

@@ -0,0 +1,3 @@
+def target(path)
+  " \"" << "#{base}/#{path}".gsub(/["?<>\*]/, '') << "\""
+end

data/test/fixtures/real/inline_do_end.txt

@@ -0,0 +1,3 @@
+it "should fail when no description given" do
+  lambda { describe do; end }.should raise_error(ArgumentError)
+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.11</a>
+      <a href="http://rubyforge.org/projects/lazibi" class="numbers">0.1.12</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.11
+  version: 0.1.12
 date: 2007-06-21 00:00:00 +08:00
 summary: Python like syntax for Ruby
 require_paths: 
@@ -54,6 +54,7 @@ files:
 - scripts/rdoc2html
 - scripts/txt2html
 - test/fixtures/clean/comment_break.txt
+- test/fixtures/clean/complex_string.txt
 - test/fixtures/clean/end_concat.txt
 - test/fixtures/clean/long_indent.txt
 - test/fixtures/clean/mixed_re.txt
@@ -69,6 +70,7 @@ files:
 - test/fixtures/meta/comment_after_end.txt
 - test/fixtures/meta/eval_code.txt
 - test/fixtures/meta/here_doc.txt
+- test/fixtures/meta/inline_do_end.txt
 - test/fixtures/meta/inline_end.txt
 - test/fixtures/meta/loop.txt
 - test/fixtures/meta/middle.txt
@@ -86,10 +88,12 @@ files:
 - test/fixtures/real/comment_after_end.txt
 - test/fixtures/real/comment_after_end_expected.txt
 - test/fixtures/real/comment_break.txt
+- test/fixtures/real/complex_string.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_do_end.txt
 - test/fixtures/real/inline_end.txt
 - test/fixtures/real/javascript.txt
 - test/fixtures/real/long_indent.txt
@@ -130,6 +134,7 @@ extra_rdoc_files:
 - Manifest.txt
 - README.txt
 - test/fixtures/clean/comment_break.txt
+- test/fixtures/clean/complex_string.txt
 - test/fixtures/clean/end_concat.txt
 - test/fixtures/clean/long_indent.txt
 - test/fixtures/clean/mixed_re.txt
@@ -145,6 +150,7 @@ extra_rdoc_files:
 - test/fixtures/meta/comment_after_end.txt
 - test/fixtures/meta/eval_code.txt
 - test/fixtures/meta/here_doc.txt
+- test/fixtures/meta/inline_do_end.txt
 - test/fixtures/meta/inline_end.txt
 - test/fixtures/meta/loop.txt
 - test/fixtures/meta/middle.txt
@@ -162,10 +168,12 @@ extra_rdoc_files:
 - test/fixtures/real/comment_after_end.txt
 - test/fixtures/real/comment_after_end_expected.txt
 - test/fixtures/real/comment_break.txt
+- test/fixtures/real/complex_string.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_do_end.txt
 - test/fixtures/real/inline_end.txt
 - test/fixtures/real/javascript.txt
 - test/fixtures/real/long_indent.txt