Clean code

lib/lipa/bunch.rb

@@ -27,7 +27,7 @@ module Lipa
   # Implementation of group description
   # 
   # @example
-  #   tree = Lipa::Tree.new :tree do 
+  #   tree = root :tree do 
   #     bunch :param_1 => "some_param" do
   #       leaf :obj_1
   #       leaf :obj_2
@@ -45,8 +45,7 @@ def initialize(parent, attrs = {}, &block)
     end
 
     def method_missing(name, *args, &block)
-      args[1] ||= {}
-      args[1] = @attrs.merge(args[1])
+      args[1] = @attrs.merge(args[1] || {})
       unless Node.add_node(name, @parent, *args, &block)
         super
       end

lib/lipa/kind.rb

@@ -27,7 +27,7 @@ module Lipa
   # Implemenation of kind(template) for description
   #
   # @example
-  #   tree = Lipa::Tree.new :tree do 
+  #   tree = root :tree do 
   #     kind :some_kind do
   #       param1 "some_param"
   #     end
@@ -40,13 +40,8 @@ module Lipa
   class Kind
     attr_reader :attrs, :name, :for, :block
     def initialize(name, attrs = {}, &block)
-      # OPTIMIZE: Make it shorter
-      if attrs[:for]
-        @for = attrs[:for]
-        attrs.delete(:for)
-      else
-        @for = :node
-      end
+      @for =  attrs.delete(:for)
+      @for ||= :node
 
       @attrs = attrs
       @name = name.to_sym

lib/lipa/node.rb

@@ -44,18 +44,13 @@ class Node
     @@init_methods = {:node => self}
 
     def initialize(name, attrs = {}, &block)
-      @attrs = attrs
       @name = name.to_s
       @children = {}
-      @parent = attrs[:parent] 
-      @root = attrs[:root]
-      @full_name = attrs[:full_name] 
-      @kind = attrs[:kind]
-
-      #clear attrs 
-      instance_variables.each do |var|  
-        attrs.delete(var[1..-1].to_sym)
-      end
+      @parent = attrs.delete(:parent)
+      @root = attrs.delete(:root)
+      @full_name = attrs.delete(:full_name)
+      @kind = attrs.delete(:kind)
+      @attrs = attrs
 
       instance_eval &block if block_given?
     end
@@ -116,8 +111,8 @@ def eval_attrs
     #   dir_2["./searched_obj"] 
     #   dir_2["../dir_2/searched_obj"] 
     def [](path)
-      split_path = path.split("/")  
-      obj = case split_path[0]
+      first, *rest_path = path.split("/")  
+      obj = case first
       when nil
         if path == "/"
           root
@@ -131,15 +126,14 @@ def [](path)
       when "."
         self
       else
-        children[split_path[0].to_sym]
+        children[first.to_sym]
       end
 
-      if obj
-        if split_path.size > 1
-          obj[split_path[1..-1].join("/")]
-        else
-          obj
-        end
+      return nil if obj.nil?
+      if rest_path.size > 0
+        obj[rest_path.join("/")]
+      else
+        obj
       end
     end
 

lib/lipa/root.rb

@@ -84,7 +84,7 @@ def self.[](uri)
     # @param path to file
     #
     # @example 
-    #   Lipa::Tree.new "lipa" do
+    #   root "lipa" do
     #     load_from File.dirname(__FILE__) + "/data/part_of_tree.rb"
     #   end
     def load_from(path)

spec/kind_spec.rb

@@ -54,7 +54,7 @@
     @tree.folder_1.name.should eql("folder_1")
   end
 
-  it 'should do_somethign' do
+  it 'should have attrs' do
    @tree.folder_1.some_file.attrs.should eql({:ext => "txt", :size => 1024})
   end