maxy-gen 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5207d413af11f892c06645d4a52eb920dc9fdb131bea13311d13285754609b33
-  data.tar.gz: 2fb7405ad16c771c903a0eb6af81947bb577aa528ccf70d62c24a98c6e7a29a1
+  metadata.gz: 2df80188bc19f248b46a0ad7662c2420c71947d3bf33c145a799b175ecbf4da1
+  data.tar.gz: 6dbc80719b431ba5e282328d4c51a6c2e97e53ff9d094ae67286d2c3dd08ebed
 SHA512:
-  metadata.gz: 4ccd516764930052b407fcf3c2bc4cea320292e9f980eda73cc9e7cf5a1d43ba72a682826e8600a7dad82cef54c7d603127ced8e27b4ae5739cd7f35ad3f6787
-  data.tar.gz: 3fa95ba2e3289e5ef500d3d86c4b030e241886880124053822b08f1a43dacf9e166bf655609b01598dbb2c7c1a78d1917b31c87cf4a47aa2c187433dd472eedf
+  metadata.gz: f145c3e6f1bb9f842cbb325a992aea9d0fde4bbf4eba243e6fadb004b6e5d83f10b60fadc7f2843cb0226e57fded36fdadeb29de1085d92b856df6fdf8ca6f0b
+  data.tar.gz: 20be68f4c03f1f008f03f41da605a56d4ed2385403f9c295355948976d33f78d7d5e6dc5f0eac384563ad17d1149a1177ce482aa679650418d7cf0a9093898f9

data/Gemfile.lock

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

data/README.md

@@ -2,7 +2,7 @@
 
 A commandline tool to generate max patches in an emmet-like fashion
 
-![](https://s3.eu-central-1.amazonaws.com/maxy-gen/maxygen-demo.gif)
+![](https://s3.eu-central-1.amazonaws.com/maxy-gen/maxygen-demo-v0.3.0.gif)
 
 ## Installation
 
@@ -28,7 +28,7 @@ Note: This is totally untested on Windows!
 
 Use an [emmet](https://emmet.io/)-like pattern to generate a max patch, e.g.
 
-    $ maxy-gen generate 'cycle~{440.}-*~{0.2}-ezdac~' > test.maxpat
+    $ maxy-gen generate 'inlet-(\-{3.14}-print)+(trigger{b}-(outlet+print))' > complex_grouping.maxpat
     
 (or shorter, `maxy-gen g ...`)
         
@@ -38,6 +38,8 @@ As of now you can use
 
 - `-` dashes to indicate patch chords 
 - `{}` curly braces to denote arguments passed to objects
+- `+` to denote sibling objects
+- `(...)` to group objects together (see demo above)
 
 A couple of objects need escaping (with `\`), because some characters are taken, obviously. These are:
 
@@ -67,4 +69,4 @@ Please include:
 ## Support
 This is a pure side project and depends on your support!
 
-If you'd like to support the development of `maxy-gen` and my other projects, take a look at [https://www.patreon.com/znibbles](https://www.patreon.com/znibbles)
+If you'd like to support the development of `maxy-gen` and my other projects, take a look at [https://www.patreon.com/znibbles](https://www.patreon.com/znibbles)

data/lib/maxy/gen/generator.rb

@@ -35,10 +35,14 @@ module Maxy
         @patch['patcher']['boxes'] << make_box(node, id)
         @object_count += 1
 
-        node.child_nodes.each do |child_node|
+        node.child_nodes.each_with_index do |child_node, index|
           child_id = "obj_#{@object_count}"
           generate_node(child_node, child_id)
-          @patch['patcher']['lines'] << make_line(id, child_id)
+          if node.flags.include? :connect_children_individually
+            @patch['patcher']['lines'] << make_line(id, child_id, index, 0)
+          else
+            @patch['patcher']['lines'] << make_line(id, child_id)
+          end
         end
       end
 
@@ -46,15 +50,19 @@ module Maxy
         box = @library[:objects][node.name].dup
         box['id'] = id
         box['patching_rect'] = [OFFSET_X + (node.x_rank - 1) * STEP_X, OFFSET_Y + (node.y_rank - 1) * STEP_Y, box['width'] || WIDTH, box['height'] || HEIGHT]
-        unless box['text'].nil?
-          box['text'] += " #{node.args}"
-        end
+        box['text'] += " #{node.args}" unless box['text'].nil?
 
         box
       end
 
-      def make_line(parent_id, child_id)
-        { patchline: { destination: [child_id, 0], source: [parent_id, 0]} }
+      def make_line(parent_id, child_id, parent_outlet = 0, child_inlet = 0)
+        {
+          patchline:
+          {
+            destination: [child_id, child_inlet],
+            source: [parent_id, parent_outlet]
+          }
+        }
       end
 
       def align_tree(node, x_rank = 1, y_rank = 1)
@@ -71,6 +79,5 @@ module Maxy
         node
       end
     end
-
   end
-end
+end

data/lib/maxy/gen/parser.rb

@@ -18,6 +18,7 @@ module Maxy
         else
           parse_begin_group parent_node
           child_node = parse_identifier parent_node
+          parse_equals child_node
           parse_dash child_node
         end
 
@@ -92,9 +93,21 @@ module Maxy
           parse(obj_node)
         end
       end
+
+      def parse_equals(obj_node)
+        if peek(:equals)
+          consume(:equals)
+          obj_node.flags << :connect_children_individually
+          parse(obj_node)
+        end
+      end
     end
 
-    ObjectNode = Struct.new(:name, :args, :child_nodes, :x_rank, :y_rank)
+    ObjectNode = Struct.new(:name, :args, :child_nodes, :x_rank, :y_rank, :flags) do
+      def initialize(name, args, child_nodes, x_rank=0, y_rank=0, flags=[])
+        super
+      end
+    end
     RootNode = Struct.new(:child_nodes)
 
   end

data/lib/maxy/gen/tokenizer.rb

@@ -3,11 +3,12 @@ module Maxy
     class Tokenizer
       TOKEN_TYPES = [
           [:arguments, /({[^{}]*})/],
-          [:escaped_identifier, /(\\[\S][^-+{}()\\]*)(?=[-+*{}])?/],
-          [:identifier, /([^-+{}()\\]+)(?=[-+*{}])?/],
+          [:escaped_identifier, /(\\[\S][^-+={}()\\]*)(?=[-+=*{}])?/],
+          [:identifier, /([^-+={}()\\]+)(?=[-+=*{}])?/],
           [:oparen, /(\()/],
           [:cparen, /(\))/],
           [:plus, /(\+)/],
+          [:equals, /(=)/],
           [:dash, /(-)/]
       ]
 

data/lib/maxy/gen/version.rb

@@ -1,5 +1,5 @@
 module Maxy
   module Gen
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

metadata

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