aptible-rails 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd07a14efbd03da90163062b232f051202c63560
-  data.tar.gz: bb7f438e6863c15d37e8177ba26507ef15b39da4
+  metadata.gz: 80b6d016eb1d4fddbaaf7864c87ff5362d449f13
+  data.tar.gz: 04913481f71fed1a2e4cdd20901a5bbe1b166c4f
 SHA512:
-  metadata.gz: 081b03b16c607208d623a6e4cf60196ce2b9dafa9e5dcac057657a8697707d5ace425cf412ff453778c692f829bcdc780ba7f163846513aff44a03be0aa0066e
-  data.tar.gz: 39d3d16cfda1c325f42009daac25623ea21df4df2b533ecdb22348355edd1565d03412e07c9cf0d675257306e4e70cc188ee7753cb08f86c2e0cbbfc4c2758d8
+  metadata.gz: c7bb3bebd2a50287dbe0df396752c06baa8d980f04133aaf26a5cb6643c548dfdf8dc7678b9e50d462cffa343857f6385342dbf9e41130b5b3c0b6bf27d6b03e
+  data.tar.gz: 477b1e8c821687955aa96d781cb5f49b5e209f29ad7dabb5469ac15124dcf5cc19a89a5357910944c94775174b4544e4407c83c755cfa6ed7260a89caae3346e

data/lib/aptible/rails/controller.rb

@@ -20,7 +20,7 @@ module Aptible
       end
 
       def current_aptible_user
-        @current_user ||= auth.find_by_url(session_subject)
+        @current_user ||= auth.find_by_url(aptible_subject)
       rescue
         clear_session_cookie
       end
@@ -30,14 +30,22 @@ module Aptible
       end
 
       def service_token
-        return unless session_token && session_token.session
-        @service_token ||= service_token_for(session_token)
+        return unless aptible_token && aptible_token.session
+        @service_token ||= service_token_for(aptible_token)
       end
 
       def aptible_login_url
         Aptible::Rails.configuration.login_url
       end
 
+      def aptible_subject
+        token_subject || session_subject
+      end
+
+      def aptible_token
+        current_token || session_token
+      end
+
       # before_action :authenticate_user
       def authenticate_aptible_user
         redirect_to aptible_login_url unless current_aptible_user

data/lib/aptible/rails/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module Rails
-    VERSION = '0.1.8'
+    VERSION = '0.1.9'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-30 00:00:00.000000000 Z
+date: 2014-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_config