ledenet_api 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d209ac850060f4e0d6f43b75c14d65061bd928a6
-  data.tar.gz: 1bc387beff34d221247328228db77626e095dc19
+  metadata.gz: fc308b3bf1a99c0a67ef519e13f84fabece00fc6
+  data.tar.gz: dd9f6a4032283d24b2f82ca3a00f4ee9647e864c
 SHA512:
-  metadata.gz: eade48784872b6538dc576a9ea88278dfd6e121c9d5641c90be9be953ff7b12bf9309740d6a15ced2f721e4a43208ea34acb66599dcc0c706821b631cf9b6a07
-  data.tar.gz: 2e8638b1c017dba772d61fad398edc4f147813beae22c58d2f8d9169ec4162d5881f10dac84c51c76518ed4a65bcd2580d6b5ecf74594c324f6e64d69bc04b0b
+  metadata.gz: 505fd9e3be7cfe496e4a3b1105145f7452a8df8e689f6b68e521ccbe37879bf381d66b2297e97409b5fbf6f0495d9d63865db294120bde6b6c5bbeaa599004e9
+  data.tar.gz: 001c8afd4e0f0228b8ace0517168992bcdb5dac57fe415fcd2044c0a0aba1fe1cd01d29e8606e2fb079b3414d90cbe2c5c995fa917e44dc885a9512d2001ba93

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ledenet_api (0.1.0)
+    ledenet_api (0.1.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/ledenet/api.rb

@@ -2,16 +2,21 @@ module LEDENET
   class Api
     API_PORT = 5577
 
-    def initialize(device_address)
+    DEFAULT_OPTIONS = {
+        reuse_connection: false
+    }
+
+    def initialize(device_address, options = {})
       @device_address = device_address
+      @options = DEFAULT_OPTIONS.merge(options)
     end
 
     def on
-      send_bytes(0x71, 0x23, 0x0F, 0xA3)
+      send_bytes_action(0x71, 0x23, 0x0F, 0xA3)
     end
 
     def off
-      send_bytes(0x71, 0x24 ,0x0F, 0xA4)
+      send_bytes_action(0x71, 0x24 ,0x0F, 0xA4)
     end
 
     def on?
@@ -21,7 +26,7 @@ module LEDENET
     def update_color(r, g, b)
       checksum = color_checksum(r, g, b)
 
-      send_bytes(0x31, r, g, b, 0xFF, 0, 0x0F, checksum)
+      send_bytes_action(0x31, r, g, b, 0xFF, 0, 0x0F, checksum)
     end
 
     def current_color
@@ -38,16 +43,13 @@ module LEDENET
       end
 
       def status
-        begin
+        socket_action do
           send_bytes(0x81, 0x8A, 0x8B, 0x96)
 
           # Example response:
           # [129, 4, 35, 97, 33, 9, 11, 22, 33, 255, 3, 0, 0, 119]
           #                         R   G   B   WW            ^--- LSB indicates on/off
           flush_response(14)
-        rescue Errno::EPIPE
-          reconnect!
-          retry
         end
       end
 
@@ -56,19 +58,28 @@ module LEDENET
       end
 
       def send_bytes(*b)
-        create_socket if @socket.nil?
+        @socket.write(b.pack('c*'))
+      end
 
-        begin
-          @socket.write(b.pack('c*'))
-        rescue Errno::EPIPE
-          reconnect!
-          retry
-        end
+      def send_bytes_action(*b)
+        socket_action { send_bytes(*b) }
       end
 
       def create_socket
-        @socket.close unless @socket.nil?
+        @socket.close unless @socket.nil? or @socket.closed?
         @socket = TCPSocket.new(@device_address, API_PORT)
       end
+
+      def socket_action
+        begin
+          create_socket if @socket.nil? or @socket.closed?
+          yield
+        rescue Errno::EPIPE, IOError
+          reconnect!
+          retry
+        ensure
+          @socket.close unless @socket.closed? or @options[:reuse_connection]
+        end
+      end
   end
 end

data/lib/ledenet/version.rb

@@ -1,3 +1,3 @@
 module LEDENET
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ledenet_api
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Christopher Mullins
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-16 00:00:00.000000000 Z
+date: 2015-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler