lazibi 0.1.9 → 0.1.10

data/History.txt

@@ -1,3 +1,15 @@
+== 0.1.10 2007-06-20
+
+* A taste of RSpec
+* do is optional _only_ in spec directory, so you can write something like
+    describe Bowling
+      before(:each)
+        @bowling = Bowling.new
+
+      it "should score 0 for gutter game"
+        20.times { @bowling.hit(0) }
+        @bowling.score.should == 0
+
 == 0.1.9 2007-06-19
 
 * Using rails as a regression test code base is rewarding

data/Manifest.txt

@@ -66,6 +66,7 @@ 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_functional.rb
 test/test_helper.rb
 test/test_unit.rb
 website/index.html

data/README.txt

@@ -7,6 +7,16 @@ the real directory for you in real time.
 
 == Examples
 
+Sweeter RSpec
+
+  describe Bowling
+    before(:each)
+      @bowling = Bowling.new
+
+    it "should score 0 for gutter game"
+      20.times { @bowling.hit(0) }
+      @bowling.score.should == 0
+
 More DIY Rails controller
 
   class AuctionsController < ApplicationController
@@ -78,9 +88,19 @@ Start hacking in meta :/
 * Create .lazibi in project/real path
 
     exclude:
-    - pattern_1
-    - pattern_2
-    - for_example_^vendor
+    - ^vendor
+    - ^tmp
+    - etc
+    
+=== RSpec taste
+
+* Optional do is only enabled for spec directory. You can customize this behavior by editing .lazibi config file.
+
+    filters:
+      optional_do:
+        - ^spec
+        - ^test
+        - etc
 
 == In Practice
 
@@ -92,7 +112,7 @@ Here docs are likely to screw up code generation. Give them enough indent so the
 
 == To Do
 
-* Targeting Rspec
+* Maybe a custom filter for RSpec runner? Still learning though...
 * Two way sync between real and meta
 
 == Author

data/lib/helper/parser_helper.rb

@@ -76,7 +76,9 @@ module Lazibi
       Beautifier::clean_line line
     end
 
+    # why?
     def nasty_line?(line)
+      return false
       s = %w! \/ ' " \( \{ \[ !
       p = Regexp.new(s.join('|'))
       return line =~ p

data/lib/helper/task_helper.rb

@@ -4,8 +4,7 @@ module Lazibi
     def skip_path?(path)
       return false if @config[:exclude].nil?
       @config[:exclude].each do |f|
-        offset = 'meta'.size + 1
-        return true if path[offset..-1] =~ Regexp.new(f)
+        return true if original_path(path) =~ Regexp.new(f)
       end
       false
     end
@@ -29,5 +28,26 @@ module Lazibi
       new_dir_name = to + dir_name[from.size..-1]
       new_path = File.join new_dir_name, base_name + new_ext
     end
+
+    def get_filters(path)
+      filters = @config[:filters]
+      return unless filters
+      path_filters = []
+      for filter in filters.keys
+        path_patterns = filters[filter]
+        for p in path_patterns
+          if original_path(path) =~ Regexp.new(p)
+            path_filters << filter.to_sym
+            next
+          end
+        end
+      end
+      path_filters
+    end
+
+    def original_path(path)
+      offset = 'meta'.size + 1
+      path[offset..-1]
+    end
   end
 end

data/lib/lazibi/version.rb

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

data/lib/lazibi.rb

@@ -9,10 +9,12 @@ module Lazibi
   class Runner
     include Parser
     include Task
+    attr :config
 
     def run
       puts '-' * 40
       load_config
+      #load_config
       init_meta
       @metas = {}
       while true

data/lib/parser.rb

@@ -6,11 +6,11 @@ module Lazibi
   module Parser
     include ParserHelper
 
-    def to_py( rb )
+    def to_py( rb, filters = [] )
       py = []
       lines = rb.split("\n")
       lines.each_index do |index|
-        l = filter_for_to_py(lines, index)
+        l = filter_for_to_py(lines, index, filters)
         if l.strip =~ /^end$/
           next
         end
@@ -26,25 +26,25 @@ module Lazibi
     end
 
 
-    def to_rb( content )
+    def to_rb( content, filters = [] )
       return '' if content.strip == ''
       lines = content.split("\n")
       first_line = lines.first.strip
       return lines[1..-1].join("\n") if first_line == '#skip_parse'
-      insert_end content
+      insert_end content, filters
     end
 
 
     # private
 
-    def insert_end( content )
+    def insert_end( content, filters )
       @lines = content.split("\n")
       progress = 0
       while progress < @lines.size
         lines = @lines[progress..-1]
         lines.each_index do |index|
           # run through filters
-          l = filter_for_to_rb(lines, index)
+          l = filter_for_to_rb(lines, index, filters)
 
           if start_anchor?(get_rest(l))
             relative_index_for_end = find_end( lines[index..-1], get_indent(l))
@@ -86,9 +86,9 @@ module Lazibi
         if get_indent(l) == indent
           rest = get_rest l
           if start_anchor? rest
-            return anchor     
+            return anchor
           elsif end_anchor? rest
-            return false     
+            return false
           elsif middle_anchor? rest
             anchor = i + 1
             next
@@ -101,22 +101,23 @@ module Lazibi
       return anchor
     end
 
-    def filter_for_to_rb(lines, index)
+    def filter_for_to_rb(lines, index, filters)
       l = lines[index]
+      if filters.include?( :optional_do )
+        l = optional_do_filter_to_rb(lines, index)
+      end
 
-      # maybe do is a good thing .....
-      return l
+      # destructive behaviour
+      lines[index] = l
+      l
+    end
 
+    def optional_do_filter_to_rb(lines, index)
+      l = lines[index]
       return l if l.strip == ''
       rest = get_rest l
       return l if start_anchor?(rest) || middle_anchor?(rest) || end_anchor?(rest)
-      l = add_do(l, lines, index)
 
-      # also change the original array
-      lines[index] = l
-    end
-
-    def add_do(l, lines, index)
       l_check = clean_line l
       return l if nasty_line?(l_check)
       next_line = index + 1 < lines.size ? lines[index+1] : nil
@@ -129,18 +130,25 @@ module Lazibi
     end
 
 
-    def filter_for_to_py(lines, index)
+    def filter_for_to_py(lines, index, filters)
       l = lines[index]
+      if filters.include?( :optional_do )
+        l = optional_do_filter_to_py( lines, index )
+      end
 
-      # same
-      return l
-      l = remove_do(l, lines, index)
+      # destructive behaviour
+      lines[index] = l
+      l
     end
 
-    def remove_do(l, lines, index)
+    def optional_do_filter_to_py(lines, index)
+      l = lines[index]
+      return l if l.strip == ''
+      return l if l.strip[0..0] == '#'
       l_check = clean_line(l).strip
-      if l_check.size > 3 && l.strip[-3..-1] == ' do' && !nasty_line?(l_check)
-        return l.rstrip[0...-3].rstrip
+      if l_check.size > 2 && l.strip[-3..-1] == ' do' && !nasty_line?(l_check)
+        l = l.rstrip[0...-3].rstrip
+        return l
       end
       return l
     end

data/lib/task.rb

@@ -10,9 +10,11 @@ module Lazibi
 
     def load_config
       @config = {}
-      default = {:exclude => ['^vendor']}
-      if File.exists? '.lazibi'
-        f = open '.lazibi'
+      default = {:exclude => ['^vendor'], :filters => {:optional_do => ['^spec']}}
+      config_path = File.join('real','.lazibi')
+      if File.exists? config_path
+        puts 'loading .lazibi config'
+        f = open config_path
         h = YAML.load(f)
         for k in h.keys
           begin
@@ -21,11 +23,11 @@ module Lazibi
             raise "wrong pattern #{h[k]}"
           end
         end
+      else
+        @config = default
       end
-      @config = default
     end
 
-
     def init_meta
       # backup real
       real_dir = 'real'
@@ -79,7 +81,7 @@ module Lazibi
       py_file = open(py_path, 'w')
       new_rb = Beautifier::ruby rb if beautify
       if new_rb
-        py = to_py(new_rb)
+        py = to_py(new_rb, filters = get_filters(py_path) )
       else
         py = SKIP + "\n" + rb
       end
@@ -89,14 +91,14 @@ module Lazibi
     end
 
 
-    def update_rb( meta_name )
+    def update_rb( meta_name, filters = {} )
       meta = open(meta_name)
       real_name = convert_path meta_name
       begin
         real_path = File.dirname real_name
         FileUtils.mkdir_p real_path
         real_rb = open( real_name, 'w' )
-        real_rb.write(to_rb(meta.read))
+        real_rb.write(to_rb(meta.read, get_filters(meta_name)))
       rescue Exception => e
         puts e
       ensure

data/lib/vendor/beautifier.rb

@@ -47,8 +47,8 @@ module Beautifier
     /^[^\{]*\}/,
     /^[^\[]*\]/
   ]
-  
-  
+
+
 
   def self.makeTab(tab)
     return (tab < 0) ? "":$tabStr * $tabSize * tab
@@ -69,31 +69,31 @@ module Beautifier
 
 
     tline.gsub!(/\/.*?[^\\]\//,"//")
-    
+
     tline.gsub!(/#\{.*?\}/,"")
     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!(/#.*$/, '') unless leave_comment
 
     tline
@@ -136,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
@@ -148,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
@@ -160,7 +160,7 @@ module Beautifier
     new_lines.join("\n")
   end
 
-    
+
   def self.valid?( line )
     not_supported = using_eval?(line) || here_doc?(line) || special_syntax(line)
     return !not_supported
@@ -183,16 +183,16 @@ module Beautifier
     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))

data/test/test_functional.rb

@@ -0,0 +1,33 @@
+require File.dirname(__FILE__) + '/test_helper'
+require 'pp'
+
+class TestLazibiFunctional < Test::Unit::TestCase
+
+  def setup
+    @r = Lazibi::Runner.new
+    @r.load_config
+  end
+
+  def test_config_load
+    assert @r.config[:exclude]
+  end
+
+  def test_exclude_option
+    assert @r.skip_path?('meta/vendor')
+  end
+
+  def test_optional_do_for_spec
+    filters = @r.get_filters('meta/spec')
+    assert filters.include?(:optional_do)
+  end
+
+  def test_spec_sample
+    assert_equal @r.to_py('it do', [:optional_do]), 'it'
+    assert_equal @r.to_rb("it\n  abc", [:optional_do]), "it do\n  abc\nend"
+  end
+
+  def test_no_spec_sample
+    assert_equal @r.to_py('it do' ), 'it do'
+    assert_equal @r.to_rb("it\n  abc" ), "it\n  abc"
+  end
+end

data/test/test_unit.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/test_helper'
 require 'pp'
 
-class TestLazibi < Test::Unit::TestCase
+class TestLazibiUnit < Test::Unit::TestCase
   attr :fixtures, :expected
 
   def setup
@@ -100,8 +100,8 @@ class TestLazibi < Test::Unit::TestCase
     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
@@ -131,7 +131,7 @@ 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

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.9</a>
+      <a href="http://rubyforge.org/projects/lazibi" class="numbers">0.1.10</a>
     </div>
     <p>
 Lazibi is a preprocessor that allows you to use Python style indentation in
@@ -45,6 +45,18 @@ generates .rb files in the real directory for you in real time.
 </p>
 <h2>Examples</h2>
 <p>
+Sweeter RSpec
+</p>
+<pre>
+  describe Bowling
+    before(:each)
+      @bowling = Bowling.new
+
+    it &quot;should score 0 for gutter game&quot;
+      20.times { @bowling.hit(0) }
+      @bowling.score.should == 0
+</pre>
+<p>
 More DIY Rails controller
 </p>
 <pre>
@@ -130,9 +142,23 @@ Start hacking in meta :/
 
 <pre>
   exclude:
-  - pattern_1
-  - pattern_2
-  - for_example_^vendor
+  - ^vendor
+  - ^tmp
+  - etc
+</pre>
+</li>
+</ul>
+<h3>RSpec taste</h3>
+<ul>
+<li>Optional do is only enabled for spec directory. You can customize this
+behavior by editing .lazibi config file.
+
+<pre>
+  filters:
+    optional_do:
+      - ^spec
+      - ^test
+      - etc
 </pre>
 </li>
 </ul>
@@ -149,7 +175,7 @@ so they are treated like normal code inside current code block ;|
 </p>
 <h2>To Do</h2>
 <ul>
-<li>Targeting Rspec
+<li>Maybe a custom filter for RSpec runner? Still learning though&#8230;
 
 </li>
 <li>Two way sync between real and meta
@@ -167,7 +193,7 @@ Released under the MIT license (included)
 </p>
 
     <p class="coda">
-      <a href="mailto:nfjinjing@gmail.com">Jinjing</a>, 19th June 2007<br>
+      <a href="mailto:nfjinjing@gmail.com">Jinjing</a>, 20th June 2007<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/index.txt

@@ -7,6 +7,16 @@ the real directory for you in real time.
 
 == Examples
 
+Sweeter RSpec
+
+  describe Bowling
+    before(:each)
+      @bowling = Bowling.new
+
+    it "should score 0 for gutter game"
+      20.times { @bowling.hit(0) }
+      @bowling.score.should == 0
+
 More DIY Rails controller
 
   class AuctionsController < ApplicationController
@@ -78,9 +88,19 @@ Start hacking in meta :/
 * Create .lazibi in project/real path
 
     exclude:
-    - pattern_1
-    - pattern_2
-    - for_example_^vendor
+    - ^vendor
+    - ^tmp
+    - etc
+    
+=== RSpec taste
+
+* Optional do is only enabled for spec directory. You can customize this behavior by editing .lazibi config file.
+
+    filters:
+      optional_do:
+        - ^spec
+        - ^test
+        - etc
 
 == In Practice
 
@@ -92,7 +112,7 @@ Here docs are likely to screw up code generation. Give them enough indent so the
 
 == To Do
 
-* Targeting Rspec
+* Maybe a custom filter for RSpec runner? Still learning though...
 * Two way sync between real and meta
 
 == Author

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.3
 specification_version: 1
 name: lazibi
 version: !ruby/object:Gem::Version 
-  version: 0.1.9
-date: 2007-06-19 00:00:00 +08:00
+  version: 0.1.10
+date: 2007-06-20 00:00:00 +08:00
 summary: Python like syntax for Ruby
 require_paths: 
 - lib
@@ -97,6 +97,7 @@ files:
 - test/fixtures/real/strange_syntax_1.txt
 - test/fixtures/real/two_methods.txt
 - test/fixtures/real/unless_problem.txt
+- test/test_functional.rb
 - test/test_helper.rb
 - test/test_unit.rb
 - website/index.html
@@ -105,6 +106,7 @@ files:
 - website/stylesheets/screen.css
 - website/template.rhtml
 test_files: 
+- test/test_functional.rb
 - test/test_helper.rb
 - test/test_unit.rb
 rdoc_options: