lipa 0.2.2 → 0.3.0

data/NEWS.md

@@ -1,9 +1,59 @@
+2011-10-27 Release-0.3.0
+-----------------------
+- Added supporting references to other object as attribute ```Node#ref```
+
+  ```Ruby
+    node :node_1 
+    node :node_2 do
+      param_1 ref("../node_1")
+    end
+  ```
+
+- Added access to object by path in Unix style for ```Node#[]```
+
+  ```Ruby
+    node["dir_1/dir_2/searched_obj"] 
+    node["searched_obj"] 
+    node["./searched_obj"] 
+    node["../dir_2/searched_obj"] 
+  ```
+
+- Added ```Node#run``` for wraping code
+
+  ``` Ruby
+    node :some_node do
+      some_param run{ rand(10) }
+    end
+  ```
+- Added load description of trees from external files ```Tree#load_from```:
+  
+  ```Ruby
+    Lipa::Tree.new "lipa" do
+      load_from File.dirname(__FILE__) + "/data/part_of_tree.rb"
+    end
+  ```
+
+- Kind for node is default:
+
+  ```Ruby
+  t = Lipa::Tree.new("1") do
+    kind :some_kind
+
+    some_kind :obj_1
+  end
+  ```
+- Added ```tree``` attribute for node
+- Deleted deprecated classes ```Lipa::Leaf``` and ```Lipa::Branch```
+- Deleted deprecated methods ```Node#leafs``` and ```Node#branch```
+
 2011-10-20 Release-0.2.2
+-------------------------
 
 - Fixed issue [#1](https://github.com/flipback/lipa/issues/1) in template functional. 
   Lambda expressions is not supporting. Use `Proc.new {}` for added calculation in your trees
 
 2011-10-19 Release-0.2.1
+------------------------
 
 - Fixed bug in Lipa::Bunch class. Now is working:
 

data/README.md

@@ -3,7 +3,7 @@ Lipa - DSL for description treelike structures in Ruby
 
 Features
 ------------------------------------------------------
-- Dynamic creating treelike structures for Ruby
+- Creating treelike structures for Ruby in DSL style
 - Flexible syntax
 - Supporting templates and scope initialization
 - Supporting Proc object as attributes
@@ -14,31 +14,49 @@ Installation
 
 Example
 ------------------------------------------------------
-  ```Ruby
-  require 'lipa'
 
-  tree = Lipa::Tree.new :tree do 
-    kind :red, :for => :node do 
-      color "red"
+    require 'lipa'
+    un = Lipa::Tree.new :universe do 
+      kind :planet_system do
+        num_planet run{
+          count = 0
+          children.values.each do |planet|
+            count += 1 if planet.kind == :planet
+          end
+          count
+        }
+      end
+
+      kind :planet do 
+        has_live false
+        has_water false
+        number 0
+      end
+
+      planet_system :sun_system do 
+        planet :mercury do 
+          number 1
+          radius 46_001_210 
+        end
+
+        planet :venus do 
+          number 2
+          radius 107_476_259
+        end
+
+        planet :earth do 
+          number 3
+          radius 147_098_074
+          has_live true
+          has_water true
+
+          node :moon, :radius => 363_104
+        end
+      end
     end
 
-    node :branch do 
-      with :color => "green",  do 
-        node :leaf_green
-        node :leaf_yelow, :color => "yelow"
-      end    
-    end
-
-    red :red_leaf
-  end
-
-  #Access
-  puts Lipa::Tree["tree://branch/leaf_green"].color
-  #or
-  puts tree["branch/leaf_yelow"].color
-  #or
-  puts tree.red_leaf.color
-  ```
+    un.sun_system.num_planet #=> 3
+    un.sun_system.earth.radius #=> 147098074
 
 Reference
 ----------------------------------

data/Rakefile

@@ -17,4 +17,7 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
+require 'yard'
+YARD::Rake::YardocTask.new
+
 task :default => :spec

data/examples/simple_tree.rb

@@ -2,7 +2,7 @@ $:.unshift File.join(File.dirname(__FILE__),'../lib')
 require 'lipa'
 
 tree = Lipa::Tree.new :tree do 
-  kind :red, :for => :node do 
+  kind :red do 
     color "red"
   end
 

data/examples/store.rb

@@ -0,0 +1,77 @@
+$:.unshift File.join(File.dirname(__FILE__),'../lib')
+require "lipa"
+
+store = Lipa::Tree.new :store do 
+  kind :category do
+    unit_count run{
+      count = 0
+      children.values.each do |child|  
+        case child.kind
+        when :unit
+          count += child.count
+        when :category
+          count += child.unit_count
+        end 
+      end
+
+      count
+    }
+
+    total_cost  run{
+      cost = 0
+      children.values.each do |child|  
+        case child.kind
+        when :unit
+          cost += child.cost * child.count
+        when :category
+          cost += child.total_cost
+        end 
+      end
+
+      cost
+    }
+
+  end
+
+  kind :unit do
+    count 0
+    cost 0.0
+  end
+
+  category :electorinics do 
+    category :video do 
+      with :label => "Sony" do
+        unit :tv_1 do 
+          count       231
+          part_number "123-567-a"
+          cost         100.0
+        end
+
+        unit :tv_2 do 
+          count       27
+          part_number "123-567-b"
+          cost        199.0
+        end
+      end
+
+      unit :tv_3 do 
+        count       98
+        part_number "123-567-c"
+        cost        299.0
+        label       "Samsung"
+      end
+    end
+
+    category :audio do 
+      unit :player_1 do 
+        count       193
+        part_number "123-567-d"
+        cost        99.0
+        label       "Apple"
+      end
+    end
+  end
+end
+
+puts store.electorinics.video.unit_count
+puts store.electorinics.video.total_cost

data/examples/universe.rb

@@ -2,11 +2,17 @@ $:.unshift File.join(File.dirname(__FILE__),'../lib')
 require 'lipa'
 
 un = Lipa::Tree.new :universe do 
-  kind :planet_system, :for => :node do
-    num_planet 0
+  kind :planet_system do
+    num_planet run{
+      count = 0
+      children.values.each do |planet|
+        count += 1 if planet.kind == :planet
+      end
+      count
+    }
   end
 
-  kind :planet, :for => :node do 
+  kind :planet do 
     has_live false
     has_water false
     number 0
@@ -39,4 +45,4 @@ puts un.sun_system.earth.number
 puts un.sun_system.earth.radius
 puts un.sun_system.earth.has_live
 puts un.sun_system.earth.has_water
-puts un.sun_system.earth.moon.radius
+puts un.sun_system.num_planet

data/lib/lipa.rb

@@ -25,8 +25,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require "lipa/version"
 require "lipa/node"
-require "lipa/leaf"
-require "lipa/branch"
 require "lipa/bunch"
 require "lipa/kind"
 require "lipa/tree"

data/lib/lipa/kind.rb

@@ -27,31 +27,31 @@ module Lipa
   # Implemenation of kind(template) for description
   #
   # @example
-  #
   #   tree = Lipa::Tree.new :tree do 
   #     kind :some_kind do
   #       param1 "some_param"
   #     end
   #
-  #     leaf :some_instance, :kind => :some_kind 
+  #     some_kind :some_instance 
   #   end
   #   tree["some_instance"].param_1 #=> "some_param"
   #
-  #   alias #kind is #template
-  class Kind < Node
-    def method_missing(name, *args, &block)
-      unless Node.add_node(name, self, *args, &block)
-        # only assigment
-        if args.size == 1
-          name = name.to_s
-          name["="] = "" if name["="]
-          @attrs[name.to_sym] = args[0]
-        else
-          super
-        end
+  # @see Tree#kind
+  class Kind
+    attr_reader :attrs, :name, :for, :block
+    def initialize(name, attrs = {}, &block)
+      # OPTIMIZE: Make it shorter
+      if attrs[:for]
+        @for = attr[:for]
+        attrs[:for] = nil
+      else
+        @for = :node
       end
-    end
 
+      @attrs = attrs
+      @name = name.to_sym
+      @block = block if block_given?
+    end
   end
 end
 

data/lib/lipa/node.rb

@@ -27,34 +27,26 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 module Lipa
   # Base object for all nested object of tree
   # It supports initialization 
-  # attributes by constant, variable or Proc object
+  # attributes by constant, variable or code
   #
   # @example
   #   tree = Lipa::Tree.new :tree do 
   #     node :object, :param_1 => 4 do
   #       param_2 "some_param"
-  #       param_3 lambda{1+param_3}
+  #       param_3 run{1+param_3}
   #     end
   #   end
-  #   tree["object"].param_1 #=> 4
-  #   tree["object"].param_2 #=> "some_param"
-  #   tree["object"].param_3 #=> 5
+  #   tree.object.param_1 #=> 4
+  #   tree.object.param_2 #=> "some_param"
+  #   tree.object.param_3 #=> 5
   class Node 
     attr_accessor :attrs
     @@init_methods = {:node => self}
-    @@kinds = {}
 
     def initialize(name, attrs = {}, &block)
-      @attrs = {} 
-
-      #init attrs from template
-      if attrs[:kind]
-        kind = @@kinds[attrs[:kind].to_sym]
-        @attrs.merge! kind.attrs if kind
-      end
-
-      @attrs.merge! attrs
+      @attrs = attrs
       @attrs[:name] = name.to_s
+      @attrs[:children] ||= {}
       instance_eval &block if block_given?
     end
 
@@ -66,6 +58,7 @@ module Lipa
             return child if child
 
             val = @attrs[name]
+            super unless val
             if val.class == Proc
               instance_eval &(val)
             else
@@ -81,15 +74,28 @@ module Lipa
       end
     end
 
-    # Accessor for node by path
+    # Accessor for node by path in Unix style
     # @param [String] path nodes
     # @return [Node] node
     #
     # @example
-    #   tree["dir_1/dir_2/searched_obj"] 
+    #   dir_2["dir_1/dir_2/searched_obj"] 
+    #   dir_2["searched_obj"] 
+    #   dir_2["./searched_obj"] 
+    #   dir_2["../dir_2/searched_obj"] 
     def [](path)
       split_path = path.split("/")   
-      obj = @attrs[:children][split_path[0].to_sym]
+      obj = case split_path[0]
+      when ""
+        @attrs[:tree]
+      when ".."
+        @attrs[:parent]
+      when "."
+        self
+      else
+        @attrs[:children][split_path[0].to_sym]
+      end
+
       if obj
         if split_path.size > 1
           obj[split_path[1..-1].join("/")]
@@ -104,19 +110,62 @@ module Lipa
     # @example
     #   tree = Lipa::Tree.new :tree do 
     #     with :param_1 => "some_param" do
-    #       leaf :obj_1
-    #       leaf :obj_2
+    #       node :obj_1
+    #       node :obj_2
     #     end
     #   end
     #
-    #   tree["obj_1"].param_1 #=> "some_param"
-    #   tree["obj_2"].param_1 #=> "some_param"
+    #   tree.obj_1.param_1 #=> "some_param"
+    #   tree.obj_2.param_1 #=> "some_param"
     def with(attrs = {}, &block)
       if block_given?
         Lipa::Bunch.new(self, attrs, &block)
       end
     end
 
+    # Wraping code in attribute
+    #
+    # @param block of code
+    #
+    # @example
+    #   Tree.new :tree do
+    #     param_1 10
+    #     param_2 run{ param_1 * 10 }
+    #   end
+    def run(&block)
+      block
+    end
+
+    # Reference to othe object
+    # @param path in Unix style
+    #
+    # @example
+    #
+    #   node :node_1 
+    #   node :node_2 do
+    #     param_1 ref("../node_1")
+    #   end
+    def ref(path) 
+     Proc.new { self[path] }
+    end
+
+    # Accesor for methods for initialization
+    # node objects
+    # 
+    # @param names of initial methods
+    #
+    # @example
+    #   class Folder < Lipa::Node
+    #     init_methods :folder
+    #   end
+    #
+    #   fls = Lipa::Tree.new :folders do
+    #     folder :folder_1 do
+    #       param_1 "some_param
+    #     end
+    #   end
+    #
+    #   fls.folder_1.class #=> Folder
     def self.init_methods(*names)
       if names.size > 0
         names.each do |name|
@@ -134,42 +183,47 @@ module Lipa
     # @param args of node
     # @param block for node
     def self.add_node(name, parent, *args, &block)
-      parent.attrs[:children] ||= {} 
-       
+      # OPTIMIZE: This code looks bad
       # Init from kind
-      kind = @@kinds[name]
+      attrs = {}
+      args[1] ||= {}
+      attrs.merge!(args[1])
+
+      kind = parent.attrs[:tree].kinds[name]
       if kind and kind.for
-        init_class = @@init_methods[kind.for] 
-        args[1] ||= {}
-        args[1][:kind] = kind.name
+        init_class = @@init_methods[kind.for]
+        attrs[:kind] = kind.name
+        attrs.merge!(kind.attrs) do |key,v1,v2|
+          v1
+        end
       else
         #from init methods
         init_class = @@init_methods[name]
       end
 
       if init_class
-        args[1] ||= {}
-        args[1][:parent] = parent 
+        attrs[:parent] = parent
+        attrs[:tree] = parent.attrs[:tree]
         child_name = args[0].to_sym
 
         existen_child = parent.attrs[:children][child_name]
-        args[1] = existen_child.attrs.merge(args[1]) if existen_child
-          
-        parent.attrs[:children][child_name] = init_class.send(:new, *args, &block )
+        attrs = existen_child.attrs.merge(args[1]) if existen_child
+
+        args[1].merge!(attrs) do |key,v1,v2| 
+          v1
+        end
+
+        if kind
+          parent.attrs[:children][child_name] = init_class.send(:new, *args.clone, &kind.block)
+          parent.attrs[:children][child_name].attrs.merge!(attrs)
+          parent.attrs[:children][child_name].instance_exec(&block) if block_given?
+        else
+          parent.attrs[:children][child_name] = init_class.send(:new, *args, &block )
+        end
+        true
       else  
         nil
       end
     end
-
-    #Deprecated methods
-    def bunch(attrs = {}, &block)
-      warn "#{__FILE__}:#{__LINE__} Deprecated method. Please use Lipa::Node. It is removing in 0.3.0 version"
-      with(attrs, &block)
-    end
-
-    def leafs
-      warn "#{__FILE__}:#{__LINE__} Deprecated method. Please use Lipa::Node. It is removing in 0.3.0 version"
-      attrs[:children]
-    end
   end
 end

data/lib/lipa/tree.rb

@@ -28,17 +28,20 @@ module Lipa
   # @example
   #
   #   tree = Lipa::Tree.new :tree do 
-  #     leaf :object do
+  #     node :object do
   #       param_1 "some_param"
-  #       param_2 lambda{1+2}
+  #       param_2 run{param_1 + "!!!!"}
   #     end
   #   end
   #
-  #   tree["object"].param_1 #=> "some_param"
-  #   tree["object"].param_2 #=> 3 
+  #   tree.object.param_1 #=> "some_param"
+  #   tree.object.param_2 #=> "some_param!!!!"
   class Tree < Node
+    attr_reader :kinds
     @@trees = {}
     def initialize(name, attrs = {}, &block_given)
+      @kinds = {}
+      attrs[:tree] = self
       super
       @@trees.merge! name.to_s => self
     end
@@ -51,10 +54,10 @@ module Lipa
     #     param1 "some_param"
     #   end
     #
-    #   leaf :some_instance, :kind => :some_kind 
+    #   some_kind :some_instance 
     def kind(name, attrs = {}, &block)
-      @@kinds ||= {}
-      @@kinds[name.to_sym] = Lipa::Kind.new(name, attrs, &block)
+      attrs = { :tree => self }
+      @kinds[name.to_sym] = Lipa::Kind.new(name, attrs, &block)
     end
 
     alias_method :template, :kind
@@ -70,5 +73,19 @@ module Lipa
       tree, path = uri.split("://")
       @@trees[tree][path] if @@trees[tree] 
     end
+
+    # Load description tree from file
+    #
+    # @param path to file
+    #
+    # @example 
+    #   Lipa::Tree.new "lipa" do
+    #     load_from File.dirname(__FILE__) + "/data/part_of_tree.rb"
+    #   end
+    def load_from(path)
+      File.open(path,'r') do |f|
+        instance_eval f.read
+      end
+    end
   end
 end

data/lib/lipa/version.rb

@@ -24,5 +24,5 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =end
 
 module Lipa 
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/spec/access_by_path_spec.rb

@@ -0,0 +1,37 @@
+require 'lipa'
+
+describe "access to object by path in Unix style" do
+  before :all do
+    @tree =  Lipa::Tree.new "lipa" do
+      node :obj_1 do 
+        node :obj_2 do
+          node :obj_3 do 
+            node :obj_4
+          end
+        end
+      end
+    end
+
+    @node = @tree.obj_1.obj_2
+  end
+
+  it 'should have access by relative path' do
+    @node["obj_3/obj_4"].should eql(@tree.obj_1.obj_2.obj_3.obj_4)
+  end
+
+  it 'should have access by parent path with "./"' do
+    @node["./obj_3/obj_4"].should eql(@tree.obj_1.obj_2.obj_3.obj_4)
+  end
+
+  it 'should have access to parent by  "../"' do
+    @node[".."].should eql(@tree.obj_1)
+  end
+
+  it 'should have access by "../obj_2/obj_3"' do 
+    @node["../obj_2/obj_3"].should eql(@tree.obj_1.obj_2.obj_3)
+  end
+
+  it 'should have access by absolute path' do
+    @node["/obj_1/obj_2/obj_3"].should eql(@tree.obj_1.obj_2.obj_3)
+  end
+end

data/spec/bunch_spec.rb

@@ -1,14 +1,26 @@
-require File.dirname(__FILE__) + "/spec_helper"
+require 'lipa'
 
 describe Lipa::Bunch do
+  before :all do
+    @tree =  Lipa::Tree.new "lipa" do
+      with :attr_1 => 100, :attr_2 => "attr_2" do 
+        node :obj_4
+        node :obj_5
+        node :obj_6, :attr_1 => 200, :attr_2 => ""
+      end
+    end
+
+    @node = @tree["group_1/obj_1"]
+  end
+
   it 'should create some object with any attributes' do 
-    tree["obj_4"].attr_1.should eql(100)
-    tree["obj_5"].attr_1.should eql(100)
-    tree["obj_6"].attr_1.should eql(200)
+    @tree["obj_4"].attr_1.should eql(100)
+    @tree["obj_5"].attr_1.should eql(100)
+    @tree["obj_6"].attr_1.should eql(200)
 
-    tree["obj_4"].attr_2.should eql("attr_2")
-    tree["obj_5"].attr_2.should eql("attr_2")
-    tree["obj_6"].attr_2.should eql("")
+    @tree["obj_4"].attr_2.should eql("attr_2")
+    @tree["obj_5"].attr_2.should eql("attr_2")
+    @tree["obj_6"].attr_2.should eql("")
   end
   
   it 'should have "with" initial method' do

data/spec/kind_spec.rb

@@ -1,25 +1,57 @@
-require File.dirname(__FILE__) + "/spec_helper"
+require 'lipa' 
 
 describe Lipa::Kind do
+  before :all  do
+    @tree = Lipa::Tree.new :tree do 
+      # Set #1 
+      kind :object, :for => :node
+      kind :group, :for => :node do 
+        object :obj_x do
+          attr_0 "from_kind"
+          attr_1 "from_kind"
+          attr_3 run{ attr_2 * 2}
+        end
+      end
+
+      group :group_1 do 
+        object :obj_x do 
+          attr_1 "from_instance"
+          attr_2 2
+        end
+      end
+      # Set #2
+      kind :folder
+      kind :file do 
+        size 1024
+        ext "jpg"
+      end
+
+      folder :folder_1 do 
+        file :some_file, :ext => "txt"
+      end
+    end    
+  end
+
   it 'should create brunch from template' do 
-    tree.group_3.obj_x.attr_0.should eql("from_kind")
+    @tree.group_1.obj_x.attr_0.should eql("from_kind")
   end
 
   it 'should support local changing in instances' do
-    tree.group_3.obj_x.attr_1.should eql("from_instance")
+    @tree.group_1.obj_x.attr_1.should eql("from_instance")
+  end
+
+  it 'should have lazy calculation' do 
+    @tree.group_1.obj_x.attr_2.should eql(2)
+    @tree.group_1.obj_x.attr_3.should eql(4)
   end
 
   it 'should create init method with name template' do
-    tree.folder_1.some_file.size.should eql(1024) 
-    tree.folder_1.some_file.ext.should eql("txt") 
+    @tree.folder_1.some_file.size.should eql(1024) 
+    @tree.folder_1.some_file.ext.should eql("txt") 
   end
 
   it 'should create node with your name' do
-    tree.folder_1.name.should eql("folder_1")
+    @tree.folder_1.name.should eql("folder_1")
   end
 
-  it 'should have lazy calculation' do 
-    tree.group_3.obj_x.attr_2.should eql(2)
-    tree.group_3.obj_x.attr_3.should eql(4)
-  end
 end

data/spec/node_spec.rb

@@ -1,16 +1,56 @@
-require File.dirname(__FILE__) + "/spec_helper"
+require 'lipa'
 
 describe Lipa::Node do
-  before :each do
-    @node = tree["group_1/obj_1"]
+  before :all do
+    @tree =  Lipa::Tree.new "lipa" do
+      node :group_1 do 
+        any_attr "any attr"
+
+        node :obj_1, :attr_1 => 5 do
+          attr_2 3
+          attr_3 run{attr_1 + attr_2}
+          attr_4 ref("/other_object")
+
+          node :obj_2 
+          node :obj_3 
+        end
+      end
+
+      node :other_object
+
+      kind :some_kind do
+        param_1 "something"
+      end
+
+      some_kind :obj_x do 
+        some_kind :obj_y1 do 
+          some_kind :obj_z1
+          some_kind :obj_z2
+        end
+
+        some_kind :obj_y2 do 
+          some_kind :obj_z3
+        end
+      end
+    end
+
+    @node = @tree["group_1/obj_1"]
   end
 
   it 'should have name' do
     @node.name.should eql("obj_1")
   end
 
+  it 'should have tree' do
+    @node.tree.should eql(@tree)
+  end
+
+  it 'should kind' do
+    @tree["obj_x"].kind.should eql(:some_kind)
+  end
+
   it 'should have parent' do
-    @node.parent.should eql(tree["group_1"])
+    @node.parent.should eql(@tree["group_1"])
   end
 
   it 'should have descripted attr_1 eql 5' do
@@ -39,15 +79,24 @@ describe Lipa::Node do
   end
 
   it 'should have children' do
-    @node.children[:obj_2].should eql(tree["group_1/obj_1/obj_2"])
-    @node.children[:obj_3].should eql(tree["group_1/obj_1/obj_3"])
+    @node.children.values.should eql([@tree["group_1/obj_1/obj_2"], @tree["group_1/obj_1/obj_3"]])
   end
 
   it 'should have [] for access entry by path' do
-    @node["obj_3"].should eql(tree["group_1/obj_1/obj_3"])
+    @node["obj_3"].should eql(@tree["group_1/obj_1/obj_3"])
   end
 
   it 'should access for children by .' do
-    @node.obj_3.should eql(tree["group_1/obj_1/obj_3"])
+    @node.obj_3.should eql(@tree["group_1/obj_1/obj_3"])
+  end
+
+  it 'should not have bug in tree of kind objects' do
+    @tree.obj_x.obj_y1.children.keys.should eql([:obj_z1, :obj_z2])
+    @tree.obj_x.children.keys.should eql([:obj_y1, :obj_y2])
+    @tree.obj_x.obj_y2.obj_z3.children.keys.should eql([])
+  end
+
+  it 'should have access other object by reference' do
+    @node.attr_4.should eql(@tree.other_object)
   end
 end

data/spec/tree_spec.rb

@@ -1,8 +1,30 @@
-require File.dirname(__FILE__) + "/spec_helper"
+require 'lipa'
 
 describe Lipa::Tree do 
+  before :all do
+    @tree =  Lipa::Tree.new "lipa" do
+      node :group_1 do 
+        any_attr "any attr"
+
+        node :obj_1, :attr_1 => 5 do
+          attr_2 3
+          attr_3 run{attr_1 + attr_2}
+
+          node :obj_2 
+          node :obj_3 
+        end
+      end
+
+      load_from File.dirname(__FILE__) + "/data/part_of_tree.rb"
+    end
+  end
+
   it "should have access any object in trees" do 
-    Lipa::Tree["lipa://group_1/obj_1"].should eql(tree["group_1/obj_1"])
+    Lipa::Tree["lipa://group_1/obj_1"].should eql(@tree["group_1/obj_1"])
+  end
+
+  it 'should load description from files' do
+    @tree.external_node.msg.should eql("Hello!")
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lipa
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-20 00:00:00.000000000Z
+date: 2011-10-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &11366740 !ruby/object:Gem::Requirement
+  requirement: &12833120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11366740
+  version_requirements: *12833120
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &11366060 !ruby/object:Gem::Requirement
+  requirement: &12795600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11366060
+  version_requirements: *12795600
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &11362040 !ruby/object:Gem::Requirement
+  requirement: &12794560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,51 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11362040
+  version_requirements: *12794560
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &12793300 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *12793300
+- !ruby/object:Gem::Dependency
+  name: rdiscount
+  requirement: &12792500 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *12792500
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: &12791100 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *12791100
+- !ruby/object:Gem::Dependency
+  name: notes
+  requirement: &12789280 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *12789280
 description: 
 email: atimin@gmail.com
 executables: []
@@ -56,17 +100,16 @@ files:
 - lib/lipa/version.rb
 - lib/lipa/kind.rb
 - lib/lipa/node.rb
-- lib/lipa/leaf.rb
 - lib/lipa/bunch.rb
 - lib/lipa/tree.rb
-- lib/lipa/branch.rb
 - spec/tree_spec.rb
 - spec/node_spec.rb
 - spec/kind_spec.rb
-- spec/spec_helper.rb
 - spec/bunch_spec.rb
+- spec/access_by_path_spec.rb
 - examples/simple_tree.rb
 - examples/universe.rb
+- examples/store.rb
 - Rakefile
 - README.md
 - NEWS.md

data/lib/lipa/branch.rb

@@ -1,36 +0,0 @@
-=begin
-Lipa - DSL for description treelike structures in Ruby
-
-Copyright (c) 2011 Aleksey Timin
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-=end
-
-module Lipa
-  # Deprecte class 
-  # Don't use it
-  class Branch < Node
-    init_methods :branch, :dir, :group
-    def initialize(name, attrs = {}, &block)
-      warn "#{__FILE__}:#{__LINE__} Deprecated class. Please use Lipa::Node. It is removing in 0.3.0 version"
-      super
-    end
-  end
-end

data/lib/lipa/leaf.rb

@@ -1,37 +0,0 @@
-=begin
-Lipa - DSL for description treelike structures in Ruby
-
-Copyright (c) 2011 Aleksey Timin
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-=end
-
-
-module Lipa
-  # Deprecte class 
-  # Don't use it
-  class Leaf < Node
-    init_methods :leaf, :object
-    def initialize(name, attrs = {}, &block)
-      warn "#{__FILE__}:#{__LINE__} Deprecated class. Please use Lipa::Node. It is removing in 0.3.0 version"
-      super
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,52 +0,0 @@
-require "lipa"
-
-TREE ||= Lipa::Tree.new "lipa" do
-    node :group_1 do 
-      any_attr "any attr"
-
-      node :obj_1, :attr_1 => 5 do
-        attr_2 3
-        attr_3 Proc.new{attr_1 + attr_2}
-
-        node :obj_2 
-        node :obj_3 
-      end
-    end
-
-    with :attr_1 => 100, :attr_2 => "attr_2" do 
-      node :obj_4
-      node :obj_5
-      node :obj_6, :attr_1 => 200, :attr_2 => ""
-    end
-
-    # Template
-    kind :kind_group do 
-      node :obj_x do
-        attr_0 "from_kind"
-        attr_1 "from_kind"
-        attr_2 0
-        attr_3 Proc.new{ attr_2 * 2}
-      end
-    end
-
-    node :group_3, :kind => :kind_group do 
-      node :obj_x do 
-        attr_1 "from_instance"
-        attr_2 2
-      end
-    end
-    #or
-    kind :folder, :for => :node
-    kind :file, :for => :node do 
-      size 1024
-      ext "jpg"
-    end
-
-    folder :folder_1 do 
-      file :some_file, :ext => "txt"
-    end
-  end
-
-def tree
-  TREE
-end