midiops 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fda112a3552a1c02142d825389c00a76b1881e4
-  data.tar.gz: 7a3d4acacd618629b0260afd27588fd77a8fe354
+  metadata.gz: 085a82aad8264f698430e464c9ebd7097e3248af
+  data.tar.gz: b4442ec22eeafc92902d3c4b893e5668b5be9b49
 SHA512:
-  metadata.gz: d5e63782941ab259e5362489b0963c75b712e6704d4489ee2222104d21b71523b013b79cc3966ff12f9f31647dd89f77966345d05d2deda3c419ff9172ab91cc
-  data.tar.gz: 31c1113ce6e4da3bc4d2eaf7ad3bd7639f7ea5177e01e82f853c8741e43b5fa11aa8221a101ef1f256dcc6eb907792a9916e87be2df308af0d7a34400ffa1bcc
+  metadata.gz: eaa508783840081753f0f0d067665c140842b7eaef3b191086a0b2e6d9a5fd73752b4d14baa13c40ad46bc4366fe4012d992ec960cf70551e64f86db7114e2da
+  data.tar.gz: 437b67cab3ab35c05ec02c8aadcf29709cb7dd4eae45b241281b1b74cc1be7057e9f6e56d45f73983148fd4b1e08cdb46415504707704043334e6a10d64c70f7

data/README.md

@@ -32,11 +32,12 @@ require 'midiops'
 
 observer = MIDIOps::Observer.new
 
-observer.on_key 0, :C, 5 do
+# args: midi ch, note in string
+observer.on_key 0, 'C5' do
   puts "Ch.0.C5 pressed!"
 end
 
-observer.on_key 0, :D, 5 do |vel|
+observer.on_key 0, 'D5' do |vel|
   puts "Ch.0.C5 pressed with velocity #{vel}!"
 end
 

data/example/args.rb

@@ -0,0 +1,23 @@
+require 'midiops'
+require 'unimidi'
+
+ob = MIDIOps::Observer.new
+
+ob.on [144, 50, 127] do
+  puts "PRESS NORMAL!!!!!"
+end
+
+ob.on_key 0, 'C3' do |i|
+  puts "PRESS!!!!!: #{i}"
+end
+
+ob.on_key 0, 'C#3' do
+  puts "press c#!!!!"
+end
+
+ob.on_pitchbend 0 do |a, b|
+  puts "Pitchbend!!!: #{a}, #{b}"
+  p a, b
+end
+
+ob.listen_first

data/example/say.rb

@@ -1,7 +1,7 @@
 require 'midiops'
 require 'unimidi'
 
-ob = MIDIOps::Observer.new 3
+ob = MIDIOps::Observer.new
 
 ob.on [144, 48, 127] do
   `say Hello`

data/lib/core_ext/hash.rb

@@ -1,6 +1,9 @@
 class Hash
   def get_by_keys *keys
-    if keys.size == 1
+    case keys.size
+    when 0
+      self
+    when 1
       self[keys.first]
     else
       key = keys.shift

data/lib/midiops/handler.rb

@@ -4,55 +4,73 @@ require 'eventmachine'
 module MIDIOps
   class Handler
     module Status
-      HAS_HANDLER        = 0
-      HANDLER_INDEFINITE = 1
-      NO_HANDLERS        = 2
-    end
+      NO_HANDLERS          = 0
+
+      HAS_HANDLER          = 1 # just have handler with current @events
+      HAS_HANDLER_WITH_ARG = 2 # have handler w/ current @events but last is :ARG
 
-    def initialize worker_number
-      @handlers = {}
-      @events = []
-      @waiting_param = false
+      HANDLER_INDEFINITE   = 3
+      WAITING_ARG          = 4 # HANDLER_INDEFINITE but current event is :ARG
     end
 
-    def push_job job
+    def initialize
+      @handlers     = {}
+      @events       = [] # pool for events not processed
+      @handler_args = [] # args to pass to handler method
     end
 
     def add event, handler
       @handlers.set_by_keys event, handler
     end
 
-    def has_handler?
-      if @handlers.keys?(*@events).nil?
-        Status::NO_HANDLERS
+    def status
+      if @handlers.get_by_keys(*@events).is_a? Proc
+        Status::HAS_HANDLER
+      elsif @handlers.get_by_keys(*(@events.take(@events.size - 1)), :ARG).is_a? Proc
+        Status::HAS_HANDLER_WITH_ARG
+      elsif @handlers.get_by_keys(*(@events.take(@events.size - 1)), :ARG).is_a? Hash
+        Status::WAITING_ARG
       elsif @handlers.get_by_keys(*@events).is_a? Hash
-        @waiting_param = true unless @handlers.get_by_keys(*@events)[:ARG].nil?
         Status::HANDLER_INDEFINITE
+      elsif @handlers.get_by_keys(*@events).nil?
+        Status::NO_HANDLERS
       else
-        Status::HAS_HANDLER
+        raise RuntimeError, "Invalid handler status: #{self.inspect}"
       end
     end
 
+    def defer handler, args=[]
+      EM.defer(Proc.new { handler.call(*args) }) unless handler.nil?
+    end
+
+    def clear_state
+      @events.clear
+      @handler_args.clear
+    end
+
     def handle event
-      if @waiting_param
-        prc = @handlers.get_by_keys(*@events)[:ARG]
-        EM.defer(Proc.new { prc.call(event) })
+      @events << event
 
-        @events.clear
-        @waiting_param = false
-      else
-        @events << event
-
-        case has_handler?
-        when Status::HAS_HANDLER
-          EM.defer(@handlers.get_by_keys(*@events)) unless @handlers.get_by_keys(*@events).nil?
-
-          @events.clear
-        when Status::NO_HANDLERS
-          @events.clear
-        when Status::HANDLER_INDEFINITE
-          # do nothing
-        end
+      case status
+      when Status::HAS_HANDLER
+        defer @handlers.get_by_keys(*@events, event), @handler_args
+        clear_state
+      when Status::HAS_HANDLER_WITH_ARG
+        @handler_args << event
+        @events.pop
+        @events << :ARG
+        defer(
+          @handlers.get_by_keys(*@events),
+          @handler_args.dup
+        )
+        clear_state
+      when Status::WAITING_ARG
+        @handler_args << event
+        @events.pop
+        @events << :ARG
+      when Status::NO_HANDLERS
+        clear_state
+      when Status::HANDLER_INDEFINITE
       end
     end
   end

data/lib/midiops/observer.rb

@@ -6,8 +6,8 @@ require 'unimidi'
 
 module MIDIOps
   class Observer
-    def initialize(worker_number = 1)
-      @handler = Handler.new worker_number
+    def initialize
+      @handler = Handler.new
     end
 
     def on event, &handler
@@ -23,10 +23,14 @@ module MIDIOps
     end
     alias_method :on_key, :on_key_press
 
-    def on_key_release ch, key, octave, &handler
+    def on_key_release ch, note_string, &handler
       @handler.add [128+ch, MIDIOps::Note.note_to_code(note_string), :ARG], handler
     end
 
+    def on_pitchbend ch, &handler
+      @handler.add [224+ch, :ARG, :ARG], handler
+    end
+
     def listen input
       EM.run do
         loop do

data/lib/midiops/version.rb

@@ -1,3 +1,3 @@
 module MIDIOps
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: midiops
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - polamjag
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-16 00:00:00.000000000 Z
+date: 2015-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unimidi
@@ -112,6 +112,7 @@ files:
 - bin/console
 - bin/setup
 - circle.yml
+- example/args.rb
 - example/notify-send.rb
 - example/say.rb
 - lib/core_ext/hash.rb