fusuma 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85a522e75bfcc182572f9c38a4d073c67f963319
-  data.tar.gz: 6679c88a779acbf8c7183d42609326eb988f9cdb
+  metadata.gz: 46afda55ad48083da6e0d94a17a9ec3b1a009b4b
+  data.tar.gz: 475fabc77f03056b25f9b718c26875bc75871380
 SHA512:
-  metadata.gz: 412eec95e91666f2839d9157d0d4a5dd1073b34b4b514e35c71ac0c69301bef3e52185d3020721543d46f701a5e4c0d71241cae0efc73dd56f66290707c2d83d
-  data.tar.gz: 018d4103d87ffd686e586fdb8c806cdc96ddfd93046df3663c35f3eb5e4043c06053e83b299732c753e4a3582e1a5e617625bc9706b2b6f91119e9cc85b15b2c
+  metadata.gz: 87b72d664ca8e7891f02265030fe261f7576b7de85ef55aad28f81809d06eaf29a4d016359375b1dae05847f4c13d86a752254fe65b7da9492e09b0b7ed9fa4e
+  data.tar.gz: fa163ef797185c55af24204466f8bb48f80d01fcbf1571973b3e7e51c495982186df767b7114280cdba4b7cadb8061b1c7259e8d79b64213eaccddd6dfbb971b

data/.rubocop.yml

@@ -0,0 +1,7 @@
+Metrics/ModuleLength:
+  Exclude:
+    - "**/*_spec.rb"
+
+Metrics/BlockLength:
+  Exclude:
+    - "**/*_spec.rb"

data/fusuma.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'pry-byebug'
+  spec.add_development_dependency 'rubocop'
 end

data/lib/fusuma/action_stack.rb

@@ -5,7 +5,6 @@ module Fusuma
       super(*args)
     end
 
-    # return { finger:, direction:, action: } or nil
     def gesture_info
       return unless enough_actions? && enough_time_passed?
       action_type = detect_action_type
@@ -25,8 +24,6 @@ module Fusuma
 
     private
 
-    GestureInfo = Struct.new(:finger, :direction, :action_type)
-
     def elapsed_time
       return 0 if length.zero?
       last.time - first.time
@@ -35,39 +32,38 @@ module Fusuma
     def detect_direction(action_type)
       case action_type
       when 'swipe'
-        detect_move
+        detect_swipe
       when 'pinch'
-        detect_zoom
+        detect_pinch
       end
     end
 
-    def detect_move
-      move = avg_moves
-      MultiLogger.debug(move: move)
-      return unless enough_distance?(move)
-      return move[:x] > 0 ? 'right' : 'left' if move[:x].abs > move[:y].abs
-      move[:y] > 0 ? 'down' : 'up'
+    def detect_swipe
+      swipe = avg_swipe
+      return unless swipe.enough_distance?
+      swipe.direction
     end
 
-    def detect_zoom
-      diameter = avg_attrs(:zoom)
-      MultiLogger.debug(diameter: diameter)
-      # TODO: change threshold from config files
-      return unless enough_diameter?(diameter)
-      return 'in' if diameter > 1
-      'out'
+    def detect_pinch
+      pinch = avg_pinch
+      return unless pinch.enough_diameter?
+      pinch.direction
     end
 
     def detect_finger
       last.finger
     end
 
-    Distance = Struct.new(:x, :y)
+    def avg_swipe
+      move_x = avg_attrs(:move_x)
+      move_y = avg_attrs(:move_y)
+      Swipe.new(move_x, move_y)
+    end
 
-    def avg_moves
-      move_x = sum_attrs(:move_x) / length
-      move_y = sum_attrs(:move_y) / length
-      Distance.new(move_x, move_y)
+    def avg_pinch
+      diameter = avg_attrs(:zoom)
+      delta_diameter = diameter - first.zoom
+      Pinch.new(delta_diameter)
     end
 
     def sum_attrs(attr)
@@ -89,21 +85,8 @@ module Fusuma
       last.action
     end
 
-    def enough_distance?(move)
-      (move[:x].abs > 20) || (move[:y].abs > 20)
-    end
-
-    def enough_diameter?(avg_diameter)
-      delta_diameter = if avg_diameter > 1
-                         avg_diameter - first.zoom
-                       else
-                         first.zoom - avg_diameter
-                       end
-      delta_diameter > 0.3
-    end
-
     def enough_actions?
-      (length > 1) && (elapsed_time > 0.1)
+      (length > 1) && (elapsed_time > 0.05)
     end
 
     def enough_time_passed?
@@ -111,7 +94,7 @@ module Fusuma
     end
 
     def last_triggerd_time
-      @last_triggered_time || 0
+      @last_triggered_time ||= 0
     end
 
     def detect_action_type

data/lib/fusuma/config.rb

@@ -0,0 +1,77 @@
+# module as namespace
+module Fusuma
+  require 'singleton'
+  # read keymap from yaml file
+  class Config
+    include Singleton
+
+    class << self
+      def shortcut(gesture_info)
+        instance.shortcut(gesture_info)
+      end
+
+      def threshold(action_type)
+        instance.threshold(action_type)
+      end
+
+      def reload
+        instance.reload
+      end
+    end
+
+    def initialize
+      reload
+    end
+    attr_accessor :keymap
+
+    def reload
+      @cache  = nil
+      @keymap = YAML.load_file(file_path)
+      self
+    end
+
+    def shortcut(gesture_info)
+      seek_index = [*action_index(gesture_info), 'shortcut']
+      cache(seek_index) { search_config(keymap, seek_index) }
+    end
+
+    def threshold(action_type)
+      seek_index = ['threshold', action_type]
+      cache(seek_index) { search_config(keymap, seek_index) } || 1
+    end
+
+    private
+
+    def search_config(keymap_node, seek_index)
+      if seek_index == []
+        return nil if keymap_node.is_a? Hash
+        return keymap_node
+      end
+      key = seek_index[0]
+      child_node = keymap_node[key]
+      next_index = seek_index[1..-1]
+      return search_config(child_node, next_index) if child_node
+      search_config(keymap_node, next_index)
+    end
+
+    def file_path
+      filename = 'fusuma/config.yml'
+      original_path = File.expand_path "~/.config/#{filename}"
+      default_path  = File.expand_path "../../#{filename}", __FILE__
+      File.exist?(original_path) ? original_path : default_path
+    end
+
+    def action_index(gesture_info)
+      action_type = gesture_info.action_type
+      finger      = gesture_info.finger
+      direction   = gesture_info.direction
+      [action_type, finger, direction]
+    end
+
+    def cache(key)
+      @cache ||= {}
+      key = key.join(',') if key.is_a? Array
+      @cache[key] ||= block_given? ? yield : nil
+    end
+  end
+end

data/lib/fusuma/config.yml

@@ -1,24 +1,28 @@
 swipe:
-  3: 
-    left: 
+  3:
+    left:
       shortcut: 'alt+Left'
-    right: 
+    right:
       shortcut: 'alt+Right'
-    up: 
+    up:
       shortcut: 'ctrl+t'
-    down: 
+    down:
       shortcut: 'ctrl+w'
   4:
-    left: 
+    left:
       shortcut: 'super+Left'
-    right: 
+    right:
       shortcut: 'super+Right'
-    up: 
+    up:
       shortcut: 'super+a'
-    down: 
+    down:
       shortcut: 'super+s'
 pinch:
   in:
     shortcut: 'ctrl+plus'
   out:
      shortcut: 'ctrl+minus'
+
+threshold:
+  swipe: 1
+  pinch: 1

data/lib/fusuma/gesture_info.rb

@@ -0,0 +1,25 @@
+module Fusuma
+  # manage actions
+  class GestureInfo
+    def initialize(finger, direction, action_type)
+      @finger      = finger.to_i
+      @direction   = direction
+      @action_type = action_type
+    end
+    attr_reader :finger, :direction, :action_type
+
+    def trigger_keyevent
+      exec_xdotool(shortcut)
+    end
+
+    private
+
+    def exec_xdotool(keys)
+      `xdotool key #{keys}` unless keys.nil?
+    end
+
+    def shortcut
+      Config.shortcut(self)
+    end
+  end
+end

data/lib/fusuma/pinch.rb

@@ -0,0 +1,26 @@
+module Fusuma
+  # manage actions
+  class Pinch
+    BASE_THERESHOLD = 0.3
+
+    def initialize(diameter)
+      @diameter = diameter.to_f
+    end
+
+    attr_reader :diameter
+
+    def direction
+      return 'in' if diameter > 0
+      'out'
+    end
+
+    def enough_diameter?
+      MultiLogger.debug(diameter: diameter)
+      diameter.abs > threshold
+    end
+
+    def threshold
+      @threshold ||= BASE_THERESHOLD * Config.threshold('pinch')
+    end
+  end
+end

data/lib/fusuma/swipe.rb

@@ -0,0 +1,26 @@
+module Fusuma
+  # manage actions
+  class Swipe
+    BASE_THERESHOLD = 20
+
+    def initialize(x, y)
+      @x = x
+      @y = y
+    end
+    attr_reader :x, :y
+
+    def direction
+      return x > 0 ? 'right' : 'left' if x.abs > y.abs
+      y > 0 ? 'down' : 'up'
+    end
+
+    def enough_distance?
+      MultiLogger.debug(x: x, y: y)
+      (x.abs > threshold) || (y.abs > threshold)
+    end
+
+    def threshold
+      @threshold ||= BASE_THERESHOLD * Config.threshold('swipe')
+    end
+  end
+end

data/lib/fusuma/version.rb

@@ -1,3 +1,3 @@
 module Fusuma
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.2.2'.freeze
 end

data/lib/fusuma.rb

@@ -1,7 +1,11 @@
 require_relative 'fusuma/version'
 require_relative 'fusuma/action_stack'
 require_relative 'fusuma/gesture_action'
+require_relative 'fusuma/gesture_info'
+require_relative 'fusuma/swipe.rb'
+require_relative 'fusuma/pinch.rb'
 require_relative 'fusuma/multi_logger'
+require_relative 'fusuma/config.rb'
 require 'logger'
 require 'open3'
 require 'yaml'
@@ -34,7 +38,7 @@ module Fusuma
           @action_stack ||= ActionStack.new
           @action_stack.push gesture_action
           gesture_info = @action_stack.gesture_info
-          trigger_keyevent(gesture_info) unless gesture_info.nil?
+          gesture_info.trigger_keyevent unless gesture_info.nil?
         end
       end
     end
@@ -71,35 +75,5 @@ module Fusuma
       return false if line =~ %r{n/a}
       true
     end
-
-    def trigger_keyevent(gesture_info)
-      case gesture_info.action_type
-      when 'swipe'
-        swipe(gesture_info.finger, gesture_info.direction)
-      when 'pinch'
-        pinch(gesture_info.direction)
-      end
-    end
-
-    def swipe(finger, direction)
-      shortcut = event_map['swipe'][finger.to_i][direction]['shortcut']
-      `xdotool key #{shortcut}` unless shortcut.nil?
-    end
-
-    def pinch(direction)
-      shortcut = event_map['pinch'][direction]['shortcut']
-      `xdotool key #{shortcut}` unless shortcut.nil?
-    end
-
-    def event_map
-      @event_map ||= YAML.load_file(config_file)
-    end
-
-    def config_file
-      filename = 'fusuma/config.yml'
-      original_path = File.expand_path "~/.config/#{filename}"
-      default_path = File.expand_path "../#{filename}", __FILE__
-      File.exist?(original_path) ? original_path : default_path
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fusuma
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - iberianpig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-18 00:00:00.000000000 Z
+date: 2016-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Fusuma is multitouch gesture recognizer. This gem makes your linux PC
   able to recognize swipes or pinchs and assign shortcuts to them. Read installation
   on Github(https://github.com/iberianpig/fusuma#installation).
@@ -78,6 +92,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -87,14 +102,17 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- config.yml
 - exe/fusuma
 - fusuma.gemspec
 - lib/fusuma.rb
 - lib/fusuma/action_stack.rb
+- lib/fusuma/config.rb
 - lib/fusuma/config.yml
 - lib/fusuma/gesture_action.rb
+- lib/fusuma/gesture_info.rb
 - lib/fusuma/multi_logger.rb
+- lib/fusuma/pinch.rb
+- lib/fusuma/swipe.rb
 - lib/fusuma/version.rb
 homepage: https://github.com/iberianpig/fusuma
 licenses:

data/config.yml

@@ -1,24 +0,0 @@
-swipe:
-  3: 
-    left: 
-      shortcut: 'alt+Right'
-    right: 
-      shortcut: 'alt+Left'
-    up: 
-      shortcut: 'ctrl+t'
-    down: 
-      shortcut: 'ctrl+w'
-  4:
-    left: 
-      shortcut: 'super+Right'
-    right: 
-      shortcut: 'super+Left'
-    up: 
-      shortcut: 'super+a'
-    down: 
-      shortcut: 'super+s'
-pinch:
-  in:
-    shortcut: 'ctrl+plus'
-  out:
-     shortcut: 'ctrl+minus'