sensi 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b62980b6c4dcd648128cbd8a1dff278d92b75e0f
-  data.tar.gz: a1b6e4f29e927390369a520afcfd2c0ef2c4fbe3
+  metadata.gz: 770c2a7369508fca70bf405ffc7339e5d4d199e3
+  data.tar.gz: 2696abe6fe7d07a34d986f569694b9cf76359dc2
 SHA512:
-  metadata.gz: d9ba0d48f6cff9a48edc43eb73243506656540010301b98f97e90a13f12d6d7b7f6557ff981712c8f1f0ac31cfb76e919911cdc2f66d7f3dbdda72ace837c409
-  data.tar.gz: e3728294b07c106691dc1e0ae7e9205dce13bd7c485c93fe9354942ad3dd69a42768f07315d4074d97cdc362d6ffd55f503aac809046680da6f7e088e895d2ec
+  metadata.gz: 1cd20e2e6fa05a39ed9239a3bb830ba9bacaefef6e94087d278169632de00bf04cfe84342699682330914deb1653ec8633022134b7ea74f53c16955809c40a58
+  data.tar.gz: 046e6e779ebed7ce0101f9849b5c543155cd81c09f61368818c0ec0deae9cedab2072cec4beef4b16c7c93e0ff264db1ea9c4c1997fe713763f935741c6c9faa

data/.byebug_history

@@ -0,0 +1,66 @@
+cont
+quit
+response.send(data).class
+hto.send(data).class
+hto.respond_to?(data)
+data
+cont
+data
+cont
+data
+cont
+data
+quit
+cont
+response.send(data).class
+cont
+response.send(data).class
+hto.send(data).class
+data
+cont
+data
+cont
+hto.send(data).classc
+data
+cont
+hto.send(data).class
+hto.respond_to?(data)
+data
+cont
+quit
+self.disconnect
+quit
+cont
+@response.m.class
+@response.m.class == Sensi::PollResponse
+@response.respond_to?(:m)
+self.valid_response?
+@response
+cont
+@response
+cont
+@response.m.class == Sensi::PollResponse
+@respsonse.m.class == Sensi::PollResponse
+@response.respond_to?(:m)
+cont
+@response.m.class
+cont
+@response.m.empty?
+@response
+self.valid_response?
+next
+step
+self.valid_response?
+t.valid_response?
+quit
+data.class
+cont
+data.class
+data
+datums
+cont
+self.c
+self
+t.c
+datums
+data

data/.gitignore

@@ -1,4 +1,5 @@
 lib/inital_response.json
 .DS_STORE
 sensi.sublime-project
-sensi.sublime-workspace
+sensi.sublime-workspace
+*.gem

data/.rspec

@@ -0,0 +1 @@
+--color

data/README.md

@@ -1,7 +1,7 @@
 # Sensi
 API Wrapper for Emersion Sensi WiFi Thermostats.
 
-**This gem is currently in development. Expect API breaking changes on each release. **
+**This gem is currently in development. Expect API breaking changes on each release.**
 
 ## Installation
 

data/lib/sensi/hash_to_object.rb

@@ -7,7 +7,7 @@ module Sensi
 
 		TEST = {'C': 'abc', 'A': ["hi", {:should=>"see"}], 'M': ['on','off','shutdown'], 'D': {'hola': 'hello'}, num: 5}
 
-	  	def initialize(hash = TEST, debug = false)
+	  	def initialize(hash = TEST, debug = false, json = nil)
 	      	convert(hash, debug)
 	    end
 
@@ -69,6 +69,24 @@ module Sensi
 	    	self.instance_variable_set("@#{k.underscore}", v)
 	    end
 
+	    def to_json
+        	hash = {}
+	        self.instance_variables.each do |var|
+	        	if var.is_a? HashToObject
+	        		hash[var] = self.instance_variable_get(var).to_json
+	        	else
+	            	hash[var] = self.instance_variable_get(var)
+	            end
+	        end
+	        hash.to_json
+	    end
+	    
+	    def from_json!(string)
+	        JSON.load(string).each do |var, val|
+	            self.instance_variable_set var, val
+	        end
+	    end
+
   	end
 
 end

data/lib/sensi/poll_response.rb

@@ -5,11 +5,14 @@ module Sensi
 
 	class PollResponse < HashToObject
 
-		attr_reader :json
+		attr_reader :json, :code
 
 		def initialize(json)
 			@json = json
 			convert(json)
+			@code = 200
+		rescue
+			@code = 500
 		end
 
 		def message_id
@@ -18,6 +21,8 @@ module Sensi
 
 		def groups_token
 			self.g
+		rescue 
+			nil
 		end
 
 		def timed_out?

data/lib/sensi/thermostat.rb

@@ -1,15 +1,17 @@
 require "sensi/version"
 require 'sensi/hash_to_object'
 require 'sensi/thermostat_connection'
+require 'byebug'
 
 module Sensi
 
 	class Thermostat < HashToObject
 
-		attr_accessor :account, :thermostat_connection
+		attr_accessor :account, :thermostat_connection, :response
 
 		@account
 		@thermostat_connection
+		@response
 
 		#private vars
 		@mode
@@ -18,7 +20,7 @@ module Sensi
 		@fan
 		@schedule
 
-		def initialize(login, password)
+		def initialize(login, password, json = nil)
 			@account = Sensi::Account.new(login, password)
 			@thermostat_connection = Sensi::ThermostatConnection.new(@account)
 		end
@@ -43,17 +45,12 @@ module Sensi
 			while not connected_to_device? and attempt < connection_attempt
 				@thermostat_connection.connect
 				@thermostat_connection.initialize_polling(self.icd)
-				convert(@thermostat_connection.start_polling)
+				@response = @thermostat_connection.start_polling
+				convert(@response)
 				attempt += 1
 			end
 
-			@heat = settings.heat_setpoint
-			@cool = settings.cool_setpoint
-			@mode = system_mode
-			@schedule = nil
-			@fan = 'Auto'
-
-			return connected_to_device?
+			connected_to_device?
 		end
 
 		def connected_to_device?
@@ -62,10 +59,42 @@ module Sensi
 			false
 		end
 
-		def update
-			response = @thermostat_connection.poll
-			self.m.a.operational_status = response.m.a.operational_status unless response.timed_out?
-			!response.timed_out?
+		def valid_response?
+			# debugger
+			@response.respond_to?(:m) and @response.m.class == Sensi::HashToObject
+		rescue StandardError
+			return false
+		end
+
+		def update(attempts = 3)
+			@response = nil
+			attempt = 0
+			# debugger
+			while attempt < attempts and not valid_response?
+				@response = @thermostat_connection.poll
+				attempt += 1
+			end
+
+			return false if @response.code != 200
+
+			update_self(self, @response) if valid_response?
+			!@response.timed_out? and valid_response?
+		end
+
+		def update_self(hto, response)
+			datums = (response.methods - Object.new.methods).reject!{|i| i.to_s =~ /=|\?|convert|contains_hash|add|json|message_id|groups_token/ }
+			datums.each do |data|
+				# debugger
+				if hto.respond_to?(data) and  hto.send(data).class == Sensi::PollResponse and response.send(data).class == Sensi::PollResponse
+					update_self(hto.send(data), response.send(data))
+				elsif hto.respond_to?(data) and  hto.send(data).class == Sensi::HashToObject and response.send(data).class == Sensi::HashToObject
+					update_self(hto.send(data), response.send(data))
+				elsif hto.respond_to?(data) and response.send(data).class == Sensi::PollResponse
+					hto.send((data.to_s + '=').to_sym, response.send(data))
+				else 
+					hto.add_var(data.to_s, response.send(data))
+				end
+			end
 		end
 
 		def system_modes
@@ -90,7 +119,11 @@ module Sensi
 			"0"
 		end
 
-		def temperature(scale: :F)
+		def system_fan
+			self.m.a.environment_controls.fan_mode
+		end
+
+		def temperature(scale = :F)
 			case scale
 			when :F
 				return self.m.a.operational_status.temperature.f 
@@ -106,11 +139,7 @@ module Sensi
 		end
 
 		def system_mode
-			self.m.a.operational_status.operating_mode
-		end
-
-		def system_fan
-			nil
+			self.m.a.environment_controls.system_mode
 		end
 
 		# def set(mode: nil, temp: 70, scale: :F, fan: :auto, schedule: :off)
@@ -124,13 +153,12 @@ module Sensi
 			args.each do |k, v|
 				case k
 				when :mode
-					@thermostat_connection.set(self.icd, 'SetSystemMode', v.to_s.capitalize) unless system_mode == mode.to_s.capitalize
+					# puts "#{system_mode}:#{v.to_s.capitalize}"
+					return update_system_mode v
 				when :fan
-					@thermostat_connection.set(self.icd, 'SetFanMode', v.to_s.capitalize) unless system_fan_on?
+					return update_fan v
 				when :temp
-					@thermostat_connection.set(self.icd, 'SetHeat', v.to_s.capitalize, scale.to_s.capitalize) unless system_temperature(:heat) == temp
-
-					@thermostat_connection.set(self.icd, 'SetCool', v.to_s.capitalize, scale.to_s.capitalize) unless system_temperature(:cool) == temp
+					return update_temp v
 				when :schedule
 					@thermostat_connection.set(self.icd, 'SetScheduleMode', v.to_s.capitalize) unless system_schedule == args
 				end
@@ -178,14 +206,20 @@ module Sensi
 			system_mode =- 'Auto'
 		end
 
-		def system_temperature(type)
+		def system_active?
+			active_mode != 'Off'
+		end
+
+		def system_temperature(type: nil)
+			type = system_mode.downcase.to_sym if type.nil?
+
 			case type
 			when :heat
 				return settings.heat_setpoint.f
 			when :cool
 				return settings.cool_setpoint.f
 			else
-				raise ArgumentError, "Type #{type} not valid."
+				raise ArgumentError, "Type :#{type.to_s} not valid."
 			end
 		end
 
@@ -198,9 +232,80 @@ module Sensi
 		# end
 
 		def system_fan_on?
-			nil
+			system_fan == 'On'
+		end
+
+		def system_fan_off?
+			system_fan == 'Auto'
+		end
+
+		def update_system_mode(state)
+			if system_mode == state.to_s.capitalize
+				return false
+			else 
+				result = @thermostat_connection.set(self.icd, 'SetSystemMode', state.to_s.capitalize)  
+				update
+				return result
+			end
 		end
 
+		def update_fan(state)
+			if system_fan == state.to_s.capitalize
+				return false
+			else
+				result = @thermostat_connection.set(self.icd, 'SetFanMode', state.to_s.capitalize) 
+				update
+				return result
+			end
+			# case state
+			# when 'On'
+			# 	return @thermostat_connection.set(self.icd, 'SetFanMode', state.to_s.capitalize) unless system_fan_on?
+			# when 'Auto'
+			# 	return @thermostat_connection.set(self.icd, 'SetFanMode', state.to_s.capitalize) unless system_fan_off?
+			# else
+			# 	raise StandarError, "#{v} is not a valid fan state."
+			# end
+		end
+
+		def update_temp(temperature, mode: nil, scale: :F)
+			mode = system_mode if mode.nil?
+
+			case mode
+			when 'Heat'
+				return true if system_temperature(type: :heat) == temperature
+				result = @thermostat_connection.set(self.icd, 'SetHeat', temperature.to_s.capitalize, scale.to_s.capitalize) 
+			when 'Cool'
+				return true if system_temperature(type: :cool) == temperature
+				result = @thermostat_connection.set(self.icd, 'SetCool', temperature.to_s.capitalize, scale.to_s.capitalize) 
+			when 'Off'
+
+			when 'Auto'
+
+			when 'Aux'
+
+			end
+			update
+			result
+		end
+
+		def to_json
+        	hash = {}
+	        self.instance_variables.each do |var|
+	        	if var.is_a? HashToObject
+	        		hash[var.to_s.delete("@")] = self.instance_variable_get var.to_json
+	        	else
+	            	hash[var.to_s.delete("@")] = self.instance_variable_get var
+	            end
+	        end
+	        hash.to_json
+	    end
+
+	    def from_json!(string)
+	        JSON.load(string).each do |var, val|
+	            self.instance_variable_set var, val
+	        end
+	    end
+
 
   	end
 

data/lib/sensi/version.rb

@@ -1,3 +1,3 @@
 module Sensi
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensi
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Chris Kirby
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-01 00:00:00.000000000 Z
+date: 2016-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -87,7 +87,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".byebug_history"
 - ".gitignore"
+- ".rspec"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt