patch 0.4.17 → 0.4.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57cdbd5fc6c84c49884f573ebc4d307c6d2da26a
-  data.tar.gz: 7920f3af576d962866a3336db4e21911128be09b
+  metadata.gz: 3bf0c19c03991900fbce579cb0a487e6e9dd99bb
+  data.tar.gz: ae5597d6bd0acc94be816b9938bd3a05a79ec047
 SHA512:
-  metadata.gz: e0e4dc8bf364aa9442a2eba2ef92ce9008fb35d71370d8478dc61210bf7b89af367a0cca3bc5971a4c18b55aa08090b768638c5f2bb67738d4b4ea983e7d4da0
-  data.tar.gz: 756b93eaef61822913acb9e178fa893fa695ac04a3b1698ff7a5e8855b8ba103ff2b8b2ac8f7f4b2397ccf98d2a83f96f34f7a0d714ed9498f0a81d7d4af0f31
+  metadata.gz: 8186c00bb4003a46ed142e005b188cf2fc2b989b9ce50a3e09c722fdd20b095602c79edcdda473c7ae854e375a3688062761151893b19033567561a3d8e00ce8
+  data.tar.gz: 2d4098b380b720c8aaabe491f9c4e9190f503abd3d6ddcba5facc30be0cf87f675722f00b3704deaffa61c94124426f7b4a444236799c2e488f160e7da04ba41

data/lib/patch.rb

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

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

@@ -64,11 +64,12 @@ module Patch
         # @param [::Patch::Message] patch_message
         # @return [::MIDIMessage::ControlChange, nil]
         def to_midi_message(action, patch_message)
-          if !action[:midi].nil?
+          unless action[:midi].nil?
             index = action[:midi][:index] || patch_message.index
             channel = action[:midi][:channel] || 0
-            value = get_midi_value_from_action(action, patch_message)
-            MIDIMessage::ControlChange.new(channel, index, value)
+            unless (value = get_midi_value_from_action(action, patch_message)).nil?
+              MIDIMessage::ControlChange.new(channel, index, value)
+            end
           end
         end
 
@@ -80,13 +81,14 @@ module Patch
         # @return [::Patch::Message, nil]
         def to_patch_message(action, index, patch_name, midi_message)
           if action[:midi][:channel].nil? || action[:midi][:channel] == midi_message.channel
-            value = get_patch_values_from_action(action, midi_message)
-            properties = {
-              :index => index,
-              :patch_name => patch_name,
-              :value => value
-            }
-            ::Patch::Message.new(properties)
+            unless (value = get_patch_values_from_action(action, midi_message)).nil?
+              properties = {
+                :index => index,
+                :patch_name => patch_name,
+                :value => value
+              }
+              ::Patch::Message.new(properties)
+            end
           end
         end
 
@@ -96,7 +98,9 @@ module Patch
         # @param [Range] to
         # @return [Fixnum]
         def get_value(value, from, to)
-          if from == to
+          if !from.member?(value) # filter out values that are out of scale
+            nil
+          elsif from == to
             value
           else
             Scale.transform(value).from(from).to(to)

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

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

data/test/config/patches.yml

@@ -23,6 +23,7 @@
       :midi:
         :channel: 0
         :index: 1
+        :scale: !ruby/range 1..127
       :osc:
         :address: /1/rotaryD
         :scale: !ruby/range 0..1.0

data/test/io/midi/message_test.rb

@@ -32,19 +32,60 @@ class Patch::IO::MIDI::MessageTest < Minitest::Test
 
     context ".to_patch_messages" do
 
-      setup do
-        @message = MIDIMessage::ControlChange.new(0, 0, 127)
-        @result = ::Patch::IO::MIDI::Message.to_patch_messages(@patches.first, @message)
+      context "not filtered" do
+
+        setup do
+          @message = MIDIMessage::ControlChange.new(0, 0, 127)
+          @result = ::Patch::IO::MIDI::Message.to_patch_messages(@patches.first, @message)
+        end
+
+        should "have correct values" do
+          refute_nil @result
+          refute_empty @result
+          message = @result.first
+
+          assert_equal ::Patch::Message, message.class
+          assert_equal 0, message.index
+          assert_equal 5, message.value
+        end
+
       end
 
-      should "have correct values" do
-        refute_nil @result
-        refute_empty @result
-        message = @result.first
+      context "filtered" do
+
+        context "pass" do
+
+          setup do
+            @message = MIDIMessage::ControlChange.new(0, 1, 127)
+            @result = ::Patch::IO::MIDI::Message.to_patch_messages(@patches.first, @message)
+          end
+
+          should "have correct values" do
+            refute_nil @result
+            refute_empty @result
+            message = @result.first
+
+            assert_equal ::Patch::Message, message.class
+            assert_equal 1, message.index
+            assert_equal 5, message.value
+          end
+
+        end
+
+        context "reject" do
+
+          setup do
+            @message = MIDIMessage::ControlChange.new(0, 1, 0)
+            @result = ::Patch::IO::MIDI::Message.to_patch_messages(@patches.first, @message)
+          end
+
+          should "have no messages" do
+            refute_nil @result
+            assert_empty @result
+          end
+
+        end
 
-        assert_equal ::Patch::Message, message.class
-        assert_equal 0, message.index
-        assert_equal 5, message.value
       end
 
     end

data/test/io/midi/output_test.rb

@@ -25,9 +25,9 @@ class Patch::IO::MIDI::OutputTest < Minitest::Test
       setup do
         @message = Patch::Message.new
         @message.index = 0
-        @message.value = 100
+        @message.value = 5
         @message.patch_name = @patch.name
-        @output.device.expects(:puts).once
+        @output.device.expects(:puts).once.with(0xB0, 0x00, 0x7F)
       end
 
       teardown do

metadata

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