omniauth-applicaster 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cdfcee895b255c8a6aab814044d79692d2a1b0f
-  data.tar.gz: 5d43ff220df15f20799c267c6e7b004e33928b9e
+  metadata.gz: 2d72901376c9698e3c3e8c5c411c051e616c3a71
+  data.tar.gz: e6bb8bb5e953da8d08ce56e16059f637922b0ada
 SHA512:
-  metadata.gz: 94660689cb5cbe63ae03646dd6fedcb3de2aac8a9aaf9560cb775e2f79a5b3c24a116d81dafefe6e19ae0e7edc38fd5b9d58cdd5cc84741084df3773097713b5
-  data.tar.gz: 5ce0f144b60f822b1b4809acd5dc777c80d3e78db654f87431c59a0ba7ef2faa106d40f2801abbe928c72f4cf5cb32775cd56309f3fd8b85275b6b3e231ca3d9
+  metadata.gz: 7c3d8a9f3829ff1c87623e042db0987156b8e3c39cd6aaed7179d6c11214e527b3819c10c3e3d7777bfaef1dcb8a4474b24f680a013a1de55a8485167c79b421
+  data.tar.gz: e6b3850aa5f59dca554a2c973e3904d840e71abed41c6b478e2c574791bf8be64cc968dc40342454efb882f4b2d0cf05c9b21c2f9bc1adf73211b542a488150e

data/Rakefile

@@ -1,2 +1,12 @@
 require "bundler/gem_tasks"
 
+begin
+  require 'rspec/core/rake_task'
+
+  RSpec::Core::RakeTask.new(:spec)
+
+  task :default => :spec
+rescue LoadError
+  # no rspec available
+end
+

data/lib/applicaster/auth_helpers.rb

@@ -15,14 +15,21 @@ module Applicaster
       end
     end
 
+    def current_access_token
+      session[:omniauth_credentials][:token] if session[:omniauth_credentials]
+    end
+
     protected
 
+    def clear_omniauth_credentials
+      session.delete(:omniauth_credentials)
+    end
+
     def user_from_session
-      return nil unless session[:omniauth_credentials]
+      return nil unless current_access_token
 
-      token = session[:omniauth_credentials][:token]
-      Applicaster::Accounts.user_from_token(token).tap do |user|
-        session.delete(:omniauth_credentials) unless user
+      Applicaster::Accounts.user_from_token(current_access_token).tap do |user|
+        clear_omniauth_credentials unless user
       end
     end
   end

data/lib/omniauth-applicaster/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Applicaster
-    VERSION = "1.3.0"
+    VERSION = "1.3.1"
   end
 end

data/spec/lib/applicaster/auth_helpers_spec.rb

@@ -92,6 +92,24 @@ RSpec.describe Applicaster::AuthHelpers do
     end
   end
 
+  describe "#current_access_token" do
+    it "returns access token" do
+      expect(controller.current_access_token).to eq(
+        session[:omniauth_credentials][:token]
+      )
+    end
+
+    context "when session has no omniauth_credentials" do
+      it "returns nil" do
+        expect(controller.current_access_token).to be nil
+      end
+
+      def session
+        {}
+      end
+    end
+  end
+
   def session
     {
       omniauth_credentials: {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-applicaster
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Neer Friedman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-12 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler