guh 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4986b5e27fcbb44059de42f06fe85270470e06c3
-  data.tar.gz: 1e67ea596ae67942ce0b138f23a53900afbb4da8
+  metadata.gz: 87351db5068f587695299eea4fd4265a42b3df8d
+  data.tar.gz: 11db8d20180f51f8f6ace596a091f27186e02d7f
 SHA512:
-  metadata.gz: 293816e7eb5266eab8d3a9d8c3065f08ed65aa21c08d5eab35e47dbb1537ef7295567023eaceea315df65c0267c51992fb7b171e8626a7d58fd17579fa597567
-  data.tar.gz: 72f9065e827d245ad456b3d0bbc33def90bde42d98682f03368b309b50eb6af673cc163ded2a6bd563d6491cd656c8438504a73ff2d6acd259b79bd41ca75696
+  metadata.gz: a2f7884c6fb3d682f6031fea70e4a80b546f1a933b9b6b7c62691fc4eae5027473444fc506f9eaf060d09e69cba08f6ec83601542f0fa81d6f3557c900558d35
+  data.tar.gz: 4572217d7b13034211ce34a8f42f5f26844921be02778fe7a93ac3aa4682f2b6e8303a2bdcef5e4d8230b4c65cbeb5ab7d32503e394b0028624fb2bb3757e4a1

data/Rakefile

@@ -14,8 +14,8 @@ task :console do
   require 'guh'
 
   Guh::Base.configure do |c|
-    c.guh_ip_address = '172.20.10.4'
-    c.guh_port = 1234
+    c.guh_ip_address = ENV['GUH_IP']
+    c.guh_port = ENV['GUH_PORT']
   end
 
   ARGV.clear

data/guh.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "json", "~> 1.8"
+  spec.add_dependency "eventmachine"
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake",    "~> 10.3"

data/lib/guh.rb

@@ -11,9 +11,13 @@ require "guh/device_class"
 require "guh/event_type"
 require "guh/event"
 require "guh/plugin"
+require "guh/rule_type"
 require "guh/rule"
 require "guh/vendor"
 
+require "guh/em/connection"
+require "guh/em/notifications"
+
 module Guh
   # Your code goes here...
 

data/lib/guh/base.rb

@@ -56,7 +56,7 @@ module Guh
       if response['status'] == 'success'
         return response['params']
       else
-        raise Guh::ResponseError, "The Request was not successful"
+        raise Guh::ResponseError, "The Request was not successful: #{response['error']}"
       end
     end
 

data/lib/guh/em/connection.rb

@@ -0,0 +1,52 @@
+require 'eventmachine'
+
+module Guh
+  ##
+  # This class wraps everything related to Notifications.
+  #
+
+  module EM
+    class Connection < ::EventMachine::Connection
+
+      def onmessage(&block)
+        @onmessage = block
+      end
+
+      def post_init
+        request_string = Guh::Base.hash_to_json({id: Guh::Base.generate_request_id, method: "JSONRPC.SetNotificationStatus", params: { enabled: true } })
+        send_data(request_string)
+
+        @message = ""
+      end
+
+      def receive_data(data)
+
+        data.each_line do |line|
+          @message << line
+
+          if line.match(/^\}\n/)
+            trigger_on_message(@message)
+
+            @message = ""
+          end
+        end
+      end
+
+      def unbind
+        # TODO implement a callback to enable the notification of all clients about lost connection
+      end
+
+      private
+
+      def trigger_on_message(message)
+        begin
+          @onmessage.call(JSON::parse(message))
+        rescue Exception => e
+          puts "--> rescue in guh.rb: #{e.inspect}"
+          return {}
+        end
+      end
+
+    end
+  end
+end

data/lib/guh/em/notifications.rb

@@ -0,0 +1,13 @@
+module Guh
+  module EM
+    class Notifications
+
+      def self.subscribe
+        EventMachine.connect Guh::Base.guh_ip_address, Guh::Base.guh_port, Connection do |connection|
+          yield connection
+        end
+      end
+
+    end
+  end
+end

data/lib/guh/rule.rb

@@ -27,20 +27,13 @@ module Guh
     #
     # Example:
     #
-    #   Guh::Rule.add(event, action)
+    #   Guh::Rule.add(params)
     #
-    def self.add(event_descriptor_list, actions)
-      unless actions.is_a?(Array)
-        actions = [actions]
-      end
-
+    def self.add(params)
       get({
         id: generate_request_id,
         method: "Rules.AddRule",
-        params: {
-          eventDescriptorList: event_descriptor_list,
-          actions: actions
-        }
+        params: params
       })
     end
 

data/lib/guh/rule_type.rb

@@ -0,0 +1,7 @@
+module Guh
+  class RuleType
+    def self.all
+      ["EventBasedRule", "StateBasedRule", "MixedRule"]
+    end
+  end
+end

data/lib/guh/version.rb

@@ -1,3 +1,3 @@
 module Guh
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guh
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Christoph Edthofer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-11 00:00:00.000000000 Z
+date: 2014-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -25,6 +25,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -103,10 +117,13 @@ files:
 - lib/guh/base.rb
 - lib/guh/device.rb
 - lib/guh/device_class.rb
+- lib/guh/em/connection.rb
+- lib/guh/em/notifications.rb
 - lib/guh/event.rb
 - lib/guh/event_type.rb
 - lib/guh/plugin.rb
 - lib/guh/rule.rb
+- lib/guh/rule_type.rb
 - lib/guh/vendor.rb
 - lib/guh/version.rb
 - spec/helper.rb