rubycas-client 2.3.7 → 2.3.8

data/History.txt

@@ -1,5 +1,12 @@
 = RubyCAS-Client Changelog
 
+== Version 2.3.8 :: 2011-12-19
+
+* Bug Fixes
+  * Fix some undesired behavior when parsing extra attributes as JSON
+    * Simple attributes (that aren't JSON Objects) stay strings
+    * We don't fallback to the YAML parser if JSON parsing fails
+
 == Version 2.3.7 :: 2011-11-29
 
 * Bug Fixes

data/VERSION

@@ -1 +1 @@
-2.3.7
+2.3.8

data/lib/casclient/responses.rb

@@ -72,25 +72,7 @@ module CASClient
         
         # unserialize extra attributes
         @extra_attributes.each do |k, v|
-          if v.blank?
-            @extra_attributes[k] = nil
-          elsif !options[:encode_extra_attributes_as]
-            begin
-                @extra_attributes[k] = YAML.load(v)
-              rescue ArgumentError
-                raise ArgumentError, "Did not find :encode_extra_attributes_as config parameter, hence default encoding scheme is YAML but CAS response recieved in encoded differently "
-              end
-          else 
-            if options[:encode_extra_attributes_as] == :json
-              begin
-                @extra_attributes[k] = JSON.parse(v)
-              rescue JSON::ParserError
-                @extra_attributes[k] = YAML.load(v)
-              end
-            else
-              @extra_attributes[k] = YAML.load(v)
-            end
-          end
+          @extra_attributes[k] = parse_extra_attribute_value(v, options[:encode_extra_attributes_as])
         end
       elsif is_failure?
         @failure_code = @xml.elements['//cas:authenticationFailure'].attributes['code']
@@ -101,6 +83,34 @@ module CASClient
       end
     end
 
+    def parse_extra_attribute_value(value, encode_extra_attributes_as)
+      attr_value = if value.blank?
+        nil
+      elsif !encode_extra_attributes_as
+        begin
+            YAML.load(value)
+          rescue ArgumentError
+            raise ArgumentError, "Did not find :encode_extra_attributes_as config parameter, hence default encoding scheme is YAML but CAS response recieved in encoded differently "
+          end
+      else
+        if encode_extra_attributes_as == :json
+          begin
+            JSON.parse(value)
+          rescue JSON::ParserError
+            value
+          end
+        else
+          YAML.load(value)
+        end
+      end
+
+      unless (attr_value.kind_of? Enumerable) || attr_value.nil?
+        attr_value.to_s
+      else
+        attr_value
+      end
+    end
+
     def is_success?
       (instance_variable_defined?(:@valid) &&  @valid) || (protocol > 1.0 && xml.name == "authenticationSuccess")
     end

data/rubycas-client.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rubycas-client"
-  s.version = "2.3.7"
+  s.version = "2.3.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Zukowski", "Matt Walker", "Matt Campbell"]
-  s.date = "2011-11-30"
+  s.date = "2011-12-19"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"

data/spec/casclient/validation_response_spec.rb

@@ -9,9 +9,12 @@ describe CASClient::ValidationResponse do
   <cas:authenticationSuccess>
     <cas:attributes>
       <cas:first_name>Jack</cas:first_name>
+      <cas:last_name>92.5</cas:last_name>
       <cas:mobile_phone></cas:mobile_phone>
       <cas:global_roles><![CDATA[]]></cas:global_roles>
       <cas:foo_data> <![CDATA[[{"id":10529}]]]></cas:foo_data>
+      <cas:food_data> <![CDATA[{"id":10529}]]></cas:food_data>
+      <cas:allegedly_yaml>- 10</cas:allegedly_yaml>
     </cas:attributes>
   </cas:authenticationSuccess>
 </cas:serviceResponse>
@@ -32,8 +35,20 @@ RESPONSE_TEXT
       subject.extra_attributes["first_name"].should == "Jack"
     end
 
-    it "sets the value of JSON attributes to their parsed value" do
+    it "sets the value of JSON attributes containing Arrays to their parsed value" do
       subject.extra_attributes["foo_data"][0]["id"].should == 10529
     end
+
+    it "sets the value of JSON attributes containing Hashes to their parsed value" do
+      subject.extra_attributes["food_data"]["id"].should == 10529
+    end
+
+    it "sets non-hash attributes as strings" do
+      subject.extra_attributes["last_name"].should be_a_kind_of String
+    end
+
+    it "sets the value of attributes which are not valid JSON but are valid YAML to their literal value" do
+      subject.extra_attributes["allegedly_yaml"].should == '- 10'
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubycas-client
 version: !ruby/object:Gem::Version
-  version: 2.3.7
+  version: 2.3.8
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-30 00:00:00.000000000Z
+date: 2011-12-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70156582713280 !ruby/object:Gem::Requirement
+  requirement: &70206959748580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70156582713280
+  version_requirements: *70206959748580
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70156582712380 !ruby/object:Gem::Requirement
+  requirement: &70206959747260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: 1.6.1
   type: :development
   prerelease: false
-  version_requirements: *70156582712380
+  version_requirements: *70206959747260
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70156582711420 !ruby/object:Gem::Requirement
+  requirement: &70206959746080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70156582711420
+  version_requirements: *70206959746080
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70156582709900 !ruby/object:Gem::Requirement
+  requirement: &70206959745140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70156582709900
+  version_requirements: *70206959745140
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70156582708880 !ruby/object:Gem::Requirement
+  requirement: &70206959743740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *70156582708880
+  version_requirements: *70206959743740
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70156582695320 !ruby/object:Gem::Requirement
+  requirement: &70206959742080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70156582695320
+  version_requirements: *70206959742080
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70156582694500 !ruby/object:Gem::Requirement
+  requirement: &70206959740920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70156582694500
+  version_requirements: *70206959740920
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70156582693440 !ruby/object:Gem::Requirement
+  requirement: &70206959740000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,7 +100,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70156582693440
+  version_requirements: *70206959740000
 description: 
 email: 
 executables: []
@@ -177,7 +177,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1034418483670907189
+      hash: -2445786591382746754
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: