lipa 0.2.0 → 0.2.1

data/NEWS.md

@@ -1,3 +1,19 @@
+2011-10-19 Release-0.2.1
+
+- Fixed bug in Lipa::Node class. Now is working:
+
+  ```Ruby
+  t = Lipa::Tree.new("1") do
+    kind :some_kind, :for => :node
+
+    with :attr_1 => 999 do 
+      some_kind :obj_1
+    end
+  end
+  ```
+
+- Refactoring. Added method Node#init_node for making cnildren nodes
+
 2011-10-17 Release-0.2.0
 ------------------------
 - New clear API with one general class ```Lipa::Node```. Classes ```Lipa::Leaf``` and ```Lipa::Branch``` 

data/lib/lipa/bunch.rb

@@ -40,19 +40,14 @@ module Lipa
     def initialize(parent, attrs = {}, &block)
       @attrs = attrs
       @parent = parent
-      @parent.attrs[:children] ||= {}
 
       instance_eval &block if block_given?
     end
 
     def method_missing(name, *args, &block)
-      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][:parent] = @parent
-        @parent.attrs[:children][args[0].to_sym] = init_class.send(:new, *args, &block )
-      else
+      args[1] ||= {}
+      args[1] = @attrs.merge(args[1])
+      unless Node.add_node(name, @parent, *args, &block)
         super
       end
     end

data/lib/lipa/node.rb

@@ -59,25 +59,7 @@ module Lipa
     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
+      unless Node.add_node(name, self, *args, &block)
         case args.size
           when 0
             child = @attrs[:children][name]
@@ -145,6 +127,35 @@ module Lipa
       end
     end
 
+    # Making children node
+    #
+    # @param [String] name of initial method or kind
+    # @param [Node] parent node
+    # @param args of node
+    # @param block for node
+    def self.add_node(name, parent, *args, &block)
+      parent.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
+        args[1] ||= {}
+        args[1][:parent] = parent 
+        parent.attrs[:children][args[0].to_sym] = init_class.send(:new, *args, &block )
+      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"

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.0"
+  VERSION = "0.2.1"
 end

data/spec/bunch_spec.rb

@@ -19,4 +19,17 @@ describe Lipa::Bunch do
     end
     t["obj_1"].attr_1.should eql(999)
   end
+
+  it 'should work with kinds' do
+    t = Lipa::Tree.new("1") do
+      kind :some_kind, :for => :node
+
+      with :attr_1 => 999 do 
+        some_kind :obj_1
+      end
+    end
+    t["obj_1"].attr_1.should eql(999)
+  end
+
+
 end

metadata

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