guh 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4d9c7442043ff911a635dce551e050563e6dada
-  data.tar.gz: a93a5f0f1b94fe8e1376651595d504ca88185ce2
+  metadata.gz: 4986b5e27fcbb44059de42f06fe85270470e06c3
+  data.tar.gz: 1e67ea596ae67942ce0b138f23a53900afbb4da8
 SHA512:
-  metadata.gz: 818cf818e6ce9bac1d326f713d32c0a287a8901e6edc6eee6856e0e65014c1014fd5197a6e90faa3c2de28c8ba22c79dddc3dfefc4b769d50257e02a510520ab
-  data.tar.gz: 10a5f8c681aecee9f25fdbf9f7f72ff8522bf47330660c8c9de0e3069bd3aba5c7a66e9cb6b9ca5ae3d1b202b7e4f2286488687949a3f9064eb453bb478b071f
+  metadata.gz: 293816e7eb5266eab8d3a9d8c3065f08ed65aa21c08d5eab35e47dbb1537ef7295567023eaceea315df65c0267c51992fb7b171e8626a7d58fd17579fa597567
+  data.tar.gz: 72f9065e827d245ad456b3d0bbc33def90bde42d98682f03368b309b50eb6af673cc163ded2a6bd563d6491cd656c8438504a73ff2d6acd259b79bd41ca75696

data/lib/guh/device.rb

@@ -71,7 +71,7 @@ module Guh
     #
     # Example for the "Elro Power Switch":
     #
-    #   Guh::Device.add("{308ae6e6-38b3-4b3a-a513-3199da2764f8}", {
+    #   Guh::Device.add("{308ae6e6-38b3-4b3a-a513-3199da2764f8}", nil, {
     #     channel1: true,
     #     channel2: false,
     #     channel3: false,
@@ -86,15 +86,15 @@ 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}", {deviceDescriptorId: "{727a4a9a-c187-446f-aadf-f1b2220607d1}"})
+    #   Guh::Device.add("{985195aa-17ad-4530-88a4-cdd753d747d7}", "{727a4a9a-c187-446f-aadf-f1b2220607d1}")
     #
-    def self.add(device_class_id, params)
+    def self.add(device_class_id, device_descriptor_id = nil, params = [])
       device_class = Guh::DeviceClass.find(device_class_id)
 
       if device_class['createMethods'].include? 'CreateMethodUser'
         add_configured_device(device_class_id, params)
       elsif device_class['createMethods'].include? 'CreateMethodDiscovery'
-        add_discovered_device(device_class_id, params.delete('deviceDescriptorId'), params)
+        add_discovered_device(device_class_id, device_descriptor_id, params)
       elsif device_class['createMethods'].include? 'CreateMethodAuto'
         # Nothing to do here
         # TODO should we raise an exception?
@@ -129,7 +129,7 @@ module Guh
     #
     # Example:
     #
-    #   device_id = Guh::Device.add("{ab73ad2f-6594-45a3-9063-8f72d365c5e5}", {familyCode: 'A'})
+    #   device_id = Guh::Device.add("{ab73ad2f-6594-45a3-9063-8f72d365c5e5}", nil, [{name: 'familyCode', value: 'A'}])
     #
     #   Guh::Device.remove(device_id)
     #

data/lib/guh/version.rb

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

data/spec/helper.rb

@@ -58,7 +58,7 @@ end
 
 def create_configured_device(device_class_id, params)
   # Create a device
-  device_id = Guh::Device.add(device_class_id, params)
+  device_id = Guh::Device.add(device_class_id, nil, params)
 
   # Get the newly configured device
   return Guh::Device.all.detect{|d| d['id'] == device_id}

data/spec/integration/device_spec.rb

@@ -18,7 +18,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}", nil, [
         {name: 'channel 1', value: true},
         {name: 'channel 2', value: false},
         {name: 'channel 3', value: false},
@@ -39,14 +39,14 @@ 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)
   end
 
   it "should create a new device, return its ID and remove it successfully" do
-    device_id = Guh::Device.add("{ab73ad2f-6594-45a3-9063-8f72d365c5e5}", [{name: 'familyCode', value: 'A'}])
+    device_id = Guh::Device.add("{ab73ad2f-6594-45a3-9063-8f72d365c5e5}", nil, [{name: 'familyCode', value: 'A'}])
 
     device_id.should match(/^\{[a-z0-9\-]+\}$/i)
 
@@ -66,7 +66,7 @@ describe Guh::Device do
 
     device_descriptors = Guh::Device.discover(device_class_id, [{name: 'location', value: 'Salzburg'}])
 
-    response = Guh::Device.add(device_class_id, {'deviceDescriptorId' => device_descriptors.first['id']})
+    response = Guh::Device.add(device_class_id, device_descriptors.first['id'])
 
     response.should match /\A\{.*\}\z/
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guh
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Christoph Edthofer