fusuma 3.11.1 → 3.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '064986ef807ceb1aa5ce1d021cdaf8931e44a1099fe8b72cd6aee283bc7ccf3a'
-  data.tar.gz: 31d80cdd2c54c1f12a4e55005c4393ae4c3683ed0a0c3a4e506090cc2c0f4f73
+  metadata.gz: d715f3ca82e4571ad3c23547a0e6d1d833327c225b40db7337b14b38fd10d024
+  data.tar.gz: 414ed1c453e221a0e01524212627c945564643af054d81c8022436929ce0964a
 SHA512:
-  metadata.gz: f27789347f194611db15b63f8cd8f04c47e3737ad2349950ab2a9210612f76a96f166c50a136bd2e4e22cce8dd9e640f89a7f8be19f2c282b4a071650cc26af1
-  data.tar.gz: 86d0e0bac6c527e7453f4495bde1e58b4b74942b3670ee313d1a7f0323c7a4f9e5ed44c33f64614357ff8b38bbf9e265e074abbd6ce5915925233e3c7f3adc01
+  metadata.gz: 01f4fcec30760030cadc3d746d8c5c2423940493f610505d7ab6ceadb79751f845181f559b5c3924c80c8c272d773ba9ca56a9c9be5230e18e7b393b829b681d
+  data.tar.gz: 21db3821c594aca2aa3b8e881ea5288bec8e5447ed0b0e75a1a060a17fb4b0ab5cab8aa7489cc9d295fd212ec84f5dd4a489f4f45ad8439dc334459fa95b2574

data/README.md

@@ -9,7 +9,7 @@ Fusuma is a powerful tool designed to enable multitouch gesture recognition on L
 
 ## Features
 
-- **Easy Installation**: Quick generate via RubyGems.
+- **Easy Installation**: Easy to install via RubyGems.
 - **Flexible Configuration**: Customize gestures and actions freely in YAML file format.
 - **Sensitivity Settings**: Fine-tune gesture recognition with adjustable thresholds and intervals to suit your preferences and enhance precision.
 - **Extension through Plugins**: A [plugin system](https://github.com/iberianpig/fusuma/#fusuma-plugins) allows for additional functionality as needed.
@@ -32,7 +32,7 @@ Then, You apply the change with no logout or reboot.
 newgrp input
 ```
 
-**IMPORTANT**: This makes `/dev/input/` readable, so if that's an issue for you for some reason (like for privacy- or securityconcerns etc. or if it causes other parts of your OS to misbehave), **consider this your heads-up.** 
+**IMPORTANT**: This makes `/dev/input/` readable, so if that's an issue for you for some reason (like for privacy- or security concerns etc. or if it causes other parts of your OS to misbehave), **consider this your heads-up.** 
 
 <details>
 <summary>For Debian Based Distros (Ubuntu, Debian, Mint, Pop!_OS)</summary>
@@ -109,7 +109,7 @@ For sending shortcuts:
 ```sh
 sudo pacman -Syu xdotool
 ```
-**For the truly lazy people:** As with pretty much anything else available as Open-Source-Software, you can install Fusuma via a package from the AUR. As off time of writing (March 2023), the package you would want is called `ruby-fusuma`.
+**For the truly lazy people:** As with pretty much anything else available as Open-Source-Software, you can install Fusuma via a package from the AUR. The package you would want is called `ruby-fusuma`.
 
 Please keep in mind that this community-built package is NOT officially supported here and while it might do the job, it is not the intended way to install.
 Installing Fusuma this way means that if things do not work as intended during or after the installation, you are on your own.
@@ -428,8 +428,8 @@ Fusuma plugins are provided with the `fusuma-plugin-XXXXX` naming convention and
 ### Installation of Fusuma plugins
 
 ```sh
-# install fusuma-plugin-XXXX
-sudo gem install fusuma-plugin-XXXXX`
+# install fusuma-plugin-XXXXX
+sudo gem install fusuma-plugin-XXXXX
 ```
 ```sh
 # update

data/bin/console

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'bundler/setup'
-require 'fusuma'
+require "bundler/setup"
+require "fusuma"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,9 +10,9 @@ require 'fusuma'
 # (If you use this, don't forget to add pry to your Gemfile!)
 
 def reload!(print = true)
-  puts 'Reloading ...' if print
+  puts "Reloading ..." if print
   # Main project directory.
-  root_dir = File.expand_path('..', __dir__)
+  root_dir = File.expand_path("..", __dir__)
   # Directories within the project that should be reloaded.
   reload_dirs = %w[lib]
   # Loop through and reload every file in all relevant project directories.

data/exe/fusuma

@@ -1,47 +1,47 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'optparse'
-require_relative '../lib/fusuma'
+require "optparse"
+require_relative "../lib/fusuma"
 
 option = {}
 opt = OptionParser.new
 
-opt.on('-c', '--config=path/to/file',
-       'Use an alternative config file') do |v|
+opt.on("-c", "--config=path/to/file",
+  "Use an alternative config file") do |v|
   option[:config_path] = v
 end
 
-opt.on('-d', '--daemon',
-       'Daemonize process') do |v|
+opt.on("-d", "--daemon",
+  "Daemonize process") do |v|
   option[:daemon] = v
 end
 
-opt.on('-l', '--list-devices',
-       'List available devices') do |v|
+opt.on("-l", "--list-devices",
+  "List available devices") do |v|
   option[:list] = v
 end
 
-opt.on('--log=path/to/file',
-       'Print logs to file') do |v|
+opt.on("--log=path/to/file",
+  "Print logs to file") do |v|
   option[:log_filepath] = v
 end
 
-opt.on('--show-config', 'Show config as YAML format which is loaded internally') do |v|
+opt.on("--show-config", "Show config as YAML format which is loaded internally") do |v|
   option[:show_config] = v
 end
 
 opt.on('--device="Device name"',
-       'Open the given device only (DEPRECATED)') do |v|
+  "Open the given device only (DEPRECATED)") do |v|
   option[:device] = v
 end
 
-opt.on('-v', '--verbose',
-       'Show details about the results of running fusuma') do |v|
+opt.on("-v", "--verbose",
+  "Show details about the results of running fusuma") do |v|
   option[:verbose] = v
 end
 
-opt.on('--version', 'Show fusuma version') do |v|
+opt.on("--version", "Show fusuma version") do |v|
   option[:version] = v
 end
 

data/lib/fusuma/config/context_matcher.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Fusuma
+  class Config
+    # Matches context conditions for configuration lookup.
+    # Supports AND (multiple keys) and OR (array values) conditions.
+    class ContextMatcher
+      class << self
+        # Check if config context matches request context.
+        # @param config_context [Hash, nil] context defined in YAML config
+        # @param request_context [Hash, nil] context from runtime
+        # @return [Boolean] true if matched
+        #: (Hash[untyped, untyped]?, Hash[untyped, untyped]?) -> bool
+        def match?(config_context, request_context)
+          return true if config_context.nil? || config_context.empty?
+          return false if request_context.nil? || request_context.empty?
+
+          config_context.all? do |key, expected_value|
+            match_value?(expected_value, request_context[key])
+          end
+        end
+
+        private
+
+        # @param expected [Object] expected value (single or array for OR)
+        # @param actual [Object] actual value from request context
+        # @return [Boolean] true if matched
+        #: (untyped, untyped) -> bool
+        def match_value?(expected, actual)
+          case expected
+          when Array
+            if actual.is_a?(Array)
+              expected == actual # exact match when both are arrays
+            else
+              expected.include?(actual) # OR condition
+            end
+          else
+            expected == actual
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fusuma/config/index.rb

@@ -45,6 +45,8 @@ module Fusuma
           @symbol = case symbol_word
           when Integer, Symbol
             symbol_word
+          when /\A[1-9]\d*\z/
+            symbol_word.to_i
           else
             symbol_word.to_sym
           end

data/lib/fusuma/config/searcher.rb

@@ -19,29 +19,37 @@ module Fusuma
       def search(index, location:)
         key = index.keys.first
         return location if key.nil?
-
         return nil if location.nil?
-
         return nil unless location.is_a?(Hash)
 
-        next_index = Index.new(Array(index.keys[1..-1]))
+        next_index = Index.new(index.keys.drop(1))
 
-        value = nil
-        next_location_cadidates(location, key).find do |next_location|
-          value = search(next_index, location: next_location)
+        next_location_cadidates(location, key).each do |next_location|
+          result = search(next_index, location: next_location)
+          return result if result
         end
-        value
+        nil
       end
 
       #: (Fusuma::Config::Index, location: Array[untyped], context: Hash[untyped, untyped] | nil) -> untyped
       def search_with_context(index, location:, context:)
         return nil if location.nil?
 
-        return search(index, location: location[0]) if context == {}
+        # When context is nil or empty, search in no-context config blocks
+        if context.nil? || context == {}
+          no_context_conf = location.find { |conf| conf[:context].nil? }
+          return no_context_conf ? search(index, location: no_context_conf) : nil
+        end
 
+        # When context is specified, search only in context-having config blocks
         value = nil
-        location.find do |conf|
-          value = search(index, location: conf) if conf[:context] == context
+        location.each do |conf|
+          next if conf[:context].nil? # skip no-context blocks
+
+          if ContextMatcher.match?(conf[:context], context)
+            value = search(index, location: conf)
+            break if value
+          end
         end
         value
       end
@@ -77,7 +85,7 @@ module Fusuma
       def next_location_cadidates(location, key)
         [
           location[key.symbol],
-          key.skippable && location
+          key.skippable ? location : nil
         ].compact
       end
 
@@ -103,12 +111,11 @@ module Fusuma
         #: (Hash[untyped, untyped], ?Array[untyped]) { () -> untyped } -> Hash[untyped, untyped]?
         def find_context(request_context, fallbacks = CONTEXT_SEARCH_ORDER, &block)
           # Search in blocks in the following order.
-          # 1. primary context(no context)
-          # 2. complete match config[:context] == request_context
-          # 3. partial match config[:context] =~ request_context
-          # no_context?(&block) ||
-          #   complete_match_context(request_context, &block) ||
-          #   partial_match_context(request_context, &block)
+          # 1. no_context: primary context (no context specified)
+          # 2. complete_match_context: config[:context] matches request_context
+          #    - Supports OR condition (array values)
+          #    - Supports AND condition (multiple keys)
+          # 3. partial_match_context: config[:context] partially matches request_context
           fallbacks.find do |method|
             result = send(method, request_context, &block)
             return result if result
@@ -125,14 +132,15 @@ module Fusuma
           {} if with_context({}, &block)
         end
 
-        # Complete match request context
+        # Match config context with request context using ContextMatcher.
+        # Supports OR condition (array values) and AND condition (multiple keys).
         # @param request_context [Hash]
         # @return [Hash] matched context
         # @return [NilClass] if not matched
         #: (Hash[untyped, untyped]) { () -> untyped } -> Hash[untyped, untyped]?
         def complete_match_context(request_context, &block)
           Config.instance.keymap.each do |config|
-            next unless config[:context] == request_context
+            next unless ContextMatcher.match?(config[:context], request_context)
             return config[:context] if with_context(config[:context], &block)
           end
           nil

data/lib/fusuma/config.rb

@@ -3,6 +3,7 @@
 require_relative "multi_logger"
 require_relative "config/index"
 require_relative "config/searcher"
+require_relative "config/context_matcher"
 require_relative "config/yaml_duplication_checker"
 require_relative "plugin/manager"
 require_relative "hash_support"

data/lib/fusuma/plugin/detectors/detector.rb

@@ -8,6 +8,7 @@ module Fusuma
     module Detectors
       # Inherite this base
       class Detector < Base
+        #: (String) -> String
         def self.type(tag_name)
           tag_name.gsub("_detector", "")
         end

data/lib/fusuma/plugin/inputs/timer_input.rb

@@ -9,6 +9,7 @@ module Fusuma
       # libinput commands wrapper
       class TimerInput < Input
         include Singleton
+
         DEFAULT_INTERVAL = 5
         EPSILON_TIME = 0.02
         def config_param_types

data/lib/fusuma/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Fusuma
-  VERSION = "3.11.1"
+  VERSION = "3.12.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fusuma
 version: !ruby/object:Gem::Version
-  version: 3.11.1
+  version: 3.12.0
 platform: ruby
 authors:
 - iberianpig
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-01-10 00:00:00.000000000 Z
+date: 2026-01-26 00:00:00.000000000 Z
 dependencies: []
 description: Fusuma is multitouch gesture recognizer. This gem makes your touchpad
   on Linux able to recognize swipes or pinchs and assign command to them. Read installation
@@ -29,6 +29,7 @@ files:
 - lib/fusuma.rb
 - lib/fusuma/config.rb
 - lib/fusuma/config.yml
+- lib/fusuma/config/context_matcher.rb
 - lib/fusuma/config/index.rb
 - lib/fusuma/config/searcher.rb
 - lib/fusuma/config/yaml_duplication_checker.rb