midiops 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a04bb045250e64a5cdd25dbdabad651413c01862
-  data.tar.gz: ab08124e7aaa484815c30e58ed5b98249494d680
+  metadata.gz: c863cc841a88dc2ba892df7a86cd3c8d7eef9f6f
+  data.tar.gz: bec221cd5ffb9874547dabb2418f81565141df4b
 SHA512:
-  metadata.gz: 99ddb03ea77b0b26722fdb03371c13b940e3f8711aeee9b7b721778fb9fe74877db00bd00e6b02efabfa5a0fbe29da31130e4ab64ba5a6789dd09f6de9918ae4
-  data.tar.gz: 3c75d2e29a474e7eb60bfecb72077e9cffadcaa4d3e081ab128498aada75e3a79183cd35814e5afb984f9004b1f085a905254092325292a2e76da35dcd353514
+  metadata.gz: da6ff6e7f9533fc5c1540b47c4a8d507e02e114975836cb8b640329556a48a6fb0116d3d9285651cb55dd6a03537026a9f67957a327f850392b78c78ff228325
+  data.tar.gz: d8062bdbbd76083eb7a4ee9e7a12f8c067a16e4893b36c13b166dbd75407f17e0750cfc2adcf00df373e9019e97a519991b8ac318f64e82c442e28822bf623b7

data/README.md

@@ -1,8 +1,9 @@
 # MIDIOps
 
 [![Gem Version](https://badge.fury.io/rb/midiops.svg)](https://rubygems.org/gems/midiops)
+[![Circle CI](https://circleci.com/gh/polamjag/midiops.svg?style=svg)](https://circleci.com/gh/polamjag/midiops)
 
-MIDI Operator. Heavily inspired by [this blog entry](http://hitode909.hatenablog.com/entry/2015/07/28/134304) and [hitode909/sketch-midi](https://github.com/hitode909/sketch-midi).
+MIDI Operations. Heavily inspired by [this blog entry](http://hitode909.hatenablog.com/entry/2015/07/28/134304) and [hitode909/sketch-midi](https://github.com/hitode909/sketch-midi).
 
 ## Installation
 
@@ -27,28 +28,22 @@ Or install it yourself as:
 This is a super simple example:
 
 ```ruby
-require 'unimidi'
+require 'midiops'
 
 observer = MIDIOps::Observer.new
 
-observer.on [144, 72, 127] do
+observer.on_key 0, :C, 5 do
   puts "Ch.0.C5 pressed!"
 end
 
+observer.on_key 0, :D, 5 do |vel|
+  puts "Ch.0.C5 pressed with velocity #{vel}!"
+end
+
 observer.listen_first
 ```
 
-Execute and press C5 key on your midi device.
-
-Optionally, you can set number of worker thread for massive parallelism like this:
-
-```ruby
-require 'unimidi'
-
-observer = MIDIOps::Observer.new 3 # three workers
-
-# ...
-```
+Connect some MIDI keyboard and execute the script, then press key C5 or D5 on your midi device. Hooray!
 
 See `/examples` for more materials.
 

data/circle.yml

@@ -0,0 +1,3 @@
+dependencies:
+  pre:
+    - gem install bundler --pre

data/lib/midiops/handler.rb

@@ -1,4 +1,5 @@
 require 'core_ext/hash'
+require 'eventmachine'
 
 module MIDIOps
   class Handler
@@ -11,41 +12,47 @@ module MIDIOps
     def initialize worker_number
       @handlers = {}
       @events = []
-      @q = Queue.new
-      @worker = Array.new worker_number do |i|
-        Thread.start do
-          while res = @q.pop
-            res.call
-          end
-        end
-      end
+      @waiting_param = false
+    end
+
+    def push_job job
     end
 
     def add event, handler
       @handlers.set_by_keys event, handler
     end
 
-    def has_handler? events
-      if @handlers.keys?(*events)
-        unless @handlers.get_by_keys(*events).is_a? Hash
-          Status::HAS_HANDLER
-        else
-          Status::HANDLER_INDEFINITE
-        end
-      else
+    def has_handler?
+      if @handlers.keys?(*@events).nil?
         Status::NO_HANDLERS
+      elsif @handlers.get_by_keys(*@events).is_a? Hash
+        @waiting_param = true unless @handlers.get_by_keys(*@events)[:ARG].nil?
+        Status::HANDLER_INDEFINITE
+      else
+        Status::HAS_HANDLER
       end
     end
 
     def handle event
-      @events << event
+      if @waiting_param
+        prc = @handlers.get_by_keys(*@events)[:ARG]
+        EM.defer(Proc.new { prc.call(event) })
 
-      case has_handler?(@events)
-      when Status::HAS_HANDLER
-        @q.push @handlers.get_by_keys(*@events)
-        @events.clear
-      when Status::NO_HANDLERS
         @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
       end
     end
   end

data/lib/midiops/note.rb

@@ -0,0 +1,40 @@
+module MIDIOps
+  module Note
+    KEY_OFFSETS = {
+      C: 0,
+
+      Csharp: 1,
+      Dflat: 1,
+
+      D: 2,
+
+      Dsharp: 3,
+      Eflat: 3,
+
+      E: 4,
+
+      F: 5,
+
+      Fsharp: 6,
+      Gflat: 6,
+
+      G: 7,
+
+      Gsharp: 8,
+      Aflat: 8,
+
+      A: 9,
+
+      Asharp: 10,
+      Bflat: 10,
+
+      B: 11
+    }
+
+    class << self
+      def key_to_code key, octave
+        KEY_OFFSETS[key] + 12 + (12 * octave)
+      end
+    end
+  end
+end

data/lib/midiops/observer.rb

@@ -1,4 +1,7 @@
 require 'midiops/handler'
+require 'midiops/note'
+require 'eventmachine'
+
 require 'unimidi'
 
 module MIDIOps
@@ -11,11 +14,26 @@ module MIDIOps
       @handler.add event, handler
     end
 
+    def on_cc ch, number, &handler
+      @handler.add [176+ch, number, :ARG], handler
+    end
+
+    def on_key_press ch, key, octave, &handler
+      @handler.add [144+ch, MIDIOps::Note.key_to_code(key, octave), :ARG], handler
+    end
+    alias_method :on_key, :on_key_press
+
+    def on_key_release ch, key, octave, &handler
+      @handler.add [128+ch, MIDIOps::Note.key_to_code(key, octave), :ARG], handler
+    end
+
     def listen input
-      loop do
-        input.gets.each do |events|
-          events[:data].each do |ev|
-            @handler.handle ev
+      EM.run do
+        loop do
+          input.gets.each do |events|
+            events[:data].each do |ev|
+              @handler.handle ev
+            end
           end
         end
       end

data/lib/midiops/version.rb

@@ -1,3 +1,3 @@
-module Midiops
-  VERSION = "0.1.1"
+module MIDIOps
+  VERSION = "0.2.0"
 end

data/lib/midiops.rb

@@ -1,6 +1,6 @@
 require "midiops/version"
 require "midiops/observer"
 
-module Midiops
+module MIDIOps
   # Your code goes here...
 end

data/midiops.gemspec

@@ -5,7 +5,7 @@ require 'midiops/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "midiops"
-  spec.version       = Midiops::VERSION
+  spec.version       = MIDIOps::VERSION
   spec.authors       = ["polamjag"]
   spec.email         = ["s@polamjag.info"]
 
@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "unimidi"
+  spec.add_dependency "eventmachine"
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: midiops
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - polamjag
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-02 00:00:00.000000000 Z
+date: 2015-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unimidi
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -97,11 +111,13 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- circle.yml
 - example/notify-send.rb
 - example/say.rb
 - lib/core_ext/hash.rb
 - lib/midiops.rb
 - lib/midiops/handler.rb
+- lib/midiops/note.rb
 - lib/midiops/observer.rb
 - lib/midiops/version.rb
 - midiops.gemspec