fanout 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c00a6654cc9a1afe647949d47e308e7e26a9cd3c
-  data.tar.gz: 779264dc8a6f2b90ee91ee53b4bcf91a12f15c49
+  metadata.gz: 857315e0ee2081c96c072f6295f9ee58086e459a
+  data.tar.gz: 8adf56221d8a4f10a3d531476979e10ee68fe137
 SHA512:
-  metadata.gz: 6dc3caeb96825aa789e7493abe3a06c5d56412703aeb09b7c3a443d5bb53c4416c3e4f39ca9e2da10f6732b2e8047a13cf74e5d10c3720b1834908e54aeb36b6
-  data.tar.gz: 2f030df94aa915a6c5f2a55e52d6929e72a45206163c00a2cb38b941bfc0d7ed6c14c3daf7faf8654590bd162788ec7d03630a032e0422b30090ce49c525fe51
+  metadata.gz: 97faeda87ee4be778929ca6a26331ee2badb2c13e6fa88519422eaf67a8125a984c0362dc72305aa8c1ef7cc375450f7cb2ecedec5c0be53fd727a50f34504c4
+  data.tar.gz: 577ada5bd31f10ab24f1c75df2e6808d8dd65828422c04c404e6c61722061f38cc31e09a8efc38b8429e3231f6cda01d5460eb66da8e736e0467edc56c21c54e

data/lib/fanout.rb

@@ -2,7 +2,7 @@
 #    ~~~~~~~~~
 #    This module implements the Fanout class.
 #    :authors: Konstantin Bokarius.
-#    :copyright: (c) 2015 by Fanout, Inc.
+#    :copyright: (c) 2015-2016 by Fanout, Inc.
 #    :license: MIT, see LICENSE for more details.
 
 require 'base64'
@@ -30,17 +30,21 @@ class Fanout
     if key.nil?
       key = ENV['FANOUT_KEY']
     end
-    @realm = realm
-    @key = key
-    @ssl = ssl
+    if ssl
+      scheme = 'https'
+    else
+      scheme = 'http'
+    end
+    uri = '%s://api.fanout.io/realm/%s' % [scheme, realm]
+    @pub = PubControl.new({'uri' => uri, 'iss' => realm,
+        'key' => Base64.decode64(key)})
   end
 
   # Synchronously publish the specified data to the specified channel for
   # the configured Fanout.io realm. Optionally provide an ID and previous
   # ID to send along with the message.
   def publish(channel, data, id=nil, prev_id=nil)
-    pub = get_pubcontrol
-    pub.publish(channel, Item.new(JsonObjectFormat.new(data), id, prev_id))
+    @pub.publish(channel, Item.new(JsonObjectFormat.new(data), id, prev_id))
   end
 
   # Asynchronously publish the specified data to the specified channel for
@@ -49,29 +53,7 @@ class Fanout
   # called after publishing is complete and passed the result and error message
   # if an error was encountered.
   def publish_async(channel, data, id=nil, prev_id=nil, callback=nil)
-    pub = get_pubcontrol
-    pub.publish_async(channel, Item.new(JsonObjectFormat.new(data), id,
+    @pub.publish_async(channel, Item.new(JsonObjectFormat.new(data), id,
         prev_id), callback)
   end
-
-  private
-
-  # An internal method used for retrieving the PubControl instance. The
-  # PubControl instance is saved as a thread variable and if an instance
-  # is not available when this method is called then one will be created.
-  def get_pubcontrol
-    if Thread.current['pubcontrol'].nil?
-      if @ssl
-        scheme = 'https'
-      else
-        scheme = 'http'
-      end
-      pub = PubControlClient.new(
-          '%s://api.fanout.io/realm/%s' % [scheme, @realm])
-      pub.set_auth_jwt({'iss' => @realm}, Base64.decode64(@key))
-      at_exit { pub.finish }
-      Thread.current['pubcontrol'] = pub
-    end
-    return Thread.current['pubcontrol']
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fanout
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Konstantin Bokarius
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2016-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pubcontrol
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.2'
 description: A Ruby convenience library for publishing messages to Fanout.io using
   the EPCP protocol
 email: bokarius@comcast.net
@@ -53,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Fanout.io library for Ruby