guh 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d9c96fa741e8caf95a21bd27791fe42948d38e9
-  data.tar.gz: 2b02f5eae38bd78c9c47b934d2480654843ddf3c
+  metadata.gz: fa6cbfff073870eabcc433d92c9f92d48cb8bd0e
+  data.tar.gz: 34762aeabd46d3c0f8d7aa0aaaf6710d5f5c779f
 SHA512:
-  metadata.gz: 3d6e69e38dd6833f5a8f6df2bf9d1c2a9ce0513512655f67ea15fb91090df70eda1a75ed6bb34d1e3faf3bc25aedf6e4649babcc21f9fdf79e79ce0aca78700f
-  data.tar.gz: b7534ed8453175c5d4886cafa03322d307d22ab89335571d9a6eef3e9e8d917e1a443b246e10bfe65d380d6cf93bdcf53a78f2fad86d43a5ba2deed80db830bc
+  metadata.gz: 476d41353de9a87a7ee4585d9317b005e5a837ceccd34f0341c929c1ed0942b7e152387ab35b8382e1db81bbb97fd66ddd6819f403e7ea3a3d622d0c5c7446cd
+  data.tar.gz: 97c5ff55e9855e436e411905e4c628fee5e66193f214742f102380ec721347403e82df861884f248401dd61dbdeb55077ac588ddb50a5c3825af727385d01f54

data/Rakefile

@@ -14,4 +14,4 @@ task :console do
   require 'guh'
   ARGV.clear
   IRB.start
-end
+end

data/guh.gemspec

@@ -17,9 +17,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
-  
+
   spec.add_dependency "json", "~> 1.8"
-  
+
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake",    "~> 10.3"
   spec.add_development_dependency "rspec",   "~> 2.14"

data/lib/guh/action.rb

@@ -1,17 +1,17 @@
 module Guh
   ##
   # This class wraps everything related to Actions.
-  # 
+  #
   class Action < Base
-    
+
     ##
-    # 
+    #
     # Executes a specific Action on a specific Device.
-    # 
+    #
     # To activate an "Elro Power Switch":
-    # 
+    #
     #   Guh::Action.execute("TODO find specific device id", "{31c9758e-6567-4f89-85bb-29e1a7c55d44}", {power: true})
-    # 
+    #
     def self.execute(device_id, action_type_id, params={})
       response = get({
         id: generate_request_id,
@@ -19,16 +19,16 @@ module Guh
         params: {
           deviceId: device_id,
           actionTypeId: action_type_id,
-          params: convert_map_to_list_of_maps(params)
+          params: params
         }
       })
-      
+
       if response['success']==true
         return response
       else
         raise Guh::ArgumentError, response['errorMessage']
       end
     end
-    
+
   end
 end

data/lib/guh/action_type.rb

@@ -3,14 +3,14 @@ module Guh
   # This class wraps everything related to ActionTypes.
   #
   class ActionType < Base
-    
+
     ##
     # Retrieves all known ActionTypes for a specific Device identified by its +device_id+.
     #
     # Example:
-    # 
+    #
     #   Guh::ActionType.all("{308ae6e6-38b3-4b3a-a513-3199da2764f8}")
-    # 
+    #
     def self.all(device_class_id)
       response = get({
         id: generate_request_id,
@@ -19,9 +19,9 @@ module Guh
           deviceClassId: device_class_id
         }
       })
-      
+
       response['actionTypes']
     end
-    
+
   end
 end

data/lib/guh/base.rb

@@ -1,149 +1,149 @@
 module Guh
   ##
   # The base class which all the specific wrapper classes inherit from. It provides some shared code to make development easier.
-  # 
+  #
   class Base
-    
+
     # Getter/Setter for the guh_ip_address attribute
     def self.guh_ip_address #:nodoc:
-      @@guh_ip_address 
+      @@guh_ip_address
     end
     def self.guh_ip_address=(hia) #:nodoc:
       @@guh_ip_address=hia
-    end 
+    end
     @@guh_ip_address = "127.0.0.1"
-    
+
     # Getter/Setter for the guh_port attribute
-    def self.guh_port #:nodoc: 
+    def self.guh_port #:nodoc:
        @@guh_port
     end
     def self.guh_port=(hia) #:nodoc:
       @@guh_port=hia
     end
     @@guh_port = 1234
-    
+
     ##
-    # 
+    #
     # Returns everything that is going on inside guh Core
-    # 
+    #
     # Example:
-    # 
+    #
     #   Guh::Base.introspect
-    # 
+    #
     def self.introspect
       get({
         id: generate_request_id,
         method: "JSONRPC.Introspect",
       })
     end
-    
+
     ##
-    # 
+    #
     # <b>Don't use this unless you know what you are doing!</b>
-    # 
+    #
     # Send a request to guh Core and fetch the Response. This is a utility method used by the subclasses.
-    # 
+    #
     def self.get(request_hash)
       request_string = hash_to_json(request_hash)
-      
+
       response = nil
       client do |c|
         c.puts(request_string)
-        
+
         response = fetch_message(c)
       end
-      
+
       if response['status']=='success'
         return response['params']
       else
         raise Guh::ResponseError, "The Request was not successful"
       end
     end
-    
+
     ##
-    # 
+    #
     # Configuration DSL helper method.
-    # 
-    # The default values are: 
+    #
+    # The default values are:
     # * +guh_ip_address+: 127.0.0.1
     # * +guh_port+: 1234
-    # 
+    #
     # Example:
-    # 
+    #
     #   Guh.configure do |config|
     #     config.guh_ip_address = 10.0.0.1
     #     config.guh_port = 6789
     #   end
-    # 
+    #
     def self.configure(&block)
       yield self
     end
-    
+
     private
-    
+
     def self.generate_request_id
       999999
     end
-    
+
     def self.client(&block)
       client = TCPSocket.open(@@guh_ip_address, @@guh_port)
-      
+
       connection_message = fetch_message(client)
-      
+
       # TODO check guh-core version and raise error if incompatible with this gem's version
       # TODO look for timeout or connection refused errors
-      
+
       yield client
     end
-    
+
     def self.fetch_message(client)
       end_of_message = false
-      
+
       message = ""
       while (line = client.gets)
         message << line
-        
+
         end_of_message = true if line.match(/^\}\n/)
-        
+
         break if end_of_message
       end
-      
+
       return JSON::parse(message)
     end
-    
+
     ##
     #
     # Converts a regular hash into a list of hashes.
-    # 
-    # Example: 
-    # 
+    #
+    # Example:
+    #
     # convert_map_to_list_of_maps({
     #   power: true,
     #   pin: 1,
     #   family_code: 'A'
     # })
     #
-    # Returns: 
-    # 
+    # Returns:
+    #
     # [
     #   {power: true},
     #   {pin: 1},
     #   {family_code: 'A'}
     # ]
-    # 
+    #
     def self.convert_map_to_list_of_maps(map)
       # make sure we have an array to work with
       map ||= []
-      
+
       # do the conversion work
       list = []
       map.each do |key, value|
         list << {key => value}
       end
-      
+
       return list
     end
-    
+
     def self.hash_to_json(hash)
       JSON::dump(hash) + "\n"
     end

data/lib/guh/device.rb

@@ -3,39 +3,39 @@ module Guh
   # This class wraps everything related to configured Devices.
   #
   class Device < Base
-    
-    
+
+
     ##
     #
     def self.find(id)
       device = self.all.detect{|d| d['id']==id}
-      
+
       return device
     end
-    
+
     ##
-    # 
+    #
     # Returns a list of all configured Devices.
-    # 
+    #
     # Example:
-    # 
+    #
     #   Guh::Device.all
-    # 
+    #
     def self.all
       response = get({
         id: generate_request_id,
         method: "Devices.GetConfiguredDevices"
       })
-      
+
       return response['devices']
     end
-    
+
     ##
-    # 
+    #
     # Creates a configured device and returns it's ID.
-    # 
+    #
     # Example for the "Elro Power Switch":
-    # 
+    #
     #   Guh::Device.add("{308ae6e6-38b3-4b3a-a513-3199da2764f8}", {
     #     channel1: true,
     #     channel2: false,
@@ -48,7 +48,7 @@ module Guh
     #     channel9: false,
     #     channel10: false
     #   })
-    # 
+    #
     def self.add(device_class_id, params)
       response = get({
         id: generate_request_id,
@@ -64,17 +64,17 @@ module Guh
         raise Guh::ArgumentError, response['errorMessage']
       end
     end
-    
+
     ##
-    # 
+    #
     # Removes a configured device.
-    # 
+    #
     # Example:
     #
     #   device_id = Guh::Device.add("{ab73ad2f-6594-45a3-9063-8f72d365c5e5}", {familyCode: 'A'})
-    #   
+    #
     #   Guh::Device.remove(device_id)
-    # 
+    #
     def self.remove(device_id)
       response = get({
         id: generate_request_id,
@@ -89,16 +89,16 @@ module Guh
         raise Guh::ResponseError, response['errorMessage']
       end
     end
-    
+
     ##
-    # 
+    #
     # Returns current number of configured devices
-    # 
+    #
     # Example: Guh::Device.count_configured
-    # 
+    #
     def self.count
       self.all.length
     end
-    
+
   end
 end

data/lib/guh/device_class.rb

@@ -3,68 +3,68 @@ module Guh
   # This class wraps everything related to available Devices.
   #
   class DeviceClass < Base
-    
+
     ##
-    # 
+    #
     # Returns a list of all supported Devices.
-    # 
+    #
     # Example:
-    # 
+    #
     #   Guh::DeviceClass.all
     #   # => a list of all supported devices
-    # 
+    #
     def self.all(options={})
       params = {}
       params['vendorId'] = options[:vendor_id] unless options[:vendor_id].nil?
-      
+
       response = get({
         id: generate_request_id,
         method: "Devices.GetSupportedDevices",
         params: params
       })
-      
+
       return response['deviceClasses']
     end
-    
+
     ##
     #
     # Finds a DeviceClass with a specific ID
-    # 
-    # Example: 
-    # 
+    #
+    # Example:
+    #
     #   Guh::DeviceClass.find("{2062d64d-3232-433c-88bc-0d33c0ba2ba6}")
     #   # => a list of all supported devices of a specific vendor
-    # 
+    #
     def self.find(id)
       device_classes = self.all
-      
+
       device_class = device_classes.detect{|dc| dc['id']==id}
-      
+
       if device_class
         return device_class
       else
         raise DeviceClassNotFound, "Could not find a DeviceClass with the id #{id}"
       end
     end
-    
+
     ##
     #
     def self.discover(id, options={})
       params = {deviceClassId: id}
       params['discoveryParams'] = options
-      
+
       response = get({
         id: generate_request_id,
         method: "Devices.GetDiscoveredDevices",
         params: params
       })
-      
+
       if response['success']
         return response['deviceDescriptors']
       else
         raise ResponseError, response['errorMessage']
       end
     end
-    
+
   end
 end

data/lib/guh/event.rb

@@ -3,7 +3,7 @@ module Guh
   # This class wraps everything related to Events.
   #
   class Event < Base
-    
+
   end
-  
-end
+
+end

data/lib/guh/event_type.rb

@@ -1,17 +1,17 @@
 module Guh
   ##
   # This class wraps everything related to EventTypes.
-  # 
+  #
   class EventType < Base
-    
+
     ##
-    # 
+    #
     # Returns a list of all available EventTypes.
-    # 
+    #
     # Example:
-    # 
+    #
     #   Guh::EventType.all(device_class_id)
-    # 
+    #
     def self.all(device_class_id)
       response = get({
         id: generate_request_id,
@@ -20,9 +20,9 @@ module Guh
           deviceClassId: device_class_id
         }
       })
-      
+
       response['eventTypes']
     end
-    
+
   end
 end

data/lib/guh/plugin.rb

@@ -1,34 +1,34 @@
 module Guh
   ##
   # This class wraps everything related to Plugins.
-  # 
+  #
   class Plugin < Base
-    
+
     ##
-    # 
+    #
     # Returns a list of all installed plugins.
-    # 
+    #
     # Example:
-    # 
+    #
     #   Guh::Plugin.all
-    # 
+    #
     def self.all
       response = get({
         id: generate_request_id,
         method: "Devices.GetPlugins"
       })
-      
+
       response['plugins']
     end
-    
+
     ##
-    # 
+    #
     # Set some params on a plugin.
-    # 
+    #
     # Example:
-    # 
+    #
     #   HiveRpcWrapper::Plugin.set_params("TODO get proper plugin id", {foo: "bar"})
-    # 
+    #
     # def self.set_config(plugin_id, params)
     #   get({
     #     id: generate_request_id,
@@ -39,6 +39,6 @@ module Guh
     #     }
     #   })
     # end
-    
+
   end
 end

data/lib/guh/rule.rb

@@ -1,58 +1,60 @@
 module Guh
   ##
   # This class wraps everything related to Rules.
-  # 
+  #
   class Rule < Base
-    
+
     ##
-    # 
+    #
     # Returns a list of all Rules.
-    # 
+    #
     # Example:
-    # 
+    #
     #   Guh::Rule.all
-    # 
+    #
     def self.all
       response = get({
         id: generate_request_id,
         method: "Rules.GetRules"
       })
-      
-      response['rules']
+
+      response['ruleIds']
     end
-    
+
     ##
-    # 
+    #
     # Creates a new Rule.
-    # 
+    #
     # Example:
-    # 
+    #
     #   Guh::Rule.add(event, action)
-    # 
-    def self.add(event, actions)
+    #
+    def self.add(event_descriptor_list, actions)
       unless actions.is_a?(Array)
         actions = [actions]
       end
-      
+
       get({
         id: generate_request_id,
         method: "Rules.AddRule",
-        event: event,
-        actions: actions
+        params: {
+          eventDescriptorList: event_descriptor_list,
+          actions: actions
+        }
       })
     end
-    
+
     ##
-    # 
+    #
     # Removes a Rule.
-    # 
+    #
     # Example:
-    # 
+    #
     #   Guh::Rule.remove(rule_id)
-    # 
+    #
     def self.remove(rule_id)
-      
+
     end
-    
+
   end
 end

data/lib/guh/vendor.rb

@@ -1,25 +1,25 @@
 module Guh
   ##
   # This class wraps everything related to Vendors.
-  # 
+  #
   class Vendor < Base
-    
+
     ##
-    # 
+    #
     # Retrieves a list of all supported vendors
-    # 
+    #
     # Example:
-    # 
+    #
     #   Guh::Vendor.all
-    # 
+    #
     def self.all
       response = get({
         id: generate_request_id,
         method: "Devices.GetSupportedVendors"
       })
-      
+
       return response['vendors']
     end
-    
+
   end
 end

data/lib/guh/version.rb

@@ -1,3 +1,3 @@
 module Guh
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/guh.rb

@@ -16,9 +16,9 @@ require "guh/vendor"
 
 module Guh
   # Your code goes here...
-  
+
   class ConnectionError < Exception; end
   class ResponseError < Exception; end
   class ArgumentError < Exception; end
-  
+
 end

data/spec/helper.rb

@@ -3,29 +3,43 @@ require 'rspec'
 
 require 'guh'
 
-puts "\n\n---------------------------------------------------"
-puts "Please make sure that Guh is running"
-puts "---------------------------------------------------\n\n"
+TEST_HOME = File.expand_path('../tmp/test_home')
 
 RSpec.configure do |config|
+
   config.before(:all) do
     Guh::Base.configure do |c|
       c.guh_ip_address = "127.0.0.1"
       c.guh_port = 1234
     end
-    
+
     # Remove all devices & rules from Guh Core
     purge_configuration()
+
+    start_guh()
+    sleep(1)
+  end
+
+  config.after(:all) do
+    stop_guh()
   end
 end
 
+def start_guh
+  @guh_pipe = IO.popen("export HOME=#{TEST_HOME}; guh 2>&1")
+end
+
+def stop_guh
+  Process.kill 'INT', @guh_pipe.pid
+end
+
 def purge_devices
-  path = File.expand_path('~/.config/guh/guh.conf')
+  path = File.join(TEST_HOME, '.config/guh/guh.conf')
   File.unlink(path) if File.exist?(path)
 end
 
 def purge_rules
-  path = File.expand_path('~/.config/guh/rules.conf')
+  path = File.join(TEST_HOME, '.config/guh/rules.conf')
   File.unlink(path) if File.exist?(path)
 end
 
@@ -45,7 +59,7 @@ end
 def create_configured_device(device_class_id, params)
   # Create a device
   device_id = Guh::Device.add(device_class_id, params)
-  
+
   # Get the newly configured device
   return Guh::Device.all.detect{|d| d['id']==device_id}
 end

data/spec/integration/action_spec.rb

@@ -1,42 +1,42 @@
 require 'helper'
 
 describe Guh::Action do
-  
+
   before :all do
     # Elro Switch
     device_class_id = "{308ae6e6-38b3-4b3a-a513-3199da2764f8}"
-    
-    @device = create_configured_device(device_class_id, {
-      channel1: true,
-      channel2: false,
-      channel3: false,
-      channel4: false,
-      channel5: false,
-      channel6: false,
-      channel7: false,
-      channel8: false,
-      channel9: false,
-      channel10: false
-    })
-    
+
+    @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: 'A',  value: false},
+      {name: 'B',  value: false},
+      {name: 'C',  value: false},
+      {name: 'D',  value: false},
+      {name: 'E', value: false}
+    ])
+
     # Get all the possible actions for the device
     actions = Guh::ActionType.all(device_class_id)
-    
+
     # Just use the first action
     @action = actions.first
   end
-  
+
   it "should execute a single action" do
     -> {
-      response = Guh::Action.execute(@device['id'], @action['id'], {power: true})
+      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
-    
+
     -> {
-      response = Guh::Action.execute(@device['id'], @action['id'], {})
+      response = Guh::Action.execute(@device['id'], @action['id'], [])
     }.should raise_error
   end
-  
+
 end

data/spec/integration/action_type_spec.rb

@@ -1,11 +1,11 @@
 require 'helper'
 
 describe Guh::ActionType do
-  
+
   it "should return the supported actions for a device" do
     response = Guh::ActionType.all("{308ae6e6-38b3-4b3a-a513-3199da2764f8}")
-    
+
     response.should be_an_instance_of(Array)
   end
-  
+
 end

data/spec/integration/base_spec.rb

@@ -1,18 +1,18 @@
 require 'helper'
 
 describe Guh::Device do
-  
+
   it 'should raise an exception if Guh Core is not running' do
     Guh::Base.configure do |c|
       c.guh_ip_address = "0.0.0.0"
       c.guh_port = 7890 # <---- wrong port to provoke excpetion
     end
-    
+
     expect { Guh::Base.introspect }.to raise_error(Errno::ECONNREFUSED)
   end
-  
+
   it 'should raise an exception if Guh Core does not respond with success on connect' do
     pending("TODO: Find a way to provoke this.")
   end
-  
-end
+
+end

data/spec/integration/device_class_spec.rb

@@ -1,50 +1,48 @@
 require 'helper'
 
 describe Guh::DeviceClass do
-  
+
   it "should get the supported devices" do
     response = Guh::DeviceClass.all
-    
+
     response.should be_an_instance_of(Array)
   end
-  
+
   it "should find a specific DeviceClass" do
     device_class_id = "{ab73ad2f-6594-45a3-9063-8f72d365c5e5}"
-    
+
     -> {
       Guh::DeviceClass.find("bogus")
     }.should raise_error
-    
+
     -> {
       device_class = Guh::DeviceClass.find(device_class_id)
       device_class['id'].should eq(device_class_id)
     }.should_not raise_error
   end
-  
+
   it "should get the supported devices of a specific vendor" do
     response = Guh::Vendor.all
-    
+
     vendor_id = response.first['id']
-    
+
     devices = Guh::DeviceClass.all(vendor_id: vendor_id)
-    
+
     if devices.length > 0
       devices.first['vendorId'].should eq(vendor_id)
     end
   end
-  
+
   it "should discover the openweathermap" do
-    
+
     device_class_id = "{985195aa-17ad-4530-88a4-cdd753d747d7}"
-    
-    # pending "TODO wait until issue #13 is fixed"
-    
-    device_descriptors = Guh::DeviceClass.discover(device_class_id, location: '')
-    
-    puts "--"
-    puts device_descriptors.inspect
-    puts "--"
-    
+
+    pending "TODO wait until issue #13 is fixed"
+
+    # device_descriptors = Guh::DeviceClass.discover(device_class_id, [
+    #   {name: 'location', value: ''}
+    # ])
+
   end
-  
+
 end

data/spec/integration/device_spec.rb

@@ -1,64 +1,64 @@
 require 'helper'
 
 describe Guh::Device do
-  
+
   it "should get the configured device" do
     response = Guh::Device.all
-    
+
     response.should be_an_instance_of(Array)
   end
-  
+
   it "should tell us the number of configured devices" do
     count = Guh::Device.count
-    
+
     count.should be_a(Integer)
   end
-  
+
   it "should let us configure a device" do
     configured_count = Guh::Device.count
-    
+
     -> {
-      response = Guh::Device.add("{308ae6e6-38b3-4b3a-a513-3199da2764f8}", {
-        channel1: true,
-        channel2: false,
-        channel3: false,
-        channel4: false,
-        channel5: false,
-        channel6: false,
-        channel7: false,
-        channel8: false,
-        channel9: false,
-        channel10: false
-      })
+      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: 'A',  value: false},
+        {name: 'B',  value: false},
+        {name: 'C',  value: false},
+        {name: 'D',  value: false},
+        {name: 'E', value: false}
+      ])
     }.should_not raise_error
-    
+
     Guh::Device.count.should eq(configured_count+1)
   end
-  
+
   it "should fail if we omit the params" do
     configured_count = Guh::Device.count
-    
+
     -> {
       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}", {familyCode: 'A'})
-    
+    device_id = Guh::Device.add("{ab73ad2f-6594-45a3-9063-8f72d365c5e5}", [{name: 'familyCode', value: 'A'}])
+
     device_id.should match(/^\{[a-z0-9\-]+\}$/i)
-    
+
     Guh::Device.remove(device_id).should be_true
-    
+
     Guh::Device.find(device_id).should be_nil
   end
-  
+
   it "should raise an error if we try to delete a non-existing device" do
     -> {
       Guh::Device.remove("abc").should
     }.should raise_error
   end
-  
+
 end

data/spec/integration/event_type_spec.rb

@@ -1,17 +1,17 @@
 require 'helper'
 
 describe Guh::EventType do
-  
+
   it "should get something back" do
     # Elro Switch
     device_class_id = "{308ae6e6-38b3-4b3a-a513-3199da2764f8}"
-    
+
     # Get all the possible events for the device
     response = Guh::EventType.all(device_class_id)
-    
+
     response.should be_an_instance_of(Array)
-    
+
     pending "Right now we get empty responses for all events"
   end
-  
+
 end

data/spec/integration/plugin_spec.rb

@@ -1,15 +1,15 @@
 require 'helper'
 
 describe Guh::Plugin do
-  
+
   it "should return a list of all loaded plugins" do
     response = Guh::Plugin.all
-    
+
     response.should be_an_instance_of(Array)
   end
-  
+
   it "should add params to the Plugin config" do
     pending("Implement after difference between PluginConfig & PluginParams is clear")
   end
-  
+
 end

data/spec/integration/rule_spec.rb

@@ -1,53 +1,56 @@
 require 'helper'
 
 describe Guh::Rule do
-  
+
   before :all do
     # Intertechno Remote
-    @sender = create_configured_device("{ab73ad2f-6594-45a3-9063-8f72d365c5e5}", {
-      familyCode: 'A'
-    })
-    
+    @sender = create_configured_device("{ab73ad2f-6594-45a3-9063-8f72d365c5e5}", [
+      {name: 'familyCode', value: 'A'}
+    ])
+
     # Intertechno Switch
-    @receiver = create_configured_device("{324219e8-7c53-41b5-b314-c2900cd15252}", {
-      familyCode: 'A',
-      buttonCode: 1
-    })
-    
+    @receiver = create_configured_device("{324219e8-7c53-41b5-b314-c2900cd15252}", [
+      {name: 'familyCode', value: 'A'},
+      {name: 'buttonCode', value: 1}
+    ])
+
   end
-  
+
   it "should return a list of all rules" do
     response = Guh::Rule.all
-    
+
     response.should be_an_instance_of(Array)
   end
-  
+
   it "should create a new rule" do
     senderDeviceClass = Guh::DeviceClass.all.detect{|d| d['id']==@sender['deviceClassId']}
-    eventId = senderDeviceClass['events'].first['id']
-    
+
+    eventTypeId = senderDeviceClass['eventTypes'].first['id']
+
     actionId = Guh::ActionType.all(@receiver['deviceClassId']).first['id']
-    
+
     event = {
-      eventTypeId: eventId,
+      eventTypeId: eventTypeId,
       deviceId: @sender['id'],
-      params: {inRange: true}
+      params: [
+        {name: 'inRange', value: true}
+      ]
     }
-    
+
     action = {
       actionTypeId: actionId,
       deviceId: @receiver['id'],
-      params: {
-        power: true
-      }
+      params: [
+        {name: 'power', value: true}
+      ]
     }
-    
+
     -> {
-      # response = Guh::Rule.add(event, action)
+      response = Guh::Rule.add(event, action)
     }.should_not raise_error
-    
+
     pending "TODO How do we know we were successful?"
-    
+
   end
-  
+
 end

data/spec/integration/vendor_spec.rb

@@ -1,17 +1,17 @@
 require 'helper'
 
 describe Guh::Vendor do
-  
+
   it "should return a list of available vendors" do
-    
+
     response = Guh::Vendor.all
-    
+
     response.length.should be > 0
-    
+
   end
-  
+
   it "should return information about a specific vendor" do
     pending "TODO: Implement Guh::Vendor.find('{abc}')"
   end
-  
-end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guh
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Christoph Edthofer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-16 00:00:00.000000000 Z
+date: 2014-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json