gaptool-server 0.3.1 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/gaptool-server.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "gaptool-server"
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Bailey"]

data/lib/helpers/services.rb

@@ -14,11 +14,22 @@ module ServiceHelpers
       return { :inuse => @inuse, :available => @available }
     else
       @all = Hash.new
-      $redis.keys('apikey:inuse:*').each do |service|
-        @all[service.gsub('apikey:inuse:', '')][:inuse] = $redis.lrange("apikey:inuse:#{service}", 0, -1)
-      end
-      $redis.keys('apikey:available:*').each do |service|
-        @all[service][:available] = $redis.lrange("apikey:available:#{service}", 0, -1)
+      $redis.keys('apikey:*').each do |service|
+        if service =~ /:available:/
+          begin
+            @all[service.gsub('apikey:available:', '')][:available] = $redis.lrange(service, 0, -1)
+          rescue
+            @all[service.gsub('apikey:available:', '')] = Hash.new
+            @all[service.gsub('apikey:available:', '')][:available] = $redis.lrange(service, 0, -1)
+          end
+        elsif service =~ /:inuse:/
+          begin
+            @all[service.gsub('apikey:inuse:', '')][:inuse] = $redis.lrange(service, 0, -1)
+          rescue
+            @all[service.gsub('apikey:inuse:', '')] = Hash.new
+            @all[service.gsub('apikey:inuse:', '')][:inuse] = $redis.lrange(service, 0, -1)
+          end
+        end
       end
       return @all
     end

metadata

@@ -2,7 +2,7 @@
 name: gaptool-server
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Matt Bailey
@@ -233,7 +233,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2178051250272354546
+      hash: 119902062152382131
       segments: 
       - 0
       version: "0"