maxy-gen 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0846a45c99b150ce94e07414b151a92c39ecee5a1dc90579b8397aeb1610df4f'
-  data.tar.gz: 352e1f3a822491a204f507b16bf3547109fcd1e15c4e37c1c0c7ab95abec1e7a
+  metadata.gz: ddf1d556c1b563928dac5451b7e431034ab0265f1599a6f075c2fbe9cea47777
+  data.tar.gz: 29b360138505a3700dc6a38abc8ac989673a0bb0a42c18484733eccfe994b1eb
 SHA512:
-  metadata.gz: eda407e64ce5503509f480eee9de4fc1f763ed26942ccdfa6f5911d78aa03623d886ab59c8b8f86d24a1719877b316c334da8eeebef0784546a8c2236dd7ce1d
-  data.tar.gz: c5526a8d487134714b16cdd79b659fddda3bc22f6a26dc35852c3194216ea0d18693e79f8df1ba0cadd78edf1ace5ef8ff6965ba169604647e71235cc49e91ae
+  metadata.gz: 5930cfb96c88d5deb47e186f685dbb3cb113609cca68d4fae099e2a6ac854a21c12e41467eae434cb1523f0378554a6d5bef1a625c282b39ed341c0cf7833bb5
+  data.tar.gz: 3e55e67c6e5b0c246c4edb0be123f57cbf6b5c6fd0ace130cf4b67f0b68328576e9e6e4b88079e9fa306b3d62da7e1d8605a6a9fad23fd13880b92aca9b6b799

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    maxy-gen (0.2.0)
+    maxy-gen (0.2.2)
       nokogiri
       thor
 

data/lib/maxy/gen/generator.rb

@@ -4,9 +4,9 @@ require 'psych'
 module Maxy
   module Gen
     class Generator
-      TEMPLATE = Psych.load_file(File.join(__dir__, '../../../assets/blank.yml')).freeze
       OFFSET_X = 20
       OFFSET_Y = 20
+      STEP_X = 70
       STEP_Y = 40
       HEIGHT = 22
       WIDTH = 50
@@ -17,13 +17,14 @@ module Maxy
         raise RuntimeError.new('No object definitions were found. please run `maxy-gen install` first') unless File.exist?("#{ENV['HOME']}/.maxy-gen/library.yml")
 
         @object_count = 1
-        @patch = TEMPLATE.freeze
+        @patch = Psych.load_file(File.join(__dir__, '../../../assets/blank.yml')).freeze
         @library = Psych.load_file("#{ENV['HOME']}/.maxy-gen/library.yml").freeze
       end
 
       def generate(node)
         return JSON.generate(@patch) if node.nil?
 
+        node = align_tree(node)
         generate_node(node, "obj_#{@object_count}")
         JSON.generate(@patch)
       end
@@ -37,12 +38,13 @@ module Maxy
           generate_node(child_node, child_id)
           @patch['patcher']['lines'] << make_line(id, child_id)
         end
+
       end
 
       def make_box(node, id)
         box = @library[:objects][node.name]
         box['id'] = id
-        box['patching_rect'] = [OFFSET_X, OFFSET_Y + @object_count * STEP_Y, box['width'] || WIDTH, box['height'] || HEIGHT]
+        box['patching_rect'] = [OFFSET_X + node.x_rank * STEP_X, OFFSET_Y + node.y_rank * STEP_Y, box['width'] || WIDTH, box['height'] || HEIGHT]
         unless box['text'].nil?
           box['text'] += " #{node.args}"
         end
@@ -53,15 +55,23 @@ module Maxy
       def make_line(parent_id, child_id)
         { patchline: { destination: [child_id, 0], source: [parent_id, 0]} }
       end
+
+      def align_tree(node, x_rank = 1, y_rank = 1)
+        node.x_rank = x_rank
+        node.y_rank = y_rank
+
+        y_rank += 1
+
+        node.child_nodes.each do |child|
+          align_tree(child, x_rank, y_rank)
+          x_rank += 1
+        end
+
+        node
+      end
     end
     #
-    # Box = Struct.new( :id,
-    #                   :maxclass,
-    #                   :numinlets,
-    #                   :numoutlets,
-    #                   :outlettype,
-    #                   :patching_rect,
-    #                   :style,
-    #                   :text)
+    # Box = Struct.new( :id, :node, :x_rank, :y_rank)
+
   end
 end

data/lib/maxy/gen/parser.rb

@@ -15,36 +15,26 @@ module Maxy
       def parse_obj(obj_node=nil)
         return if @tokens.length == 0
 
-        if peek(:identifier)
-          obj_name = consume(:identifier).value
-        else
-          if peek(:escaped_identifier)
-            obj_name = consume(:escaped_identifier).value
-          end
-        end
+        obj_name = parse_identifier
 
-        raise RuntimeError.new("Could not find #{obj_name} in object definitions.") if @library[:objects][obj_name].nil?
-
-        arguments = ''
-        if peek(:arguments)
-          arguments = parse_arguments
-        end
+        arguments = parse_arguments || ''
 
         new_obj_node = ObjectNode.new(obj_name, arguments, [])
         obj_node.child_nodes << new_obj_node unless obj_node.nil?
 
-        if peek(:dash)
-          consume(:dash)
-          parse_obj(new_obj_node)
-        end
+        parse_plus(obj_node)
+
+        parse_dash(new_obj_node)
 
         new_obj_node
       end
 
       def parse_arguments
-        args = consume(:arguments)
-        args.value =~ /\A{([^{}]*)}\Z/
-        $1
+        if peek(:arguments)
+          args = consume(:arguments)
+          args.value =~ /\A{([^{}]*)}\Z/
+          $1
+        end
       end
 
       def consume(expected_type)
@@ -59,8 +49,42 @@ module Maxy
       def peek(expected_type)
         @tokens.length > 0 && @tokens.fetch(0).type == expected_type
       end
+
+      def parse_identifier
+        if peek(:identifier)
+          obj_name = consume(:identifier).value
+        else
+          if peek(:escaped_identifier)
+            obj_name = consume(:escaped_identifier).value
+          end
+        end
+        raise RuntimeError.new("Could not find #{obj_name} in object definitions.") if @library[:objects][obj_name].nil?
+
+        obj_name
+      end
+
+      def parse_plus(obj_node)
+        if peek(:plus)
+          consume(:plus)
+          sibling_obj_name = parse_identifier
+          sibling_args = parse_arguments || ''
+          sibling_obj_node = ObjectNode.new(sibling_obj_name, sibling_args, [])
+          obj_node.child_nodes << sibling_obj_node
+
+          parse_plus(obj_node)
+
+          parse_dash(sibling_obj_node)
+        end
+      end
+
+      def parse_dash(obj_node)
+        if peek(:dash)
+          consume(:dash)
+          parse_obj(obj_node)
+        end
+      end
     end
 
-    ObjectNode = Struct.new(:name, :args, :child_nodes)
+    ObjectNode = Struct.new(:name, :args, :child_nodes, :x_rank, :y_rank)
   end
 end

data/lib/maxy/gen/tokenizer.rb

@@ -5,6 +5,7 @@ module Maxy
           [:arguments, /({[^{}]*})/],
           [:escaped_identifier, /(\\[\S][^-+{}()\\]+)(?=[-+*{}])?/],
           [:identifier, /([^-+{}()\\]+)(?=[-+*{}])?/],
+          [:plus, /(\+)/],
           [:dash, /(-)/]
       ]
 

data/lib/maxy/gen/version.rb

@@ -1,5 +1,5 @@
 module Maxy
   module Gen
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maxy-gen
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Julian Rubisch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-05 00:00:00.000000000 Z
+date: 2018-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler