easydsl 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6f2bb1a8dbc0ece711617165a48837362dbb071
-  data.tar.gz: d30bc490e726fc53603234e473806df65d0d3c73
+  metadata.gz: 15e90cbb3aa3b31d9b1431a5a03150fcce3ee8fe
+  data.tar.gz: 22764b495dcf37ed851751466b834776d946bf9d
 SHA512:
-  metadata.gz: e99e1c93f4a53df6d15574757f72d769e1e44f0398326ec03de6c6818579d4fdc23ab0dffd375625b136b08f651207377674cb78edff21c5975a144ee5d6f61b
-  data.tar.gz: 923bfc0dc4af71e2d6dd61b6f8e8af75dbd6dd04896c9579671037377f0fd6964ae7c605fe26a08e095411e311f0e7e754674e356c6e6ed5c6b38813e58057f5
+  metadata.gz: 018ac1248ba9677c22587f3e8d97a74b747c92d8361e6c9a1581615d119e7dee001856ffee64e846bf7c3520250feb51f4fd8407ab73093ccc65aa18f7889e6b
+  data.tar.gz: 5f7fc73e69c593f80308b108eccb254e6bb96fd359ea760149f4ca0747de3822db0c9f1e834de7c56fe140d5e525fd55baa31e4408fc29e748c3e98e4ee1c2c1

data/.rubocop.yml

@@ -44,3 +44,9 @@ Rails:
 
 Metrics/ClassLength:
   Max: 150
+
+Style/AccessorMethodName:
+  Enabled: false
+
+Style/PredicateName:
+  Enabled: false

data/lib/easydsl.rb

@@ -7,6 +7,6 @@ module Easydsl
     raise(ArgumentError, 'A block is mandatory.') unless block_given?
     tree = NodeBuilder.new('root')
     tree.instance_exec(&block)
-    Node.new(tree.name, tree.args, 0, nil, tree.nodes)
+    Node.new(tree.get_name, tree.get_args, 0, nil, tree.get_nodes)
   end
 end

data/lib/easydsl/node.rb

@@ -3,66 +3,89 @@ require 'easydsl/node_array'
 
 module Easydsl
   class Node
-    attr_reader :name, :index, :parent, :singleton
-    attr_accessor :args
-
     def initialize(name, args, index, parent, node_builders = [])
       @name = name.to_s.chomp('!').to_sym
       @singleton = name[-1] == '!'
       @args = args
       @index = index
       @parent = parent
-      node_builders.each_with_index do |item, i|
-        add_child(item.name, item.args, i, self, item.nodes)
-      end
+      add_hierarchy(self, node_builders, 0)
     end
 
-    def nodes
+    def get_nodes
       @nodes ||= Hash.new { |h, k| h[k] = NodeArray.new }
     end
 
-    def all_nodes
+    def get_all_nodes
       all = []
       nodes.each { |k, _v| all += nodes[k] }
-      all.sort! { |a, b| a.index <=> b.index }
+      all.sort! { |a, b| a.get_index <=> b.get_index }
+    end
+
+    def get_name
+      @name
+    end
+
+    def get_args
+      @args
+    end
+
+    def set_args(value)
+      @args = value
     end
 
-    def max_index
-      all_nodes.map(&:index).max || 0
+    def get_max_index
+      get_all_nodes.map(&:get_index).max || 0
+    end
+
+    def get_index
+      @index
+    end
+
+    def get_parent
+      @parent
     end
 
     def define(&block)
       add_block(&block)
     end
 
+    def is_singleton?
+      @singleton
+    end
+
     protected
 
+    def nodes
+      get_nodes
+    end
+
     def add_hierarchy(to, tree, base_index)
       tree.each_with_index do |item, index|
-        to.add_child(item.name, item.args, base_index + index, to, item.nodes)
+        to.add_child(item.get_name, item.get_args, base_index + index, to, item.get_nodes)
       end
     end
 
     def add_block(&block)
       tree = NodeBuilder.new('tree')
       tree.instance_exec(&block)
-      add_hierarchy(self, tree.nodes, max_index)
+      add_hierarchy(self, tree.get_nodes, get_max_index)
     end
 
     def add_child(name, args, index, parent, node_builders = [])
       node = handle_singleton(name, args, node_builders)
       return node unless node.nil?
       node = Node.new(name, args, index, parent, node_builders)
-      nodes[node.name] << node
+      nodes[node.get_name] << node
       node
     end
 
     def handle_singleton(name, args, node_builders = [])
       return nil unless nodes.key?(name)
       node = nodes[name].first
-      return nil if node.nil? || node.singleton == false
-      node.args = args
-      add_hierarchy(node, node_builders, node.max_index)
+      return nil if node.nil? || node.is_singleton? == false
+      node.set_args(args)
+      add_hierarchy(node, node_builders, node.get_max_index)
       nodes[name].first
     end
 
@@ -79,7 +102,7 @@ module Easydsl
       child = if collection.count > 0
         collection.first
       else
-        add_child(method_symbol, args, max_index, self)
+        add_child(method_symbol, args, get_max_index, self)
       end
       child.add_block(&block)
     end
@@ -100,9 +123,9 @@ module Easydsl
     def handle_assignment(method_symbol, *args)
       collection = nodes[method_symbol]
       if collection.count > 0
-        collection.first.args = args
+        collection.first.set_args(args)
       else
-        add_child(method_symbol, args, max_index, self)
+        add_child(method_symbol, args, get_max_index, self)
       end
     end
 

data/lib/easydsl/node_builder.rb

@@ -1,11 +1,17 @@
 module Easydsl
   class NodeBuilder
-    attr_reader :name, :args
-
-    def nodes
+    def get_nodes
       @nodes ||= []
     end
 
+    def get_name
+      @name
+    end
+
+    def get_args
+      @args
+    end
+
     def initialize(name, *args)
       @name = name
       @args = args
@@ -13,7 +19,7 @@ module Easydsl
 
     def method_missing(method_symbol, *args, &block)
       child = NodeBuilder.new(method_symbol, *args)
-      nodes.push(child)
+      get_nodes.push(child)
       child.instance_exec(&block) if block_given?
     end
   end

data/lib/easydsl/version.rb

@@ -1,3 +1,3 @@
 module Easydsl
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easydsl
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Mirko Mignini
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-31 00:00:00.000000000 Z
+date: 2016-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler