radar_client_rb 1.0.0 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73ac6c931eb4277fe3b894f8a7d77cad4703bbae
-  data.tar.gz: 2416eedb7fd0ca5dd06a476905e7d554255325be
+  metadata.gz: 7824fb63d8f0d67804525ccb9c3a3fe75c4ba23c
+  data.tar.gz: 8f7a3f8f8ce4272a563070eb568751d817ea45b5
 SHA512:
-  metadata.gz: 86b28b604f744aac64873b31cf7ea72d3c2ce1bcdb6c129bf354f788ae7ac5a1049b2625973acdf467b073c2f2eaad92e3392b9c26a8da19bfbd8d9d30cb98c5
-  data.tar.gz: c80b696d50947d1dd183396a658c62f3e75f1f58dad1f8a3892c4e41dba059032ca03e52be3ea0122ba3296eab28fc767cc4130ebb3dd6ded8bc3611be5288b9
+  metadata.gz: 298eda373afffbaca84bafa666ba8060f09316c80b23b470c5d8da6483526f56c6573c252480ce0e5463ea3e0f60ae69294cc0fdbaf3505c46ec1bc175ef9b95
+  data.tar.gz: 178ea51532bd587079dfe26ea27d61de669aa768d25928b097db497e57f97bbe6a7f3b59da125f90d49f0e058a42107fdedd58f04c0e7c56c043f39447ea5571

data/lib/radar_client_rb/resource.rb

@@ -19,16 +19,39 @@ module Radar
 
     def get
       result = {}
-      @client.redis.hgetall(@name).each do |key, value|
-        user_id, client_id = key.split('.')
-        message = JSON.parse(value)
-        if message['online']
-          result[user_id] ||= { :clients => {}, :userType => message['userType'] }
-          result[user_id][:clients][client_id] = message['userData'] || {}
-        end
+
+      clients = get_clients.select { |client| client['online'] }
+      sentries = clients.map { |client| client['sentry'] }
+      online_sentries = select_online_sentries(sentries)
+      online_clients = clients.select { |client| online_sentries.include?(client['sentry']) }
+
+      online_clients.each do |client|
+        user_id = client['userId']
+        result[user_id] ||= { :clients => {}, :userType => client['userType'] }
+        result[user_id][:clients][client['clientId']] = client['userData'] || {}
       end
       result
     end
+
+    private
+
+    def get_clients
+      @client.redis.hgetall(@name).values.map { |value| JSON.parse(value) }
+    end
+
+    def select_online_sentries(sentry_ids)
+      return [] unless sentry_ids && sentry_ids.any?
+      online_sentries = @client.redis.hmget('sentry:/radar', *sentry_ids.uniq)
+        .select { |x| !x.nil? }
+        .map { |data| JSON.parse(data) }
+        .select { |sentry| !message_is_expired?(sentry) }
+
+      online_sentries.map { |sentry| sentry['name'] }
+    end
+
+    def message_is_expired?(message)
+      !message['expiration'] || message['expiration'] <= (Time.now.to_i * 1000)
+    end
   end
 
   class Status < Resource

data/lib/radar_client_rb/version.rb

@@ -1,5 +1,5 @@
 module Radar
   class Client
-    VERSION = '1.0.0'
+    VERSION = '1.0.3'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: radar_client_rb
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.3
 platform: ruby
 authors:
 - Patrick O'Brien
@@ -10,104 +10,104 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2016-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   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: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeredis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: private_gem
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bump
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Read/Write Radar Resources from Redis through Ruby
@@ -116,10 +116,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/radar_client_rb.rb
 - lib/radar_client_rb/client.rb
 - lib/radar_client_rb/resource.rb
 - lib/radar_client_rb/version.rb
+- lib/radar_client_rb.rb
 homepage: http://github.com/zendesk/radar_client_rb
 licenses: []
 metadata: {}
@@ -129,17 +129,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.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Read/Write Radar Resources from Redis through Ruby