rack-cas 0.3.0 → 0.3.1

data/lib/rack-cas/service_validation_response.rb

@@ -1,18 +1,26 @@
 module RackCAS
   class ServiceValidationResponse
-    REQUEST_HEADERS = { 'Accept' => '*/*' }
+    class AuthenticationFailure < StandardError; end
 
+    REQUEST_HEADERS = { 'Accept' => '*/*' }
+    
     def initialize(url)
       @url = URL.parse(url)
     end
 
     def user
-      xml.xpath('/cas:serviceResponse/cas:authenticationSuccess/cas:user').text
+      if success?
+        xml.xpath('/cas:serviceResponse/cas:authenticationSuccess/cas:user').text
+      else
+        raise AuthenticationFailure, failure_message
+      end
     end
 
     def extra_attributes
       attrs = {}
 
+      raise AuthenticationFailure, failure_message unless success?
+
       # Jasig style
       if attr_node = xml.at('/cas:serviceResponse/cas:authenticationSuccess/cas:attributes')
         attr_node.children.each do |node|
@@ -38,7 +46,18 @@ module RackCAS
 
     protected
 
+    def success?
+      @success ||= !!xml.at('/cas:serviceResponse/cas:authenticationSuccess')
+    end
+
+    def failure_message
+      if node = xml.at('/cas:serviceResponse/cas:authenticationFailure')
+        node.text.strip
+      end
+    end
+
     def response
+      require 'net/http'
       return @response unless @response.nil?
       
       http = Net::HTTP.new(@url.host, @url.inferred_port)

data/lib/rack-cas/url.rb

@@ -34,17 +34,7 @@ module RackCAS
     end
 
     def dup
-      duplicated_uri = RackCAS::URL.new(
-        :scheme => self.scheme ? self.scheme.dup : nil,
-        :user => self.user ? self.user.dup : nil,
-        :password => self.password ? self.password.dup : nil,
-        :host => self.host ? self.host.dup : nil,
-        :port => self.port,
-        :path => self.path ? self.path.dup : nil,
-        :query => self.query ? self.query.dup : nil,
-        :fragment => self.fragment ? self.fragment.dup : nil
-      )
-      return duplicated_uri
+      RackCAS::URL.new(super.to_hash)
     end
   end
 end

data/lib/rack-cas/version.rb

@@ -1,3 +1,3 @@
 module RackCAS
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-cas
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-23 00:00:00.000000000 Z
+date: 2012-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -59,6 +59,54 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.11.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.11.0
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple CAS authentication for Rails, Sinatra or any Rack-based site
 email: adam.crownoble@biola.edu
 executables: []