micromidi 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d899af108dba8fc0eb7b830cdc53ecf65f8a9946
-  data.tar.gz: 947eb84dfbba8084a55359b460effd7da0bfa881
+  metadata.gz: 34add3c5d0d82e3fe9ac1ea773a574d8f29b43ca
+  data.tar.gz: 77bb91ec4695c2aeea7cfa4b589d1cdef3864d6a
 SHA512:
-  metadata.gz: 738e6469b03feff4fdf5f64027ca32f2d6341c18f0f2767b0dcc810b265c16cf4290fc13ac862ec0eeedc339ef43d6379ba590c93612fccce2d68e15450a697e
-  data.tar.gz: c9b87df40f972394d975d23d3ba35de7b8bf145efce20857504f069d02857e4c53401ce9358a7e88d1b401c09d1d536734a7f5efc84360db143ad0c4430586a4
+  metadata.gz: 330ba95c70c88f7a493a2df2a9ac06877aebb500173dc19761c2aa07fc82f356566f5098b28fd2672bb82e0a31161e0bace2df950b9b97483c2c74996461fe60
+  data.tar.gz: b4ec59d0664aa536713fedfa736edcda4536ff54ac73b5224ad6f1d44b6caa6bcf75eab420adf9f73029887514fdec4d75a113a3bd4c9980a9c46b02beca94b4

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2011-2014 Ari Russo
+Copyright 2011-2015 Ari Russo
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/README.md

@@ -5,7 +5,7 @@ A Ruby DSL for MIDI
 ![micromidi](http://img855.imageshack.us/img855/9804/midi.png)
 
 ## Features
- 
+
 * Cross-platform compatible using MRI or JRuby.
 * Simplified MIDI and Sysex message output
 * MIDI Thru, processing and custom input events
@@ -30,17 +30,17 @@ require "midi"
 
 @input = UniMIDI::Input.gets
 @output = UniMIDI::Output.gets
-  
+
 MIDI.using(@output) do
-    
+
   5.times do |oct|
     octave oct
-    %w{C E G B}.each { |n| play n 0.5 }
+    %w{C E G B}.each { |n| play n, 0.5 }
   end
 
 end
 ```
-    
+
 This next example filters outs notes if their octave is between 1 and 3.  All other messages are sent thru.  
 
 Output is also printed to the console by passing `$stdout` as though it's a MIDI device
@@ -66,26 +66,26 @@ M(@input, @output) do
 
 end
 ```
-  
+
 Finally, here is an example that maps some MIDI Control Change messages to SysEx
-  
+
 ```ruby
 MIDI.using(@input, @output) do
-  
+
   *@the_map =
     [0x40, 0x7F, 0x00],
     [0x41, 0x7F, 0x00],
     [0x42, 0x7F, 0x00]
-  
+
   node :roland, :model_id => 0x42, :device_id => 0x10
-  
+
   receive :cc do |message|
-    
+
     command @the_map[message.index - 1], message.value
-      
+
   end
-  
-end 
+
+end
 ```
 
 Here are a few posts explaining each of the concepts used here in greater detail:
@@ -96,7 +96,7 @@ Here are a few posts explaining each of the concepts used here in greater detail
 * [Shorthand](http://tx81z.blogspot.com/2011/08/micromidi-shorthand.html)
 * [Sysex](http://tx81z.blogspot.com/2011/09/generating-sysex-messages-with.html)
 * [Etc](http://tx81z.blogspot.com/2011/09/more-micromidi-tricks.html)
- 
+
 ## Documentation
 
 * [rdoc](http://rubydoc.info/github/arirusso/micromidi)
@@ -109,4 +109,4 @@ Here are a few posts explaining each of the concepts used here in greater detail
 
 Apache 2.0, See the file LICENSE
 
-Copyright (c) 2011-2014 Ari Russo
+Copyright (c) 2011-2015 Ari Russo

data/lib/micromidi.rb

@@ -1,9 +1,8 @@
 #
 # MicroMIDI
-#
 # A Ruby DSL for MIDI
 #
-# (c)2011-2014 Ari Russo
+# (c)2011-2015 Ari Russo
 # Apache 2.0 License
 #
 
@@ -34,7 +33,14 @@ require "micromidi/instructions/shorthand"
 
 module MicroMIDI
 
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 
 end
+
 MIDI = MicroMIDI
+
+# Shortcuts to UniMIDI modules
+module MIDI
+  Input = UniMIDI::Input
+  Output = UniMIDI::Output
+end

data/lib/micromidi/context.rb

@@ -19,12 +19,12 @@ module MicroMIDI
 
       @instructions = {
         :process => Instructions::Process.new(@state),
-        :input => Instructions::Input.new(@state),
         :message => Instructions::Message.new(@state),
         :output => Instructions::Output.new(@state),
         :sticky => Instructions::Sticky.new(@state),
         :sysex => Instructions::SysEx.new(@state)
       }
+      @instructions[:input] = Instructions::Input.new(@state) { |message| @instructions[:output].output(message) }
 
       edit(&block) if block_given?
     end

data/lib/micromidi/instructions/input.rb

@@ -6,8 +6,10 @@ module MicroMIDI
     class Input
 
       # @param [State] state
-      def initialize(state)
+      # @param [Proc] thru_action Output module to send thru messages to
+      def initialize(state, &thru_action)
         @state = state
+        @thru_action = thru_action
       end
 
       # Bind an event that will be fired when a message is received
@@ -58,7 +60,7 @@ module MicroMIDI
       # @return [Boolean]
       def thru_if(*args)
         receive_options = thru_arguments(args)
-        receive(*receive_options) { |message, timestamp| output(message) }
+        receive(*receive_options) { |message, timestamp| @thru_action.call(message) }
         true
       end
 
@@ -67,7 +69,7 @@ module MicroMIDI
       # @return [Boolean]
       def thru_unless(*args)
         receive_options = thru_arguments(args)
-        receive_unless(*receive_options) { |message, timestamp| output(message) }
+        receive_unless(*receive_options) { |message, timestamp| @thru_action.call(message) }
       end
 
       # Similar to Input#thru_unless except a callback can be passed that will be fired when notes specified arrive

data/lib/micromidi/instructions/shorthand.rb

@@ -14,6 +14,7 @@ module MicroMIDI
   module Instructions
 
     module Composite
+      alias_method :console, :p # move Kernel#p
       alias_method :p, :play
       alias_method :q!, :all_off
       alias_method :x, :all_off

data/test/context_test.rb

@@ -20,6 +20,16 @@ class ContextTest < Minitest::Test
     assert_equal(0, msg.channel)
   end
 
+  def test_exception
+    msg = nil
+    m = MIDI::IO.new
+    assert_raises(ArgumentError) do
+      m.edit do
+        msg = m.note
+      end
+    end
+  end
+
   def test_edit
     msg = nil
     m = MIDI::IO.new

data/test/helper.rb

@@ -2,6 +2,7 @@ dir = File.dirname(File.expand_path(__FILE__))
 $LOAD_PATH.unshift dir + "/../lib"
 
 require "minitest/autorun"
+require "shoulda-context"
 require "midi"
 
 module TestHelper

data/test/module_test.rb

@@ -0,0 +1,19 @@
+require "helper"
+
+class ModuleTest < Minitest::Test
+
+  context "MIDI" do
+
+    should "have MIDI module" do
+      refute_nil MIDI
+      assert_equal MicroMIDI, MIDI
+    end
+
+    should "add UniMIDI modules" do
+      assert_equal UniMIDI::Input, MIDI::Input
+      assert_equal UniMIDI::Output, MIDI::Output
+    end
+
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: micromidi
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Ari Russo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-03 00:00:00.000000000 Z
+date: 2015-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -199,6 +199,7 @@ files:
 - test/helper.rb
 - test/input_test.rb
 - test/message_test.rb
+- test/module_test.rb
 - test/output_test.rb
 - test/state_test.rb
 - test/sticky_test.rb