lipa 0.2.1 → 0.2.2

data/NEWS.md

@@ -1,6 +1,11 @@
+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::Node class. Now is working:
+- Fixed bug in Lipa::Bunch class. Now is working:
 
   ```Ruby
   t = Lipa::Tree.new("1") do

data/lib/lipa/kind.rb

@@ -39,6 +39,19 @@ module Lipa
   #
   #   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
+      end
+    end
+
   end
 end
 

data/lib/lipa/node.rb

@@ -46,7 +46,6 @@ module Lipa
 
     def initialize(name, attrs = {}, &block)
       @attrs = {} 
-      @attrs[:name] = name.to_s
 
       #init attrs from template
       if attrs[:kind]
@@ -55,6 +54,7 @@ module Lipa
       end
 
       @attrs.merge! attrs
+      @attrs[:name] = name.to_s
       instance_eval &block if block_given?
     end
 
@@ -67,7 +67,7 @@ module Lipa
 
             val = @attrs[name]
             if val.class == Proc
-              val.call
+              instance_eval &(val)
             else
               val
             end
@@ -150,7 +150,12 @@ module Lipa
       if init_class
         args[1] ||= {}
         args[1][:parent] = parent 
-        parent.attrs[:children][args[0].to_sym] = init_class.send(:new, *args, &block )
+        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 )
       else  
         nil
       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.1"
+  VERSION = "0.2.2"
 end

data/spec/kind_spec.rb

@@ -2,15 +2,24 @@ require File.dirname(__FILE__) + "/spec_helper"
 
 describe Lipa::Kind do
   it 'should create brunch from template' do 
-    tree["group_3/obj_y"].attr_1.should eql("from_kind")
+    tree.group_3.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_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
+
+  it 'should create node with your name' do
+    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

@@ -23,6 +23,8 @@ describe Lipa::Node do
 
   it 'should have descripted attr_3 eql sum of attr_1 and attr_2' do
     @node.attr_3.should eql(8)
+    @node.attr_2 = 10
+    @node.attr_3.should eql(15)
   end
 
   it 'should support write access for attrs' do

data/spec/spec_helper.rb

@@ -6,7 +6,7 @@ TREE ||= Lipa::Tree.new "lipa" do
 
       node :obj_1, :attr_1 => 5 do
         attr_2 3
-        attr_3 lambda{attr_1 + attr_2}
+        attr_3 Proc.new{attr_1 + attr_2}
 
         node :obj_2 
         node :obj_3 
@@ -21,15 +21,18 @@ TREE ||= Lipa::Tree.new "lipa" do
 
     # Template
     kind :kind_group do 
-      node :obj_x
-      node :obj_y 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lipa
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-19 00:00:00.000000000Z
+date: 2011-10-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &9989380 !ruby/object:Gem::Requirement
+  requirement: &11366740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9989380
+  version_requirements: *11366740
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &9988620 !ruby/object:Gem::Requirement
+  requirement: &11366060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9988620
+  version_requirements: *11366060
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &9987980 !ruby/object:Gem::Requirement
+  requirement: &11362040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9987980
+  version_requirements: *11362040
 description: 
 email: atimin@gmail.com
 executables: []