ruby_traverser 0.1.1 → 0.2.0

data/test/mutate/mutate_class_test.rb

@@ -14,15 +14,15 @@ end}
 
     def_code = Ripper::RubyBuilder.build(def_src)    
     code = Ripper::RubyBuilder.build(src)              
-    code.inside_class('Monty', :superclass => 'Abc::Blip') do |b|
+    code.inside(:class, 'Monty', :superclass => 'Abc::Blip') do |b|
       assert_equal Ruby::Class, b.class                                  
-      gem_abc = b.append_code("gem 'abc'")
-      blip = b.append_code("blip")
-      gem_123 = gem_abc.append_code("gem '123'")      
-      gem_123.append_comment("hello")      
-      my_def = b.append_code(def_src)      
+      gem_abc = b.insert(:after, "gem 'abc'")
+      blip = b.insert(:after,"blip")
+      gem_123 = gem_abc.insert(:after,"gem '123'")      
+      gem_123.insert_comment(:after, "hello")      
+      my_def = b.insert(:after, def_src)      
       
-      b.prepend_code("gem '789'")
+      b.insert(:before, "gem '789'")
       puts b.to_ruby
     end
   end

data/test/mutate/mutate_test.rb

@@ -14,10 +14,11 @@ end
     
     code = Ripper::RubyBuilder.build(src)                 
     
-    code.inside_block('group', :args => [:test]) do |b|
-      call_node = b.find_call('gem', :args => ['ripper', {:src => 'github'}])
+    code.find(:block, 'group', :args => [:test]) do |b|
+      puts "BLOCK"
+      call_node = b.find(:call, 'gem', :args => ['ripper', {:src => 'github'}])
       assert_equal Ruby::Call, call_node.class
-      b.append_code("gem 'abc'")
+      b.insert(:after, "gem 'abc'")
       puts "mutated block:"
       puts b.to_ruby
     end       
@@ -31,11 +32,10 @@ end
     }
 
     code = Ripper::RubyBuilder.build(src)                 
-    code.inside_block('group', :args => [:test]) do |b|
-      call_node = b.find_call('gem', :args => ['ripper'])
-      assert_equal Ruby::Call, call_node.class
-      call_node.replace(:arg => :src , :replace_code => "{:src => 'unknown'}")
-      puts b.to_ruby
+    code.find(:block, 'group', :args => [:test]) do
+      call_node = find(:call, 'gem', :args => ['ripper'])
+      call_node.update(:select => {:arg => :src}, :with_code => "{:src => 'unknown'}")      
+      puts to_ruby
     end       
   end  
 
@@ -47,10 +47,10 @@ end
     }
 
     code = Ripper::RubyBuilder.build(src)                 
-    code.inside_block('group', :args => [:test]) do |b|
-      call_node = b.find_call('gem', :args => ['ripper'])
+    code.inside(:block, 'group', :args => [:test]) do |b|
+      call_node = b.find(:call, 'gem', :args => ['ripper'])
       assert_equal Ruby::Call, call_node.class
-      call_node.replace(:arg => {:src => 'blip'} , :replace_code => "{:src => 'unknown'}")
+      call_node.update(:select => {:arg => {:src => 'blip'}} , :with_code => "{:src => 'unknown'}")
       puts b.to_ruby
     end       
   end  
@@ -64,12 +64,13 @@ end
           
     code = Ripper::RubyBuilder.build(src)               
 
-    code.inside_def('hello_world', :params => ['a']) do |b|
+    code.find(:def, 'hello_world', :params => ['a']) do |b|
+      puts "HELLO"
       # call_node = b.find_call('gem', :args => ['ripper', {:src => 'github'}], :verbose => true)
-      call_node = b.find_assignment('my_var')
-      assert_equal Ruby::Assignment, call_node.class
+      ass_node = b.find(:assignment, 'my_var')
+      assert_equal Ruby::Assignment, ass_node.class
       
-      call_node.replace(:value => "3")      
+      ass_node.update(:value => "3")      
       puts b.to_ruby
     end
   end  
@@ -80,9 +81,9 @@ end
       end 
     }
     code = Ripper::RubyBuilder.build(src)              
-    code.find_class('Monty', :superclass => 'Abc::Blip') do |b|
+    code.find(:class, 'Monty', :superclass => 'Abc::Blip') do |b|
       assert_equal Ruby::Class, b.class                                  
-      b.append_code("gem 'abc'")   
+      b.insert(:after, "gem 'abc'")   
       puts b.to_ruby      
     end
   end 

data/test/traversal/gemfile_test.rb

@@ -52,9 +52,9 @@ class TraversalTest < Test::Unit::TestCase
             
       code = Ripper::RubyBuilder.build(src)               
       code.inside_def('hello_world', :params => ['a']) do |b|
-        call_node = b.find_variable('my_var')
-        assert_equal Ruby::Variable, call_node.class
-        puts call_node.to_ruby
+        var_node = b.find(:variable, 'my_var')
+        assert_equal Ruby::Variable, var_node.class
+        puts var_node.to_ruby
       end
     end  
 
@@ -67,9 +67,9 @@ class TraversalTest < Test::Unit::TestCase
             
       code = Ripper::RubyBuilder.build(src)               
       code.inside_def('hello_world', :params => ['a']) do |b|
-        call_node = b.find_assignment('my_var')
-        assert_equal Ruby::Assignment, call_node.class
-        puts call_node.to_ruby
+        ass_node = b.find_assignment('my_var')
+        assert_equal Ruby::Assignment, ass_node.class
+        puts ass_node.to_ruby
       end
     end  
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-27 00:00:00 -04:00
+date: 2010-04-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,22 +59,30 @@ files:
 - LICENSE
 - README.markdown
 - Rakefile
+- TODO.txt
 - VERSION
-- lib/mutate/api.rb
-- lib/mutate/replacer.rb
-- lib/rails/api_wrapper.rb
+- lib/config/api.rb
+- lib/config/has_ext.rb
+- lib/config/misc.rb
+- lib/config/mixin.rb
+- lib/config/module.rb
+- lib/config/patch.rb
+- lib/manipulation/api.rb
+- lib/manipulation/delete/api.rb
+- lib/manipulation/helpers.rb
+- lib/manipulation/insert/api.rb
+- lib/manipulation/position.rb
+- lib/manipulation/update/api.rb
+- lib/query/api.rb
+- lib/query/find.rb
+- lib/rails/api.rb
+- lib/rails/gemfile.rb
 - lib/ruby_traverser.rb
-- lib/traversal/api/finders.rb
-- lib/traversal/api/inside.rb
-- lib/traversal/api/traversal.rb
-- lib/traversal/misc.rb
-- lib/traversal/mixin.rb
-- lib/traversal/module.rb
-- lib/traversal/patch.rb
 - ruby_traverser.gemspec
 - spec/ruby_traverser_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- test/mutate/delete_test.rb
 - test/mutate/mutate_class_test.rb
 - test/mutate/mutate_test.rb
 - test/rails_api/gemfile_api.rb
@@ -114,6 +122,7 @@ summary: traverse and mutate ruby code using a nice DSL
 test_files: 
 - spec/ruby_traverser_spec.rb
 - spec/spec_helper.rb
+- test/mutate/delete_test.rb
 - test/mutate/mutate_class_test.rb
 - test/mutate/mutate_test.rb
 - test/rails_api/gemfile_api.rb

data/lib/mutate/api.rb

@@ -1,124 +0,0 @@
-require 'mutate/replacer'
-
-class String
-  # Returns an indented string, all lines of string will be indented with count of chars
-  def indent(char, count)
-    (char * count) + gsub(/(\n+)/) { $1 + (char * count) }
-  end
-end
-
-
-module RubyAPI
-  module Mutator
-    include Replacer
-    
-    def append_code(code)
-      return append_code_simple(code) if !elemental?
-      obj = object
-      indentation = obj.last_indent  
-      code =  "\n#{code}\n".indent(' ', indentation)
-      ruby_code = Ripper::RubyBuilder.build(code)
-      inject_code = ruby_code.elements[0]
-      obj.get_elements << inject_code
-      inject_code
-    end
-
-    def append_code_simple(code)
-      indentation = position.col
-      code =  "\n#{code}\n".indent(' ', indentation)
-      ruby_code = Ripper::RubyBuilder.build(code)
-      inject_code = ruby_code.elements[0]
-      index = parent.find_index(self)
-      parent.get_elements.insert(index+1, inject_code)
-      inject_code
-    end
-
-    def find_index(obj)
-      get_elements.each_with_index do |elem, i|
-        if elem == obj
-          return i
-        end
-      end        
-    end
-
-    def prepend_code(code)
-      obj = object
-      indentation = obj.first_indent  
-      code =  "\n#{code}\n".indent(' ', indentation)
-      ruby_code = Ripper::RubyBuilder.build(code)
-      inject_code = ruby_code.elements[0]
-      obj.get_elements.insert(0, inject_code)
-      obj
-    end
-
-
-    def append_comment(text)
-      append_code("# #{text}")
-    end      
-
-    def elemental?
-      respond_to?(:body) || respond_to?(:elements)
-    end
-
-    def get_elements
-      case self
-      when Ruby::Class
-        body.elements
-      else
-        elements
-      end
-    end
-
-
-    protected
-
-    def last_indent
-      case self
-      when Ruby::Block, Ruby::Class
-        last_position(get_elements)                           
-      else
-        puts "unknown: #{obj.class}"
-      end
-    end
-
-    def last_position(elements) 
-      last_element = elements.last
-      return position.col 
-      return position.col if simple_pos?(last_element)
-      return last_element.identifier.position.col if elements && elements.size > 0
-      inside_indent
-    end
-
-    def simple_pos?(elem)       
-      [Ruby::Token, Ruby::Variable].include?(elem.class)
-    end
-
-    def first_indent
-      case self
-      when Ruby::Block, Ruby::Class
-        first_position(get_elements)                           
-      else
-        puts "unknown: #{obj.class}"
-      end
-    end
-
-    def first_position(elements) 
-      first_element = elements.first
-      return position.col if simple_pos?(first_element)
-      return first_element.identifier.position.col if elements && elements.size > 0
-      inside_indent
-    end
-
-    def object
-      self.respond_to?(:block) ? self.block : self
-    end
-    
-  end
-end
-
-module Ruby
-  class Node
-    include RubyAPI::Mutator
-  end
-end
-                

data/lib/traversal/api/finders.rb

@@ -1,41 +0,0 @@
-require 'yaml'
-
-module RubyAPI
-  module Finders
-    def find_module(name)
-      get_obj.select(Ruby::Module, :identifier => name).first
-    end
-
-    def find_class(name, options = {})
-      options.merge!(:identifier => name)
-      get_obj.select(Ruby::Class, options).first    
-    end
-
-    def find_variable(name, options = {})
-      options.merge!(:token => name)      
-      get_obj.select(Ruby::Variable, options).first      
-    end
-
-    def find_assignment(name, options = {})
-      options.merge!(:left_token => name)      
-      get_obj.select(Ruby::Assignment, options).first      
-    end    
-
-    def find_call(name, options = {})
-      options.merge!(:identifier => name)      
-      get_obj.select(Ruby::Call, options).first
-    end 
-
-    def find_block(name, options = {})  
-      options.merge!(:identifier => name)
-      options.merge!(:block => true) if !options.has_key?(:block_params)    
-      get_obj.select(Ruby::Call, options).first    
-    end 
-
-
-    def find_def(name, options = {})
-      options.merge!(:identifier => name)
-      get_obj.select(Ruby::Method, options).first
-    end 
-  end
-end  

data/lib/traversal/api/inside.rb

@@ -1,36 +0,0 @@
-module RubyAPI
-  module Inside              
-    def inside_block(name, options = {}, &block) 
-      call_block(find_block(name, options), options, &block)
-    end 
-
-    def inside_module(name, &block)
-      call_block(find_module(name), options, &block)      
-    end
-
-    def inside_class(name, options = {}, &block) 
-      call_block(find_class(name, options), options, &block)
-    end
-
-    def inside_def(name, options = {}, &block)
-      call_block(find_def(name, options), options, &block)
-    end
-    
-    protected
-    
-    def call_block(s, options, &block)
-      # inc_inside_indent
-      s.extend(options[:extend]) if options[:extend] 
-      block.arity < 1 ? s.instance_eval(&block) : block.call(s)      
-    end
-
-    def inside_indent
-      if self.class == Ruby::Class
-        pos = ldelim.position.col
-        return pos
-      end
-      2
-    end
-    
-  end
-end

data/lib/traversal/api/traversal.rb

@@ -1,20 +0,0 @@
-require 'traversal/api/finders'
-require 'traversal/api/inside'
-
-module RubyAPI 
-  include Finders
-  include Inside   
-  
-  protected
-  
-  def get_obj(options = {})
-    return self.block if self.class == Ruby::Method     
-    self
-  end  
-end
-
-module Ruby
-  class Node
-    include RubyAPI
-  end
-end

data/lib/traversal/mixin.rb

@@ -1,50 +0,0 @@
-require 'traversal/module'
-require 'traversal/misc'
-require 'traversal/patch'
-
-module Ruby
-  class Node
-    include Traversal::Module
-    include Traversal::Misc
-    include Traversal::Patch      
-    
-    def has_const?(value)
-      if respond_to?(:const)
-        if namespace?(value)
-          name = value.split('::').last
-          return self.const.identifier.token == name
-        end
-      end
-      false
-    end
-
-    def has_block?
-      respond_to? :block
-    end      
-
-    def has_namespace?(value)
-      if respond_to?(:namespace)
-        return self.namespace.identifier.token == value
-      end
-      false
-    end
-
-    def has_identifier?(value)
-      if respond_to?(:identifier)
-        id = self.identifier
-
-        if namespace?(value)
-          return id.token.to_s == value.to_s if id.respond_to?(:token)
-          if id.respond_to?(:identifier)
-            name = value.split('::').last
-            return id.identifier.token == name
-          end
-        end
-      else
-        has_const?(value)
-      end
-    end
-  end    
-end   
-
-