pakyow-realtime 0.10.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0ff21392040bb4adc29a3cdc1e7cc9b3bc8ebdd
-  data.tar.gz: 4e34247a87e937bd1069aceb6dbb90b8d23ce2a0
+  metadata.gz: d3af56bba7d1aa3e3b121eb2b542d0dc4f85d35d
+  data.tar.gz: 33f0af0198c31f0b2b728d07a63635a2f85ad79a
 SHA512:
-  metadata.gz: a5b1fe2d6ae6fd38bf06b6ad7ee2adba20dc681fb2335fae53b2d115768b144a0cd2302848be0581bd28be50ee2a90e3c69c32829221967db61343322f0f79fe
-  data.tar.gz: efe74c79e7d4d82e5db1a05cbeb973308dd597e69309c806534dac5908a1205d7e32337999f0e84f695937302832c18005e7b79ade8d85c19300eeb25ba53766
+  metadata.gz: bf7e58a486cdef598237a63744c06069c9df16bf70c39d206d9bd18e2272e8a2035007ac3cd50d7dec232488ad89deb122d1b369a1230a229b2e6f09818dc968
+  data.tar.gz: 2ab01fe491a66614a021fefea6e674f68cf614fb970742b57ba2a3adca12c4dfae3716dc0c25c51ff3e3b147985730e0f657cd586fa784fdcd9da4e59aba7520

data/pakyow-realtime/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.10.2 / 2015-11-15
+
+  * Adds ability to return only a partial in call-route response
+  * Fixes several bugs with the redis registry / subscriptions
+  * Fixes a bug causing qualifications to not match when using redis
+  * Bumps concurrent-ruby version to 1.0
+
 # 0.10.0 / 2015-10-19
 
   * Initial release

data/pakyow-realtime/lib/pakyow-realtime/message_handlers/call_route.rb

@@ -18,10 +18,14 @@ Pakyow::Realtime.handler :'call-route' do |message, session, response|
   res = app.process(env)
 
   container = message['container']
+  partial = message['partial']
+
+  composer = app.presenter.composer
 
   if container
-    composer = app.presenter.composer
     body = composer.container(container.to_sym).includes(composer.partials).to_s
+  elsif partial
+    body = composer.partial(partial.to_sym).includes(composer.partials).to_s
   else
     body = res[2].body
   end

data/pakyow-realtime/lib/pakyow-realtime/redis_subscription.rb

@@ -7,51 +7,42 @@ module Pakyow
     #
     # @api private
     class RedisSubscription
-      include Concurrent::Async
+      SIGNAL_UNSUBSCRIBE = :unsubscribe
 
       def initialize
         @redis = ::Redis.new(Config.realtime.redis)
-        @channels = []
-
-        ObjectSpace.define_finalizer(self, self.class.finalize)
       end
 
-      def self.finalize
-        -> {
-          unsubscribe
-          @redis.quit
+      def subscribe(channels = [])
+        channels << signal_channel
+
+        Concurrent::Future.execute {
+          @redis.subscribe(*channels) do |on|
+            on.message do |channel, msg|
+              if channel == signal_channel
+                if msg == SIGNAL_UNSUBSCRIBE
+                  @redis.unsubscribe
+                  return
+                end
+              end
+
+              msg = JSON.parse(msg)
+
+              if msg.is_a?(Hash)
+                msg[:__propagated] = true
+              elsif msg.is_a?(Array)
+                msg << :__propagated
+              end
+
+              context = Pakyow::Realtime::Context.new(Pakyow.app)
+              context.push(msg, channel)
+            end
+          end
         }
       end
 
-      def subscribe(channels)
-        return if channels.empty?
-        @channels = channels
-
-        run
-      end
-
-      def unsubscribe
-        return if @channels.empty?
-        @redis.unsubscribe(*@channels)
-      end
-
-      private
-
-      def run
-        @redis.subscribe(*@channels) do |on|
-          on.message do |channel, msg|
-            msg = JSON.parse(msg)
-
-            if msg.is_a?(Hash)
-              msg[:__propagated] = true
-            elsif msg.is_a?(Array)
-              msg << :__propagated
-            end
-
-            context = Pakyow::Realtime::Context.new(Pakyow.app)
-            context.push(msg, channel)
-          end
-        end
+      def signal_channel
+        "pw:#{object_id}:signal"
       end
     end
   end

data/pakyow-realtime/lib/pakyow-realtime/registries/redis_registry.rb

@@ -71,12 +71,12 @@ module Pakyow
       # subscriber with the current channels.
       def resubscribe
         if @subscriber
-          @subscriber.async.unsubscribe
+          Pakyow::Realtime.redis.publish(@subscriber.signal_channel, RedisSubscription::SIGNAL_UNSUBSCRIBE)
         else
           @subscriber = RedisSubscription.new
         end
 
-        @subscriber.async.subscribe(@channels)
+        @subscriber.subscribe(@channels)
       end
 
       # Returns the key used to store channels.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pakyow-realtime
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors:
 - Bryan Powell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-19 00:00:00.000000000 Z
+date: 2015-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pakyow-support
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.10.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.10.2
 - !ruby/object:Gem::Dependency
   name: pakyow-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.10.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.10.2
 - !ruby/object:Gem::Dependency
   name: websocket_parser
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 description: WebSockets and realtime channels for Pakyow
 email: bryan@metabahn.com
 executables: []
@@ -130,3 +130,4 @@ signing_key:
 specification_version: 4
 summary: Pakyow Realtime
 test_files: []
+has_rdoc: