guh 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 068cafcdebfd3a9f6001772252d927c8a51bdc60
-  data.tar.gz: 5f1b8f7cb9575e656aa2e16e1efb624f0dfeeec1
+  metadata.gz: d4d9c7442043ff911a635dce551e050563e6dada
+  data.tar.gz: a93a5f0f1b94fe8e1376651595d504ca88185ce2
 SHA512:
-  metadata.gz: 3b6c5acdf0d427af9d69555f35b45f9bf4f8b50806b1aeb1755ac730754bc7e655a949a56dfd359f76cad3b8f088b92980375868774f94720e275d8f9b1eb247
-  data.tar.gz: da8e4508aeb160afdd3466acbb68d5117cb056c0cd36b54dbccff2c1df8b6e7ebb7e9ddc89b9239b7e93f315c88896f515b07e739599b8b84267e62a3b033fed
+  metadata.gz: 818cf818e6ce9bac1d326f713d32c0a287a8901e6edc6eee6856e0e65014c1014fd5197a6e90faa3c2de28c8ba22c79dddc3dfefc4b769d50257e02a510520ab
+  data.tar.gz: 10a5f8c681aecee9f25fdbf9f7f72ff8522bf47330660c8c9de0e3069bd3aba5c7a66e9cb6b9ca5ae3d1b202b7e4f2286488687949a3f9064eb453bb478b071f

data/Rakefile

@@ -14,7 +14,7 @@ task :console do
   require 'guh'
 
   Guh::Base.configure do |c|
-    c.guh_ip_address = '192.168.1.30'
+    c.guh_ip_address = '172.20.10.4'
     c.guh_port = 1234
   end
 

data/lib/guh/action.rb

@@ -26,7 +26,7 @@ module Guh
       if response['deviceError'] == 'DeviceErrorNoError'
         return response
       else
-        raise Guh::ArgumentError, response['deviceError']
+        raise Guh::DeviceError, response['deviceError']
       end
     end
 

data/lib/guh/device.rb

@@ -61,7 +61,7 @@ module Guh
       if response['deviceError'] == 'DeviceErrorNoError'
         return response['deviceDescriptors']
       else
-        raise Guh::ResponseError, response['deviceError']
+        raise Guh::DeviceError, response['deviceError']
       end
     end
 
@@ -86,17 +86,16 @@ module Guh
     #
     # To create a discovered device you have to provide a descriptor ID in the params:
     #
-    #   Guh::Device.add("{985195aa-17ad-4530-88a4-cdd753d747d7}", {descriptorId: "{727a4a9a-c187-446f-aadf-f1b2220607d1}"})
+    #   Guh::Device.add("{985195aa-17ad-4530-88a4-cdd753d747d7}", {deviceDescriptorId: "{727a4a9a-c187-446f-aadf-f1b2220607d1}"})
     #
     def self.add(device_class_id, params)
       device_class = Guh::DeviceClass.find(device_class_id)
 
-      case device_class['createMethod']
-      when 'CreateMethodUser'
+      if device_class['createMethods'].include? 'CreateMethodUser'
         add_configured_device(device_class_id, params)
-      when 'CreateMethodDiscovery'
-        add_discovered_device(device_class_id, params['descriptorId'])
-      when 'CreateMethodAuto'
+      elsif device_class['createMethods'].include? 'CreateMethodDiscovery'
+        add_discovered_device(device_class_id, params.delete('deviceDescriptorId'), params)
+      elsif device_class['createMethods'].include? 'CreateMethodAuto'
         # Nothing to do here
         # TODO should we raise an exception?
       end
@@ -120,7 +119,7 @@ module Guh
       if response['deviceError'] == 'DeviceErrorNoError'
         return response
       else
-        raise Guh::ArgumentError, response['deviceError']
+        raise Guh::DeviceError, response['deviceError']
       end
     end
 
@@ -145,7 +144,7 @@ module Guh
       if response['deviceError'] == 'DeviceErrorNoError'
         return true
       else
-        raise Guh::ResponseError, response['deviceError']
+        raise Guh::DeviceError, response['deviceError']
       end
     end
 
@@ -174,51 +173,53 @@ module Guh
       if response['deviceError'] == 'DeviceErrorNoError'
         return response['deviceId']
       else
-        raise Guh::ArgumentError, response['deviceError']
+        raise Guh::DeviceError, response['deviceError']
       end
     end
 
-    def self.add_discovered_device(device_class_id, descriptor_id)
+    def self.add_discovered_device(device_class_id, descriptor_id, params = [])
       device_class = Guh::DeviceClass.find(device_class_id)
 
       if device_class['setupMethod'] == 'SetupMethodJustAdd'
-        add_discovered_device_just_add(device_class_id, descriptor_id)
+        add_discovered_device_just_add(device_class_id, descriptor_id, params)
       else
-        add_discovered_device_pair(device_class_id, descriptor_id)
+        add_discovered_device_pair(device_class_id, descriptor_id, params)
       end
     end
 
-    def self.add_discovered_device_just_add(device_class_id, descriptor_id)
+    def self.add_discovered_device_just_add(device_class_id, device_descriptor_id, params = [])
       response = get({
         id: generate_request_id,
         method: "Devices.AddConfiguredDevice",
         params: {
           deviceClassId: device_class_id,
-          deviceDescriptorId: descriptor_id
+          deviceDescriptorId: device_descriptor_id,
+          deviceParams: params
         }
       })
 
       if response['deviceError'] == 'DeviceErrorNoError'
         return response['deviceId']
       else
-        raise Guh::ArgumentError, response['deviceError']
+        raise Guh::DeviceError, response['deviceError']
       end
     end
 
-    def self.add_discovered_device_pair(device_class_id, descriptor_id)
+    def self.add_discovered_device_pair(device_class_id, descriptor_id, params = [])
       response = get({
         id: generate_request_id,
         method: "Devices.PairDevice",
         params: {
           deviceClassId: device_class_id,
-          deviceDescriptorId: descriptor_id
+          deviceDescriptorId: descriptor_id,
+          deviceParams: params
         }
       })
 
       if response['deviceError'] == 'DeviceErrorNoError'
         return response
       else
-        raise Guh::ArgumentError, response['deviceError']
+        raise Guh::DeviceError, response['deviceError']
       end
     end
 

data/lib/guh/version.rb

@@ -1,3 +1,3 @@
 module Guh
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/guh.rb

@@ -20,6 +20,8 @@ module Guh
   class ConnectionError < Exception; end
   class ResponseError < Exception; end
   class ArgumentError < Exception; end
+  class DeviceError < Exception; end
+  class ActionError < Exception; end
   class DeviceClassNotFound < Exception; end
 
 end

data/spec/helper.rb

@@ -9,7 +9,7 @@ RSpec.configure do |config|
 
   config.before(:all) do
     Guh::Base.configure do |c|
-      c.guh_ip_address = '192.168.1.30'
+      c.guh_ip_address = '172.20.10.4'
       c.guh_port = 1234
     end
 
@@ -61,5 +61,5 @@ def create_configured_device(device_class_id, params)
   device_id = Guh::Device.add(device_class_id, params)
 
   # Get the newly configured device
-  return Guh::Device.all.detect{|d| d['id']==device_id}
+  return Guh::Device.all.detect{|d| d['id'] == device_id}
 end

data/spec/integration/action_spec.rb

@@ -7,11 +7,11 @@ describe Guh::Action do
     device_class_id = "{308ae6e6-38b3-4b3a-a513-3199da2764f8}"
 
     @device = create_configured_device(device_class_id, [
-      {name: 'channel1',  value: true},
-      {name: 'channel2',  value: false},
-      {name: 'channel3',  value: false},
-      {name: 'channel4',  value: false},
-      {name: 'channel5',  value: false},
+      {name: 'channel 1',  value: true},
+      {name: 'channel 2',  value: false},
+      {name: 'channel 3',  value: false},
+      {name: 'channel 4',  value: false},
+      {name: 'channel 5',  value: false},
       {name: 'A',  value: false},
       {name: 'B',  value: false},
       {name: 'C',  value: false},
@@ -27,9 +27,10 @@ describe Guh::Action do
   end
 
   it "should execute a single action" do
-    -> {
-      response = Guh::Action.execute(@device['id'], @action['id'], [{name: 'power', value: true}])
-    }.should_not raise_error
+    pending "Find another device to test this"
+    # -> {
+    #   response = Guh::Action.execute(@device['id'], @action['id'], [{name: 'power', value: true}])
+    # }.should_not raise_error
   end
 
   it 'should fail if the wrong params are provided' do

data/spec/integration/device_spec.rb

@@ -19,11 +19,11 @@ describe Guh::Device do
 
     -> {
       response = Guh::Device.add("{308ae6e6-38b3-4b3a-a513-3199da2764f8}", [
-        {name: 'channel1', value: true},
-        {name: 'channel2', value: false},
-        {name: 'channel3', value: false},
-        {name: 'channel4', value: false},
-        {name: 'channel5', value: false},
+        {name: 'channel 1', value: true},
+        {name: 'channel 2', value: false},
+        {name: 'channel 3', value: false},
+        {name: 'channel 4', value: false},
+        {name: 'channel 5', value: false},
         {name: 'A', value: false},
         {name: 'B', value: false},
         {name: 'C', value: false},
@@ -39,7 +39,7 @@ describe Guh::Device do
     configured_count = Guh::Device.count
 
     -> {
-      response = Guh::Device.add("{308ae6e6-38b3-4b3a-a513-3199da2764f8}", {})
+      response = Guh::Device.add("{308ae6e6-38b3-4b3a-a513-3199da2764f8}", [])
     }.should raise_error
 
     Guh::Device.count.should eq(configured_count)
@@ -50,7 +50,7 @@ describe Guh::Device do
 
     device_id.should match(/^\{[a-z0-9\-]+\}$/i)
 
-    Guh::Device.remove(device_id).should be_truthy
+    Guh::Device.remove(device_id).should be_true
 
     Guh::Device.find(device_id).should be_nil
   end
@@ -66,7 +66,9 @@ describe Guh::Device do
 
     device_descriptors = Guh::Device.discover(device_class_id, [{name: 'location', value: 'Salzburg'}])
 
-    response = Guh::Device.add(device_class_id, {'descriptorId' => device_descriptors.first['id']})
+    response = Guh::Device.add(device_class_id, {'deviceDescriptorId' => device_descriptors.first['id']})
+
+    response.should match /\A\{.*\}\z/
   end
 
 end

data/spec/integration/rule_spec.rb

@@ -11,7 +11,7 @@ describe Guh::Rule do
     # Intertechno Switch
     @receiver = create_configured_device("{324219e8-7c53-41b5-b314-c2900cd15252}", [
       {name: 'familyCode', value: 'A'},
-      {name: 'buttonCode', value: 1}
+      {name: 'button', value: 1}
     ])
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guh
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Christoph Edthofer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json