casual 0.2.0 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/casual.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{casual}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Zach Holman"]
-  s.date = %q{2010-06-10}
+  s.date = %q{2010-08-06}
   s.description = %q{A tiny CAS client for Ruby}
   s.email = %q{github.com@zachholman.com}
   s.extra_rdoc_files = [
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/holman/casual}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A tiny CAS client for Ruby}
   s.test_files = [
     "test/helper.rb",
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
     else
       s.add_dependency(%q<nokogiri>, [">= 0"])

data/lib/casual.rb

@@ -3,12 +3,14 @@ require 'hpricot'
 
 module Casual
   class Client
-    attr_accessor :server_path, :callback_url, :port
+    attr_accessor :hostname, :path, :https, :port, :callback_url, :jasig
 
     def initialize(config)
-      @server_path = config[:server_path]
+      @hostname     = config[:hostname]
+      @path         = config[:path]
+      @https        = config[:https]
+      @port         = config[:port] || 443
       @callback_url = config[:callback_url]
-      @port = config[:port] || 443
     end
 
     def authorization_url
@@ -18,32 +20,59 @@ module Casual
     def authenticate(username,password)
       ticket = acquire_ticket
       params = "username=#{username}&password=#{password}&lt=#{ticket}"
-      status,response = connection.post('/login', params)#.last
-      (status.code == '200') ? username : nil
+      params << '&_eventId=submit&submit=LOGIN' if jasig
+      status,response =
+          connection.post("/#{no_slash_path}/login#{jasig}", params)
+
+      if jasig
+        (response =~ /Log In Successful/) ? username : nil
+      else
+        status.code == '200' ? username : nil
+      end
     end
 
     def acquire_ticket
-      login_page = connection.get('/login')
-      Hpricot(login_page.body).search('input[@id=lt]').first['value']
+      login_page = connection.get("/#{no_slash_path}/login")
+      ticket = Hpricot(login_page.body).search('input[@name=lt]').first
+      jasig_eats_babies(login_page.body)
+      ticket ? ticket['value'] : nil
+    end
+
+    def jasig_eats_babies(body)
+      @jasig = ';'
+      @jasig << Hpricot(body).search('form[@id=fm1]').
+                    first['action'].split(';').last
     end
 
     def connection
-      http = Net::HTTP.new(server_path, port)
-      http.use_ssl = true
+      http = Net::HTTP.new(hostname, port)
+      http.use_ssl = @https
       http
     end
 
     def authenticate_ticket(ticket)
-      connection.get("/serviceValidate?service=#{callback_url}&ticket=#{ticket}").body
+      connection.
+        get("/#{no_slash_path}/serviceValidate?service=#{callback_url}" +
+            "&ticket=#{ticket}").
+        body
     end
 
     def user_login(ticket)
-      user = Hpricot::XML(authenticate_ticket(ticket)).search('//cas:authenticationSuccess //cas:user').text
+      user = Hpricot::XML(authenticate_ticket(ticket)).
+                search('//cas:authenticationSuccess //cas:user').text
       user.strip != '' ? user : nil
     end
 
     def server_url
-      "https://#{server_path}:#{port}"
+      "#{protocol}://#{hostname}:#{port}/#{no_slash_path}"
+    end
+
+    def protocol
+      https ? 'http' : 'https'
+    end
+
+    def no_slash_path
+      path[0] == 47 ? path[1..path.size] : path
     end
 
   end

data/test/test_casual.rb

@@ -1,18 +1,19 @@
 require 'helper'
 
 class TestCasual < Test::Unit::TestCase
-  
+
   def setup
-    @client = Casual::Client.new(:server_path => 'localhost', 
-                                 :port => 443, 
+    @client = Casual::Client.new(:hostname     => 'localhost',
+                                 :path         => '/cas',
+                                 :port         => '8080',
                                  :callback_url => 'http://localhost')
   end
-  
+
   def test_authorization_url
-    assert_equal @client.authorization_url, 
-      "https://localhost:443/login?service=http://localhost"
+    assert_equal @client.authorization_url,
+      "https://localhost:8080/cas/login?service=http://localhost"
   end
-  
+
   def test_user_login_success
     mock(@client).authenticate_ticket.with('GOLDEN_TICKET_LOL') {
       '<cas:serviceResponse xmlns:cas="http://www.yale.edu/tp/cas">'+
@@ -21,7 +22,7 @@ class TestCasual < Test::Unit::TestCase
     }
     assert_equal @client.user_login('GOLDEN_TICKET_LOL'), 'holman'
   end
-  
+
   def test_user_login_fail
     mock(@client).authenticate_ticket.with('GOLDEN_TICKET_FAIL') {
       '<cas:serviceResponse xmlns:cas="http://www.yale.edu/tp/cas">'+
@@ -30,9 +31,9 @@ class TestCasual < Test::Unit::TestCase
     }
     assert_equal @client.user_login('GOLDEN_TICKET_FAIL'), nil
   end
-  
+
   def test_authenticate_success
-    connection_mock = mock('').post.with_any_args { 
+    connection_mock = mock('').post.with_any_args {
       [Net::HTTPSuccess.new('','200',''), '<div class="messagebox confirmation">You have successfully logged in.</div>']
     }
     mock(@client).connection { connection_mock }

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: casual
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Zach Holman
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-10 00:00:00 -04:00
+date: 2010-08-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -59,23 +62,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A tiny CAS client for Ruby