patch 0.4.16 → 0.4.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cd3946117fb996ae07fa615cf94829cdcb468ab
-  data.tar.gz: b3e66f89dac3bfdd964ab87d2ad762dfb4f0cb4a
+  metadata.gz: 57cdbd5fc6c84c49884f573ebc4d307c6d2da26a
+  data.tar.gz: 7920f3af576d962866a3336db4e21911128be09b
 SHA512:
-  metadata.gz: e8ff22748c79b1f1f06807180c4612496235641ff494eac18ec0121e36242e06a160147bef510c8e7b3d0addd246831d4fca69142575b2e32f688913b504e07f
-  data.tar.gz: af543eee31a85c35e59d797ee6c4d60cb869b46b624d1a5c940dd57d12a31888a48ae0a8c1f16c47fa7771d03171f435743a1759590e84884d8578635e15807c
+  metadata.gz: e0e4dc8bf364aa9442a2eba2ef92ce9008fb35d71370d8478dc61210bf7b89af367a0cca3bc5971a4c18b55aa08090b768638c5f2bb67738d4b4ea983e7d4da0
+  data.tar.gz: 756b93eaef61822913acb9e178fa893fa695ac04a3b1698ff7a5e8855b8ba103ff2b8b2ac8f7f4b2397ccf98d2a83f96f34f7a0d714ed9498f0a81d7d4af0f31

data/lib/patch/io/midi/output.rb

@@ -26,7 +26,10 @@ module Patch
         def puts(patch, patch_messages)
           patch_messages = [patch_messages].flatten
           messages = ::Patch::IO::MIDI::Message.to_midi_messages(patch, patch_messages)
-          @device.puts(messages) unless messages.empty?
+          unless messages.empty?
+            bytes = messages.map(&:to_a)
+            @device.puts(*bytes)
+          end
           messages
         end
 

data/lib/patch.rb

@@ -37,6 +37,6 @@ require "patch/em_patch"
 
 module Patch
 
-  VERSION = "0.4.16"
+  VERSION = "0.4.17"
 
 end

data/test/config/nodes.yml

@@ -8,6 +8,10 @@
     :direction: input
     :name: Apple Inc. IAC Driver
   - :id: 3
+    :type: midi
+    :direction: output
+    :name: Apple Inc. IAC Driver
+  - :id: 4
     :type: osc
     :server:
       :port: 8000

data/test/config/patches.yml

@@ -1,7 +1,7 @@
 :patches:
   :test_patch:
     :node_map:
-      [2, 3]: 1
+      [2, 4]: [1, 3]
     :actions:
     - :name: Zoom
       :key: zoom
@@ -20,6 +20,9 @@
       :default:
         :scale: !ruby/range 0..5.0
         :value: 0.5
+      :midi:
+        :channel: 0
+        :index: 1
       :osc:
         :address: /1/rotaryD
         :scale: !ruby/range 0..1.0
@@ -29,6 +32,9 @@
       :default:
         :scale: !ruby/range 0..2.0
         :value: 1
+      :midi:
+        :channel: 0
+        :index: 2
       :osc:
         :address: /faderM
         :scale:
@@ -39,6 +45,9 @@
       :default:
         :scale: !ruby/range 0..1000
         :value: 200
+      :midi:
+        :channel: 0
+        :index: 3
       :osc:
         :address: /1/faderA
         :scale:

data/test/node/map_test.rb

@@ -1,6 +1,7 @@
 require "helper"
 
 class Patch::Node::MapTest < Minitest::Test
+  include Mocha::ParameterMatchers
 
   context "Map" do
 
@@ -34,14 +35,20 @@ class Patch::Node::MapTest < Minitest::Test
         refute_empty @nodes
         assert [Patch::IO::MIDI::Input, Patch::IO::OSC::Server, Patch::IO::Websocket::Node].all? { |klass| @nodes.map(&:class).include?(klass) }
         ::Patch::Thread.expects(:new).times(@nodes.count)
+        refute_empty @maps
         @maps.each do |map|
-          map.to.expects(:puts).at_least_once.with(@patch, @patch.default_messages)
+          refute_empty map.to.nodes
+          map.to.nodes.each do |node|
+            #node.expects(:puts).at_least_once.with(is_a(Patch::Patch), is_a(Array))
+          end
         end
       end
 
       teardown do
         ::Patch::Thread.unstub(:new)
-        @maps.each { |map| map.to.unstub(:puts) }
+        @maps.each do |map|
+          map.to.nodes.each { |node| node.unstub(:puts) }
+        end
       end
 
       should "create node start threads" do

data/test/patch_test.rb

@@ -36,10 +36,10 @@ class Patch::PatchTest < Minitest::Test
 
       setup do
         @patch = @patches.first
-        @messages = @patch.default_messages
         @actions_with_default = @patch.actions.select do |action|
           !action[:default].nil? && !action[:default][:value].nil?
         end
+        @messages = @patch.default_messages
       end
 
       should "populate messages from defaults" do
@@ -56,9 +56,12 @@ class Patch::PatchTest < Minitest::Test
     context "#enable" do
 
       setup do
-        Patch::IO::MIDI::Input.any_instance.expects(:listen).once
-        Patch::IO::OSC::Server.any_instance.expects(:listen).once
-        Patch::IO::Websocket::Node.any_instance.expects(:listen).once
+        @patch = @patches.first
+        outputs = @patch.maps.map(&:to).map(&:nodes).flatten
+        @num_outputs = outputs.count
+        Patch::IO::MIDI::Input.any_instance.expects(:listen).times(@num_outputs)
+        Patch::IO::OSC::Server.any_instance.expects(:listen).times(@num_outputs)
+        Patch::IO::Websocket::Node.any_instance.expects(:listen).times(@num_outputs)
       end
 
       teardown do
@@ -68,7 +71,7 @@ class Patch::PatchTest < Minitest::Test
       end
 
       should "map nodes together" do
-        assert @patches.first.enable
+        assert @patch.enable
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: patch
 version: !ruby/object:Gem::Version
-  version: 0.4.16
+  version: 0.4.17
 platform: ruby
 authors:
 - Ari Russo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-07 00:00:00.000000000 Z
+date: 2015-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest