SensorStream 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 969d6c982ad55343c56dbfb8192021e4649edba6
-  data.tar.gz: 4f1a0a9f69fc0fa01695d86540340b87a08e6f03
+  metadata.gz: fb098ddfd37fabf24bf24a65d53d144d6a5449c7
+  data.tar.gz: bf9330e4121f5da1aa791875c69b1a1b000fef86
 SHA512:
-  metadata.gz: 10fb9911ae273a696fd95f7529bb656bbba44540dc4a6508c38edc7fb611ece7ff076a4f9e438d66a6a2933e7722e1d23930982b35801927a2da25ddb4112431
-  data.tar.gz: d3ec2fde6bd9a87b6c61362dca312f90e553c33c9307deba66e2919e579d13290856b095ad8fc1985f7c90ed1ea5c98303644b8cbb49a4719b4557926b30079c
+  metadata.gz: bb5ee40a24e7af1c5dd679125eb2dbbb107691496ab7bf3a5509fc5b9c24fb5d43c189eb8b2f59348db86e1221f61b38b57568a9563d82936d8009f5ecf75304
+  data.tar.gz: 2862a3e185201f18f813c7afbafeabd1ba8d6436d1842466d6337939aca92c0597028575ff57b8292a5d7256bb0d97b66e0d11ec59d485f32a97b7dbb0d90baf

data/lib/SensorStream.rb

@@ -28,7 +28,7 @@ module SensorStream
 
   # Allows the SensorStream server to be overridden
   def self.set_default_server
-    @host_name = "sensorstream.cloudapp.net"
+    @host_name = "sensorstream.coas.oregonstate.edu"
     @port_number = 80
   end
   
@@ -49,10 +49,16 @@ module SensorStream
 
     http = Net::HTTP.new(@host_name, @port_number);
     http.read_timeout = timeout; # 10 minute default timeout
-    http.post(uri.request_uri, JSON.generate(body_dict), header_dict);
-    # This is very important:  we're making use of the implied return of ruby, here!!!
-  end
-  
+    retval = http.post(uri.request_uri, JSON.generate(body_dict), header_dict);
+
+    rescue Errno::ETIMEDOUT => e
+        puts "Timed out while waiting for SensorStream."
+        return nil
+    end
+
+    return retval
+end
+
   # Internally used to wrap HTTP gets with the required headers
   def self.make_http_get(request = "", header_dict = {}, timeout = 600, debug = false)
     # Ensure that the hostname and port are set
@@ -67,8 +73,14 @@ module SensorStream
 
     http = Net::HTTP.new(@host_name, @port_number);
     http.read_timeout = 600; # 10 minute timeout
-    http.get(uri.request_uri, header_dict);
-    # This is very important:  we're making use of the implied return of ruby, here!!!
+    retval = http.get(uri.request_uri, header_dict);
+
+    rescue Errno::ETIMEDOUT => e
+        puts "Timed out while waiting for SensorStream."
+        return nil
+    end
+
+    return retval
   end
   
   # create a new device on the server
@@ -125,12 +137,15 @@ module SensorStream
       return nil;
     else
       devices = [];
+
+      if (resp.body.empty?)
+        return nil
+      end
+
       JSON.parse(resp.body).each { |device|
-        devices << SensorStream::Device.new(device["username"],
-                                            device["devicename"],
-                                            device["description"])
-        #devices.last.get_streams
-      }
+      devices << SensorStream::Device.new(device["username"],
+                                          device["devicename"],
+                                          device["description"]) }
       return devices;
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: SensorStream
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - William Dillon