teletask 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bf110c899a56469721c423745f3ef5c733db49a
-  data.tar.gz: 0eb0b4e397f907457ae01f881f94f4f4da9d5c93
+  metadata.gz: 3e61a169dc5d6902cedcee9792dfd3bbafc297d1
+  data.tar.gz: 89dc4834ac52e46ae058d63d1fadff6d06c62b5f
 SHA512:
-  metadata.gz: 32ab75974fd417efb56248547e3e3ee2635ec7b00dfbe83e22d035a5d3f46e4b24b6ee7f318ac4a5437e295ed39f3f76e5a9f7469cfd61f8028c2d228fa9dd9e
-  data.tar.gz: 615974b959e61ab11055b0f8c854e574553e0999575614eb75c409d69d37254795c21c04a8766bbd4bd5bdc64ad492b00c501708a1ccaaf1f039c159418122d8
+  metadata.gz: 1e65820ac75cb5432b429d0adc45ef7d6bfc9f56bbf33cc3e9ff5d80ee94c6b7a6083b5a6b704aecbdae83aa8a8c9641aacc0acbd2df468ff8dbeb3bdef5530b
+  data.tar.gz: 5aabb8df4e505bb6223be764f07f0c1699a203e4f7f9151af2bc215e8f48285da90d0bcfa44998d9f692dfd3f5296937f431bedfc870625a607ad2b880856db1

data/lib/request.rb

@@ -6,8 +6,8 @@ module TeletaskApi
 			@parameters = Array.new
 
 			case command
-			when Teletask::Command::KEEPALIVE
-			when Teletask::Command::LOG
+			when Command::KEEPALIVE
+			when Command::LOG
 				@parameters = Array.new
 				@parameters[0] = function
 				@parameters[1] = number

data/lib/response.rb

@@ -20,12 +20,12 @@ module TeletaskApi
 					calculatedChecksum = data[startindex..startindex+length-1].inject{|sum,x| sum + x } % 256
 					checksum = data[startindex+length]
 					raise "Checksum mismatch. Expecting #{checksum}, but calculated #{calculatedChecksum}" unless checksum == calculatedChecksum
-					raise "Not an response." unless data[startindex+2] == Teletask::Command::EVENTREPORT 
+					raise "Not an response." unless data[startindex+2] == Command::EVENTREPORT 
 					central = data[startindex+3]
 					function = data[startindex+4]
 					number = data[startindex+5..startindex+6].pack("c*").unpack("n").first
 					case function
-					when Teletask::Function::SENSOR
+					when Function::SENSOR
 						parameters =data[startindex+8..startindex+9]
 					else
 						parameters =data[startindex+8]
@@ -42,15 +42,15 @@ module TeletaskApi
 		def to_hash
 			hash = Hash.new
 			hash[:function] = function
-			hash[:function_name] = Teletask::Function.name function
+			hash[:function_name] = Function.name function
 			hash[:number] = number
 			hash[:parameters] = parameters
 			case function
-			when Teletask::Function::SENSOR
-				hash[:temperature] = TeletaskApi::Converter.short_to_temperature parameters
-			when Teletask::Function::RELAY
+			when Function::SENSOR
+				hash[:temperature] = Converter.short_to_temperature parameters
+			when Function::RELAY
 				hash[:state] = parameters
-				hash[:state_name] = Teletask::Setting.name parameters
+				hash[:state_name] = Setting.name parameters
 			end
 			hash
 		end

data/lib/teletask.rb

@@ -6,10 +6,8 @@ require_relative './constants'
 require_relative './request'
 require_relative './response'
 
-include TeletaskApi
 
 module TeletaskApi
-
 	class Teletask
 		include Observable
 
@@ -88,5 +86,3 @@ module TeletaskApi
 	end
 
 end
-
-Teletask = TeletaskApi::Teletask

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teletask
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Sille Van Landschoot