lazibi 0.1.14 → 0.1.15

data/History.txt

@@ -1,3 +1,10 @@
+== 0.1.15 2007-07-08
+
+* Bugs
+  * :do will not be treated as a keyword
+  * includes extra dependencies
+
+
 == 0.1.14 2007-06-29
 
 * Features

data/Manifest.txt

@@ -5,6 +5,7 @@ Manifest.txt
 README.txt
 Rakefile
 bin/lazibi
+config/lazibi_config.rb
 config/lazibi_config_template.rb
 lib/core/beautify_engine.rb
 lib/core/default_engine.rb
@@ -31,7 +32,9 @@ spec/filter/filter_spec_helper.rb
 spec/filter/optional_do_filter_spec.rb
 spec/filter/optional_end_filter_spec.rb
 spec/filter/syntax_guard_filter_spec.rb
+spec/fixtures/beautify/metas/space_sep_do.txt
 spec/fixtures/beautify/metas/square_brackets.txt
+spec/fixtures/beautify/rbs/space_sep_do.txt
 spec/fixtures/beautify/rbs/square_brackets.txt
 spec/fixtures/clean/comment_break.txt
 spec/fixtures/clean/complex_string.txt
@@ -73,6 +76,8 @@ spec/fixtures/optional_do/rbs/describe.txt
 spec/fixtures/optional_do/rbs/do_block.txt
 spec/fixtures/optional_do/rbs/lambda.txt
 spec/fixtures/optional_do/rbs/square_brackets.txt
+spec/fixtures/optional_end/metas/space_sep_do.txt
+spec/fixtures/optional_end/rbs/space_sep_do.txt
 spec/fixtures/real/basic_class.txt
 spec/fixtures/real/case.txt
 spec/fixtures/real/class_with_def.txt

data/Rakefile

@@ -72,7 +72,8 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
   
   # == Optional
   p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  p.extra_deps = [ ['hoe', '>= 1.2.1'], ['webgen', '>= 0.4.4'], ['activesupport', '>=1.4.2']]     # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
+  p.extra_deps = [ ['hoe', '>= 1.2.1'], ['webgen', '>= 0.4.4'], ['activesupport', '>= 1.4.2'],
+  ['rake', '>= 0.7.3'], ['rspec', '>= 1.0.5'], ['rcov', '>= 0.8.0'], ['coderay', '>= 0.7.4']]     # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
   #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
 end
 

data/config/lazibi_config.rb

@@ -0,0 +1,15 @@
+module Lazibi
+  class Config
+    def filter_order
+      [:syntax_guard, :beautify, :optional_end, :optional_do]
+    end
+
+    def exclude
+      ['^vendor']
+    end
+
+    def filters
+      {:optional_do => ['^spec'], :optional_end => ['']}
+    end
+  end
+end

data/lib/core/engine_base.rb

@@ -8,11 +8,11 @@ require 'application_helper'
 module Lazibi
   class EngineBase
     include Helper::ApplicationHelper
-    
+
     attr :up_path
     attr :down_path
     attr :filters
-    
+
     def initialize
       @filters = []
       @up_path = []
@@ -25,16 +25,16 @@ module Lazibi
         @filters << fn.scan(/(.*)[.]/).to_s.to_sym
       end
     end
-        
-        
+
+
     def go_up(*paths)
       @up_path += Array(paths)
     end
-  
+
     def go_down(*paths)
       @down_path += Array(paths)
     end
-  
+
     def up(source)
       return source if source.blank?
       transcript = source
@@ -48,17 +48,17 @@ module Lazibi
           break
         end
       end
-      
+
       valid ? transcript : skip_notice + "\n" + source
     end
-  
+
     def down(source)
       return source if source.blank?
       transcript = source
       if transcript.split("\n").first == skip_notice
         return source.split("\n")[1..-1].join("\n")
       end
-      
+
       @down_path.each do |step|
         class_name = step.to_s.camelize
         filter = Filter.const_get(class_name).new
@@ -66,7 +66,7 @@ module Lazibi
       end
       transcript
     end
-      
+
     def to_s
       'up_path: ' + @up_path.to_s + "\n" + 'down_path: ' + @down_path.to_s
     end

data/lib/filter/beautify_filter.rb

@@ -12,7 +12,7 @@ module Lazibi
   module Filter
     class Beautify < FilterBase
       include Helper::BeautifyFilterHelper
-      
+
       def make_tab(tab)
         return (tab < 0) ? "": tab_str * tab_size * tab
       end

data/lib/filter/filter_base.rb

@@ -6,11 +6,11 @@ module Lazibi
   module Filter
     class FilterBase
       include Helper::FilterHelper
-      
+
       def up(source)
         source
       end
-      
+
       def down(source)
         source
       end

data/lib/filter/optional_do_filter.rb

@@ -24,8 +24,8 @@ module Lazibi
         end
         return l
       end
-        
-    
+
+
       def down(source)
         lines = source.split("\n")
         lines.each_index do |index|

data/lib/filter/optional_end_filter.rb

@@ -3,7 +3,7 @@ require 'filter_base'
 module Lazibi
   module Filter
     class OptionalEnd < FilterBase
-      
+
       def up( source )
         rb = source
         py = []
@@ -47,7 +47,7 @@ module Lazibi
         return lines[1..-1].join("\n") if first_line == '#skip_parse'
         insert_end content
       end
-      
+
       def insert_end( content )
         @lines = content.split("\n")
         progress = 0

data/lib/helper/beautify_filter_helper.rb

@@ -8,7 +8,7 @@ module Lazibi
       def tab_str
         " "
       end
-  
+
       def indent_exp
         [
           /^module\b/,
@@ -24,7 +24,7 @@ module Lazibi
           /^class\b/,
           /^rescue\b/,
           /^def\b/,
-          /\bdo\b/,
+          /\sdo\b/,
           /^else\b/,
           /^elsif\b/,
           /^ensure\b/,

data/lib/helper/filter_helper.rb

@@ -24,7 +24,8 @@ module Lazibi
           /\bcase\b/,
           /^class\b/,
           /^def\b/,
-          /\bdo\b/,
+          /\sdo\b/,
+          /^do\b/
         ]
       end
 
@@ -107,12 +108,12 @@ module Lazibi
 
         tline
       end
-        
-    
+
+
       def clean_block(line)
         line.gsub /do\b.*?;\s*end/, ''
       end
-        
+
       def split_end( source )
         lines = source.split("\n")
         new_lines = []

data/lib/helper/task_helper.rb

@@ -42,21 +42,21 @@ module Lazibi
             end
           end
         end
-        
+
         sort_filter path_filters
       end
-        
+
       def sort_filter( filters )
         order = @config[:filter_order] if @config
         order = [:syntax_guard, :beautify, :optional_end, :optional_do] unless order
         filters.sort{ |a,b| order.index(a) <=> order.index(b) }
       end
-      
+
       def original_path(path)
         offset = 'meta'.size + 1
         path[offset..-1]
       end
-        
+
       def sep_line
         puts '-' * 40
       end

data/lib/lazibi.rb

@@ -8,7 +8,7 @@ module Lazibi
   class Runner
     include Task
     attr :config
-    
+
     def run
       puts '-' * 40
       load_config

data/lib/lazibi/version.rb

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

data/lib/task.rb

@@ -9,7 +9,7 @@ require 'yaml'
 module Lazibi
   module Task
     include Helper::TaskHelper
-    
+
     def load_config
       @config = {}
       default = {:exclude => ['^vendor'], :filters => {:optional_do => ['^spec'], :optional_end => ['']}}
@@ -21,7 +21,7 @@ module Lazibi
         FileUtils.cp template_path, config_path
         puts 'created real/config/lazibi_config.rb'
       end
-      
+
       puts 'loading lazibi_config.rb'
       sep_line
       require config_path
@@ -38,7 +38,7 @@ module Lazibi
       real_dir = 'real'
       if File.directory? real_dir
         backup_dir = '.backup'
-        
+
         # backup is disabled for now, not useful :/
         unless File.exists? backup_dir || true
           puts "backup #{real_dir} to #{backup_dir}"

data/spec/core/beautify_engine_spec.rb

@@ -5,7 +5,7 @@ describe 'BeautifyEngine' do
   before(:each) do
     @e = BeautifyEngine.new
   end
-    
+
   it "should beautify" do
     @e.up('   def class; end').should == "def class; end\n"
   end

data/spec/core/default_engine_spec.rb

@@ -6,7 +6,7 @@ describe 'DefaultEngine' do
   before(:each) do
     @e = DefaultEngine.new
   end
-    
+
   it "should stack filters" do
     rb = "  def\n  it do\n    puts\n  end\nend"
     meta ="def\n  it\n    puts"
@@ -14,12 +14,12 @@ describe 'DefaultEngine' do
     @e.up(rb).should == meta
     @e.down(meta).should == rb_clean
   end
-    
+
   it 'should skip' do
     rb = '<<-HERE abc HERE'
     @e.up(rb).should =~ /^#/
   end
-    
+
   it 'should preserved skipped rb' do
     rb = '<<-HERE abc HERE'
     meta = @e.up(rb)

data/spec/core/engine_base_spec.rb

@@ -5,12 +5,12 @@ describe 'EngineBase' do
   before(:each) do
     @e = EngineBase.new
   end
-    
+
   it "should be able to go_up" do
     @e.go_up(:beautify)
     @e.up('  def;end').should == "def;end\n"
   end
-    
+
   it "should stack filters" do
     rb = "  def\n  it do\n    puts\n  end\nend"
     meta ="def\n  it\n    puts"

data/spec/filter/beautify_filter_spec.rb

@@ -5,7 +5,7 @@ module Lazibi
     describe 'BeautifyFilter' do
       before(:all) do
         @f = Beautify.new
-    
+
         # load fixtures
         @p_rbs = {}
         @p_metas = {}
@@ -39,21 +39,21 @@ module Lazibi
           @metas[fn.scan(/(.*)[.]/).to_s.to_sym] = File.read(meta_dir + "/#{fn}")
         end
       end
-    
+
       it "should beautify public" do
         @p_metas.keys.each do |k|
           @f.up(@p_rbs[k]).should == @p_metas[k]
         end
       end
-      
+
       it 'should clean str.gsub(/([^ \/a-zA-Z0-9_.-])/n)' do
         @f.clean_line('str.gsub(/([^ \/a-zA-Z0-9_.-])/n)').should == 'str.gsub(//n)'
       end
-    
+
       it 'should clean %r{\A#{Regexp.escape(expanded_root)}(/|\\)}' do
         @f.clean_line('%r{\A#{Regexp.escape(expanded_root)}(/|\\)}').should == "''"
       end
-          
+
       it 'should beautify' do
         @metas.keys.each do |k|
           @f.up(@rbs[k]).should == @metas[k]

data/spec/filter/optional_do_filter_spec.rb

@@ -7,7 +7,7 @@ module Lazibi
         @f = OptionalDo.new
         @beautify = Beautify.new
         @optional_end = OptionalEnd.new
-    
+
         # load fixtures
         @rbs = {}
         @metas = {}
@@ -30,22 +30,22 @@ module Lazibi
         @f.up('it do').should == 'it'
         @f.down("it\n  abc").should == "it do\n  abc"
       end
-      
-      
+
+
       it 'should integrate with beautify and optional_end' do
         list = [:classical, :lambda, :brackets_block, :describe, :do_block, :square_brackets]
         list.each do |name|
           assert_integrate name
         end
       end
-          
+
       def assert_integrate(name, debug = false)
         code = @rbs[name]
         code = @beautify.up(code)
         code = @optional_end.up(code)
         code = @f.up(code)
         code.should == @metas[name]
-        
+
         code = @metas[name]
         code = @f.down(code)
         code = @optional_end.down(code)

data/spec/filter/optional_end_filter_spec.rb

@@ -5,25 +5,45 @@ module Lazibi
     describe 'OptionalEndFilter' do
       before(:all) do
         @f = OptionalEnd.new
-    
+
         # load fixtures
-        @rbs = {}
-        @metas = {}
+        @p_rbs = {}
+        @p_metas = {}
 
 
         rb_dir = FIXTURE_DIR + '/real'
         Dir.open(rb_dir).each do |fn|
           next unless fn =~ /[.]txt$/
-          @rbs[fn.scan(/(.*)[.]/).to_s.to_sym] = File.read(rb_dir + "/#{fn}")
+          @p_rbs[fn.scan(/(.*)[.]/).to_s.to_sym] = File.read(rb_dir + "/#{fn}")
         end
 
         meta_dir = FIXTURE_DIR + '/meta'
+        Dir.open(meta_dir).each do |fn|
+          next unless fn =~ /[.]txt$/
+          @p_metas[fn.scan(/(.*)[.]/).to_s.to_sym] = File.read(meta_dir + "/#{fn}")
+
+          @beautify = Beautify.new
+
+          # load fixtures
+          @rbs = {}
+          @metas = {}
+        end
+
+
+        rb_dir = FIXTURE_DIR + '/optional_end/rbs'
+        Dir.open(rb_dir).each do |fn|
+          next unless fn =~ /[.]txt$/
+          @rbs[fn.scan(/(.*)[.]/).to_s.to_sym] = File.read(rb_dir + "/#{fn}")
+        end
+
+        meta_dir = FIXTURE_DIR + '/optional_end/metas'
         Dir.open(meta_dir).each do |fn|
           next unless fn =~ /[.]txt$/
           @metas[fn.scan(/(.*)[.]/).to_s.to_sym] = File.read(meta_dir + "/#{fn}")
         end
       end
-    
+
+
       it "should find end" do
         assert_find :basic_class, 0, 0
         assert_find :class_with_def, 0, 1
@@ -37,34 +57,52 @@ module Lazibi
       end
 
       it "should preserve" do
-        @metas.keys.reject{|k| ['partial_method', 'inline_end', 'optional_do',
+        @p_metas.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_preserve k    
+          assert_preserve_p k
         end
       end
 
-    
+
       it "should convert to rb" do
-        assert_to_rb :partial_method
-        assert_to_rb :eval_code
-        assert_to_rb :comment_after_end, :comment_after_end_expected
+        assert_to_rb_p :partial_method
+        assert_to_rb_p :eval_code
+        assert_to_rb_p :comment_after_end, :comment_after_end_expected
       end
 
       it "should convert to meta" do
-        assert_to_meta :inline_end
-        assert_to_meta :comment_after_end
+        assert_to_meta_p :inline_end
+        assert_to_meta_p :comment_after_end
+      end
+
+      it "should ignore :do" do
+        assert_preserve( :space_sep_do )
       end
-          
-          
+
       def assert_find( name, indent, end_i, range = nil )
         unless range
-          @f.find_end(@metas[name].split("\n"), indent).should == end_i
+          @f.find_end(@p_metas[name].split("\n"), indent).should == end_i
         else
-          @f.find_end(@metas[name].split("\n")[range], indent).should == end_i
+          @f.find_end(@p_metas[name].split("\n")[range], indent).should == end_i
         end
       end
 
-          
+
+      def assert_to_rb_p( name, name_2 = nil )
+        name_2 = name unless name_2
+        @f.down( @p_metas[name]).should == @p_rbs[name_2]
+      end
+
+      def assert_to_meta_p( name, name_2 = nil )
+        name_2 = name unless name_2
+        @f.up( @p_rbs[name]).should == @p_metas[name_2]
+      end
+
+      def assert_preserve_p( name )
+        assert_to_rb_p(name)
+        assert_to_meta_p(name)
+      end
+
       def assert_to_rb( name, name_2 = nil )
         name_2 = name unless name_2
         @f.down( @metas[name]).should == @rbs[name_2]

data/spec/filter/syntax_guard_filter_spec.rb

@@ -5,7 +5,7 @@ module Lazibi
     describe 'SyntaxGuardFilter' do
       before(:all) do
         @f = SyntaxGuard.new
-    
+
         # load fixtures
         @p_rbs = {}
         @p_metas = {}

data/spec/fixtures/beautify/metas/space_sep_do.txt

@@ -0,0 +1,4 @@
+def test_find_user_filter
+  post :do => 'deposit'
+  assert_match /behalf/, flash[:notice]
+end

data/spec/fixtures/beautify/rbs/space_sep_do.txt

@@ -0,0 +1,4 @@
+def test_find_user_filter
+  post :do => 'deposit'
+  assert_match /behalf/, flash[:notice]
+end

data/spec/fixtures/optional_end/metas/space_sep_do.txt

@@ -0,0 +1,3 @@
+def test_find_user_filter
+  post :do => 'deposit'
+  assert_match /behalf/, flash[:notice]

data/spec/fixtures/optional_end/rbs/space_sep_do.txt

@@ -0,0 +1,4 @@
+def test_find_user_filter
+  post :do => 'deposit'
+  assert_match /behalf/, flash[:notice]
+end

data/spec/helper/filter_helper_spec.rb

@@ -5,7 +5,7 @@ include Filter
 
 module Lazibi
   module Spec
-      
+
     describe 'FilterHelper' do
       include Helper::FilterHelper
       it 'should detect start anchor' do
@@ -16,17 +16,17 @@ module Lazibi
         start_anchor?( '"abc do  |"').should == false
         start_anchor?( 'lambda').should == false
       end
-        
+
       it 'should detect end anchor' do
         end_anchor?( 'lambda' ).should == false
       end
-        
+
       it 'should detect middle anchor' do
         middle_anchor?( '' ).should == false
         middle_anchor?( 'rescue' ).should == true
         middle_anchor?( 'lambda').should == false
       end
-      
+
       it 'should detect comment at end' do
         comment_at_end('  dab #abcd').should_not be_nil
       end

data/spec/helper/task_helper_spec.rb

@@ -11,8 +11,8 @@ module Lazibi
         convert_path( 'real/abc.rb' ).should == 'meta/abc.py.rb'
         convert_path( 'meta/lib/abc.py.rb' ).should == 'real/lib/abc.rb'
       end
-      
-      
+
+
       it 'should soft filters' do
         sort_filter([:optional_end, :optional_do, :beautify]).should == [:beautify, :optional_end, :optional_do]
       end

data/spec/lazibi_spec.rb

@@ -2,13 +2,13 @@ require File.dirname(__FILE__) + '/spec_helper'
 
 module Lazibi
   module Spec
-      
+
     describe 'Lazibi' do
       before(:all) do
         @r = Lazibi::Runner.new
         @r.load_config
       end
-        
+
       it 'should load default config' do
         @r.config[:exclude].should_not be_nil
       end
@@ -18,5 +18,4 @@ module Lazibi
       end
     end
   end
-end
-        
+end

data/webgen/src/faq.page

@@ -19,9 +19,7 @@ create .py.rb files in corresponding directories inside 'meta', .rb files will b
 
 h1. Exclude certain directories
 
-[default is ^vendor]
-
-Edit lazibi_config.rb in project/real/config/
+Stop Lazibi process, edit lazibi_config.rb in project/real/config/, start Lazibi. For example:
 
 <pre>
 def exclude
@@ -31,7 +29,7 @@ end
 
 h1. RSpec taste
 
-Optional do is only enabled for spec directory. You can customize this behavior by editing lazibi_config.rb in project/real/config/
+Edit lazibi_config.rb in project/real/config/. For example:
 
 <pre>
 def filters

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: lazibi
 version: !ruby/object:Gem::Version 
-  version: 0.1.14
-date: 2007-06-29 00:00:00 +08:00
+  version: 0.1.15
+date: 2007-07-08 00:00:00 +08:00
 summary: Python like indenting for Ruby
 require_paths: 
 - lib
@@ -36,6 +36,7 @@ files:
 - README.txt
 - Rakefile
 - bin/lazibi
+- config/lazibi_config.rb
 - config/lazibi_config_template.rb
 - lib/core/beautify_engine.rb
 - lib/core/default_engine.rb
@@ -62,7 +63,9 @@ files:
 - spec/filter/optional_do_filter_spec.rb
 - spec/filter/optional_end_filter_spec.rb
 - spec/filter/syntax_guard_filter_spec.rb
+- spec/fixtures/beautify/metas/space_sep_do.txt
 - spec/fixtures/beautify/metas/square_brackets.txt
+- spec/fixtures/beautify/rbs/space_sep_do.txt
 - spec/fixtures/beautify/rbs/square_brackets.txt
 - spec/fixtures/clean/comment_break.txt
 - spec/fixtures/clean/complex_string.txt
@@ -104,6 +107,8 @@ files:
 - spec/fixtures/optional_do/rbs/do_block.txt
 - spec/fixtures/optional_do/rbs/lambda.txt
 - spec/fixtures/optional_do/rbs/square_brackets.txt
+- spec/fixtures/optional_end/metas/space_sep_do.txt
+- spec/fixtures/optional_end/rbs/space_sep_do.txt
 - spec/fixtures/real/basic_class.txt
 - spec/fixtures/real/case.txt
 - spec/fixtures/real/class_with_def.txt
@@ -166,7 +171,9 @@ extra_rdoc_files:
 - License.txt
 - Manifest.txt
 - README.txt
+- spec/fixtures/beautify/metas/space_sep_do.txt
 - spec/fixtures/beautify/metas/square_brackets.txt
+- spec/fixtures/beautify/rbs/space_sep_do.txt
 - spec/fixtures/beautify/rbs/square_brackets.txt
 - spec/fixtures/clean/comment_break.txt
 - spec/fixtures/clean/complex_string.txt
@@ -208,6 +215,8 @@ extra_rdoc_files:
 - spec/fixtures/optional_do/rbs/do_block.txt
 - spec/fixtures/optional_do/rbs/lambda.txt
 - spec/fixtures/optional_do/rbs/square_brackets.txt
+- spec/fixtures/optional_end/metas/space_sep_do.txt
+- spec/fixtures/optional_end/rbs/space_sep_do.txt
 - spec/fixtures/real/basic_class.txt
 - spec/fixtures/real/case.txt
 - spec/fixtures/real/class_with_def.txt
@@ -265,3 +274,39 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.4.2
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rake
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.7.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.5
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.8.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: coderay
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.7.4
+    version: