singularity 0.0.5 → 0.0.6

data/lib/singularity.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'redis_hash'
+require 'securerandom'
 
 require_relative 'global_user'
 
@@ -26,14 +27,7 @@ module Singularity
 
   class << self
 
-    def generate_token(length)
-      chars = ['a'..'z','A'..'Z',0..9].map(&:to_a).flatten
-      token = ''
-      length.times { token << chars.sample.to_s }
-      token
-    end
-
-    def generate_session_token(session_id, session)
+    def generate_session_token(session_id, session, options = {})
       if session.key?("_token_expires") && session["_token_expires"].to_i > Time.now.to_i
         unless session.nil? || session["_session_id"] != session_id
           return session["_token"]
@@ -41,12 +35,16 @@ module Singularity
           redis.del token_key(session['_token'])
         end
       end
-      session_token = generate_token(32)
-      token_expiration = 1800 # 30 minutes # JUNK
+
+      session_token    = SecureRandom.hex(32)
+      token_expiration = options.fetch(:expires, 1800)
+
       redis.setex token_key(session_token), token_expiration, session_id
-      session["_session_id"] = session_id
-      session["_token"] = session_token
+
+      session["_session_id"]    = session_id
+      session["_token"]         = session_token
       session["_token_expires"] = Time.now.to_i + token_expiration
+
       session_token
     end
 

data/lib/singularity/version.rb

@@ -1,3 +1,3 @@
 module Singularity
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: singularity
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-07 00:00:00.000000000 Z
+date: 2013-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-native_hash