gripcontrol 0.0.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fade519a63e6be1ac17eb0ea2ea4ddb8d78e7367
-  data.tar.gz: f2dd08501c6eaa2bbff443b203d08e5715fb59c5
+  metadata.gz: d709d64f9facb387326983acb791366354fd8512
+  data.tar.gz: 667c73728317fe50cf690de577980bfaff52e4b8
 SHA512:
-  metadata.gz: 297c3cc3ef5ae7d192fed603252a063bdebfe558586a38c23f4410144cebb15147ad3716d104a16059aade8d9162da2c2f2aa3ebe099b452294d6876c59b75cf
-  data.tar.gz: 3f684ae5636fda24f2c03fd75acab568fa98720c7f0475e31ac46a26888edb300ddd20e36f1f1adb6d6ea89c05ec1fa69281aa6215a4d8e61e209345dc8e6930
+  metadata.gz: aa392d7bcdb2eb01dec64a6530457d69d0485c01bc26ca7deaabd53b64ada73cf81b64770ff4eb6e63661ba4af7c351f3c7ee15f5f0c4d3afde315587322c3c4
+  data.tar.gz: c1e903c08c0112e5a919ea5e8194b35b4038397dfd664f9db58e4bb0d913a4d715596ae12f5e42f8376c278ca6c710ddb5b9549e825eee113f32bd6fca1c2b1b

data/lib/gripcontrol.rb

@@ -7,12 +7,15 @@
 
 require 'base64'
 require 'jwt'
+require 'uri'
+require 'cgi'
 require_relative 'channel.rb'
 require_relative 'httpresponseformat.rb'
 require_relative 'httpstreamformat.rb'
 require_relative 'websocketmessageformat.rb'
 require_relative 'websocketevent.rb'
 require_relative 'grippubcontrol.rb'
+require_relative 'response.rb'
 
 class GripControl
   def self.create_hold(mode, channels, response)
@@ -54,9 +57,9 @@ class GripControl
       end
       if !response.body.nil?
         if response.body.encoding.name == 'ASCII-8BIT'
-          iresponse['body'] = response.body
-        else
           iresponse['body-bin'] = Base64.encode64(response.body)
+        else
+          iresponse['body'] = response.body
         end
       end
     end
@@ -68,24 +71,49 @@ class GripControl
     return instruct.to_json
   end
 
-  def self.create_hold_response(channels, response=nil)
-    return GripControl.create_hold('response', channels, response)
-  end
-
-  def self.create_hold_stream(channels, response=nil)
-    return create_hold('stream', channels, response)
+  def self.parse_grip_uri(uri)
+    uri = URI(uri)
+    params = CGI.parse(uri.query)
+    iss = nil
+    key = nil
+    if params.key?('iss')
+      iss = params['iss'][0]
+      params.delete('iss')
+    end
+    if params.key?('key')
+      key = params['key'][0]
+      params.delete('key')
+    end
+    if !key.nil? and key.start_with?('base64:')
+      key = Base64.decode64(key[7..-1])
+    end
+    qs = build_query_string(params)
+    path = uri.path
+    if path.end_with?('/')
+      path = path[0..-2]
+    end
+    control_uri = parsed.scheme + '://' + parsed.host + path
+    if !qs.nil? and !qs.empty?
+      control_uri += '?' + qs
+    end
+    out = {'control_uri' => control_uri}
+    if !iss.nil?
+      out['control_iss'] = iss
+    end
+    if !key.nil?
+      out['key'] = key
+    end
+    return out
   end
 
   def self.validate_sig(token, key)
     token = token.encode('utf-8')
     begin
-      claim = JWT.encode(claim, @auth_jwt_key).decode(token, key,
-          verify_expiration=false)
+      claim = JWT.decode(token, key, verify_expiration=false)
     rescue
       return false
     end
-    exp = claim.get('exp')
-    if !claim.has_key?('exp')
+    if !claim.key?('exp')
       return false
     end
     if Time.now.utc.to_i >= claim['exp']
@@ -94,6 +122,32 @@ class GripControl
     return true
   end
 
+  def self.create_grip_channel_header(channels)
+    if channels.is_a?(Channel)
+      channels = [channels]
+    elsif channels.is_a?(String)
+      channels = [Channel.new(channels)]
+    end
+    raise 'channels.length equal to 0' unless channels.length > 0
+    parts = []
+    channels.each do |channel|
+      s = channel.name
+      if !channel.prev_id.nil?
+        s += '; prev-id=%s' % [channel.prev_id]
+      end
+      parts.push(s)
+    end
+    return parts.join(', ')
+  end
+
+  def self.create_hold_response(channels, response=nil)
+    return GripControl.create_hold('response', channels, response)
+  end
+
+  def self.create_hold_stream(channels, response=nil)
+    return create_hold('stream', channels, response)
+  end
+
   def self.decode_websocket_events(body)
     out = []
     start = 0
@@ -123,7 +177,7 @@ class GripControl
     out = ''
     events.each do |event|
       if !event.content.nil?
-        out += '%s %x\r\n%s\r\n' % [e.type, len(event.content), event.content]
+        out += '%s %x\r\n%s\r\n' % [e.type, event.content.length, event.content]
       else
         out += '%s\r\n' % [e.type]
       end
@@ -133,7 +187,6 @@ class GripControl
 
   def self.websocket_control_message(type, args=nil)
     if !args.nil?
-      # REVIEW: is this deep copy workaround effective in this case?
       out = Marshal.load(Marshal.dump(args))
     else
       out = Hash.new
@@ -141,4 +194,15 @@ 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/grippubcontrol.rb

@@ -8,9 +8,26 @@
 require 'pubcontrol'
 
 class GripPubControl < PubControl
+  alias super_add_client add_client
   alias super_publish publish
   alias super_publish_async publish_async
 
+  def apply_grip_config(config)
+    if !config.is_a?(Array)
+      config = [config]
+    end
+    config.each do |entry|
+      if !entry.key?('control_uri')
+        next
+      end
+      client = PubControlClient.new(entry['control_uri'])
+      if entry.key?('control_iss')
+        client.set_auth_jwt({'iss' => entry['control_iss']}, entry['key'])
+      end
+      super_add_client(client)
+    end
+  end
+
   def publish_http_response(channel, http_response, id=nil, prev_id=nil)
     if http_response.is_a?(String)
       http_response = HttpResponseFormat.new(nil, nil, nil, http_response)

data/lib/response.rb

@@ -0,0 +1,20 @@
+#    response.rb
+#    ~~~~~~~~~
+#    This module implements the Response class.
+#    :authors: Konstantin Bokarius.
+#    :copyright: (c) 2015 by Fanout, Inc.
+#    :license: MIT, see LICENSE for more details.
+
+class Response
+  attr_accessor :code
+  attr_accessor :reason
+  attr_accessor :headers
+  attr_accessor :body
+
+  def initialize(code=nil, reason=nil, headers=nil, body=nil)
+    @code = code
+    @reason = reason
+    @headers = headers
+    @body = body
+  end
+end

data/lib/websocketmessageformat.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gripcontrol
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Konstantin Bokarius
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2015-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pubcontrol
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -49,6 +49,7 @@ files:
 - lib/grippubcontrol.rb
 - lib/httpresponseformat.rb
 - lib/httpstreamformat.rb
+- lib/response.rb
 - lib/websocketevent.rb
 - lib/websocketmessageformat.rb
 homepage: http://rubygems.org/gems/gripcontrol