colossus 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41f6b42502ef1d7dc7ac3f6c9db2fcda269ba638
-  data.tar.gz: b2d287c2ae7064d7d44560807d624fc97eeb2507
+  metadata.gz: 744e97003be9b4ba97c54fd8877679f042268423
+  data.tar.gz: 831be7283ce1271cf95cb80ea751d62c4ab384e8
 SHA512:
-  metadata.gz: b490b25cd109750c14adcf9dd0c372759906bc06c94a00a185aaf8339937a0f707b986b3c8d8895c3787e04e8c0359b051399d1549af917fc3e0e642c57e2461
-  data.tar.gz: 9cfc3449c0f3258f91edd91263ce058381ee58ecf656720a3ae8dd57d27bc6fc54a35f49247f340b880a595fa55e6f94469380719cc819d06e4afcd65a654ef7
+  metadata.gz: 0db8010a14269f54288633e7701c6bae7a13a27cd087e8b024faedbc307717fbc185b2e051a653575cd5abfe17ef6a0bb0898e982a5ca9b8a8c1c465ca0df9e2
+  data.tar.gz: 287374b1f76f7b5891f4ebb5ea4a25c66c9cdb9df77d6db0231fe8369a70572238df3a3ab426b7877e019686ccae675e97b855950e4a84815d33afafa4854e85

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

@@ -8,6 +8,7 @@ class Colossus
 
       attr_reader :client_sessions, :ttl, :mutex
 
+      # @param [Integer/Float] ttl TTL in seconds
       def initialize(ttl)
         @client_sessions = Hash.new do |hash, key|
           hash[key] = Colossus::Engine::Memory::ClientSessionStore.new
@@ -30,7 +31,8 @@ class Colossus
           end
         end
 
-        if client_sessions[user_id].status_changed?
+        if client_sessions[user_id].sessions.empty? ||
+            client_sessions[user_id].status_changed?
           status = client_sessions[user_id].status
           delete(user_id) if status == 'disconnected'
           user_changed(user_id, status)
@@ -76,23 +78,35 @@ class Colossus
 
       def new_periodic_ttl
         secs_ttl = Colossus.config.seconds_before_ttl_check
-        @periodic_ttl = EM::Synchrony.add_periodic_timer(secs_ttl) do
-          client_sessions.each_pair do |user_id, session_store|
-            sessions_dupped = session_store.sessions.dup
-
-            session_store.sessions.each_pair do |session_id, session|
-              if (session.last_seen + ttl) < Time.now
-                sessions_dupped.delete(session_id)
-              end
-            end
+        @periodic_ttl = EM::Synchrony.add_periodic_timer(secs_ttl, &method(:gc_ttl))
+      end
+
+      def gc_ttl
+        user_ids_to_delete = []
 
-            mutex.synchronize { session_store.sessions = sessions_dupped }
+        client_sessions.each_pair do |user_id, session_store|
+          sessions_dupped = session_store.sessions.dup
 
-            if (session_store.last_seen + ttl) < Time.now
-              delete(user_id)
-              user_changed(user_id, 'disconnected')
+          session_store.sessions.each_pair do |session_id, session|
+            if (session.last_seen + ttl) < Time.now
+              sessions_dupped.delete(session_id)
             end
           end
+
+          mutex.synchronize { session_store.sessions = sessions_dupped }
+
+          if (session_store.last_seen + ttl) < Time.now
+            user_ids_to_delete << user_id
+          end
+        end
+
+        delete_expired_users(user_ids_to_delete)
+      end
+
+      def delete_expired_users(user_ids)
+        user_ids.each do |user_id|
+          delete(user_id)
+          user_changed(user_id, 'disconnected')
         end
       end
     end

data/lib/colossus/version.rb

@@ -1,4 +1,4 @@
 # The Version
 class Colossus
-  VERSION = '0.9.0'
+  VERSION = '0.10.0'
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: colossus
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - antoinelyset
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-04 00:00:00.000000000 Z
+date: 2015-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faye
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: em-synchrony
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 description: Colossus is a Push and Presence pure Ruby server. It uses Faye internally.
@@ -93,17 +93,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Colossus, Web Push & Presence made easy.