midiops 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c863cc841a88dc2ba892df7a86cd3c8d7eef9f6f
-  data.tar.gz: bec221cd5ffb9874547dabb2418f81565141df4b
+  metadata.gz: 7fda112a3552a1c02142d825389c00a76b1881e4
+  data.tar.gz: 7a3d4acacd618629b0260afd27588fd77a8fe354
 SHA512:
-  metadata.gz: da6ff6e7f9533fc5c1540b47c4a8d507e02e114975836cb8b640329556a48a6fb0116d3d9285651cb55dd6a03537026a9f67957a327f850392b78c78ff228325
-  data.tar.gz: d8062bdbbd76083eb7a4ee9e7a12f8c067a16e4893b36c13b166dbd75407f17e0750cfc2adcf00df373e9019e97a519991b8ac318f64e82c442e28822bf623b7
+  metadata.gz: d5e63782941ab259e5362489b0963c75b712e6704d4489ee2222104d21b71523b013b79cc3966ff12f9f31647dd89f77966345d05d2deda3c419ff9172ab91cc
+  data.tar.gz: 31c1113ce6e4da3bc4d2eaf7ad3bd7639f7ea5177e01e82f853c8741e43b5fa11aa8221a101ef1f256dcc6eb907792a9916e87be2df308af0d7a34400ffa1bcc

data/lib/midiops.rb

@@ -2,5 +2,4 @@ require "midiops/version"
 require "midiops/observer"
 
 module MIDIOps
-  # Your code goes here...
 end

data/lib/midiops/note.rb

@@ -35,6 +35,29 @@ module MIDIOps
       def key_to_code key, octave
         KEY_OFFSETS[key] + 12 + (12 * octave)
       end
+
+      def parse_note note
+        # formats to accept: "C3" / "B-1" / "C#4" (sharp) / "Db5" (flat)
+
+        case note
+        when /^([A-Ga-g])(-?[0-9]{1,2})$/
+          m = $~.captures
+          {key: m[0].upcase.to_sym, octave: m[1].to_i}
+        when /^([CDFGAcdfga])\#(-?[0-9]{1,2})$/
+          m = $~.captures
+          {key: "#{m[0].upcase}sharp".to_sym, octave: m[1].to_i}
+        when /^([DEGABdegab])b(-?[0-9]{1,2})$/
+          m = $~.captures
+          {key: "#{m[0].upcase}flat".to_sym, octave: m[1].to_i}
+        else
+          raise RuntimeError, "Invalid note format: #{note}"
+        end
+      end
+
+      def note_to_code note
+        res = parse_note note
+        key_to_code res[:key], res[:octave]
+      end
     end
   end
 end

data/lib/midiops/observer.rb

@@ -18,13 +18,13 @@ module MIDIOps
       @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
+    def on_key_press ch, note_string, &handler
+      @handler.add [144+ch, MIDIOps::Note.note_to_code(note_string), :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
+      @handler.add [128+ch, MIDIOps::Note.note_to_code(note_string), :ARG], handler
     end
 
     def listen input

data/lib/midiops/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: midiops
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - polamjag