rampart 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 232b9e365aa3332af1bfab8f8e43c0d1afd01004
-  data.tar.gz: aa89e1bb28884d2d24dd3d76f41560807880ce11
+  metadata.gz: 566746956c4ed56ef3c98f3d4bf90064bdf61b37
+  data.tar.gz: f751ee340e4ca2a6f8bbd7d28ed9645524a1af1e
 SHA512:
-  metadata.gz: 512befd8ab543652f52254430620c67c5da7ad5733fd3bd969c6915e3576ed7f34c96dc0faa9fe31fdb20824bf35f6d16848663efd26e47e945c867dd6c5441d
-  data.tar.gz: 0965c56202244745dc1558adb912acda1803f4dd9b2c9a4c971ad4550dd1ce6c4b600d3fd5f52210f55b2be6504813f478c6e7b4b8bba488740b51d980161883
+  metadata.gz: 4f67cc92951353e4c02f892a8430ae7d511267915f8d225b3cc640f21a246f095988f0385b4b17de4fa6ce7304e5ccf3e9748404d4c810cc4cf368a6ae7d10d0
+  data.tar.gz: 99ddfa8c7a0fd88346e81bca8fd34eafae86a8ba4a2c987253f233668b9db3d001869d509cd49d78b537a4e324662fa6d9e1db9601f245b2c178a85d265f72ad

data/lib/rampart/auth.rb

@@ -15,9 +15,8 @@ module Rampart
     def call(env)
       strategy_manager = StrategyManager.new(env)
       @strategies.each { |k,v| strategy_manager.register(k,v) }
-      proxy = Proxy.new(strategy_manager, UserStore.new(Session.new(env), @serializer))
+      proxy = Proxy.new(strategy_manager, Session.new(env), UserStore.new(Session.new(env), @serializer))
 
-      env["rampart.session.key"] = @session_key
       env["rampart"] = proxy
 
       catch(:rampart) do

data/lib/rampart/proxy.rb

@@ -1,7 +1,8 @@
 module Rampart
   class Proxy
-    def initialize(strategy_manager, user_store)
+    def initialize(strategy_manager, session, user_store)
       @strategy_manager = strategy_manager
+      @session = session
       @user_store = user_store
     end
 
@@ -25,6 +26,14 @@ module Rampart
       end
     end
 
+    def logout
+      @session.delete
+    end
+
+    def user_id
+      @session.fetch
+    end
+
     def set_user(user)
       @user_store.store(user)
     end

data/lib/rampart/version.rb

@@ -1,3 +1,3 @@
 module Rampart
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/rampart/proxy_spec.rb

@@ -12,7 +12,9 @@ describe Rampart::Proxy do
       user_store = MiniTest::Mock.new
       user_store.expect(:store, true, [Object])
 
-      proxy = Rampart::Proxy.new(strategy_manager, user_store)
+      session = MiniTest::Mock.new 
+
+      proxy = Rampart::Proxy.new(strategy_manager, session, user_store)
       proxy.authenticate!(:basic).must_equal(user)
     end
 
@@ -25,7 +27,9 @@ describe Rampart::Proxy do
       user_store = MiniTest::Mock.new
       user_store.expect(:store, true, [Object])
 
-      proxy = Rampart::Proxy.new(strategy_manager, user_store)
+      session = MiniTest::Mock.new 
+
+      proxy = Rampart::Proxy.new(strategy_manager, session, user_store)
       response = catch(:rampart){ proxy.authenticate!(:basic) }
       response.must_be_instance_of(Array)
     end
@@ -41,7 +45,9 @@ describe Rampart::Proxy do
       user_store = MiniTest::Mock.new
       user_store.expect(:store, true, [Object])
 
-      proxy = Rampart::Proxy.new(strategy_manager, user_store)
+      session = MiniTest::Mock.new
+
+      proxy = Rampart::Proxy.new(strategy_manager, session, user_store)
       proxy.authenticate(:basic).must_equal(user)
     end
 
@@ -54,7 +60,9 @@ describe Rampart::Proxy do
       user_store = MiniTest::Mock.new
       user_store.expect(:store, true, [Object])
 
-      proxy = Rampart::Proxy.new(strategy_manager, user_store)
+      session = MiniTest::Mock.new 
+      
+      proxy = Rampart::Proxy.new(strategy_manager, session, user_store)
       proxy.authenticate(:basic).must_be_nil
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rampart
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Erik Lott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-16 00:00:00.000000000 Z
+date: 2014-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack