domotics-core 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eca10e6f705a187186a2656342714b990f23eeee
-  data.tar.gz: 261c537133b2ac6ee8d15a2de0632785cc5cfa33
+  metadata.gz: 74cbeb6f3ebcc02fddd4fdd6a4b980aad204da2a
+  data.tar.gz: 9d7c8c5d0fbeb9bdb9c8f4e7e4042c420fca3af2
 SHA512:
-  metadata.gz: f403cc9cd6974724d3e23b94c9473acf632280cd34c266065a1fe0cf56ca2ece20375715566a81c5e3e7039c99e7c2b34418b3e1a9e93ff3171233f555987e12
-  data.tar.gz: 82762b63df335fb078dc48b03c6017468c86592b33a693be8df4a8bf7c57f196e525b96c12e91f0938d82580c1d1b833f4279c4aad1eac9cedabc7a3c6dfcb30
+  metadata.gz: d210cd402ee0601e23168fb037b19650e5a570737aa82f5ec1fcbcb315fc40d6978478fa7ad1a1b1b74b6adaddde42770cfb54637bd4f682447842d6e1a9686d
+  data.tar.gz: 0ade937876a477a4a3594875766b19a2f32a0ce01e09004f1bf822f0f4efc1b17a0725dc2004410eda8ef61a7f134364c1ef714e19b69037d3acf5bc04c82e2d

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

@@ -1,14 +1,13 @@
 module Domotics::Core
   class FileCameraDevice < Device #__as__ :file_camera
+    attr_accessor :mode
+    attr_reader :current_file_name, :camera_element
     def initialize(args = {})
-      @current_name = nil
+      @current_file_name = nil
+      @mode = args[:mode] || :watch
       # Emulate element
-      @camera_element = Element.new args
-      s = self
-      image_lambda = lambda { s.current_link }
-      file_lambda = lambda { |*args| s.current_file }
-      @camera_element.eigenclass.send :define_method, :image, image_lambda
-      @camera_element.eigenclass.send :define_method, :file, file_lambda
+      args[:device] = self
+      @camera_element = Domotics::FileCamera::CameraElement.new args
       # Path to shots
       @path = args[:path] || "/tmp"
       @path.chop! if @path[-1] == "/"
@@ -26,25 +25,28 @@ module Domotics::Core
       super
     end
     def event_handler(event)
-      filename = "#{@path}/#{event.name}"
-      @current_name = "#{@path}/#{Time.now.to_i}#{@file_ext}"
+      return if File.extname(event.name) != @file_ext
       # Wait untill close file and rename it
-      #inot = INotify::Notifier.new
-      #inot.watch(filename, :close_write) do |file|
-      #  @current_name = "#{@path}/#{Time.now.to_i}#{@file_ext}"
-      #  sleep 0.1
-      #  File.rename filename, @current_name
-      #end
-      #inot.process
-      #inot.close
-      sleep 0.5
-      File.rename filename, @current_name
+      sleep 0.25
+      case @mode
+      when :save
+        dir_name = Time.now.strftime("%Y%m%d")
+        FileUtils.mkdir_p "#{@path}/#{dir_name}"
+        @current_file_name = "#{@path}/#{dir_name}/#{Time.now.to_i}#{@file_ext}"
+        File.rename "#{@path}/#{event.name}", @current_file_name
+      when :watch
+        @current_file_name = "#{@path}/current#{@file_ext}"
+        File.rename "#{@path}/#{event.name}", @current_file_name
+      else #:delete
+        @current_file_name = nil
+        FileUtils.rm "#{@path}/#{event.name}"
+      end
     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_name if @current_name
+      IO.read @current_file_name if @current_file_name
     end
   end
 end

data/lib/domotics/core/device.rb

@@ -3,8 +3,9 @@ module Domotics::Core
     @@devices = {}
     attr_reader :name, :type
     def initialize(args = {})
-      @@devices[@name = args[:name]] = self
-      @type = args[:type]
+      @name = args[:name] || SecureRandom.hex
+      @@devices[@name] = self
+      @type = args[:type] || "undefined"
     end
 
     def self.[](symbol = nil)

data/lib/domotics/core/element.rb

@@ -5,6 +5,7 @@ module Domotics::Core
 
     def initialize(args = {})
       @room = args[:room]
+      @device = args[:device]
       @room.register_element self, @name = args[:name]
       @type ||= :element
       set_state(self.state || :off)

data/lib/domotics/core/version.rb

@@ -1,5 +1,5 @@
 module Domotics
   module Core
-    VERSION = "0.1.8"
+    VERSION = "0.1.9"
   end
 end

data/lib/domotics/core.rb

@@ -1,16 +1,18 @@
 require 'bundler/setup'
+# From arduino_board
+#require "../domotics-arduino/lib/domotics/arduino"
+require 'domotics/arduino'
 # From data_mongo
 require 'mongo'
 # From data_redis
 require 'redis'
 require 'hiredis'
-# From arduino_board
-#require "../domotics-arduino/lib/domotics/arduino"
-require 'domotics/arduino'
-# From server
-require 'json'
+# From device
+require 'securerandom'
 # From file_camera_device
 require 'rb-inotify'
+# From server
+require 'json'
 
 module Domotics
   module Core

data/lib/domotics/file_camera/camera_element.rb

@@ -0,0 +1,16 @@
+module Domotics
+  module FileCamera
+    class CameraElement < Domotics::Core::Element
+      def image
+        @device.current_link
+      end
+      def file
+        @device.current_file
+      end
+      def mode(param)
+        @device.mode = param
+        set_state param
+      end
+    end
+  end
+end

data/test/test_devices.rb

@@ -7,5 +7,36 @@ Domotics::Core::TestHelper.init
 
 class DomoticsDevicesTestCase < Test::Unit::TestCase
   def test_file_camera
+    # General
+    cam = Domotics::Core::Device[:cam]
+    assert_equal "cam", cam.name.to_s
+    assert_equal "test/cam/file/#{Time.now.to_i}.jpg", cam.current_link
+    # Watch mode (default)
+    %x{echo "[test foto content]" > /tmp/test_foto_1.jpg}
+    sleep 0.5
+    assert_equal "/tmp/current.jpg", cam.current_file_name
+    assert_equal "[test foto content]", cam.current_file.chomp
+    # Save mode
+    cam.mode = :save
+    dir_name = Time.now.strftime("%Y%m%d")
+    %x{rm -rf /tmp/#{dir_name}}
+    %x{echo "[test foto content]" > /tmp/test_foto_2.jpg}
+    name = Time.now.to_i
+    sleep 0.5
+    assert_match /\/tmp\/#{dir_name}\/#{name/100}\d{2}.jpg/, cam.current_file_name
+    assert_equal "[test foto content]", cam.current_file.chomp
+    # Delete mode
+    cam.mode = :delete
+    %x{echo "[test foto content]" > /tmp/test_foto_3.jpg}
+    sleep 0.5
+    assert_nil cam.current_file_name
+    assert_nil cam.current_file
+    # Test CameraElement
+    assert_equal "test/cam/file/#{Time.now.to_i}.jpg", cam.camera_element.image
+    cam.camera_element.mode :watch
+    assert_equal :watch, cam.camera_element.state
+    %x{echo "[test foto content]" > /tmp/test_foto_4.jpg}
+    sleep 0.5
+    assert_equal "[test foto content]", cam.camera_element.file.chomp
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: domotics-core
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - goredar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-31 00:00:00.000000000 Z
+date: 2014-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: domotics-arduino
@@ -197,6 +197,7 @@ files:
 - lib/domotics/core/server.rb
 - lib/domotics/core/setup.rb
 - lib/domotics/core/version.rb
+- lib/domotics/file_camera/camera_element.rb
 - lib/domotics/file_camera/digital_sensor.rb
 - test/config.test.rb
 - test/test_devices.rb