Commit 735700c

@@ -8,6 +8,7 @@ module Saml
       validates_presence_of :content
       validate :must_match_xsd
       validate :must_be_expected_type
+      validate :must_be_valid_version
 
       attr_reader :content, :name
 
@@ -79,6 +80,12 @@ module Saml
 
         errors[:base] << error_message(:invalid) unless expected_type?
       end
+
+      def must_be_valid_version
+        return unless expected_type?
+        return if "2.0" == version
+        errors[:version] << error_message(:invalid_version)
+      end
     end
   end
 end

@@ -5,7 +5,6 @@ module Saml
 
       attr_reader :request_id
       validates_presence_of :id
-      validate :must_be_valid_version
       validates_inclusion_of :status_code, in: [Namespaces::SUCCESS]
 
       validate :must_match_request_id
@@ -50,12 +49,6 @@ module Saml
 
       private
 
-      def must_be_valid_version
-        return unless expected_type?
-        return if "2.0" == version
-        errors[:version] << error_message(:invalid_version)
-      end
-
       def must_match_request_id
         return if request_id.nil?