domotics-core 0.2.4 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02ebecc7f97e80de2536f358cecad8575b774fe0
-  data.tar.gz: 5883efe2e1f49b13f602956ddfcbbc79f532709e
+  metadata.gz: d0df5b7aed0f74551c9630ea84e66e006c0b095c
+  data.tar.gz: 7b682e057b6b50a7d3c298c802ba319509addb61
 SHA512:
-  metadata.gz: e27789dbc3e14975c31f149778d2855b28b63c019e3e0afd341fd693e43469bd8ff6f279d4cda8802233400487eee5738f226e98b4f5030bcb9fea624f94407e
-  data.tar.gz: 9ba2b8410f2e8b945f577f0988906e1bdd4adc8d569dad18231c27126b53fe3b707caf3291d063086841062e2fe3a4ad2d66b0d734b3ff2df5492913bb0bd4c1
+  metadata.gz: d6cd5037e04cfd22ac710ac87ed0c122d45933b7312764eface9213d5564384d91a96a8ba4e457906960a068ca463f26c0bdbf1fb701dc84892310ef46354bb4
+  data.tar.gz: 881b28a9040dcdc5109b5355a804cd1d30263b4a8ac9a31e72152ae401192759afa54b4dc35b16110a6e9264fd777e8c900b2c32af9097faef5bb61a5df054bd

data/lib/domotics/core/device/file_camera_device.rb

@@ -1,8 +1,11 @@
 module Domotics::Core
   class FileCameraDevice < Device #__as__ :file_camera
+
     attr_accessor :mode
     attr_reader :current_file_name, :camera_element
+
     def initialize(args = {})
+      @sensors = []
       @current_file_name = nil
       @mode = args[:mode] || :watch
       # Emulate element
@@ -24,6 +27,11 @@ module Domotics::Core
       end
       super
     end
+
+    def register_sensor(sensor)
+      @sensors << sensor
+    end
+
     def event_handler(event)
       return if File.extname(event.name) != @file_ext
       # Wait untill close file and rename it
@@ -41,10 +49,13 @@ module Domotics::Core
         @current_file_name = nil
         FileUtils.rm "#{@path}/#{event.name}"
       end
+      @sensors.each { |sensor| sensor.state_changed :motion_detection }
     end
+
     def current_link
       "#{@camera_element.room.name}/#{@camera_element.name}/file/#{Time.now.to_i}#{@file_ext}"
     end
+
     def current_file
       IO.read @current_file_name if @current_file_name
     end

data/lib/domotics/core/version.rb

@@ -1,6 +1,6 @@
 module Domotics
   module Core
-    VERSION = "0.2.4"
+    VERSION = "0.2.6"
   end
 end
 

data/lib/domotics/file_camera/digital_sensor.rb

@@ -1,6 +1,11 @@
 module Domotics
   module FileCamera
     module DigitalSensor
+      def initialize(args = {})
+        @device ||= args[:device]
+        @device && @device.register_sensor(self)
+        super
+      end
     end
   end
 end

data/test/test_elements.rb

@@ -60,4 +60,12 @@ class DomoticsElementsTestCase < Test::Unit::TestCase
     sleep 0.01
     assert_equal room.last_event(btn.name), :state_changed => :long_tap
   end
+  
+  def test_camera_motion_sensor
+    room = Domotics::Core::Room[:test]
+    cam_mt = room.cam_motion
+    %x{echo "[test foto content]" > /tmp/test_foto.jpg}
+    sleep 0.5
+    assert_equal room.last_event(cam_mt.name), :state_changed => :motion_detection
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: domotics-core
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.6
 platform: ruby
 authors:
 - goredar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2014-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: domotics-arduino