csdl 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86d840515b02e9204cf62b918aa6e66d938ee28c
-  data.tar.gz: 13214717542d540b965100afedcd272860b0f6ea
+  metadata.gz: 0d619a1a1247aa90f4208236515b2e9babf7a2fe
+  data.tar.gz: 23668650182608ad4b8824552164a821ad82d1d8
 SHA512:
-  metadata.gz: 0ba7deed00875ae83ce82c63f94aef32c44c6c2c3f5159238763ec76f924325a662bcfef4d3bdaf66b3c34911750bbded0ab33540343b988f5f7d2243264e1be
-  data.tar.gz: cac413670a0cbe3df8f6504e5f8d0059b3fdcb40ab28bf4241ac95c574e2a8151f51c3d454d783d1131d47eab6bbd4ab8b9496621907646c156a47a8ac85b2a3
+  metadata.gz: 8024a4518a67bb92ed703301f0cbd97bedc9080cabc106a3ab740fdb7904cd2bbe9c7e257b02587d5ff4da691759aaad3467219b2cd41ec5a140092703e5dc31
+  data.tar.gz: 9ddee6b21793b7b3df25664ade3ef3f6260a4b055ed708d8ea88187ae08b063685261d954386f0910d6b62fb72f88632efea3134d0832ce53dcecc0744f9ee91

data/lib/csdl/interaction_filter_processor.rb

@@ -50,7 +50,7 @@ module CSDL
     # @return [String] The processed :statement_scope child node, prepended by the "return" keyword.
     #
     def on_return(node)
-      statement_scope = node.children.find { |child| child.type == :statement_scope }
+      statement_scope = node.children.compact.find { |child| child.type == :statement_scope }
 
       if statement_scope.nil?
         fail ::CSDL::MissingReturnStatementScopeError, "Invalid CSDL AST: return statment scope is missing"
@@ -74,7 +74,7 @@ module CSDL
     # @see #on_tag
     #
     def on_statement_scope(node)
-      "{" + process_all(node.children).join(" ") + "}"
+      "{" + process_all(node.children.compact).join(" ") + "}"
     end
 
     # Process :tag node with it's child nodes :tag_namespaces (optional), :tag_class, and :statement_scope.
@@ -107,9 +107,10 @@ module CSDL
     # @raise [MissingTagStatementScopeError] When we don't have a first-level :statement_scope child.
     #
     def on_tag(node)
-      tag_namespaces       = node.children.find { |child| child.type == :tag_namespaces }
-      tag_class       = node.children.find { |child| child.type == :tag_class }
-      statement_scope = node.children.find { |child| child.type == :statement_scope }
+      children = node.children.compact
+      tag_namespaces  = children.find { |child| child.type == :tag_namespaces }
+      tag_class       = children.find { |child| child.type == :tag_class }
+      statement_scope = children.find { |child| child.type == :statement_scope }
 
       if tag_class.nil?
         fail ::CSDL::MissingTagClassError, "Invalid CSDL AST: :tag node must have a :tag_class child node"
@@ -168,7 +169,7 @@ module CSDL
     # @raise [MissingTagNodesError] When there aren't any first-level :tag_namespace child nodes.
     #
     def on_tag_namespaces(node)
-      child_tag_namespaces = node.children.select { |child| child.type == :tag_namespace }
+      child_tag_namespaces = node.children.compact.select { |child| child.type == :tag_namespace }
 
       if child_tag_namespaces.empty?
         fail ::CSDL::MissingTagNodesError, "Invalid CSDL AST: A :tag_namespaces node must have at least one :tag_namespace child"

data/lib/csdl/version.rb

@@ -1,3 +1,3 @@
 module CSDL
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csdl
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - BJ Neilsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-10 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast