Merge pull request #79 from tsukasaoishi/json_session

Objects change to Hash object before storing into session.

Author: dennisreimann

lib/openid/consumer.rb

@@ -2,6 +2,7 @@
 require "openid/consumer/checkid_request.rb"
 require "openid/consumer/associationmanager.rb"
 require "openid/consumer/responses.rb"
+require "openid/consumer/session"
 require "openid/consumer/discovery_manager"
 require "openid/consumer/discovery"
 require "openid/message"
@@ -189,7 +190,8 @@ class Consumer
     #
     # store: an object that implements the interface in Store.
     def initialize(session, store)
-      @session = session
+      @origin_session = session
+      @session = Session.new(session, OpenID::OpenIDServiceEndpoint)
       @store = store
       @session_key_prefix = 'OpenID::Consumer::'
     end
@@ -321,7 +323,7 @@ def cleanup_last_requested_endpoint
     end
 
     def discovery_manager(openid_identifier)
-      DiscoveryManager.new(@session, openid_identifier, @session_key_prefix)
+      DiscoveryManager.new(@origin_session, openid_identifier, @session_key_prefix)
     end
 
     def cleanup_session

lib/openid/consumer/discovery.rb

@@ -136,6 +136,24 @@ def get_local_id
       end
     end
 
+    def to_session_value
+      Hash[*(instance_variables.map{|name| [name, instance_variable_get(name)] }.flatten(1))]
+    end
+
+    def ==(other)
+      to_session_value == other.to_session_value
+    end
+
+    def self.from_session_value(value)
+      return value unless value.is_a?(Hash)
+
+      self.new.tap do |endpoint|
+        value.each do |name, val|
+          endpoint.instance_variable_set(name, val)
+        end
+      end
+    end
+
     def self.from_basic_service_endpoint(endpoint)
       # Create a new instance of this class from the endpoint object
       # passed in.

lib/openid/consumer/discovery_manager.rb

@@ -28,6 +28,33 @@ def started?
       def empty?
         @services.empty?
       end
+
+      def to_session_value
+        services = @services.map{|s| s.respond_to?(:to_session_value) ? s.to_session_value : s }
+        current_val = @current.respond_to?(:to_session_value) ? @current.to_session_value : @current
+
+        {
+          'starting_url' => @starting_url,
+          'yadis_url' => @yadis_url,
+          'services' => services,
+          'current' => current_val
+        }
+      end
+
+      def ==(other)
+        to_session_value == other.to_session_value
+      end
+
+      def self.from_session_value(value)
+        return value unless value.is_a?(Hash)
+
+        services = value['services'].map{|s| OpenID::OpenIDServiceEndpoint.from_session_value(s) }
+        current = OpenID::OpenIDServiceEndpoint.from_session_value(value['current'])
+
+        obj = self.new(value['starting_url'], value['yadis_url'], services)
+        obj.instance_variable_set("@current", current)
+        obj
+      end
     end
 
     # Manages calling discovery and tracking which endpoints have
@@ -36,7 +63,7 @@ class DiscoveryManager
       def initialize(session, url, session_key_suffix=nil)
         @url = url
 
-        @session = session
+        @session = OpenID::Consumer::Session.new(session, DiscoveredServices)
         @session_key_suffix = session_key_suffix || 'auth'
       end
 

lib/openid/consumer/session.rb

@@ -0,0 +1,36 @@
+module OpenID
+  class Consumer
+    class Session
+      def initialize(session, decode_klass = nil)
+        @session = session
+        @decode_klass = decode_klass
+      end
+
+      def [](key)
+        val = @session[key]
+        @decode_klass ? @decode_klass.from_session_value(val) : val
+      end
+
+      def []=(key, val)
+        @session[key] = to_session_value(val)
+      end
+
+      def keys
+        @session.keys
+      end
+
+      private
+
+      def to_session_value(val)
+        case val
+        when Array
+          val.map{|ele| to_session_value(ele) }
+        when Hash
+          Hash[*(val.map{|k,v| [k, to_session_value(v)] }.flatten(1))]
+        else
+          val.respond_to?(:to_session_value) ? val.to_session_value : val
+        end
+      end
+    end
+  end
+end

test/test_discovery_manager.rb

@@ -66,11 +66,12 @@ def method_missing(m, *args)
 
   class TestDiscoveryManager < Test::Unit::TestCase
     def setup
-      @session = {}
+      session = {}
+      @session = OpenID::Consumer::Session.new(session, OpenID::Consumer::DiscoveredServices)
       @url = "http://unittest.com/"
       @key_suffix = "testing"
       @yadis_url = "http://unittest.com/xrds"
-      @manager = PassthroughDiscoveryManager.new(@session, @url, @key_suffix)
+      @manager = PassthroughDiscoveryManager.new(session, @url, @key_suffix)
       @key = @manager.session_key
     end
 
@@ -100,7 +101,8 @@ def test_get_next_service
       # services in @disco.
       assert_equal(@manager.get_next_service, "two")
       assert_equal(@manager.get_next_service, "three")
-      assert_equal(@session[@key], disco)
+      disco = @session[@key]
+      assert_equal(disco.current, "three")
 
       # The manager is exhausted and should be deleted and a new one
       # should be created.
@@ -136,8 +138,8 @@ def test_cleanup
       assert_equal(@manager.cleanup, nil)
       assert_equal(@session[@key], nil)
 
-      @session[@key] = disco
       disco.next
+      @session[@key] = disco
       assert_equal(@manager.cleanup, "one")
       assert_equal(@session[@key], nil)
 
@@ -188,10 +190,11 @@ def test_create_manager
       returned_disco = @manager.create_manager(@yadis_url, services)
 
       stored_disco = @session[@key]
+      assert_equal(stored_disco, returned_disco)
+
       assert(stored_disco.for_url?(@yadis_url))
       assert_equal(stored_disco.next, "created")
 
-      assert_equal(stored_disco, returned_disco)
 
       # Calling create_manager with a preexisting manager should
       # result in StandardError.