lipa 0.1.0 → 0.2.0

data/NEWS.md

@@ -1,3 +1,59 @@
-Release-0.1.0
----------------------
-Initial relese!
+2011-10-17 Release-0.2.0
+------------------------
+- New clear API with one general class ```Lipa::Node```. Classes ```Lipa::Leaf``` and ```Lipa::Branch``` 
+is deprecated and is deleting in release 0.3.0. 
+
+ 
+  ```Ruby
+  node :node_1 do
+   node :node_2 do
+    param_1 :some_value
+   end
+  end
+  ```
+
+- Added new methods access to nodes;
+ 
+  ```Ruby
+  Tree["tree://path/to/obj"]
+  tree.path.to.obj
+  ```
+
+- Extended template functional. For example, if you set attr ```:for => :node``` in kind
+you will use name of kind instead of method ```node``` for subsribtion. [See examples](https://github.com/flipback/lipa/tree/master/examples)
+  
+  ```Ruby
+  kind :planet_system, :for => :node do
+    num_planet 0
+  end
+
+  kind :planet, :for => :node 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
+  ```
+2011-10-16 Release-0.1.0
+------------------------
+Initial released!

data/README.md

@@ -14,27 +14,32 @@ Installation
 
 Example
 ------------------------------------------------------
-```Ruby
-require 'lipa'
-
-tree = Lipa::Tree.new :tree do 
-  kind :red_leaf do 
-    color "red"
-  end
-
-  branch :branch do 
-    bunch :color => "green",  do 
-      leaf :leaf_green
-      leaf :leaf_yelow, :color => "yelow"
-    end    
+  ```Ruby
+  require 'lipa'
+
+  tree = Lipa::Tree.new :tree do 
+    kind :red, :for => :node do 
+      color "red"
+    end
+
+    node :branch do 
+      with :color => "green",  do 
+        node :leaf_green
+        node :leaf_yelow, :color => "yelow"
+      end    
+    end
+
+    red :red_leaf
   end
 
-  leaf :red_leaf, :kind => :red_leaf
-end
-
-
-puts tree["branch/leaf_green"].color
-puts tree["branch/leaf_yelow"].color
-puts tree["red_leaf"].color
-```
-
+  #Access
+  puts Lipa::Tree["tree://branch/leaf_green"].color
+  #or
+  puts tree["branch/leaf_yelow"].color
+  #or
+  puts tree.red_leaf.color
+  ```
+
+Reference
+----------------------------------
+Home page: http://lipa.flipback.net

data/examples/simple_tree.rb

@@ -0,0 +1,24 @@
+$:.unshift File.join(File.dirname(__FILE__),'../lib')
+require 'lipa'
+
+tree = Lipa::Tree.new :tree do 
+  kind :red, :for => :node do 
+    color "red"
+  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

data/examples/universe.rb

@@ -0,0 +1,42 @@
+$:.unshift File.join(File.dirname(__FILE__),'../lib')
+require 'lipa'
+
+un = Lipa::Tree.new :universe do 
+  kind :planet_system, :for => :node do
+    num_planet 0
+  end
+
+  kind :planet, :for => :node 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
+
+
+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

data/lib/lipa.rb

@@ -24,6 +24,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =end
 
 require "lipa/version"
+require "lipa/node"
 require "lipa/leaf"
 require "lipa/branch"
 require "lipa/bunch"

data/lib/lipa/branch.rb

@@ -24,70 +24,13 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 =end
 
 module Lipa
-  # Implemenation of branch (conteiner) for description
-  #  
-  # @example
-  #
-  # tree = Lipa::Tree.new :tree do 
-  #   branch :group_1 do
-  #     leaf :obj_1, :param_1 => "some_param"
-  #   end
-  # end
-  # tree["group_1/obj_1"].param_1 #=> "some_param"
-  #
-  # alias #branch is #group, #dir
-
-  class Branch < Leaf
+  # Deprecte class 
+  # Don't use it
+  class Branch < Node
     init_methods :branch, :dir, :group
-
-    def method_missing(name, *args, &block)
-      @attrs[:leafs] ||= {} 
-      init_class = @@init_methods[name.to_s]
-      if init_class
-        args[1] ||= {}
-        args[1][:branch] = self
-        @attrs[:leafs][args[0].to_s] = init_class.send(:new, *args, &block )
-      else
-        super
-      end
-    end
-
-    # Accessor for entry by path
-    # @param [String] path to entry
-    # @return entry
-    #
-    # @example
-    # tree["dir_1/dir_2/searched_obj"] 
-    def [](path)
-      split_path = path.split("/")   
-      obj = @attrs[:leafs][split_path[0]]
-      if obj
-        if split_path.size > 1
-          obj[split_path[1..-1].join("/")]
-        else
-          obj
-        end
-      end
+    def initialize(name, attrs = {}, &block)
+      warn "#{__FILE__}:#{__LINE__} Deprecated class. Please use Lipa::Node. It is removing in 0.3.0 version"
+      super
     end
-
-    # Initial method for group description
-    # 
-    # @example
-    # tree = Lipa::Tree.new :tree do 
-    #   bunch :param_1 => "some_param" do
-    #     leaf :obj_1
-    #     leaf :obj_2
-    #   end
-    # end
-    #
-    # tree["obj_1"].param_1 #=> "some_param"
-    # tree["obj_2"].param_1 #=> "some_param"
-    def bunch(attrs = {}, &block)
-      if block_given?
-        Lipa::Bunch.new(self, attrs, &block)
-      end
-    end
-
-    alias_method :with, :bunch
   end
 end

data/lib/lipa/bunch.rb

@@ -27,31 +27,31 @@ module Lipa
   # Implementation of group description
   # 
   # @example
-  # tree = Lipa::Tree.new :tree do 
-  #   bunch :param_1 => "some_param" do
-  #     leaf :obj_1
-  #     leaf :obj_2
+  #   tree = Lipa::Tree.new :tree do 
+  #     bunch :param_1 => "some_param" do
+  #       leaf :obj_1
+  #       leaf :obj_2
+  #     end
   #   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"
   class Bunch 
-    def initialize(branch, attrs = {}, &block)
+    def initialize(parent, attrs = {}, &block)
       @attrs = attrs
-      @branch = branch
-      @branch.attrs[:leafs] ||= {}
+      @parent = parent
+      @parent.attrs[:children] ||= {}
 
       instance_eval &block if block_given?
     end
 
     def method_missing(name, *args, &block)
-      init_class = Lipa::Leaf.init_methods[name.to_s]
+      init_class = Lipa::Node.init_methods[name]
       if init_class and init_class.class == Class
         args[1] ||= {}
         args[1] = @attrs.merge(args[1]) #to save local attrs
-        args[1][:branch] = @branch
-        @branch.attrs[:leafs][args[0].to_s] = init_class.send(:new, *args, &block )
+        args[1][:parent] = @parent
+        @parent.attrs[:children][args[0].to_sym] = init_class.send(:new, *args, &block )
       else
         super
       end

data/lib/lipa/kind.rb

@@ -28,17 +28,17 @@ module Lipa
   #
   # @example
   #
-  # tree = Lipa::Tree.new :tree do 
-  #   kind :some_kind do
-  #     param1 "some_param"
-  #   end
+  #   tree = Lipa::Tree.new :tree do 
+  #     kind :some_kind do
+  #       param1 "some_param"
+  #     end
   #
-  #   leaf :some_instance, :kind => :some_kind 
-  # end
-  # tree["some_instance"].param_1 #=> "some_param"
+  #     leaf :some_instance, :kind => :some_kind 
+  #   end
+  #   tree["some_instance"].param_1 #=> "some_param"
   #
-  # alias #kind is #template
-  class Kind < Branch
+  #   alias #kind is #template
+  class Kind < Node
   end
 end
 

data/lib/lipa/leaf.rb

@@ -25,65 +25,13 @@ 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
-  #
-  # @example
-  # tree = Lipa::Tree.new :tree do 
-  #   leaf :object, :param_1 => 4 do
-  #     param_2 "some_param"
-  #     param_3 lambda{1+param_3}
-  #   end
-  # end
-  # tree["object"].param_1 #=> 4
-  # tree["object"].param_2 #=> "some_param"
-  # tree["object"].param_3 #=> 5
- 
-  class Leaf 
-    attr_accessor :attrs
-    @@init_methods = {"leaf" => self, "object" => self}
-    @@kinds = {}
-
+  # Deprecte class 
+  # Don't use it
+  class Leaf < Node
+    init_methods :leaf, :object
     def initialize(name, attrs = {}, &block)
-      @attrs = attrs 
-      @attrs[:name] = name.to_s
-
-      if attrs[:kind]
-        @kind = @@kinds[attrs[:kind].to_sym]
-
-        @attrs.merge! @kind.attrs
-      end
-
-      instance_eval &block if block_given?
-    end
-
-    def method_missing(name, *args, &block)
-      case args.size
-        when 0
-          val = @attrs[name]
-          if val.class == Proc
-            val.call
-          else
-            val
-          end
-        when 1
-          name = name.to_s
-          name["="] = "" if name["="]
-          @attrs[name.to_sym] = args[0]
-        else
-          super
-      end
-    end
-
-    def self.init_methods(*names)
-      if names.size > 0
-        names.each do |name|
-          @@init_methods[name.to_s] = self
-        end
-      else
-        @@init_methods
-      end
+      warn "#{__FILE__}:#{__LINE__} Deprecated class. Please use Lipa::Node. It is removing in 0.3.0 version"
+      super
     end
   end
 end

data/lib/lipa/node.rb

@@ -0,0 +1,159 @@
+=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
+  # Base object for all nested object of tree
+  # It supports initialization 
+  # attributes by constant, variable or Proc object
+  #
+  # @example
+  #   tree = Lipa::Tree.new :tree do 
+  #     node :object, :param_1 => 4 do
+  #       param_2 "some_param"
+  #       param_3 lambda{1+param_3}
+  #     end
+  #   end
+  #   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 = {} 
+      @attrs[:name] = name.to_s
+
+      #init attrs from template
+      if attrs[:kind]
+        kind = @@kinds[attrs[:kind].to_sym]
+        @attrs.merge! kind.attrs if kind
+      end
+
+      @attrs.merge! attrs
+      instance_eval &block if block_given?
+    end
+
+    def method_missing(name, *args, &block)
+      @attrs[:children] ||= {} 
+
+      # Init from kind
+      kind = @@kinds[name]
+      if kind and kind.for
+        init_class = @@init_methods[kind.for] 
+        args[1] ||= {}
+        args[1][:kind] = kind.name
+      else
+        #from init methods
+        init_class = @@init_methods[name]
+      end
+
+      if init_class
+        # Making children objects
+        args[1] ||= {}
+        args[1][:parent] = self
+        @attrs[:children][args[0].to_sym] = init_class.send(:new, *args, &block )
+      else
+        case args.size
+          when 0
+            child = @attrs[:children][name]
+            return child if child
+
+            val = @attrs[name]
+            if val.class == Proc
+              val.call
+            else
+              val
+            end
+          when 1
+            name = name.to_s
+            name["="] = "" if name["="]
+            @attrs[name.to_sym] = args[0]
+          else
+            super
+        end
+      end
+    end
+
+    # Accessor for node by path
+    # @param [String] path nodes
+    # @return [Node] node
+    #
+    # @example
+    #   tree["dir_1/dir_2/searched_obj"] 
+    def [](path)
+      split_path = path.split("/")   
+      obj = @attrs[:children][split_path[0].to_sym]
+      if obj
+        if split_path.size > 1
+          obj[split_path[1..-1].join("/")]
+        else
+          obj
+        end
+      end
+    end
+
+    # Initial method for group description
+    # 
+    # @example
+    #   tree = Lipa::Tree.new :tree do 
+    #     with :param_1 => "some_param" do
+    #       leaf :obj_1
+    #       leaf :obj_2
+    #     end
+    #   end
+    #
+    #   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
+
+    def self.init_methods(*names)
+      if names.size > 0
+        names.each do |name|
+          @@init_methods[name.to_sym] = self
+        end
+      else
+        @@init_methods
+      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

@@ -27,35 +27,48 @@ module Lipa
   # Implementaion of root of description
   # @example
   #
-  # tree = Lipa::Tree.new :tree do 
-  #   leaf :object do
-  #     param_1 "some_param"
-  #     param_2 lambda{1+2}
+  #   tree = Lipa::Tree.new :tree do 
+  #     leaf :object do
+  #       param_1 "some_param"
+  #       param_2 lambda{1+2}
+  #     end
   #   end
-  # end
   #
-  # tree["object"].param_1 #=> "some_param"
-  # tree["object"].param_2 #=> 3 
-  class Tree < Branch
-    attr_reader :kinds
+  #   tree["object"].param_1 #=> "some_param"
+  #   tree["object"].param_2 #=> 3 
+  class Tree < Node
+    @@trees = {}
+    def initialize(name, attrs = {}, &block_given)
+      super
+      @@trees.merge! name.to_s => self
+    end
 
     # Initialize of kind
     # @see Lipa::Kind
     #
     # @example
+    #   kind :some_kind do
+    #     param1 "some_param"
+    #   end
     #
-    # kind :some_kind do
-    #   param1 "some_param"
-    # end
-    #
-    # leaf :some_instance, :kind => :some_kind 
+    #   leaf :some_instance, :kind => :some_kind 
     def kind(name, attrs = {}, &block)
-      if block_given?
-        @@kinds ||= {}
-        @@kinds[name.to_sym] = Lipa::Kind.new(name, attrs, &block)
-      end
+      @@kinds ||= {}
+      @@kinds[name.to_sym] = Lipa::Kind.new(name, attrs, &block)
     end
 
     alias_method :template, :kind
+
+    # Accessor for node by uri
+    #  
+    # @param [String] uri by format [tree_name]://[path]
+    # @return [Node] node
+    #
+    # @example
+    #  Lipa::Tree["some_tree://node_1/node_2"] 
+    def self.[](uri)
+      tree, path = uri.split("://")
+      @@trees[tree][path] if @@trees[tree] 
+    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.1.0"
+  VERSION = "0.2.0"
 end

data/spec/bunch_spec.rb

@@ -14,7 +14,7 @@ describe Lipa::Bunch do
   it 'should have "with" initial method' do
     t = Lipa::Tree.new("1") do
       with :attr_1 => 999 do 
-        leaf :obj_1
+        node :obj_1
       end
     end
     t["obj_1"].attr_1.should eql(999)

data/spec/kind_spec.rb

@@ -8,4 +8,9 @@ describe Lipa::Kind do
   it 'should support local changing in instances' do
     tree["group_3/obj_x"].attr_1.should eql("from_instance")
   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") 
+  end
 end

data/spec/node_spec.rb

@@ -0,0 +1,51 @@
+require File.dirname(__FILE__) + "/spec_helper"
+
+describe Lipa::Node do
+  before :each do
+    @node = tree["group_1/obj_1"]
+  end
+
+  it 'should have name' do
+    @node.name.should eql("obj_1")
+  end
+
+  it 'should have parent' do
+    @node.parent.should eql(tree["group_1"])
+  end
+
+  it 'should have descripted attr_1 eql 5' do
+    @node.attr_1.should eql(5)
+  end
+
+  it 'should have descripted attr_2 eql 4' do
+    @node.attr_2.should eql(3)
+  end
+
+  it 'should have descripted attr_3 eql sum of attr_1 and attr_2' do
+    @node.attr_3.should eql(8)
+  end
+
+  it 'should support write access for attrs' do
+    @node.attr_1 = 8
+    @node.attr_1.should eql(8)
+  end
+
+  it 'should have hash access for attrs' do
+    @node.attrs[:attr_1].should eql(8)
+    @node.attrs[:attr_1] = 9
+    @node.attrs[:attr_1].should eql(9)
+  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"])
+  end
+
+  it 'should have [] for access entry by path' do
+    @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"])
+  end
+end

data/spec/spec_helper.rb

@@ -1,39 +1,47 @@
 require "lipa"
 
 TREE ||= Lipa::Tree.new "lipa" do
-    branch :group_1 do 
+    node :group_1 do 
       any_attr "any attr"
 
-      leaf :obj_1, :attr_1 => 5 do
+      node :obj_1, :attr_1 => 5 do
         attr_2 3
         attr_3 lambda{attr_1 + attr_2}
-      end
-
-      leaf :obj_2 
 
-      branch :group_2 do
-        leaf :obj_3
+        node :obj_2 
+        node :obj_3 
       end
     end
 
-    bunch :attr_1 => 100, :attr_2 => "attr_2" do 
-      leaf :obj_4
-      leaf :obj_5
-      leaf :obj_6, :attr_1 => 200, :attr_2 => ""
+    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 
-      leaf :obj_x
-      leaf :obj_y do
+      node :obj_x
+      node :obj_y do
         attr_1 "from_kind"
       end
     end
 
-    branch :group_3, :kind => :kind_group do 
-      leaf :obj_x do 
+    node :group_3, :kind => :kind_group do 
+      node :obj_x do 
         attr_1 "from_instance"
       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

data/spec/tree_spec.rb

@@ -0,0 +1,8 @@
+require File.dirname(__FILE__) + "/spec_helper"
+
+describe Lipa::Tree do 
+  it "should have access any object in trees" do 
+    Lipa::Tree["lipa://group_1/obj_1"].should eql(tree["group_1/obj_1"])
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lipa
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-16 00:00:00.000000000Z
+date: 2011-10-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &16006520 !ruby/object:Gem::Requirement
+  requirement: &21636340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16006520
+  version_requirements: *21636340
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &16005820 !ruby/object:Gem::Requirement
+  requirement: &21635780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16005820
+  version_requirements: *21635780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &16004980 !ruby/object:Gem::Requirement
+  requirement: &21635220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16004980
+  version_requirements: *21635220
 description: 
 email: atimin@gmail.com
 executables: []
@@ -55,19 +55,22 @@ files:
 - lib/lipa.rb
 - 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/branch_spec.rb
 - spec/bunch_spec.rb
-- spec/leaf_spec.rb
+- examples/simple_tree.rb
+- examples/universe.rb
 - Rakefile
 - README.md
 - NEWS.md
-homepage: http://xpca.org
+homepage: http://lipa.flipback.net
 licenses: []
 post_install_message: 
 rdoc_options:

data/spec/branch_spec.rb

@@ -1,30 +0,0 @@
-require File.dirname(__FILE__) + "/spec_helper"
-
-describe Lipa::Branch do
-  before :each do
-    @grp = tree["group_1"]
-  end
-
-  it 'should have leafs (children)' do
-    @grp.leafs["obj_1"].should eql(tree["group_1/obj_1"])
-    @grp.leafs["obj_2"].should eql(tree["group_1/obj_2"])
-  end
-
-  it 'should have [] for access entry by path' do
-    @grp["group_2/obj_3"].should eql(tree["group_1/group_2/obj_3"])
-  end
-
-  it 'should have any attrs also as leaf (Lipa::Leaf)' do
-    @grp.any_attr.should eql("any attr")
-  end
-
-  it 'should have "dir" initial method' do
-    t = Lipa::Tree.new(nil) { dir :dir_1 }
-    t["dir_1"].class.should eql(Lipa::Branch)
-  end
-
-  it 'should have "object" initial method' do
-    t = Lipa::Tree.new(nil) { group :group_1 }
-    t["group_1"].class.should eql(Lipa::Branch)
-  end
-end

data/spec/leaf_spec.rb

@@ -1,43 +0,0 @@
-require File.dirname(__FILE__) + "/spec_helper"
-
-describe Lipa::Leaf do
-  before :each do
-    @obj = tree["group_1/obj_1"]
-  end
-
-  it 'should have name' do
-    @obj.name.should eql("obj_1")
-  end
-
-  it 'should have branch (parent)' do
-    @obj.branch.should eql(tree["group_1"])
-  end
-
-  it 'should have descripted attr_1 eql 5' do
-    @obj.attr_1.should eql(5)
-  end
-
-  it 'should have descripted attr_2 eql 4' do
-    @obj.attr_2.should eql(3)
-  end
-
-  it 'should have descripted attr_3 eql sum of attr_1 and attr_2' do
-    @obj.attr_3.should eql(8)
-  end
-
-  it 'should support write access for attrs' do
-    @obj.attr_1 = 8
-    @obj.attr_1.should eql(8)
-  end
-
-  it 'should have hash access for attrs' do
-    @obj.attrs[:attr_1].should eql(8)
-    @obj.attrs[:attr_1] = 9
-    @obj.attrs[:attr_1].should eql(9)
-  end
-
-  it 'should have "object" initial method' do
-    t = Lipa::Tree.new(nil) { object :obj }
-    t["obj"].class.should eql(Lipa::Leaf)
-  end
-end