visualize_ruby 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6655cbb07b2f7220d53af06fbe613c97ca457360f36d9fbbc03bb8fa409fdcf6
-  data.tar.gz: f28064b42af7819dec8e73266e902217b399cbec08552c02ace05c311d8080fa
+  metadata.gz: 065c1db111e1a4716755a68ff69bce287b3192d4939f86cd2913d67ff8aaa0ad
+  data.tar.gz: 3440f90a823b7fe3c4a1b236f39948a237ecc645ca0e86fcf7cf5b82ea78d864
 SHA512:
-  metadata.gz: 21021c4540db60df784411e44e360268fb52ceb3f097407053597a089a783bd72af4ed64c188e4069921807797637eca87f508a0c9a4ebf7a644585313880725
-  data.tar.gz: 9b7c47fb8d402cb7b3c01a4604dfd3327e7355c326f38ab68f7da3c25db6ee3f6b9b72dca465fc95c94297b54096c9c51304bfb1c02918a16ef310bc9270c511
+  metadata.gz: 8179f8b332606875a3fde94e873abee27aa5eb3edb68a3d210a9eef522ba6431013d83be06d77061a31f58eca6d032404d67529b8537c96e9898f8cff6d8d0c3
+  data.tar.gz: be6299a6bbcf6f6e61e552f050a78ee8710190b4eb4afcbdf0a329bea2ef320cb33aa67ce4b27ed6db0c7532c68f724ae50346f05e1a3ed65da27ecb4754070a

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 0.8.0 - 2018-07-17
+### Enhancement
+* Better handle conditions outside of if statements.
+
 ## 0.7.0 - 2018-07-17
 ### Fix
 * Ruby types like Hash and Array causing error. Now render as code.

data/lib/visualize_ruby/parser/and.rb

@@ -1,12 +1,13 @@
 module VisualizeRuby
   class Parser
     class And < Base
+      include Conditions
       # @return [Array<VisualizeRuby::Node>, Array<VisualizeRuby::Edge>]
       def parse
         last_node = nil
         edges     = []
         nodes     = @ast.children.reverse.map do |c|
-          node = Node.new(name: c.children.last, type: :decision)
+          node = set_conditions(c).first
           edges << Edge.new(name: "AND", nodes: [node, last_node]) if last_node
           last_node = node
           node

data/lib/visualize_ruby/parser/conditions.rb

@@ -0,0 +1,13 @@
+module VisualizeRuby
+  class Parser
+    module Conditions
+      def set_conditions(condition)
+        condition_nodes, condition_edges = Parser.new(ast: condition).parse
+        condition_nodes.first.type       = :decision
+        nodes.concat(condition_nodes)
+        edges.concat(condition_edges)
+        condition_nodes
+      end
+    end
+  end
+end

data/lib/visualize_ruby/parser/if.rb

@@ -1,6 +1,7 @@
 module VisualizeRuby
   class Parser
     class If < Base
+      include Conditions
       # @return [Array<VisualizeRuby::Node>, Array<VisualizeRuby::Edge>]
       def parse
         break_ast
@@ -27,14 +28,6 @@ module VisualizeRuby
 
       private
 
-      def set_conditions(condition)
-        condition_nodes, condition_edges = Parser.new(ast: condition).parse
-        condition_nodes.first.type       = :decision
-        nodes.concat(condition_nodes)
-        edges.concat(condition_edges)
-        condition_nodes
-      end
-
       attr_reader :condition, :on_true, :on_false
 
       def break_ast

data/lib/visualize_ruby/parser/or.rb

@@ -1,15 +1,14 @@
 module VisualizeRuby
   class Parser
     class Or < Base
-
+      include Conditions
       # @return [Array<VisualizeRuby::Node>, Array<VisualizeRuby::Edge>]
       def parse
         last_node = nil
         @ast.children.reverse.map do |c|
-          node = Node.new(name: AstHelper.new(c).description, type: :decision)
+          node = set_conditions(c).first
           edges << Edge.new(name: "OR", nodes: [node, last_node]) if last_node
           last_node = node
-          nodes << node
         end
         return nodes.reverse, edges
       end

data/lib/visualize_ruby/parser.rb

@@ -1,4 +1,5 @@
 require "parser/current"
+require_relative "parser/conditions"
 require_relative "parser/base"
 require_relative "parser/or"
 require_relative "parser/and"

data/lib/visualize_ruby/version.rb

@@ -1,3 +1,3 @@
 module VisualizeRuby
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: visualize_ruby
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Dustin Zeisler
@@ -139,6 +139,7 @@ files:
 - lib/visualize_ruby/parser/begin.rb
 - lib/visualize_ruby/parser/block.rb
 - lib/visualize_ruby/parser/case.rb
+- lib/visualize_ruby/parser/conditions.rb
 - lib/visualize_ruby/parser/false.rb
 - lib/visualize_ruby/parser/if.rb
 - lib/visualize_ruby/parser/or.rb