hotkeys 0.1.0 → 0.1.1

data/README.md

@@ -9,7 +9,8 @@ A simple gem which allows you to bind global hot keys with macruby
 Usage example:
 `macruby examples/simple.rb`
 
-      require File.dirname(__FILE__) + '/lib/hotkeys'
+      require 'rubygems'
+      require 'hotkeys'
 
       # Delegate method called when the app finished loading
       def applicationDidFinishLaunching(notification)

data/lib/hotkeys/support/keys.rb

@@ -43,9 +43,9 @@ class HotKeys
         keyModifiers = HotKeys::Support::Keys::Mappings.select {|key, value| key =~ /Key$/ }
         keyCodes     = HotKeys::Support::Keys::Mappings.select {|key, value| !(key =~ /Key$/) }
 
-        keyModifiersRegexPart = keyModifiers.map {|key, value| key.gsub(/Key$/, "")}.join("|")
+        keyModifiersRegexPart = keyModifiers.map {|key, value| key.gsub(/Key$/, "")}.sort_by {|x| x.length}.reverse.join("|")
         keyModifiers          = keyModifiers.map {|key, value| {key.gsub(/Key$/, "").to_s.downcase => value}}.inject({}) {|retval,hash| retval.merge(hash) }
-        keyCodesRegexPart     = keyCodes.map     {|key, value| key                 }.join("|")
+        keyCodesRegexPart     = keyCodes.map     {|key, value| key                 }.sort_by {|x| x.length}.reverse.join("|")
         keyCodes              = keyCodes.map     {|key, value| {key.to_s.downcase => value}}.inject({}) {|retval,hash| retval.merge(hash) }
 
         keyRegexString = "(#{keyCodesRegexPart})[\+]?(#{keyModifiersRegexPart})?[\+]?(#{keyModifiersRegexPart})?[\+]?(#{keyModifiersRegexPart})?"

data/lib/hotkeys/version.rb

@@ -22,7 +22,7 @@ class Hotkeys
   module Version
     MAJOR = 0
     MINOR = 1
-    PATCH = 0
+    PATCH = 1
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

metadata

@@ -2,7 +2,7 @@
 name: hotkeys
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Rob Lowe