ruby-openid 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fbaf8c0eb91738a8f831057ca44c96803c50e46
-  data.tar.gz: b8ba0a1278cb1f452734608ea079baf63e9772ac
+  metadata.gz: 3d186800e0c39656fbed4cbd52caa3e3f0bb9fc5
+  data.tar.gz: 8a971700503c5c287aa46f5c4c1804300f52a921
 SHA512:
-  metadata.gz: dfad5f054b6b04f6d488584b2902aac70d10636ff9ba7c53140c61f7474dc6a463f771ce8a07c2cda0ae501a0a45db745b927427625407873ed35b22b2eb4572
-  data.tar.gz: e4f5e210aceead1e8c7502304b4d45746daf600d0ac4ba2bd65133b446d6dcf0355d4f7a1a636289b4f5221beecf7ca5b7b8d3904862198fe895bcac197fd9e0
+  metadata.gz: aee76e05216b0b0954496c11d70b5df2c4a3cfe7c9f55aad74f1f1563f18891a6f7526859b695ace038556bb77ce33e152671547592a78591a8b4b1ff50d9fb2
+  data.tar.gz: 4eefe5dcdcbe9fcce8f3846c06e3e1841bd7b703bee34c2d46193eb6d32d17ef87bfe47fda605fa73090401317e5c7390de21f7206c09a288373c4ebf8f5948f

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 2.5.0
+
+* Revert json serialization - 8dc60e553369df2300ebb4b83a29618aff643c2c
+  See https://github.com/openid/ruby-openid/pull/73
+
 ## 2.4.0
 
 * Allow expecting a parameter to be nil during return_to verification - 708e992ab3e6c26d478283fc11faa6a0a74bfec0

data/lib/openid/consumer.rb

@@ -7,7 +7,6 @@ require "openid/consumer/discovery"
 require "openid/message"
 require "openid/yadis/discovery"
 require "openid/store/nonce"
-require "openid/serializer"
 
 module OpenID
   # OpenID support for Relying Parties (aka Consumers).
@@ -298,17 +297,11 @@ module OpenID
     protected
 
     def session_get(name)
-      value = @session[session_key(name)]
-
-      if value.is_a?(Array) # new serialized format
-        Serializer.deserialize(*value)
-      else # deprecated object format
-        value
-      end
+      @session[session_key(name)]
     end
 
     def session_set(name, val)
-      @session[session_key(name)] = Serializer.serialize(val)
+      @session[session_key(name)] = val
     end
 
     def session_key(suffix)

data/lib/openid/consumer/discovery.rb

@@ -58,7 +58,7 @@ module OpenID
     def display_identifier
       return @display_identifier if @display_identifier
 
-      return @claimed_id if @claimed_id.nil?
+      return @claimed_id if @claimed_id.nil? 
 
       begin
         parsed_identifier = URI.parse(@claimed_id)
@@ -376,7 +376,7 @@ module OpenID
     #
     # @param uri: normalized identity URL
     # @type uri: str
-    #
+    # 
     # @return: (claimed_id, services)
     # @rtype: (str, list(OpenIDServiceEndpoint))
     #

data/lib/openid/store/memcache.rb

@@ -66,7 +66,7 @@ module OpenID
         if result.is_a? String
           return !!(result =~ /^STORED/)
         else
-          return result == true
+          return !!(result)
         end
       end
 

data/lib/openid/version.rb

@@ -1,3 +1,3 @@
 module OpenID
-  VERSION = "2.4.0"
+  VERSION = "2.5.0"
 end

data/test/test_consumer.rb

@@ -6,24 +6,14 @@ module OpenID
   class Consumer
     module TestConsumer
       class TestLastEndpoint < Test::Unit::TestCase
-        def all_instance_variables(object)
-          object.instance_variables.map { |v| [v.to_s, object.instance_variable_get(v)] }
-        end
-
         def test_set_get
-          stored = OpenID::OpenIDServiceEndpoint.new
-          stored.server_url = "test"
           session = {}
-
           consumer = Consumer.new(session, nil)
-          consumer.send(:last_requested_endpoint=, stored)
-
+          consumer.send(:last_requested_endpoint=, :endpoint)
           ep = consumer.send(:last_requested_endpoint)
-          assert_equal(all_instance_variables(stored), all_instance_variables(ep))
-
+          assert_equal(:endpoint, ep)
           ep = consumer.send(:last_requested_endpoint)
-          assert_equal(all_instance_variables(stored), all_instance_variables(ep))
-
+          assert_equal(:endpoint, ep)
           consumer.send(:cleanup_last_requested_endpoint)
           ep = consumer.send(:last_requested_endpoint)
           assert_equal(nil, ep)
@@ -120,7 +110,7 @@ module OpenID
           result = consumer.begin_without_discovery(@service, @anonymous)
           assert(result.instance_of?(CheckIDRequest))
           assert_equal(@anonymous, result.anonymous)
-          assert_equal(@service.claimed_id, consumer.send(:last_requested_endpoint).claimed_id)
+          assert_equal(@service, consumer.send(:last_requested_endpoint))
           assert_equal(result.instance_variable_get(:@assoc), @assoc)
           return result
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-openid
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - JanRain, Inc
 autorequire: openid
 bindir: bin
 cert_chain: []
-date: 2014-01-27 00:00:00.000000000 Z
+date: 2014-01-29 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: openid@janrain.com
@@ -115,7 +115,6 @@ files:
 - lib/openid/kvpost.rb
 - lib/openid/message.rb
 - lib/openid/protocolerror.rb
-- lib/openid/serializer.rb
 - lib/openid/server.rb
 - lib/openid/store/filesystem.rb
 - lib/openid/store/interface.rb

data/lib/openid/serializer.rb

@@ -1,21 +0,0 @@
-module OpenID
-  class Serializer
-    SERIALIZABLE = {
-      "OpenID::OpenIDServiceEndpoint" => [OpenID::OpenIDServiceEndpoint, 0],
-      "OpenID::Consumer::DiscoveredServices" => [OpenID::Consumer::DiscoveredServices, 3]
-    }
-
-    def self.serialize(instance)
-      klass = instance.class.name
-      raise "unable to serialize #{klass}" unless SERIALIZABLE[klass]
-      [klass, instance.instance_variables.map { |v| [v.to_s, instance.instance_variable_get(v)] }]
-    end
-
-    def self.deserialize(klass, data)
-      klass, arguments = SERIALIZABLE[klass] || raise("unable to deserialize #{klass}")
-      instance = klass.new(*Array.new(arguments))
-      data.each { |k,v| instance.instance_variable_set(k,v) }
-      instance
-    end
-  end
-end