domotics-core 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3c82136cdfecddb9568a2d83694c21a2e3a3b587
-  data.tar.gz: 0501d81331a6de29327ce59d42fd4030bb840607
+SHA256:
+  metadata.gz: aa3e061dd51a3ebe28885793ab969d98f67df951c4fec5ff3e90bd48b1c76f89
+  data.tar.gz: 175278d956f8ccafda95bb89a371172181581c297f3fb9cad6eb9a7e4589027e
 SHA512:
-  metadata.gz: cb5bb04aaf28fe8d6ff4de7e8abeba8691524f78885325db072671f58f76b0466c21494620cab2a4260c51df6cd15d14a886f74846d80e80174cd1edbe5c6bf0
-  data.tar.gz: bbf33de38b9e412374e2894b8c363974d39074abb1c1f2ed1ba4767a569f0e9847a8ede9023fcc52234a4bdb1e809c3aec636cbb3e763f7fddc1e9c531a933a7
+  metadata.gz: 67c0ff46d5504c10d22278e300a57047fe45d23310890cb56c2153fd0c6f0e2144efabca02a5f37d7f6b022b45fd61ae387e5fac65cce5cc7443bc86740081f8
+  data.tar.gz: 12f3e5e769cb24e392f48c0c10afe6e9d962381294c74588e2372752b005b5f50498ded8a4ce0a6db82936abe9be61384f30a6bb145cb65bdb9226e33293e449

data/domotics-core.gemspec

@@ -1,21 +1,20 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'domotics/core/version'
+require "domotics/core/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "domotics-core"
-  spec.version       = Domotics::Core::VERSION
-  spec.authors       = ["goredar"]
-  spec.email         = ["info@goredar.it"]
-  spec.summary       = %q{Home automation system.}
-  spec.description   = %q{Main core elements}
-  spec.homepage      = "https://goredar.it"
-  spec.license       = "MIT"
+  spec.name = "domotics-core"
+  spec.version = Domotics::Core::VERSION
+  spec.authors = ["goredar"]
+  spec.email = ["info@goredar.it"]
+  spec.summary = "Home automation system."
+  spec.description = "Main core elements"
+  spec.homepage = "https://goredar.it"
+  spec.license = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.files = `git ls-files -z`.split("\x0")
+  spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "domotics-arduino"

data/lib/domotics/core/element/button.rb

@@ -3,35 +3,26 @@ module Domotics::Core
     def initialize(args = {})
       @type = args[:type] || :button
       @touch = args[:touch]
-      @taped = true
-      #@tap_lock = Mutex.new
+      @last_on = nil
       args[:driver] = @touch ? "DigitalSensor" : "NOSensor"
       load_driver args
       super
     end
-    def set_state(*args)
+
+    def set_state(*_args)
       nil
     end
 
     def state_changed(value)
       case value
       when :on
-        (@last_on = Time.now; @taped = false) if @taped
+        @last_on = Time.now
       when :off
         case Time.now - (@last_on || Time.now)
-        when 0...0.01 then return # debounce
-        when 0.01...0.3 then super :tap; @taped = true
-        when 0.3...1 then super :long_tap; @taped = true
-          #@tap_lock.synchronize do
-          #  if @tap and @tap.alive?
-          #    @tap.kill
-          #    @tap = nil
-          #    super :double_tap
-          #  else
-          #    @tap = Thread.new { sleep 0.25; super :tap }
-          #  end
-          #end
-        else super :long_tap_x2; @taped = true
+        when 0...0.03 then nil # debounce
+        when 0.03...0.3 then super :tap
+        when 0.3...1 then super :long_tap
+        when 1...2 then super :long_tap_x2
         end
       end
     end

data/lib/domotics/core/element/motion_sensor.rb

@@ -6,9 +6,9 @@ module Domotics::Core
       load_driver args
       super
     end
-    #def to_hls(state)
-    #  super == :on ? :move : :no_move
-    #end
+    def to_hls(state)
+      super == :on ? :move : :no_move
+    end
     def set_state(*args)
       nil
     end

data/lib/domotics/core/element/reed_switch.rb

@@ -6,9 +6,9 @@ module Domotics::Core
       load_driver args
       super
     end
-    #def to_hls(state)
-    #  super == :on ? :open : :close
-    #end
+    def to_hls(state)
+      super == :on ? :open : :close
+    end
     def set_state(*args)
       nil
     end

data/lib/domotics/core/element/switch.rb

@@ -1,6 +1,6 @@
 module Domotics::Core
   class Switch < Element
-    MINIMUM_LAG = 1
+    MINIMUM_LAG = 0
     def initialize(args = {})
       @type = args[:type] || :switch
       @lag = nil
@@ -11,52 +11,62 @@ module Domotics::Core
       super
       @initialized = true
     end
+
     def set_state(value)
       @initialized ? (super unless state == value) : super
     end
+
     def on(timer = nil)
       set_state :on
       lag(:off, timer)
     end
+
     def on?
       state == :on
     end
+
     def delay_on(timer)
       lag(:on, timer)
     end
+
     def off(timer = nil)
       set_state :off
       lag(:on, timer)
     end
+
     def off?
       state == :off
     end
-    def delay_off(timer)
-      lag(:off, timer)
+
+    def delay_off(timer, &block)
+      lag(:off, timer, &block)
     end
+
     def toggle(timer = nil)
       set_state state == :off ? :on : :off
       lag(:toggle, timer)
     end
+
     def delay_toggle(timer)
       lag(:toggle, timer)
     end
 
     private
 
-    def lag(action = nil, timer = nil)
+    def lag(action = nil, timer = nil, &block)
       # Kill previous action -> out of date
       @lag_lock.synchronize do
-        if @lag and @lag.alive?
+        if @lag && @lag.alive?
           @lag.kill
           @lag = nil
         end
-        raise ArgumentError unless (timer.is_a?(Integer) and timer >= MINIMUM_LAG)
+        raise ArgumentError unless timer.is_a?(Integer) && (timer >= MINIMUM_LAG)
+
         # Delayed action
-        @lag = Thread.new do
+        @lag = Thread.new {
           sleep timer
-          public_send action
-        end
+          block_given? ? (public_send(action) if block.call) : public_send(action)
+        }
       end
     rescue ArgumentError
       nil

data/lib/domotics/core/version.rb

@@ -1,6 +1,6 @@
 module Domotics
   module Core
-    VERSION = "0.2.7"
+    VERSION = "0.2.8"
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: domotics-core
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - goredar
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-04-07 00:00:00.000000000 Z
+date: 2020-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: domotics-arduino
@@ -223,7 +223,7 @@ homepage: https://goredar.it
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -238,9 +238,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Home automation system.
 test_files: