lazibi 0.1.12 → 0.1.13

data/History.txt

@@ -1,3 +1,12 @@
+== 0.1.13 2007-06-22
+
+* Bugs
+  * {} and lambda syntax for optioanl_do 
+  * correctly parse inline def; end
+
+Features
+  * Passed all spec tests for RSpec with optional_do filter on
+  
 == 0.1.12 2007-06-21
 
 * Bugs

data/Manifest.txt

@@ -32,6 +32,18 @@ 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/functional/ruby/brackets_block.txt
+test/fixtures/functional/ruby/classical.txt
+test/fixtures/functional/ruby/describe.txt
+test/fixtures/functional/ruby/do_block.txt
+test/fixtures/functional/ruby/lambda.txt
+test/fixtures/functional/ruby/square_brackets.txt
+test/fixtures/functional/simply/brackets_block.txt
+test/fixtures/functional/simply/classical.txt
+test/fixtures/functional/simply/describe.txt
+test/fixtures/functional/simply/do_block.txt
+test/fixtures/functional/simply/lambda.txt
+test/fixtures/functional/simply/square_brackets.txt
 test/fixtures/meta/basic_class.txt
 test/fixtures/meta/case.txt
 test/fixtures/meta/class_with_def.txt

data/README.txt

@@ -110,6 +110,11 @@ Start hacking in meta :/
 
 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.
 
+A few projects are used as test code:
+  ActiveRecord, ActionMailer, ActionPack, ActiveSupport, Mongrel, RSpec, redMine.
+
+Lazibi was used to generate .py.rb files from these projects, and then to .rb files back ( this is the default process ). Tests were then run to ensure compatibility.
+
 == Known issues
 
 Here docs, eval, javascript related libs, and complex string evaluation are currently not supported. 

data/lib/helper/task_helper.rb

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

data/lib/lazibi/version.rb

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

data/lib/parser.rb

@@ -15,9 +15,9 @@ module Lazibi
           next
         end
         l = remove_colon_at_end(l)
-        
+
         s = l
-        if comment_at_end(l)          
+        if comment_at_end(l)
           s = s.sub(/(\s*;\s*end*\s*)(#.*)/, ' \2')
           s = s.sub(/(\s+end*\s*)(#.*)/, ' \2')
         else
@@ -39,7 +39,7 @@ module Lazibi
         l.sub /;*$/, ''
       end
     end
-      
+
     def to_rb( content, filters = [] )
       return '' if content.strip == ''
       lines = content.split("\n")
@@ -58,9 +58,13 @@ module Lazibi
         lines = @lines[progress..-1]
         lines.each_index do |index|
           # run through filters
+          # destructively
           l = filter_for_to_rb(lines, index, filters)
-          
+          @lines[progress] = l
           safe_l = clean_block(clean_line(get_rest(l)))
+          if l =~ /dependencies/
+            puts l, safe_l, clean_line(get_rest(l))
+          end
           if start_anchor? safe_l
             relative_index_for_end = find_end( lines[index..-1], get_indent(l))
             unless relative_index_for_end
@@ -68,15 +72,19 @@ module Lazibi
               break
             end
             index_for_end = relative_index_for_end + index
+
             if relative_index_for_end == 0 && !comment_at_end(l)
-              l = lines[index_for_end]
+              #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
+
+
             progress += 1
             break
           end
@@ -126,7 +134,6 @@ module Lazibi
       if filters.include?( :optional_do )
         l = optional_do_filter_to_rb(lines, index)
       end
-
       # destructive behaviour
       lines[index] = l
       l
@@ -135,13 +142,24 @@ module Lazibi
     def optional_do_filter_to_rb(lines, index)
       l = lines[index]
       return l if l.strip == ''
-      rest = get_rest l
+      return l if l =~ /[\{\[]\s*$/
+      rest = get_rest(l)
       return l if start_anchor?(rest) || middle_anchor?(rest) || end_anchor?(rest)
 
       l_check = clean_line l
-      return l if nasty_line?(l_check)
-      next_line = index + 1 < lines.size ? lines[index+1] : nil
-      return l unless next_line
+      # bad code
+      # return l if nasty_line?(l_check)
+      next_line = ''
+      if index + 1 < lines.size
+        lines[index+1..-1].each_index do |i|
+          abs_i = index + 1 + i
+          next if lines[abs_i].strip == ''
+          next_line = lines[abs_i]
+          break
+        end
+      else
+        return l
+      end
       if get_indent(next_line) > get_indent(l)
         return l.rstrip + ' do'
       else

data/lib/vendor/beautifier.rb

@@ -72,12 +72,12 @@ module Beautifier
 
     tline.gsub!(/#\{.*?\}/,"")
     tline.gsub!(/\\\"/,"'")
-    
+
     # deal with nested syntax
-    
+
     tline.gsub!(/"\/*?"/,"\"\"")
     tline.gsub!(/\/.*?[^\\]\//,"//")
-    
+
     # again
     tline.gsub!(/".*?"/,"\"\"")
     tline.gsub!(/'.*?'/,"''")

data/test/fixtures/functional/ruby/brackets_block.txt

@@ -0,0 +1,5 @@
+it "should handle just a message" do
+  lambda {
+    Spec::Expectations.fail_with "the message"
+  }.should fail_with("the message")
+end

data/test/fixtures/functional/ruby/classical.txt

@@ -0,0 +1,10 @@
+describe Bowling do
+  before(:each) do
+    @bowling = Bowling.new
+  end
+
+  it "should score 0 for gutter game" do
+    20.times { @bowling.hit(0) }
+    @bowling.score.should == 0
+  end
+end

data/test/fixtures/functional/ruby/describe.txt

@@ -0,0 +1,11 @@
+module Spec
+  module Mocks
+
+    describe "Mock ordering" do
+
+      before do
+        @mock = mock("test mock")
+      end
+    end
+  end
+end

data/test/fixtures/functional/ruby/do_block.txt

@@ -0,0 +1,12 @@
+def require_dependencies(layer, dependencies)
+  dependencies.flatten.each do |dependency|
+    begin
+      require_dependency(dependency.to_s)
+    rescue LoadError => e
+      raise LoadError.new("Missing #{layer} #{dependency}.rb").copy_blame!(e)
+    rescue Exception => exception  # error from loaded file
+      exception.blame_file! "=> #{layer} #{dependency}.rb"
+      raise
+    end
+  end
+end

data/test/fixtures/functional/ruby/lambda.txt

@@ -0,0 +1,10 @@
+it "should throw when told to" do
+  @mock.stub!(:something).and_throw(:blech)
+  lambda do
+    @mock.something
+  end.should throw_symbol(:blech)
+end
+
+lambda do
+  @mock.something
+end.should throw_symbol(:blech)

data/test/fixtures/functional/ruby/square_brackets.txt

@@ -0,0 +1,6 @@
+it "should read several example names from file if --example is given an existing file name" do
+  options = parse(["--example", File.dirname(__FILE__) + '/examples.txt'])
+  options.examples.should eql([
+    "Sir, if you were my husband, I would poison your drink.", 
+    "Madam, if you were my wife, I would drink it."])
+end

data/test/fixtures/functional/simply/brackets_block.txt

@@ -0,0 +1,4 @@
+it "should handle just a message"
+  lambda {
+    Spec::Expectations.fail_with "the message"
+  }.should fail_with("the message")

data/test/fixtures/functional/simply/classical.txt

@@ -0,0 +1,7 @@
+describe Bowling
+  before(:each)
+    @bowling = Bowling.new
+
+  it "should score 0 for gutter game"
+    20.times { @bowling.hit(0) }
+    @bowling.score.should == 0

data/test/fixtures/functional/simply/describe.txt

@@ -0,0 +1,7 @@
+module Spec
+  module Mocks
+
+    describe "Mock ordering"
+
+      before
+        @mock = mock("test mock")

data/test/fixtures/functional/simply/do_block.txt

@@ -0,0 +1,9 @@
+def require_dependencies(layer, dependencies)
+  dependencies.flatten.each do |dependency|
+    begin
+      require_dependency(dependency.to_s)
+    rescue LoadError => e
+      raise LoadError.new("Missing #{layer} #{dependency}.rb").copy_blame!(e)
+    rescue Exception => exception  # error from loaded file
+      exception.blame_file! "=> #{layer} #{dependency}.rb"
+      raise

data/test/fixtures/functional/simply/lambda.txt

@@ -0,0 +1,9 @@
+it "should throw when told to"
+  @mock.stub!(:something).and_throw(:blech)
+  lambda
+    @mock.something
+  end.should throw_symbol(:blech)
+
+lambda
+  @mock.something
+end.should throw_symbol(:blech)

data/test/fixtures/functional/simply/square_brackets.txt

@@ -0,0 +1,5 @@
+it "should read several example names from file if --example is given an existing file name"
+  options = parse(["--example", File.dirname(__FILE__) + '/examples.txt'])
+  options.examples.should eql([
+    "Sir, if you were my husband, I would poison your drink.", 
+    "Madam, if you were my wife, I would drink it."])

data/test/test_functional.rb

@@ -4,6 +4,30 @@ require 'pp'
 class TestLazibiFunctional < Test::Unit::TestCase
 
   def setup
+    # load fixtures
+    @ruby = {}
+    @beauty = {}
+    @simply = {}
+
+    ruby_dir = File.dirname(__FILE__) + '/fixtures/functional/ruby'
+    Dir.open(ruby_dir).each do |fn|
+      next unless fn =~ /[.]txt$/
+      @ruby[fn.scan(/(.*)[.]/).to_s.to_sym] = File.read(ruby_dir + "/#{fn}")
+    end
+
+    beauty_dir = File.dirname(__FILE__) + '/fixtures/functional/beauty'
+    Dir.open(beauty_dir).each do |fn|
+      next unless fn =~ /[.]txt$/
+      @beauty[fn.scan(/(.*)[.]/).to_s.to_sym] = File.read(beauty_dir + "/#{fn}")
+    end
+
+    simply_dir = File.dirname(__FILE__) + '/fixtures/functional/simply'
+    Dir.open(simply_dir).each do |fn|
+      next unless fn =~ /[.]txt$/
+      @simply[fn.scan(/(.*)[.]/).to_s.to_sym] = File.read(simply_dir + "/#{fn}")
+    end
+
+
     @r = Lazibi::Runner.new
     @r.load_config
   end
@@ -30,4 +54,22 @@ class TestLazibiFunctional < Test::Unit::TestCase
     assert_equal @r.to_py('it do' ), 'it do'
     assert_equal @r.to_rb("it\n  abc" ), "it\n  abc"
   end
+
+  def test_optional_do_filter
+    list = [:classical, :lambda, :brackets_block, :describe, :square_brackets, :do_block]
+    for token in list
+      assert_filter :optional_do, token
+    end
+  end
+
+
+  def assert_filter( filters, name )
+    if filters.class == 'Array'
+      f = filters
+    else
+      f = [filters]
+    end
+    assert_equal @r.to_py(@ruby[name], f), @simply[name]
+    assert_equal @r.to_rb(@simply[name], f), @ruby[name]
+  end
 end

data/test/test_unit.rb

@@ -39,13 +39,18 @@ class TestLazibiUnit < Test::Unit::TestCase
     assert @r.start_anchor?( 'do    |abc,def| ')
     assert !@r.start_anchor?( '"abc do "')
     assert !@r.start_anchor?( '"abc do  |"')
+    assert !@r.start_anchor?( 'lambda')
   end
 
   def test_middle_anchor?
     assert !@r.middle_anchor?( '' )
     assert @r.middle_anchor?( 'rescue' )
+    assert !@r.middle_anchor?( 'lambda')
   end
 
+  def test_end_anchor?
+    assert !@r.end_anchor?( 'lambda' )
+  end
   def test_find_end
     assert_find :basic_class, 0, 0
     assert_find :class_with_def, 0, 1

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.12</a>
+      <a href="http://rubyforge.org/projects/lazibi" class="numbers">0.1.13</a>
     </div>
     <p>
 Lazibi is a preprocessor that allows you to use Python style indentation in
@@ -180,6 +180,17 @@ 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.
 </p>
+<p>
+A few projects are used as test code:
+</p>
+<pre>
+  ActiveRecord, ActionMailer, ActionPack, ActiveSupport, Mongrel, RSpec, redMine.
+</pre>
+<p>
+Lazibi was used to generate .py.rb files from these projects, and then to
+.rb files back ( this is the default process ). Tests were then run to
+ensure compatibility.
+</p>
 <h2>Known issues</h2>
 <p>
 Here docs, eval, javascript related libs, and complex string evaluation are
@@ -212,7 +223,7 @@ Released under the MIT license (included)
 </p>
 
     <p class="coda">
-      <a href="mailto:nfjinjing@gmail.com">Jinjing</a>, 20th June 2007<br>
+      <a href="mailto:nfjinjing@gmail.com">Jinjing</a>, 21st June 2007<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/index.txt

@@ -110,6 +110,11 @@ Start hacking in meta :/
 
 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.
 
+A few projects are used as test code:
+  ActiveRecord, ActionMailer, ActionPack, ActiveSupport, Mongrel, RSpec, redMine.
+
+Lazibi was used to generate .py.rb files from these projects, and then to .rb files back ( this is the default process ). Tests were then run to ensure compatibility.
+
 == Known issues
 
 Here docs, eval, javascript related libs, and complex string evaluation are currently not supported. 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.3
 specification_version: 1
 name: lazibi
 version: !ruby/object:Gem::Version 
-  version: 0.1.12
-date: 2007-06-21 00:00:00 +08:00
+  version: 0.1.13
+date: 2007-06-22 00:00:00 +08:00
 summary: Python like syntax for Ruby
 require_paths: 
 - lib
@@ -63,6 +63,18 @@ files:
 - test/fixtures/clean/semi_colon_after_end.txt
 - test/fixtures/clean/sep_line.txt
 - test/fixtures/clean/unless_problem.txt
+- test/fixtures/functional/ruby/brackets_block.txt
+- test/fixtures/functional/ruby/classical.txt
+- test/fixtures/functional/ruby/describe.txt
+- test/fixtures/functional/ruby/do_block.txt
+- test/fixtures/functional/ruby/lambda.txt
+- test/fixtures/functional/ruby/square_brackets.txt
+- test/fixtures/functional/simply/brackets_block.txt
+- test/fixtures/functional/simply/classical.txt
+- test/fixtures/functional/simply/describe.txt
+- test/fixtures/functional/simply/do_block.txt
+- test/fixtures/functional/simply/lambda.txt
+- test/fixtures/functional/simply/square_brackets.txt
 - test/fixtures/meta/basic_class.txt
 - test/fixtures/meta/case.txt
 - test/fixtures/meta/class_with_def.txt
@@ -143,6 +155,18 @@ extra_rdoc_files:
 - test/fixtures/clean/semi_colon_after_end.txt
 - test/fixtures/clean/sep_line.txt
 - test/fixtures/clean/unless_problem.txt
+- test/fixtures/functional/ruby/brackets_block.txt
+- test/fixtures/functional/ruby/classical.txt
+- test/fixtures/functional/ruby/describe.txt
+- test/fixtures/functional/ruby/do_block.txt
+- test/fixtures/functional/ruby/lambda.txt
+- test/fixtures/functional/ruby/square_brackets.txt
+- test/fixtures/functional/simply/brackets_block.txt
+- test/fixtures/functional/simply/classical.txt
+- test/fixtures/functional/simply/describe.txt
+- test/fixtures/functional/simply/do_block.txt
+- test/fixtures/functional/simply/lambda.txt
+- test/fixtures/functional/simply/square_brackets.txt
 - test/fixtures/meta/basic_class.txt
 - test/fixtures/meta/case.txt
 - test/fixtures/meta/class_with_def.txt