pubcontrol 0.2.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab97545468d3337e4e281e5d36f515a3acb707d4
-  data.tar.gz: f9649e54bce224b03683182c09583c283b358e4c
+  metadata.gz: 72a4849cda3e8c5921a09ff97df674726be6bc06
+  data.tar.gz: 53cb42aa569100d5f2d788545bcdd8a43435e904
 SHA512:
-  metadata.gz: ffe3037a12a43e76a5a1fbc09cccda35833c3c5528c04ee66d3ccdb670ae657f0d300a4e88a1410d63e8d83959083a8a9836dfe7cfc68f3cf695fe85093751bc
-  data.tar.gz: cfd4eb7cd7c050d8e67c5741545a1ceba708f0f4e29b32d5c2f7a423ebbe7b26508cfffc408e850d121afc6be63ed32fc05dc5e4d16604038b96f65297c3cf8b
+  metadata.gz: 8c6bec7d9dd4efd0806012f471449ef6086a5c97427fb13ce8ca26290a679d0809e94e953ec1f294dfc4a01f3f7c10c42c517ab409ef90e19705767fe2911a56
+  data.tar.gz: beda44c933432151d9ccc7b7fa73430c789830ca5f1e9db0f76a4a7fb5d9ec56def1c61913d551799c429af14c2b7884a96cafb8edf5de1f081088e30418e6b6

data/lib/{pccbhandler.rb → pcccbhandler.rb}

@@ -1,11 +1,11 @@
-#    format.rb
+#    pcccbhandler.rb
 #    ~~~~~~~~~
-#    This module implements the PubControlCallbackHandler class.
+#    This module implements the PubControlClientCallbackHandler class.
 #    :authors: Konstantin Bokarius.
 #    :copyright: (c) 2015 by Fanout, Inc.
 #    :license: MIT, see LICENSE for more details.
 
-class PubControlCallbackHandler
+class PubControlClientCallbackHandler
   def initialize(num_calls, callback)
     @num_calls = num_calls
     @callback = callback

data/lib/pubcontrol.rb

@@ -5,187 +5,60 @@
 #    :copyright: (c) 2015 by Fanout, Inc.
 #    :license: MIT, see LICENSE for more details.
 
-require 'algorithms'
-require 'thread'
-require 'base64'
-require 'jwt'
-require 'json'
-require 'net/http'
-require_relative 'item.rb'
 require_relative 'format.rb'
-require_relative 'pubcontrolset.rb'
+require_relative 'item.rb'
+require_relative 'pubcontrolclient.rb'
+require_relative 'pcccbhandler.rb'
 
 class PubControl
-  attr_accessor :req_queue
-
-  def initialize(uri)
-    @uri = uri
-    @lock = Mutex.new
-    @thread = nil
-    @thread_cond = nil
-    @thread_mutex = nil
-    @req_queue = Containers::Deque.new
-    @auth_basic_user = nil
-    @auth_basic_pass = nil
-    @auth_jwt_claim = nil
-    @auth_jwt_key = nil
-  end
-
-  def set_auth_basic(username, password)
-    @lock.synchronize do
-      @auth_basic_user = username
-      @auth_basic_pass = password
+  def initialize(config=nil)
+    @clients = Array.new
+    if !config.nil?
+      apply_config(config)
     end
   end
 
-  def set_auth_jwt(claim, key)
-    @lock.synchronize do
-      @auth_jwt_claim = claim
-      @auth_jwt_key = key
-    end
+  def remove_all_clients
+    @clients = Array.new
   end
 
-  def publish(channel, item)
-    export = item.export
-    export['channel'] = channel
-    uri = nil
-    auth = nil
-    @lock.synchronize do
-      uri = @uri
-      auth = gen_auth_header
-    end
-    PubControl.pubcall(uri, auth, [export])
+  def add_client(client)
+    @clients.push(client)
   end
 
-  def publish_async(channel, item, callback=nil)
-    export = item.export
-    export['channel'] = channel
-    uri = nil
-    auth = nil
-    @lock.synchronize do
-      uri = @uri
-      auth = gen_auth_header
-      ensure_thread
+  def apply_config(config)
+    if !config.is_a?(Array)
+      config = [config]
     end
-    queue_req(['pub', uri, auth, export, callback])
-  end
-
-  def finish
-    @lock.synchronize do
-      if !@thread.nil?
-        queue_req(['stop'])
-        @thread.join
-        @thread = nil
-      end
-    end
-  end
-
-  def pubworker
-    quit = false
-    while !quit do
-      @thread_mutex.lock
-      if @req_queue.length == 0
-        @thread_cond.wait(@thread_mutex)
-        if @req_queue.length == 0
-          @thread_mutex.unlock
-          next
-        end
-      end
-      reqs = Array.new
-      while @req_queue.length > 0 and reqs.length < 10 do
-        m = @req_queue.pop_front
-        if m[0] == 'stop'
-          quit = true
-          break
-        end
-        reqs.push([m[1], m[2], m[3], m[4]])
-      end
-      @thread_mutex.unlock
-      if reqs.length > 0
-        PubControl.pubbatch(reqs)
+    config.each do |entry|
+      pub = PubControlClient.new(entry['uri'])
+      if entry.key?('iss')
+        pub.set_auth_jwt({'iss' => entry['iss']}, entry['key'])
       end
+      @clients.push(pub)
     end
   end
 
-  def self.pubcall(uri, auth_header, items)
-    uri = URI(uri + '/publish/')
-    content = Hash.new
-    content['items'] = items
-    request = Net::HTTP::Post.new(uri.request_uri)
-    request.body = content.to_json
-    if !auth_header.nil?
-      request['Authorization'] = auth_header
-    end
-    request['Content-Type'] = 'application/json'
-    use_ssl = uri.scheme == 'https'
-    response = Net::HTTP.start(uri.host, uri.port, use_ssl: use_ssl) do |http|
-      http.request(request)
-    end
-    # REVIEW: HTTPSuccess does not include 3xx status codes.
-    if !response.kind_of? Net::HTTPSuccess
-      raise 'failed to publish: ' + response.class.to_s + ' ' +
-          response.message
+  def finish
+    @clients.each do |pub|
+      pub.finish
     end
   end
 
-  def self.pubbatch(reqs)
-    raise 'reqs length == 0' unless reqs.length > 0
-    uri = reqs[0][0]
-    auth_header = reqs[0][1]
-    items = Array.new
-    callbacks = Array.new
-    reqs.each do |req|
-      items.push(req[2])
-      callbacks.push(req[3])
-    end
-    begin
-      PubControl.pubcall(uri, auth_header, items)
-      result = [true, '']
-    rescue => e
-      result = [false, e.message]
-    end
-    callbacks.each do |callback|
-      if !callback.nil?
-        callback.call(result[0], result[1])
-      end
+  def publish(channel, item)
+    @clients.each do |pub|
+      pub.publish(channel, item)
     end
   end
 
-  def self.timestamp_utcnow
-    return Time.now.utc.to_i
-  end
-
-  private
-
-  def gen_auth_header
-    if !@auth_basic_user.nil?
-      return 'Basic ' + Base64.encode64(
-          '#{@auth_basic_user}:#{@auth_basic_pass}')
-    elsif !@auth_jwt_claim.nil?
-      if !@auth_jwt_claim.has_key?('exp')
-        claim = @auth_jwt_claim.clone
-        claim['exp'] = PubControl.timestamp_utcnow + 3600
-      else
-        claim = @auth_jwt_claim
-      end
-      return 'Bearer ' + JWT.encode(claim, @auth_jwt_key)
-    else
-      return nil
+  def publish_async(channel, item, callback=nil)
+    cb = nil
+    if !callback.nil?
+      cb = PubControlClientCallbackHandler.new(@clients.length, callback).
+          handler_method_symbol
     end
-  end
-
-  def ensure_thread
-    if @thread.nil?
-      @thread_cond = ConditionVariable.new
-      @thread_mutex = Mutex.new
-      @thread = Thread.new { pubworker }
+    @clients.each do |pub|
+      pub.publish_async(channel, item, cb)
     end
   end
-
-  def queue_req(req)
-    @thread_mutex.lock
-    @req_queue.push_back(req)
-    @thread_cond.signal
-    @thread_mutex.unlock
-  end
 end

data/lib/pubcontrolclient.rb

@@ -0,0 +1,188 @@
+#    pubcontrolclient.rb
+#    ~~~~~~~~~
+#    This module implements the PubControlClient class.
+#    :authors: Konstantin Bokarius.
+#    :copyright: (c) 2015 by Fanout, Inc.
+#    :license: MIT, see LICENSE for more details.
+
+require 'algorithms'
+require 'thread'
+require 'base64'
+require 'jwt'
+require 'json'
+require 'net/http'
+require_relative 'item.rb'
+
+class PubControlClient
+  attr_accessor :req_queue
+
+  def initialize(uri)
+    @uri = uri
+    @lock = Mutex.new
+    @thread = nil
+    @thread_cond = nil
+    @thread_mutex = nil
+    @req_queue = Containers::Deque.new
+    @auth_basic_user = nil
+    @auth_basic_pass = nil
+    @auth_jwt_claim = nil
+    @auth_jwt_key = nil
+  end
+
+  def set_auth_basic(username, password)
+    @lock.synchronize do
+      @auth_basic_user = username
+      @auth_basic_pass = password
+    end
+  end
+
+  def set_auth_jwt(claim, key)
+    @lock.synchronize do
+      @auth_jwt_claim = claim
+      @auth_jwt_key = key
+    end
+  end
+
+  def publish(channel, item)
+    export = item.export
+    export['channel'] = channel
+    uri = nil
+    auth = nil
+    @lock.synchronize do
+      uri = @uri
+      auth = gen_auth_header
+    end
+    PubControlClient.pubcall(uri, auth, [export])
+  end
+
+  def publish_async(channel, item, callback=nil)
+    export = item.export
+    export['channel'] = channel
+    uri = nil
+    auth = nil
+    @lock.synchronize do
+      uri = @uri
+      auth = gen_auth_header
+      ensure_thread
+    end
+    queue_req(['pub', uri, auth, export, callback])
+  end
+
+  def finish
+    @lock.synchronize do
+      if !@thread.nil?
+        queue_req(['stop'])
+        @thread.join
+        @thread = nil
+      end
+    end
+  end
+
+  def pubworker
+    quit = false
+    while !quit do
+      @thread_mutex.lock
+      if @req_queue.length == 0
+        @thread_cond.wait(@thread_mutex)
+        if @req_queue.length == 0
+          @thread_mutex.unlock
+          next
+        end
+      end
+      reqs = Array.new
+      while @req_queue.length > 0 and reqs.length < 10 do
+        m = @req_queue.pop_front
+        if m[0] == 'stop'
+          quit = true
+          break
+        end
+        reqs.push([m[1], m[2], m[3], m[4]])
+      end
+      @thread_mutex.unlock
+      if reqs.length > 0
+        PubControlClient.pubbatch(reqs)
+      end
+    end
+  end
+
+  def self.pubcall(uri, auth_header, items)
+    uri = URI(uri + '/publish/')
+    content = Hash.new
+    content['items'] = items
+    request = Net::HTTP::Post.new(uri.request_uri)
+    request.body = content.to_json
+    if !auth_header.nil?
+      request['Authorization'] = auth_header
+    end
+    request['Content-Type'] = 'application/json'
+    use_ssl = uri.scheme == 'https'
+    response = Net::HTTP.start(uri.host, uri.port, use_ssl: use_ssl) do |http|
+      http.request(request)
+    end
+    if !response.kind_of? Net::HTTPSuccess
+      raise 'failed to publish: ' + response.class.to_s + ' ' +
+          response.message
+    end
+  end
+
+  def self.pubbatch(reqs)
+    raise 'reqs length == 0' unless reqs.length > 0
+    uri = reqs[0][0]
+    auth_header = reqs[0][1]
+    items = Array.new
+    callbacks = Array.new
+    reqs.each do |req|
+      items.push(req[2])
+      callbacks.push(req[3])
+    end
+    begin
+      PubControlClient.pubcall(uri, auth_header, items)
+      result = [true, '']
+    rescue => e
+      result = [false, e.message]
+    end
+    callbacks.each do |callback|
+      if !callback.nil?
+        callback.call(result[0], result[1])
+      end
+    end
+  end
+
+  def self.timestamp_utcnow
+    return Time.now.utc.to_i
+  end
+
+  private
+
+  def gen_auth_header
+    if !@auth_basic_user.nil?
+      return 'Basic ' + Base64.encode64(
+          '#{@auth_basic_user}:#{@auth_basic_pass}')
+    elsif !@auth_jwt_claim.nil?
+      if !@auth_jwt_claim.has_key?('exp')
+        claim = @auth_jwt_claim.clone
+        claim['exp'] = PubControlClient.timestamp_utcnow + 3600
+      else
+        claim = @auth_jwt_claim
+      end
+      return 'Bearer ' + JWT.encode(claim, @auth_jwt_key)
+    else
+      return nil
+    end
+  end
+
+  def ensure_thread
+    if @thread.nil?
+      @thread_cond = ConditionVariable.new
+      @thread_mutex = Mutex.new
+      @thread = Thread.new { pubworker }
+    end
+  end
+
+  def queue_req(req)
+    @thread_mutex.lock
+    @req_queue.push_back(req)
+    @thread_cond.signal
+    @thread_mutex.unlock
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pubcontrol
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Konstantin Bokarius
@@ -46,9 +46,9 @@ extra_rdoc_files: []
 files:
 - lib/format.rb
 - lib/item.rb
-- lib/pccbhandler.rb
+- lib/pcccbhandler.rb
 - lib/pubcontrol.rb
-- lib/pubcontrolset.rb
+- lib/pubcontrolclient.rb
 homepage: http://rubygems.org/gems/pubcontrol
 licenses:
 - MIT

data/lib/pubcontrolset.rb

@@ -1,72 +0,0 @@
-#    pubcontrolset.rb
-#    ~~~~~~~~~
-#    This module implements the PubControlSet class.
-#    :authors: Konstantin Bokarius.
-#    :copyright: (c) 2015 by Fanout, Inc.
-#    :license: MIT, see LICENSE for more details.
-
-require_relative 'pubcontrol.rb'
-require_relative 'pccbhandler.rb'
-
-class PubControlSet
-  def initialize
-    @pubs = Array.new
-    at_exit { finish }
-  end
-
-  def clear
-    @pubs = Array.new
-  end
-
-  def add(pub)
-    @pubs.push(pub)
-  end
-
-  def apply_config(config)
-    config.each do |entry|
-      pub = PubControl.new(entry['uri'])
-      if entry.key?('iss')
-        pub.set_auth_jwt({'iss' => entry['iss']}, entry['key'])
-      end
-      @pubs.push(pub)
-    end
-  end
-
-  def apply_grip_config(config)
-    config.each do |entry|
-      if !entry.key?('control_uri')
-        next
-      end
-      pub = PubControl.new(entry['control_uri'])
-      if !entry.key?('control_iss')
-        pub.set_auth_jwt({'iss' => entry['control_iss']}, entry['key'])
-      end
-      @pubs.push(pub)
-    end
-  end
-
-  def publish(channel, item)
-    @pubs.each do |pub|
-      pub.publish(channel, item)
-    end
-  end
-
-  def publish_async(channel, item, callback=nil)
-    cb = nil
-    if !callback.nil?
-      cb = PubControlCallbackHandler.new(@pubs.length, callback).
-          handler_method_symbol
-    end
-    @pubs.each do |pub|
-      pub.publish_async(channel, item, cb)
-    end
-  end
-
-  private
-
-  def finish
-    @pubs.each do |pub|
-      pub.finish
-    end
-  end
-end