openplacos 0.0.8 → 0.0.9

data/lib/openplacos/template_client.rb

@@ -0,0 +1,17 @@
+#!/usr/bin/ruby
+
+
+require 'digest/sha1'
+require File.dirname(__FILE__) + "/libclient_oauth.rb"
+
+HOST = 'http://0.0.0.0:4567'     
+REDIRECT_URI = "http://0.0.0.0:2000"
+ID = Digest::SHA1.file(__FILE__).hexdigest
+
+
+
+client = Openplacos::Client.new(HOST, "TRUC", ["read", "user"] , "auth_code")
+
+puts client.objects["/home/temperature"]["analog.sensor.temperature.celcuis"].read
+puts client.objects["/home/fan"]["analog.order.dimmer"].write(0.5)
+

data/lib/openplacos/widget/Analog.rb

@@ -0,0 +1,63 @@
+#    This file is part of Openplacos.
+#
+#    Openplacos is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Openplacos is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.s.instance
+#
+#    You should have received a copy of the GNU General Public License
+#    along with Openplacos.  If not, see <http://www.gnu.org/licenses/>.
+
+
+module Openplacos
+
+  # Namespace for Analog signals.
+  module Analog
+
+    # convert an analog value to a string
+    # supposed to be generic to all clients
+    # can be easily overloaded if needed
+    def to_s
+      read({}).round(2).to_s
+    end
+
+    # render method is supposed to be overlaoded
+    # this method is like a view 
+    # this method returns a string formatted as needed for the client to express an analog value
+    def render
+      return to_s
+    end
+
+  end
+  
+  module Analog::Order
+    include Analog
+
+    def set(arg_)
+     write(arg_.to_f, {})
+    end
+  end
+  
+  module Analog::Regul
+    include Analog::Order
+  end
+
+  module  Analog::Sensor
+    include Analog
+
+    def render
+      return to_s + " " + unit
+    end
+
+    def unit
+      @name.split(".").last
+    end
+
+  end
+end
+

data/lib/openplacos/widget/Digital.rb

@@ -0,0 +1,55 @@
+#    This file is part of Openplacos.
+#
+#    Openplacos is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Openplacos is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.s.instance
+#
+#    You should have received a copy of the GNU General Public License
+#    along with Openplacos.  If not, see <http://www.gnu.org/licenses/>.
+
+module Openplacos
+  module Digital
+    def to_s
+      read({})
+    end
+
+    def render
+      return to_s
+    end
+
+
+    module Order
+      include Digital
+
+      module Switch
+        include Order
+
+        def set(arg_)
+          if (arg_ == "True" || (arg_ == "true") || (arg_ == "on")|| (arg_ == "ON"))
+            return write(true, {})
+          end
+          if (arg_ == "False" || (arg_ == "false")|| (arg_ == "off")|| (arg_ == "OFF"))
+            return write(false, {})
+          end
+          puts "Action not recognized, please use ON/OFF"
+        end
+      end
+
+    end
+    
+    module Regul
+      include Digital
+      
+      module Switch
+        include Order::Switch
+      end
+    end
+    
+  end
+end

data/lib/openplacos/widget/modules.rb

@@ -0,0 +1,19 @@
+#    This file is part of Openplacos.
+#
+#    Openplacos is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Openplacos is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with Openplacos.  If not, see <http://www.gnu.org/licenses/>.
+
+
+require File.dirname(__FILE__) + "/Analog.rb"
+require File.dirname(__FILE__) + "/Digital.rb"
+

data/openplacos.gemspec

@@ -12,10 +12,12 @@ GEMSPEC = Gem::Specification.new do |s|
   s.version = File.read("VERSION").strip
   s.license = 'GPL-3'
   s.author = "Openplacos Team"
-  s.email = "openplacos-general@lists.sourceforge.net"
-  s.homepage = "http://openplacos.sourceforge.net/"
+  s.email = "openplacos@lists.tuxfamily.org"
+  s.homepage = "http://openplacos.tuxfamily.org/"
   s.files = FileList["{lib}/**/*", "openplacos.gemspec", "VERSION"].to_a.sort
   s.require_path = "lib"
   s.has_rdoc = false
-  s.add_dependency('ruby-dbus-openplacos', '>= 0.6.2')
+  s.add_runtime_dependency 'ruby-dbus-openplacos', '~> 0.7.0'
+  s.add_runtime_dependency 'json', '~> 1.7.0'
+  s.add_runtime_dependency 'oauth2', '~> 0.7.1'
 end

metadata

@@ -1,87 +1,104 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: openplacos
-version: !ruby/object:Gem::Version 
-  hash: 15
+version: !ruby/object:Gem::Version
+  version: 0.0.9
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 8
-  version: 0.0.8
 platform: ruby
-authors: 
+authors:
 - Openplacos Team
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-18 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ruby-dbus-openplacos
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 6
-        - 2
-        version: 0.6.2
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.0
   type: :runtime
-  version_requirements: *id001
-description: "    Openplacos Gem is a set of libraries for openplacos software.\n    These libraries allow an easier coding of openplacos clients, plugins or drivers in ruby.\n"
-email: openplacos-general@lists.sourceforge.net
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+- !ruby/object:Gem::Dependency
+  name: oauth2
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+description: ! "    Openplacos Gem is a set of libraries for openplacos software.\n
+  \   These libraries allow an easier coding of openplacos clients, plugins or drivers
+  in ruby.\n"
+email: openplacos@lists.tuxfamily.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - VERSION
 - lib/openplacos.rb
 - lib/openplacos/libclient.rb
-- lib/openplacos/libdriver.rb
-- lib/openplacos/libplugin.rb
+- lib/openplacos/libcomponent.rb
+- lib/openplacos/template_client.rb
+- lib/openplacos/widget/Analog.rb
+- lib/openplacos/widget/Digital.rb
+- lib/openplacos/widget/modules.rb
 - openplacos.gemspec
-has_rdoc: true
-homepage: http://openplacos.sourceforge.net/
-licenses: 
+homepage: http://openplacos.tuxfamily.org/
+licenses:
 - GPL-3
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: "Openplacos libraries : Libclient, LibPlugin, LibDriver"
+summary: ! 'Openplacos libraries : Libclient, LibPlugin, LibDriver'
 test_files: []
-

data/lib/openplacos/libdriver.rb

@@ -1,129 +0,0 @@
-#    This file is part of Openplacos.
-#
-#    Openplacos is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    Openplacos is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with Openplacos.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-ENV["DBUS_THREADED_ACCESS"] = "1" #activate threaded dbus
-require 'dbus-openplacos'
-
-
-module Openplacos
-  module Driver
-  
-  class GenericPin < DBus::Object
-
-    def set_off(iface_req_)
-      if (@init != iface_req_) # Iface changed, turn off previous one
-         if(self.methods.include?("exit_"+@init))
-           eval("exit_"+@init+"()")
-        end     
-      end
-    end
-
-
-    def write(iface_, value_, option_)
-      
-      set_off(iface_)
-      if (@input == 1)# Set output
-        if(self.methods.include?("set_output"))
-          self.set_output()
-        end
-        @input = 0; 
-      end
-
-      if (@init != iface_) # If the iface needs to be init
-        if(self.methods.include?("init_"+iface_))
-          eval("init_#{iface_}()")
-        end
-        @init = iface_
-      end
-      eval("write_#{iface_}(value_, option_)")
-
-    end
-
-    def add_write(iface_)
-      dbusdef = "dbus_interface 'org.openplacos.driver.#{iface_}' do
-                    dbus_method :write, 'out return:v, in value:v, in option:a{sv}' do |value, option|
-                      return self.write( \"#{iface_}\", value,option)
-                    end 
-                  end"
-
-      self.singleton_class.instance_eval(dbusdef)
-    end
-
-    def read(iface_, option_)
-       set_off(iface_)
-      if (@input == 0)# Set input
-        if(self.methods.include?("set_input"))
-          self.set_input()
-        end
-        @input = 1; 
-      end
-
-      eval("read_#{iface_}( option_)")
-
-    end
-    
-
-    def add_read(iface_)
-      dbusdef = "dbus_interface 'org.openplacos.driver.#{iface_}' do
-                    dbus_method :read, 'out return:v, in option:a{sv}' do |option|
-                      return self.read(\"#{iface_}\", option)
-                    end 
-                  end"
-      self.singleton_class.instance_eval(dbusdef)
-    end
-    
-    def add_read_and_write(iface_) # dbus do not merge methods in interface if they are not define in the same time
-      dbusdef = "dbus_interface 'org.openplacos.driver.#{iface_}' do
-                    dbus_method :read, 'out return:v, in option:a{sv}' do |option|
-                       return self.read(\"#{iface_}\",option)
-                    end
-                    dbus_method :write, 'out return:v, in value:v, in option:a{sv}' do |value, option|
-                     return self.write(\"#{iface_}\", value,option)
-                    end 
-                  end"
-
-      self.singleton_class.instance_eval(dbusdef)
-    end
-   
-    
-    def initialize(path_, write_intfs_, read_intfs_) # path name , an array of string of interface wich write methods, an array of 
-      @init = ""
-      @input = nil
-
-      (write_intfs_ & read_intfs_).each { |iface|
-        self.add_read_and_write(iface)
-        self.instance_eval("self.extend(Module_write_#{iface})")
-        self.instance_eval("self.extend(Module_read_#{iface})")
-        write_intfs_.delete(iface)
-        read_intfs_.delete(iface)
-      }          
-      
-      write_intfs_.each{ |iface|
-        self.add_write(iface)
-        self.instance_eval("self.extend(Module_write_#{iface})")
-      }
-      
-      read_intfs_.each{ |iface|
-        self.add_read(iface)
-        self.instance_eval("self.extend(Module_read_#{iface})")
-      }
-      super(path_)
-      self.extend(Other_common_fonctions)
-    end
-
-  end
-end
-end