colossus 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a1798af6e47665a55ac7d9140b00f2317c7cf9f
-  data.tar.gz: 1943594c8954d3cd1255f2b5626b6eee6d08fde1
+  metadata.gz: bb6bde537b83a3d4fa31045c127768b5946b15fb
+  data.tar.gz: 7657430bfb89a206589e6de59bb7e6d0d9ae8c89
 SHA512:
-  metadata.gz: f08853ae51aa21a4526b33955717b903030ac681df09a3d86eb44a5b6a0c39ac92ca9711195450eced0c8918fc94dce7330e9c767581189542cac1a3558e8bda
-  data.tar.gz: 5e39feee2464f72cdbb66a4f2e8fc2d1bc860fae862d9b2b1600069c7b73b6a4a33796ae97d5182a2a1a6e8433f553323de86ccde79cec54650fb0f3c79321d5
+  metadata.gz: a444ab4e80672e97cede59b755e63abd900e9b3e82ad3a020dc80f8fb68539ecb7feccb7dcb5aae9586bee8f22015bb521afec19976ed9b0736603be1fcb64f1
+  data.tar.gz: fb8c04a1fee8a2282022f09524ce6d10221186f74a4d9d9d724f5fcf3f4c38966a051afae8aed217bf597e6f580c9fb0dd084841ff7a27880033492089786ee3

data/lib/colossus.rb

@@ -74,7 +74,7 @@ class Colossus
   # @param user_ids [Array<#to_s>] An array of user ids
   # (see #get)
   def get_multi(*user_ids)
-    engine.get_multi(user_ids.map(&:to_s))
+    engine.get_multi(*user_ids.map(&:to_s))
   end
 
   # (see #get)

data/lib/colossus/engines/memory/memory.rb

@@ -49,9 +49,7 @@ class Colossus
       end
 
       def get_multi(*user_ids)
-        statuses = {}
-        user_ids.each { |user_id| statuses[user_id] = get(user_id) }
-        statuses
+        user_ids.inject({}) { |memo, user_id| memo.merge!(get(user_id)) }
       end
 
       def get_all

data/lib/colossus/faye/extension.rb

@@ -22,13 +22,16 @@ class Colossus
           handle_user_action(message)
           message.delete('data')
           message.delete('ext')
+        elsif message['ext']['writer_token']
+          message.delete('ext')
         end
 
         callback.call(message)
       end
 
       def acceptable?(message)
-        message['ext'] && message['ext']['user_token']
+        message['ext'] &&
+          (message['ext']['user_token'] || message['ext']['writer_token'])
       end
 
       def handle_user_action(message)

data/lib/colossus/simple_writer_server.rb

@@ -1,13 +1,17 @@
 class Colossus
   class SimpleWriterServer
-    attr_reader :faye_extension
+    attr_reader :faye_extension, :faye_client, :faye_client_extension
 
     def initialize(faye_extension)
-      @faye_extension = faye_extension
+      @faye_extension        = faye_extension
+      @faye_client           = faye_extension.faye.get_client
+      @faye_client_extension = FayeClientExtension.new
+      @faye_client.add_extension(faye_client_extension)
     end
 
     def presence(writer_token, optional_user_ids = nil)
       raise 'Invalid token' unless valid?(writer_token)
+      faye_client_extension.writer_token = writer_token
 
       case optional_user_ids
       when Array
@@ -23,6 +27,7 @@ class Colossus
 
     def push(writer_token, user_ids, message)
       raise 'Invalid token' unless valid?(writer_token)
+      faye_client_extension.writer_token = writer_token
 
       case user_ids
       when Array
@@ -40,12 +45,28 @@ class Colossus
       colossus.verifier.verify_writer_token(writer_token)
     end
 
-    def faye_client
-      faye_extension.faye.get_client
-    end
-
     def colossus
       faye_extension.colossus
     end
+
+    class FayeClientExtension
+      attr_accessor :writer_token
+
+      def initialize(writer_token = nil)
+        @writer_token = writer_token
+      end
+
+      def incoming(message, callback)
+        callback.call(message)
+      end
+
+      def outgoing(message, callback)
+        message['ext'] ||= {}
+        message['ext']['writer_token'] = writer_token
+        puts message
+
+        callback.call(message)
+      end
+    end
   end
 end

data/lib/colossus/version.rb

@@ -1,4 +1,4 @@
 # The Version
 class Colossus
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: colossus
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - antoinelyset