csdl 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a90262fd16ee8936dd0fe2de172ca90a443603f6
-  data.tar.gz: 89cb93fa4bdcb617dbd066edc004bde34f33c1af
+  metadata.gz: 135ecbcd588b93734289488616a6da8e47933dc3
+  data.tar.gz: 21e8f7d9fa247a9aecaae66c710cc0a85c07608f
 SHA512:
-  metadata.gz: 485e7164255da714fb1d5bc59e4a9d01b7568e6a58acb5c6b865d85bcef56063cc4c904482482e45c9bdbcb82fab90f097a99fbc2778f2b2b8b46c49c041f494
-  data.tar.gz: 55d987844a46743cc6013402225279458aa33419ea38b38e5226ea1ea665debff6124f8671030d76df24236f4d506e8f16fef13129c63ecc5470159a48b7530b
+  metadata.gz: 7d8499b0904fa8ce5da292cb8f9704407235549e4fd8052105883dce5a59bd3fcf067a82cbc77ca286b6fd25751139b6f610fc0ade7b0725c234601a52f363c8
+  data.tar.gz: 7977cd29e77bc3e548a7019df211b063e218cf345d7ed4f3ce1dcde20f31be29b74422d851ae811156a808f144f4279d459e89f0533328f842601b76ccbe794f

data/lib/csdl/builder.rb

@@ -39,7 +39,14 @@ module CSDL
     # @see #logical_group
     #
     def _and(&block)
-      s(:and, *__one_or_more_child_nodes(&block))
+      children = __one_or_more_child_nodes(&block)
+      if children.empty?
+        nil
+      elsif children.size == 1
+        children.first
+      else
+        s(:and, *children)
+      end
     end
 
     # Negate a condition. Analogous to {#condition} with NOT prepended to the condition.
@@ -89,7 +96,14 @@ module CSDL
     # @see #logical_group
     #
     def _or(&block)
-      s(:or, *__one_or_more_child_nodes(&block))
+      children = __one_or_more_child_nodes(&block)
+      if children.empty?
+        nil
+      elsif children.size == 1
+        children.first
+      else
+        s(:or, *children)
+      end
     end
 
     # Wrap child nodes in a return statement scope.
@@ -215,10 +229,13 @@ module CSDL
     # @see #_or
     #
     def logical_group(logical_operator = nil, &block)
+      children = __one_or_more_child_nodes(&block)
+      return nil if children.empty?
+
       if logical_operator.nil?
-        s(:logical_group, *__one_or_more_child_nodes(&block))
+        s(:logical_group, *children)
       else
-        s(:logical_group, s(logical_operator, *__one_or_more_child_nodes(&block)))
+        s(:logical_group, s(logical_operator, *children))
       end
     end
 
@@ -251,7 +268,12 @@ module CSDL
     # @see #tag_tree
     #
     def root(&block)
-      s(:root, *__one_or_more_child_nodes(&block))
+      children = __one_or_more_child_nodes(&block)
+      if children.empty?
+        nil
+      else
+        s(:root, *children)
+      end
     end
 
     # Wrap child nodes in braces. @note Generally not useful on its own, see {#_return}, {#tag}, or {#tag_tree} usage.
@@ -274,7 +296,12 @@ module CSDL
     # @see #tag_tree
     #
     def statement_scope(&block)
-      s(:statement_scope, *__one_or_more_child_nodes(&block))
+      children = __one_or_more_child_nodes(&block)
+      if children.empty?
+        nil
+      else
+        s(:statement_scope, *children)
+      end
     end
 
     # Wrap child nodes in a VEDO tag classification.
@@ -340,7 +367,7 @@ module CSDL
 
     def __one_or_more_child_nodes(&block)
       children = instance_eval(&block)
-      [ children ].flatten
+      [ children ].flatten.compact
     end
 
   end

data/lib/csdl/version.rb

@@ -1,3 +1,3 @@
 module CSDL
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csdl
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - BJ Neilsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-17 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast