singularity 0.0.6 → 0.0.7

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YTZmY2IxNDdmMzIyYTg2YjM2MGMxY2MwNDgwZTI3NjcwMzZiZWMzNQ==
+  data.tar.gz: !binary |-
+    MzAyMWEyMjdlNWIzNGYyZGViOTU1ZTE3ZjQyOTg2ZTFkMzcwNTEwMg==
+SHA512:
+  metadata.gz: !binary |-
+    ODk1MzdmM2FiMzNhMmJjZTk1NWNiZjk4ZDhlZjY3OTIwYjljMTMyMmRlODlm
+    ZjA0MTQxNjVjZjNhMTVkYTg2ODdlNjVkMDU0ZDc0YTNiMGI4Mjc3M2U2NTQ1
+    ZGFiOWMxNDgzNzU0YTJlYmU2YmQxNDExN2RkYjZhYzM4MzJkOWE=
+  data.tar.gz: !binary |-
+    MTk0MDdmMGVkYjQ5ZmM1ZjJjYjhiNTZjN2UzZjRkODUxNDE0Y2MxODQ0N2Jh
+    NTVmODBjN2RhNDY2NjMxMTQwMjljMmRhYzk5OTQ1ZDQyZTA1MjcyZTJkNTE3
+    OTFjYTZkYTJmZjlkMTdjMDIxZThlN2E2YWZlZGJlMTJkYTAxODc=

data/lib/assets/javascripts/singularity.js.erb

@@ -8,39 +8,52 @@ var Singularity = (function () {
     jQuery.extend( true, this, options );
   }
 
-  this.init = function () {
-    this.logged_in ? this.registerMasterAuth() : this.checkMasterAuth();
+  this.init = function ( command ) {
+    if ( this.logged_in === true )
+    if ( command === 'register' ) {
+      this.registerMasterAuth();
+    }
+
+    if ( this.logged_in === false )
+    if ( command === 'lookup' ) {
+      this.checkMasterAuth();
+    }
   }
 
   function login ( result ) {
-    if ( result['logged_in'] )
-      $(Singularity).trigger('login.success');
-    else
-      $(Singularity).trigger('login.failure');
+    $(Singularity).trigger(result['logged_in'] ? 'login.success' : 'login.failure')
   }
 
   function register ( result ) {
-    if ( result['logged_in'] )
-      $(Singularity).trigger('register.success');
-    else
-      $(Singularity).trigger('register.failure');
+    $(Singularity).trigger(result['logged_in'] ? 'register.success' : 'register.failure');
   }
 
+  var xhr, timeout;
+
   this.checkMasterAuth = function () {
-    var url = this.master_auth + '?session_token=' + this.session_token + '&callback=?';
-    $.getJSON( url, login );
+    $(this).trigger('lookup');
+
+    var url = this.master_auth + '/lookup?token=' + this.session_token + '&callback=?';
+    xhr     = $.getJSON(url).then(login).fail(function () { $(Singularity).trigger('login.failure') });
+    timeout = setTimeout(requestTimeout, 5000);
+
+    return xhr;
+  }
+
+  function requestTimeout () {
+    if ( xhr.readyState !== 4 ) xhr.abort();
   }
 
   this.registerMasterAuth = function () {
-    var url = this.master_auth + '?register_token=' + this.session_token + '&callback=?';
-    $.getJSON( url, register );
+    $(this).trigger('register');
+
+    var url = this.master_auth + '/register?token=' + this.session_token + '&callback=?';
+    return xhr = $.getJSON(url).then(register).fail(function () { $(Singularity).trigger('register.failure') });
   }
 
-  $(this).bind('login.success', function () {
-    setTimeout(function () { window.location.reload(true); }, 2000);
-  });
+  $(this).on('login.success', function () { window.location.reload(true) });
+  $(this).on('login.success login.failure', function () { clearTimeout(timeout) });
 
   return this;
 
 }).apply({});
-

data/lib/singularity.rb

@@ -37,7 +37,8 @@ module Singularity
       end
 
       session_token    = SecureRandom.hex(32)
-      token_expiration = options.fetch(:expires, 1800)
+      token_expiration = options.fetch(:expires){ redis.ttl session_key(session_id) }
+      token_expiration = 1_800 if token_expiration < 1
 
       redis.setex token_key(session_token), token_expiration, session_id
 
@@ -49,11 +50,11 @@ module Singularity
     end
 
     def session_key(id)
-      Singularity.session_prefix.nil? ? id : "#{Singularity.session_prefix}:#{id}"
+      Singularity.session_prefix ? "#{ Singularity.session_prefix }:#{ id }" : id
     end
 
     def token_key(token)
-      "#{Singularity.token_prefix}:#{token}"
+      "#{ Singularity.token_prefix }:#{ token }"
     end
 
     def find_session_id_by_token(session_token)
@@ -63,11 +64,11 @@ module Singularity
     end
 
     def fetch_key_from_session(session_id, key)
-      redis.hget session_key(session_id), key
+      redis.hget session_key(session_id), key if session_id
     end
 
     def store_key_in_session(session_id, key, value)
-      redis.hset session_key(session_id), key, value
+      redis.hset session_key(session_id), key, value if session_id
     end
 
     def destroy_session(*ids)

data/lib/singularity/password_hash.rb

@@ -1,4 +1,5 @@
 require 'openssl'
+require 'rack/utils'
 
 module Singularity
   class PasswordHash

data/lib/singularity/version.rb

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

data/singularity.gemspec

@@ -15,8 +15,8 @@ Gem::Specification.new do |s|
   s.require_path = "lib"
 
   s.add_dependency "redis-native_hash", ">= 0"
-  s.add_dependency "railties", "~> 3.1"
-  s.add_dependency "jquery-rails", "~> 1.0"
+  s.add_dependency "railties", ">= 3.1"
+  s.add_dependency "jquery-rails"
 
   s.add_development_dependency "bundler", "~> 1.0.0"
   s.add_development_dependency "rspec", "~> 2.3.0"

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: singularity
 version: !ruby/object:Gem::Version
-  version: 0.0.6
-  prerelease: 
+  version: 0.0.7
 platform: ruby
 authors:
 - Carl Zulauf
@@ -10,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-15 00:00:00.000000000 Z
+date: 2013-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-native_hash
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -23,7 +21,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -31,39 +28,34 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -71,7 +63,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -79,7 +70,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -87,7 +77,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -111,31 +100,29 @@ files:
 - lib/singularity/engine.rb
 - lib/singularity/password_hash.rb
 - lib/singularity/version.rb
-- lib/warden/strategies/singularity.rb
 - singularity.gemspec
 homepage: https://github.com/lyconic/singularity
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.1.10
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: multi-domain single sign on
 test_files: []

data/lib/warden/strategies/singularity.rb

@@ -1,21 +0,0 @@
-module Warden
-  module Strategies
-    class Singularity < Base
-      def valid?
-        params["login"] || params["password"]
-      end
-
-      def authenticate!
-        IG::User.includes(:authorizations).find_by_login(params['login'].strip).tap do |user|
-          if user.try(:can_login?) && user.try(:password?, params['password'])
-            success! user
-          else
-            fail! 'Invalid username/password'
-          end
-        end
-      end
-    end
-  end
-end
-
-Warden::Strategies.add(:singularity, Warden::Strategies::Singularity)