uinput-keyboard 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a2456a2d30b81219abee04f64a31da51b170724
-  data.tar.gz: 9aaf462f74e3b92583babba97c48c9477bf8ae13
+  metadata.gz: 055f65c464f1c5f9310cc2d31288a1d36409830f
+  data.tar.gz: 120db4ff5630594825c319fba7d59b1108a20826
 SHA512:
-  metadata.gz: f473d72d327d7ab7db33e0fb3126b6de19390764459559e608eb583ba9226259e958f0ddef6c5eb4affae0c02e318f71229e67258e47bf4637c2afcfe8ca3e33
-  data.tar.gz: e8d8a189d12fddd315f936494e02544c94226808dd7abfda4e6b402f6eb898c0bab74c0a7e48312e27d20a6766b606ce9d243020522ed4de7968589904874253
+  metadata.gz: 0c4e5fb9a2588d4defddae092d735e266e6d153c2893b504f364f9452a5cf90addceac725883ac7979f822d27fa22fa8483d16c589131f73feb192fdf014d08a
+  data.tar.gz: 755ef4927a1d0bdb840e1d0760d04e452502ce4e9568a2898c67b45ba48185c747e41e74cba8275524010e9fb2cc713932c80cf62a447bdebf00e544556f735c

data/lib/uinput/keyboard.rb

@@ -20,21 +20,25 @@ module Uinput
     attr_accessor :keymap
 
     def press(*symbols)
-      keys = symbols_to_keys(*symbols)
-      keys.each do |key|
-        send_event(:EV_KEY, key.scan_code, 1)
+      symbols.flat_map do |symbol|
+        symbol(symbol).keys.map do |key|
+          send_event(:EV_KEY, key.scan_code, 1)
+          key.code
+        end.tap do
+          send_event(:EV_SYN, :SYN_REPORT)
+        end
       end
-      send_event(:EV_SYN, :SYN_REPORT)
-      keys.map(&:code)
     end
 
     def release(*symbols)
-      keys = symbols_to_keys(*symbols)
-      keys.each do |key|
-        send_event(:EV_KEY, key.scan_code, 0)
+      symbols.flat_map do |symbol|
+        symbol(symbol).keys.map do |key|
+          send_event(:EV_KEY, key.scan_code, 0)
+          key.code
+        end.tap do
+          send_event(:EV_SYN, :SYN_REPORT)
+        end
       end
-      send_event(:EV_SYN, :SYN_REPORT)
-      keys.map(&:code)
     end
 
     def tap(*symbols)
@@ -54,23 +58,15 @@ module Uinput
     end
 
     def symbols_to_keycodes(*names)
-      symbols_to_keys(*names).map(&:code)
-    end
-
-    def string_to_keycodes(string)
-      string_to_symbols(string).map{ |symbols| symbols_to_keycodes(*symbols) }
-    end
-
-    private
-
-    def symbols_to_keys(*names)
-      [*names].flat_map{ |name| symbol(name).keys }
+      names.map{ |name| symbol(name).keys.map(&:code) }
     end
 
     def string_to_symbols(string)
       string.chars.map{ |char| char_to_symbol(char).name }
     end
 
+    private
+
     def symbol(name)
       @keymap.symbols[name.to_sym] or raise Device::Error.new("no keysym '#{name}' in keymap")
     end

data/lib/uinput/keyboard/version.rb

@@ -1,3 +1,3 @@
 module Uinput
-  Keyboard_VERSION = "0.2"
+  Keyboard_VERSION = "0.3"
 end

data/test.rb

@@ -10,11 +10,11 @@ begin
   puts keyboard.sys_path
   puts keyboard.dev_path
 
-  puts keyboard.string_to_keycodes('DaTe!').inspect
-  puts keyboard.symbols_to_keycodes(:Shift_L, :d).inspect
+  symbols = keyboard.string_to_symbols('DaTe!')
+  puts symbols.inspect
+  puts keyboard.symbols_to_keycodes(*symbols).inspect
 
   puts keyboard.type('date').inspect
-
   puts keyboard.tap(:Return).inspect
 
   #keyboard.type('Ѣ')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uinput-keyboard
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Christopher Aue