gripcontrol 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d709d64f9facb387326983acb791366354fd8512
-  data.tar.gz: 667c73728317fe50cf690de577980bfaff52e4b8
+  metadata.gz: 9b62afb4338b37256758b58f1e959e40c5f45212
+  data.tar.gz: 21ffa0c1927a93ce093d5315d5d0eaae6b12ed58
 SHA512:
-  metadata.gz: aa392d7bcdb2eb01dec64a6530457d69d0485c01bc26ca7deaabd53b64ada73cf81b64770ff4eb6e63661ba4af7c351f3c7ee15f5f0c4d3afde315587322c3c4
-  data.tar.gz: c1e903c08c0112e5a919ea5e8194b35b4038397dfd664f9db58e4bb0d913a4d715596ae12f5e42f8376c278ca6c710ddb5b9549e825eee113f32bd6fca1c2b1b
+  metadata.gz: 1aedadcb5d5559803db3fd53c7c91d4b46b47918bf9b2fc513f2d1ed611520155f295b36ca5208e00b47c1773c80f29844a80b99b69ec65713073a5ac39f2045
+  data.tar.gz: d3dd7823ac5e8c2a481e0daaaf0258f59e96e422668e257ccf45ccd833e4ed7c2e1ebfa4a54b5655b148a5c0deaa0b50329ecf532288e33325e85f69b2173cea

data/lib/gripcontrol.rb

@@ -87,12 +87,18 @@ class GripControl
     if !key.nil? and key.start_with?('base64:')
       key = Base64.decode64(key[7..-1])
     end
-    qs = build_query_string(params)
+    qs = []
+    params.map do |name,values|
+      values.map do |value|
+        qs.push('#{CGI.escape name}=#{CGI.escape value}')
+      end
+    end
+    qs = qs.join('&')
     path = uri.path
     if path.end_with?('/')
       path = path[0..-2]
     end
-    control_uri = parsed.scheme + '://' + parsed.host + path
+    control_uri = uri.scheme + '://' + uri.host + path
     if !qs.nil? and !qs.empty?
       control_uri += '?' + qs
     end
@@ -109,14 +115,14 @@ class GripControl
   def self.validate_sig(token, key)
     token = token.encode('utf-8')
     begin
-      claim = JWT.decode(token, key, verify_expiration=false)
+      claim = JWT.decode(token, key, true, {verify_expiration: false})
     rescue
       return false
     end
-    if !claim.key?('exp')
+    if claim.length == 0 or !claim[0].key?('exp')
       return false
     end
-    if Time.now.utc.to_i >= claim['exp']
+    if Time.now.utc.to_i >= claim[0]['exp']
       return false
     end
     return true
@@ -152,23 +158,24 @@ class GripControl
     out = []
     start = 0
     while start < body.length do
-      at = body.index('\r\n', start)
-      if !at.nil?
+      at = body.index("\r\n", start)
+      if at.nil?
         raise 'bad format'
       end
       typeline = body[start..at - 1]
       start = at + 2
       at = typeline.index(' ')
+      event = nil
       if !at.nil?
         etype = typeline[0..at - 1]
-        clen = ('0x' + typeline[at + 1..-1]).to_s(16)
-        content = body[start:start + clen - 1]
+        clen = ('0x' + typeline[at + 1..-1]).to_i(16)
+        content = body[start..start + clen - 1]
         start += clen + 2
-        e = WebSocketEvent.new(etype, content)
+        event = WebSocketEvent.new(etype, content)
       else
-        e = WebSocketEvent.new(typeline)
+        event = WebSocketEvent.new(typeline)
       end
-      out.push(e)
+      out.push(event)
     end
     return out
   end
@@ -177,9 +184,10 @@ class GripControl
     out = ''
     events.each do |event|
       if !event.content.nil?
-        out += '%s %x\r\n%s\r\n' % [e.type, event.content.length, event.content]
+        out += "%s %x\r\n%s\r\n" % [event.type, event.content.length, 
+            event.content]
       else
-        out += '%s\r\n' % [e.type]
+        out += "%s\r\n" % [event.type]
       end
     end
     return out
@@ -194,15 +202,4 @@ class GripControl
     out['type'] = type
     return out.to_json
   end
-
-  private
-
-  def build_query_string(params)
-    params.map do |name,values|
-      values.map do |value|
-        '#{CGI.escape name}=#{CGI.escape value}'
-      end
-    end.flatten.join('&')
-  end
-
 end

data/lib/websocketmessageformat.rb

@@ -22,9 +22,9 @@ class WebSocketMessageFormat < Format
   def export
     out = Hash.new
     if @content.encoding.name == 'ASCII-8BIT'
-      out['body-bin'] = Base64.encode64(@content)
+      out['content-bin'] = Base64.encode64(@content)
     else
-      out['body'] = @content
+      out['content'] = @content
     end
     return out
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gripcontrol
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Konstantin Bokarius
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-07 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pubcontrol