pubcontrol 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e6fcb8db8ed8cda62abecf09a037501fb5ae547
-  data.tar.gz: ef00fbf3e4963a288125f5743c9015d85f8d5b52
+  metadata.gz: ab97545468d3337e4e281e5d36f515a3acb707d4
+  data.tar.gz: f9649e54bce224b03683182c09583c283b358e4c
 SHA512:
-  metadata.gz: de5f3cc596bdbffdf7ff2c4bd1b1d6d2419847800e1624c0f942198466d6842bc04113a8cd6b2d8a298eee69dec243627d06f4d3002c07a532e1475f19a758fe
-  data.tar.gz: 300373c255dde069f23af2aa014814f909367a3748b40399e72824d178aeec831de17a7a8228d714796f7d377da78b2b0d303c2223dd2184c0984f8d1d3bd4f0
+  metadata.gz: ffe3037a12a43e76a5a1fbc09cccda35833c3c5528c04ee66d3ccdb670ae657f0d300a4e88a1410d63e8d83959083a8a9836dfe7cfc68f3cf695fe85093751bc
+  data.tar.gz: cfd4eb7cd7c050d8e67c5741545a1ceba708f0f4e29b32d5c2f7a423ebbe7b26508cfffc408e850d121afc6be63ed32fc05dc5e4d16604038b96f65297c3cf8b

data/lib/pubcontrol.rb

@@ -18,7 +18,7 @@ require_relative 'pubcontrolset.rb'
 class PubControl
   attr_accessor :req_queue
 
-  def initialize(uri, use_ssl=true)
+  def initialize(uri)
     @uri = uri
     @lock = Mutex.new
     @thread = nil
@@ -29,7 +29,6 @@ class PubControl
     @auth_basic_pass = nil
     @auth_jwt_claim = nil
     @auth_jwt_key = nil
-    @use_ssl = use_ssl
   end
 
   def set_auth_basic(username, password)
@@ -55,7 +54,7 @@ class PubControl
       uri = @uri
       auth = gen_auth_header
     end
-    PubControl.pubcall(uri, auth, [export], @use_ssl)
+    PubControl.pubcall(uri, auth, [export])
   end
 
   def publish_async(channel, item, callback=nil)
@@ -103,23 +102,22 @@ class PubControl
       end
       @thread_mutex.unlock
       if reqs.length > 0
-        PubControl.pubbatch(reqs, @use_ssl)
+        PubControl.pubbatch(reqs)
       end
     end
   end
 
-  def self.pubcall(uri, auth_header, items, use_ssl)
+  def self.pubcall(uri, auth_header, items)
     uri = URI(uri + '/publish/')
     content = Hash.new
     content['items'] = items
-    # REVIEW: POST implementation
     request = Net::HTTP::Post.new(uri.request_uri)
-    # REVIEW: is simply encoding in UTF-8 correct here?
     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
@@ -130,7 +128,7 @@ class PubControl
     end
   end
 
-  def self.pubbatch(reqs, use_ssl)
+  def self.pubbatch(reqs)
     raise 'reqs length == 0' unless reqs.length > 0
     uri = reqs[0][0]
     auth_header = reqs[0][1]
@@ -141,7 +139,7 @@ class PubControl
       callbacks.push(req[3])
     end
     begin
-      PubControl.pubcall(uri, auth_header, items, use_ssl)
+      PubControl.pubcall(uri, auth_header, items)
       result = [true, '']
     rescue => e
       result = [false, e.message]
@@ -154,7 +152,6 @@ class PubControl
   end
 
   def self.timestamp_utcnow
-    # REVIEW: gmtime Ruby implementation
     return Time.now.utc.to_i
   end
 
@@ -182,13 +179,10 @@ class PubControl
       @thread_cond = ConditionVariable.new
       @thread_mutex = Mutex.new
       @thread = Thread.new { pubworker }
-      # REVIEW: Ruby threads are daemonic by default 
-      #@thread.daemon = true
     end
   end
 
   def queue_req(req)
-    # REVIEW: thread condition implementation
     @thread_mutex.lock
     @req_queue.push_back(req)
     @thread_cond.signal

data/lib/pubcontrolset.rb

@@ -45,20 +45,20 @@ class PubControlSet
     end
   end
 
-  def publish(channel, item, blocking=false, callback=nil)
-    if blocking
-      @pubs.each do |pub|
-        pub.publish(channel, item)
-      end
-    else
-      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
+  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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pubcontrol
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Konstantin Bokarius