lazibi 0.1.10 → 0.1.11

data/lib/helper/parser_helper.rb

@@ -72,8 +72,8 @@ module Lazibi
       str =~ end_keys
     end
 
-    def clean_line(line)
-      Beautifier::clean_line line
+    def clean_line(line, leave_comment = false)
+      Beautifier::clean_line line, leave_comment
     end
 
     # why?
@@ -83,5 +83,10 @@ module Lazibi
       p = Regexp.new(s.join('|'))
       return line =~ p
     end
+
+    def comment_at_end(line)
+      return false if line.strip ==''
+      clean_line(line, true) =~ /#/
+    end
   end
 end

data/lib/lazibi/version.rb

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

data/lib/parser.rb

@@ -14,9 +14,15 @@ module Lazibi
         if l.strip =~ /^end$/
           next
         end
+        l = remove_colon_at_end(l)
+        
         s = l
-        if l.rstrip[-4..-1] == ' end'
-          s = l.rstrip[0...-3].rstrip
+        if comment_at_end(l)          
+          s = s.sub(/(\s*;\s*end*\s*)(#.*)/, ' \2')
+          s = s.sub(/(\s+end*\s*)(#.*)/, ' \2')
+        else
+          s = s.sub(/\s+end\s*$/, '')
+          s = remove_colon_at_end(s)
         end
 
         py << s
@@ -26,6 +32,14 @@ module Lazibi
     end
 
 
+    def remove_colon_at_end(l)
+      if comment_at_end(l)
+        l.sub /(\s*;\s*)(#.*)/, ' \2'
+      else
+        l.sub /;*$/, ''
+      end
+    end
+      
     def to_rb( content, filters = [] )
       return '' if content.strip == ''
       lines = content.split("\n")
@@ -53,7 +67,12 @@ module Lazibi
               break
             end
             index_for_end = relative_index_for_end + index
-            lines[index_for_end] = lines[index_for_end] + "\n" +  ' ' * get_indent(l) + "end"
+            if relative_index_for_end == 0 && !comment_at_end(l)
+              l = lines[index_for_end]
+              lines[index_for_end] = lines[index_for_end].rstrip + '; end'
+            else
+              lines[index_for_end] = lines[index_for_end] + "\n" +  ' ' * get_indent(l) + "end"
+            end
             head = @lines[0...progress]
             tail = lines[index..-1].join("\n").split("\n")
             @lines = head + tail

data/lib/vendor/beautifier.rb

@@ -65,7 +65,7 @@ module Beautifier
     # throw out sequences that will
     # only sow confusion
 
-    tline = line.dup
+    tline = line.dup.sub /[;]*$/, ''
 
 
     tline.gsub!(/\/.*?[^\\]\//,"//")

data/test/fixtures/clean/semi_colon_after_end.txt

@@ -0,0 +1,3 @@
+class DevelopersProject; end;
+
+class ManyToManyFixturesWithClassDefined < Test::Unit::TestCase

data/test/fixtures/meta/comment_after_end.txt

@@ -0,0 +1 @@
+def #abc

data/test/fixtures/meta/inline_end.txt

@@ -1,3 +1,5 @@
 def abc
 
-def def abc end
+def some def abc end
+
+alias_method :proxy_extend, :extend

data/test/fixtures/real/basic_class.txt

@@ -1,2 +1 @@
-class basic
-end
+class basic; end

data/test/fixtures/real/class_with_def.txt

@@ -1,4 +1,3 @@
 class abc
-  def
-  end
+  def; end
 end

data/test/fixtures/real/comment.txt

@@ -2,13 +2,10 @@ def a
   # comment
 end
   
-def b
-end
+def b; end
 
 #comment
-def c
-end
+def c; end
 
-def d
-end
+def d; end
 #

data/test/fixtures/real/comment_after_end.txt

@@ -0,0 +1 @@
+def end #abc

data/test/fixtures/real/comment_after_end_expected.txt

@@ -0,0 +1,2 @@
+def #abc
+end

data/test/fixtures/real/inline_end.txt

@@ -1,3 +1,5 @@
 def abc end
 
-def def abc end end
+def some def abc end end
+
+alias_method :proxy_extend, :extend

data/test/fixtures/real/partial_method.txt

@@ -1,3 +1,2 @@
-  def
-  end
+  def; end
 end

data/test/fixtures/real/semi_colon_after_end.txt

@@ -0,0 +1,3 @@
+class DevelopersProject; end;
+
+  class ManyToManyFixturesWithClassDefined < Test::Unit::TestCase

data/test/fixtures/real/two_methods.txt

@@ -1,7 +1,5 @@
 class abc
-  def a
-  end
+  def a; end
     
-  def b
-  end
+  def b; end
 end

data/test/test_unit.rb

@@ -65,7 +65,8 @@ class TestLazibiUnit < Test::Unit::TestCase
   end
 
   def test_convert_content
-    @meta.keys.reject{|k| ['partial_method', 'inline_end', 'optional_do', 'eval_code', 'here_doc', 'single_method'].include? k.to_s }.each do |k|
+    @meta.keys.reject{|k| ['partial_method', 'inline_end', 'optional_do',
+    'eval_code', 'here_doc', 'single_method', 'comment_after_end'].include? k.to_s }.each do |k|
       assert_convert k
     end
   end
@@ -74,10 +75,12 @@ class TestLazibiUnit < Test::Unit::TestCase
     assert_to_rb :partial_method
     #    assert_to_rb :optional_do
     assert_to_rb :eval_code
+    assert_to_rb :comment_after_end, :comment_after_end_expected
   end
 
   def test_to_py
     assert_to_py :inline_end
+    assert_to_py :comment_after_end
   end
 
   def test_skip
@@ -102,17 +105,22 @@ class TestLazibiUnit < Test::Unit::TestCase
   end
 
 
+  def test_check_comment
+    assert @r.comment_at_end('  dab #abcd')
+  end
   private
   def assert_find( name, indent, end_i )
     assert_equal @r.find_end(@meta[name].split("\n"), indent), end_i
   end
 
-  def assert_to_rb( name )
-    assert_equal @r.to_rb( @meta[name]), @real[name], name
+  def assert_to_rb( name, name_2 = nil )
+    name_2 = name unless name_2
+    assert_equal @r.to_rb( @meta[name]), @real[name_2], name
   end
 
-  def assert_to_py( name )
-    assert_equal @r.to_py( @real[name]), @meta[name], name
+  def assert_to_py( name, name_2 = nil )
+    name_2 = name unless name_2
+    assert_equal @r.to_py( @real[name]), @meta[name_2], name
   end
 
   def assert_convert( name )

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.10</a>
+      <a href="http://rubyforge.org/projects/lazibi" class="numbers">0.1.11</a>
     </div>
     <p>
 Lazibi is a preprocessor that allows you to use Python style indentation in
@@ -45,7 +45,7 @@ generates .rb files in the real directory for you in real time.
 </p>
 <h2>Examples</h2>
 <p>
-Sweeter RSpec
+Sweeter RSpec [ Thanks Jay ]
 </p>
 <pre>
   describe Bowling
@@ -161,6 +161,18 @@ behavior by editing .lazibi config file.
       - etc
 </pre>
 </li>
+<li>Personally I would not recommend using this filter outside the context of
+RSpec
+
+<ul>
+<li>It&#8217;s not well tested
+
+</li>
+<li>Anything more complex then simple description will get unreadable
+
+</li>
+</ul>
+</li>
 </ul>
 <h2>In Practice</h2>
 <p>
@@ -170,8 +182,15 @@ have, and Lazibi works pretty well using TDD.
 </p>
 <h2>Known issues</h2>
 <p>
-Here docs are likely to screw up code generation. Give them enough indent
-so they are treated like normal code inside current code block ;|
+Here docs, eval, javascript related libs, and complex string evaluation are
+currently not supported. Ruby code with above syntax will be preserved as
+is. So your code should still works, just no parse. In other words, if you
+don&#8217;t want your code to be parsed, simply add a dummy here doc
+string&#8230;
+</p>
+<h2>Talk</h2>
+<p>
+http://groups.google.com/group/lazibi-talk
 </p>
 <h2>To Do</h2>
 <ul>

data/website/index.txt

@@ -7,7 +7,7 @@ the real directory for you in real time.
 
 == Examples
 
-Sweeter RSpec
+Sweeter RSpec [ Thanks Jay ]
 
   describe Bowling
     before(:each)
@@ -102,13 +102,22 @@ Start hacking in meta :/
         - ^test
         - etc
 
+* Personally I would not recommend using this filter outside the context of RSpec
+  * It's not well tested
+  * Anything more complex then simple description will get unreadable
+  
 == In Practice
 
 Lazibi is written using Lazibi itself ( incrementally ). Personally I think autotest from  http://www.zenspider.com/ZSS/Products/ZenTest/ is a must have, and Lazibi works pretty well using TDD.
 
 == Known issues
 
-Here docs are likely to screw up code generation. Give them enough indent so they are treated like normal code inside current code block ;|
+Here docs, eval, javascript related libs, and complex string evaluation are currently not supported. 
+Ruby code with above syntax will be preserved as is. So your code should still works, just no parse. In other words, if you don't want your code to be parsed, simply add a dummy here doc string...
+
+== Talk
+
+http://groups.google.com/group/lazibi-talk
 
 == To Do
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.3
 specification_version: 1
 name: lazibi
 version: !ruby/object:Gem::Version 
-  version: 0.1.10
-date: 2007-06-20 00:00:00 +08:00
+  version: 0.1.11
+date: 2007-06-21 00:00:00 +08:00
 summary: Python like syntax for Ruby
 require_paths: 
 - lib
@@ -36,6 +36,13 @@ files:
 - README.txt
 - Rakefile
 - bin/lazibi
+- coverage/index.html
+- coverage/lib-helper-parser_helper_rb.html
+- coverage/lib-helper-task_helper_rb.html
+- coverage/lib-lazibi-version_rb.html
+- coverage/lib-lazibi_rb.html
+- coverage/lib-parser_rb.html
+- coverage/lib-task_rb.html
 - lib/helper/app_helper.rb
 - lib/helper/parser_helper.rb
 - lib/helper/task_helper.rb
@@ -52,12 +59,14 @@ files:
 - test/fixtures/clean/mixed_re.txt
 - test/fixtures/clean/only_if.txt
 - test/fixtures/clean/re.txt
+- test/fixtures/clean/semi_colon_after_end.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
 - 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_end.txt
@@ -74,6 +83,8 @@ files:
 - test/fixtures/real/case.txt
 - test/fixtures/real/class_with_def.txt
 - 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/end_concat.txt
 - test/fixtures/real/eval_code.txt
@@ -92,6 +103,7 @@ files:
 - test/fixtures/real/optional_do_with_nasty_chars.txt
 - test/fixtures/real/partial_method.txt
 - test/fixtures/real/re.txt
+- test/fixtures/real/semi_colon_after_end.txt
 - test/fixtures/real/sep_line.txt
 - test/fixtures/real/single_method.txt
 - test/fixtures/real/strange_syntax_1.txt
@@ -123,12 +135,14 @@ extra_rdoc_files:
 - test/fixtures/clean/mixed_re.txt
 - test/fixtures/clean/only_if.txt
 - test/fixtures/clean/re.txt
+- test/fixtures/clean/semi_colon_after_end.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
 - 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_end.txt
@@ -145,6 +159,8 @@ extra_rdoc_files:
 - test/fixtures/real/case.txt
 - test/fixtures/real/class_with_def.txt
 - 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/end_concat.txt
 - test/fixtures/real/eval_code.txt
@@ -163,6 +179,7 @@ extra_rdoc_files:
 - test/fixtures/real/optional_do_with_nasty_chars.txt
 - test/fixtures/real/partial_method.txt
 - test/fixtures/real/re.txt
+- test/fixtures/real/semi_colon_after_end.txt
 - test/fixtures/real/sep_line.txt
 - test/fixtures/real/single_method.txt
 - test/fixtures/real/strange_syntax_1.txt