fusuma 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46afda55ad48083da6e0d94a17a9ec3b1a009b4b
-  data.tar.gz: 475fabc77f03056b25f9b718c26875bc75871380
+  metadata.gz: 216f8562a1a8273c5067e09b85d558669ad8b929
+  data.tar.gz: 19dd9a739ae9e3050dc5ac121d66499b3c084000
 SHA512:
-  metadata.gz: 87b72d664ca8e7891f02265030fe261f7576b7de85ef55aad28f81809d06eaf29a4d016359375b1dae05847f4c13d86a752254fe65b7da9492e09b0b7ed9fa4e
-  data.tar.gz: fa163ef797185c55af24204466f8bb48f80d01fcbf1571973b3e7e51c495982186df767b7114280cdba4b7cadb8061b1c7259e8d79b64213eaccddd6dfbb971b
+  metadata.gz: a0c05bba807ab4569b2de22142713cc1a45c66b783e90785c7195bf58e39249a4d6b31a7a1ad72cb16b7275e62ad896a579c1fb214de4187f1b0df7cdb93ddc3
+  data.tar.gz: 07d4d793259309e26b5809cd5d8d7005ccb36b2de07dc6595e3a28ac17b45572e24ef77871549198085e3d90804a1f52c76bcbe103abfeea7537400589fdab82

data/README.md

@@ -61,10 +61,17 @@ pinch:
     shortcut: 'ctrl+plus'
   out:
      shortcut: 'ctrl+minus'
+
+threshold:
+  swipe: 1
+  pinch: 1
 ```
 
 if `shortcut: ` is blank, the swipe/pinch doesn't trigger a keyevent.
 
+`threshold:` is sensitivity to swipe/pinch. Default value is 1.
+if the swipe's threshold change to `0.5`, shorten swipe-length by half
+
 ## Options
 
 *   `-v` : Enable debug mode.

data/lib/fusuma/action_stack.rb

@@ -1,12 +1,14 @@
 module Fusuma
   # manage actions
   class ActionStack < Array
+    ELAPSED_TIME = 0.01
+
     def initialize(*args)
       super(*args)
     end
 
     def gesture_info
-      return unless enough_actions? && enough_time_passed?
+      return unless enough_actions?
       action_type = detect_action_type
       direction = detect_direction(action_type)
       return if direction.nil?
@@ -24,32 +26,21 @@ module Fusuma
 
     private
 
-    def elapsed_time
-      return 0 if length.zero?
-      last.time - first.time
+    def detect_direction(action_type)
+      vector = generate_vector(action_type)
+      return if vector && !vector.enough?
+      vector.direction
     end
 
-    def detect_direction(action_type)
+    def generate_vector(action_type)
       case action_type
       when 'swipe'
-        detect_swipe
+        avg_swipe
       when 'pinch'
-        detect_pinch
+        avg_pinch
       end
     end
 
-    def detect_swipe
-      swipe = avg_swipe
-      return unless swipe.enough_distance?
-      swipe.direction
-    end
-
-    def detect_pinch
-      pinch = avg_pinch
-      return unless pinch.enough_diameter?
-      pinch.direction
-    end
-
     def detect_finger
       last.finger
     end
@@ -86,14 +77,15 @@ module Fusuma
     end
 
     def enough_actions?
-      (length > 1) && (elapsed_time > 0.05)
+      length > 2
     end
 
-    def enough_time_passed?
-      (last.time - last_triggerd_time) > 0.5
+    def enough_elapsed_time?
+      return false if length.zero?
+      (last.time - first.time) > ELAPSED_TIME
     end
 
-    def last_triggerd_time
+    def last_triggered_time
       @last_triggered_time ||= 0
     end
 

data/lib/fusuma/config.yml

@@ -21,7 +21,7 @@ pinch:
   in:
     shortcut: 'ctrl+plus'
   out:
-     shortcut: 'ctrl+minus'
+    shortcut: 'ctrl+minus'
 
 threshold:
   swipe: 1

data/lib/fusuma/pinch.rb

@@ -1,7 +1,8 @@
 module Fusuma
-  # manage actions
+  # vector data
   class Pinch
     BASE_THERESHOLD = 0.3
+    INTERVAL_TIME = 0.05
 
     def initialize(diameter)
       @diameter = diameter.to_f
@@ -14,13 +15,37 @@ module Fusuma
       'out'
     end
 
-    def enough_diameter?
+    def enough?
       MultiLogger.debug(diameter: diameter)
+      enough_diameter? && enough_interval? && self.class.touch_last_time
+    end
+
+    private
+
+    def enough_diameter?
       diameter.abs > threshold
     end
 
+    def enough_interval?
+      return true if first_time?
+      return true if (Time.now - self.class.last_time) > INTERVAL_TIME
+      false
+    end
+
+    def first_time?
+      self.class.last_time.nil?
+    end
+
     def threshold
       @threshold ||= BASE_THERESHOLD * Config.threshold('pinch')
     end
+
+    class << self
+      attr_reader :last_time
+
+      def touch_last_time
+        @last_time = Time.now
+      end
+    end
   end
 end

data/lib/fusuma/swipe.rb

@@ -1,7 +1,8 @@
 module Fusuma
-  # manage actions
+  # vector data
   class Swipe
     BASE_THERESHOLD = 20
+    INTERVAL_TIME   = 0.5
 
     def initialize(x, y)
       @x = x
@@ -14,13 +15,37 @@ module Fusuma
       y > 0 ? 'down' : 'up'
     end
 
-    def enough_distance?
+    def enough?
       MultiLogger.debug(x: x, y: y)
+      enough_distance? && enough_interval? && self.class.touch_last_time
+    end
+
+    private
+
+    def enough_distance?
       (x.abs > threshold) || (y.abs > threshold)
     end
 
+    def enough_interval?
+      return true if first_time?
+      return true if (Time.now - self.class.last_time) > INTERVAL_TIME
+      false
+    end
+
+    def first_time?
+      self.class.last_time.nil?
+    end
+
     def threshold
       @threshold ||= BASE_THERESHOLD * Config.threshold('swipe')
     end
+
+    class << self
+      attr_reader :last_time
+
+      def touch_last_time
+        @last_time = Time.now
+      end
+    end
   end
 end

data/lib/fusuma/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fusuma
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - iberianpig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-31 00:00:00.000000000 Z
+date: 2017-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler