Rails hydra

.gitignore

@@ -23,5 +23,5 @@ pkg
 .rvmrc
 
 .project
-
+*.DS_Store
 Gemfile.lock

MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright 2012 YOURNAME
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

lib/casclient/tickets/storage/active_record_ticket_store.rb

@@ -69,6 +69,10 @@ def retrieve_pgt(pgt_iou)
       class ServiceTicketAwareSession < ActiveRecord::SessionStore::Session
         before_save :save_service_ticket
 
+        def self.find_by_session_id(session_id)
+          super
+        end
+
         def save_service_ticket
           if data[:service_ticket]
             self.service_ticket = data[:service_ticket]

spec/.gitignore

@@ -1 +1,3 @@
 test.*.db
+dummy/log/*
+dummy/db/*.sqlite3

spec/casclient/frameworks/rails/filter_spec.rb

@@ -1,39 +1,44 @@
 require 'spec_helper'
-require 'action_controller'
 require 'casclient/frameworks/rails/filter'
 
 describe CASClient::Frameworks::Rails::Filter do
 
   before(:each) do
+    @controller = build_controller_instance
     CASClient::Frameworks::Rails::Filter.configure(
-      :cas_base_url => 'http://test.local/',
+      :cas_base_url => 'http://test.local',
       :logger => double("Logger")
     )
   end
 
   describe "#fake" do
-    subject { Hash.new }
+    subject { @controller.session }
+
     context "faking user without attributes" do
       before { CASClient::Frameworks::Rails::Filter.fake('tester@test.com') }
+
       it 'should set the session user' do
-        CASClient::Frameworks::Rails::Filter.filter(mock_controller_with_session(nil, subject))
+        CASClient::Frameworks::Rails::Filter.filter(@controller)
         subject.should eq({:cas_user => 'tester@test.com', :casfilteruser => 'tester@test.com'})
       end
+
       after { CASClient::Frameworks::Rails::Filter.fake(nil,nil) }
     end
 
     context "faking user with attributes" do
       before { CASClient::Frameworks::Rails::Filter.fake('tester@test.com', {:test => 'stuff', :this => 'that'}) }
+
       it 'should set the session user and attributes' do
-        CASClient::Frameworks::Rails::Filter.filter(mock_controller_with_session(nil, subject))
+        CASClient::Frameworks::Rails::Filter.filter(@controller)
         subject.should eq({ :cas_user => 'tester@test.com', :casfilteruser => 'tester@test.com', :cas_extra_attributes => {:test => 'stuff', :this => 'that' }})
       end
+
       after { CASClient::Frameworks::Rails::Filter.fake(nil,nil) }
     end
   end
 
   context "new valid service ticket" do
-     it "should return successfully from filter" do
+    it "should return successfully from filter" do
 
       pgt = CASClient::ProxyGrantingTicket.new(
       "PGT-1308586001r9573FAD5A8C62E134A4AA93273F226BD3F0C3A983DCCCD176",
@@ -50,13 +55,12 @@
       CASClient::Client.any_instance.stub(:request_cas_response).and_return(response)
       CASClient::Client.any_instance.stub(:retrieve_proxy_granting_ticket).and_return(pgt)
 
-      controller = mock_controller_with_session()
-      CASClient::Frameworks::Rails::Filter.filter(controller).should eq(true)
+      CASClient::Frameworks::Rails::Filter.filter(@controller).should eq(true)
      end
   end
 
   context "new invalid service ticket" do
-     it "should return failure from filter" do
+    it "should return failure from filter" do
 
       raw_text = "<cas:serviceResponse xmlns:cas=\"http://www.yale.edu/tp/cas\">
                     <cas:authenticationFailure>Some Error Text</cas:authenticationFailure>
@@ -66,21 +70,22 @@
       CASClient::Client.any_instance.stub(:request_cas_response).and_return(response)
       CASClient::Frameworks::Rails::Filter.stub(:unauthorized!) {"bogusresponse"}
 
-      controller = mock_controller_with_session()
-      CASClient::Frameworks::Rails::Filter.filter(controller).should eq(false)
-     end
+      CASClient::Frameworks::Rails::Filter.filter(@controller).should eq(false)
+    end
   end
 
   context "does not have new input service ticket" do
+    before do
+      @controller = build_controller_instance({:params=>''})
+    end
+
     context "with last service ticket" do
-       it "should return failure from filter" do
+      it "should return failure from filter" do
 
         CASClient::Frameworks::Rails::Filter.stub(:unauthorized!) {"bogusresponse"}
 
-        controller = mock_controller_with_session()
-        controller.stub(:params) {{}}
-        CASClient::Frameworks::Rails::Filter.filter(controller).should eq(false)
-       end
+        CASClient::Frameworks::Rails::Filter.filter(@controller).should eq(false)
+      end
     end
 
     context "sent through gateway" do
@@ -90,21 +95,17 @@
           CASClient::Frameworks::Rails::Filter.stub(:unauthorized!) {"bogusresponse"}
 
           CASClient::Frameworks::Rails::Filter.config[:use_gatewaying] = false 
-          controller = mock_controller_with_session()
-          controller.session[:cas_sent_to_gateway] = true
-          controller.stub(:params) {{}}
-          CASClient::Frameworks::Rails::Filter.filter(controller).should eq(false)
+          @controller.session[:cas_sent_to_gateway] = true
+          CASClient::Frameworks::Rails::Filter.filter(@controller).should eq(false)
          end
       end
 
       context "gatewaying on" do
          it "should return failure from filter" do
 
           CASClient::Frameworks::Rails::Filter.config[:use_gatewaying] = true 
-          controller = mock_controller_with_session()
-          controller.session[:cas_sent_to_gateway] = true
-          controller.stub(:params) {{}}
-          CASClient::Frameworks::Rails::Filter.filter(controller).should eq(true)
+          @controller.session[:cas_sent_to_gateway] = true
+          CASClient::Frameworks::Rails::Filter.filter(@controller).should eq(true)
          end
       end
     end
@@ -125,8 +126,7 @@
         CASClient::Client.any_instance.stub(:request_cas_response).and_return(response)
         CASClient::Client.any_instance.stub(:retrieve_proxy_granting_ticket).and_raise CASClient::CASException
 
-        controller = mock_controller_with_session()
-        expect { CASClient::Frameworks::Rails::Filter.filter(controller) }.to raise_error(CASClient::CASException)
+        expect { CASClient::Frameworks::Rails::Filter.filter(@controller) }.to raise_error(CASClient::CASException)
        end
     end
 
@@ -135,41 +135,37 @@
 
         CASClient::Client.any_instance.stub(:request_cas_response).and_raise "Some exception"
 
-        controller = mock_controller_with_session()
-        expect { CASClient::Frameworks::Rails::Filter.filter(controller) }.to raise_error(RuntimeError)
+        expect { CASClient::Frameworks::Rails::Filter.filter(@controller) }.to raise_error(RuntimeError)
        end
     end
 
     context "matches existing service ticket" do
-      subject { Hash.new }
+      subject { @controller.session }
       it "should return successfully from filter" do
 
         mock_client = CASClient::Client.new()
         mock_client.should_receive(:request_cas_response).at_most(0).times
         mock_client.should_receive(:retrieve_proxy_granting_ticket).at_most(0).times
         CASClient::Frameworks::Rails::Filter.send(:class_variable_set, :@@client, mock_client)
 
-        subject[:cas_last_valid_ticket] = 'bogusticket'
-        subject[:cas_last_valid_ticket_service] = 'bogusurl'
-        controller = mock_controller_with_session(mock_post_request(), subject)
-        CASClient::Frameworks::Rails::Filter.filter(controller).should eq(true)
+        subject[:cas_last_valid_ticket] = @controller.params[:ticket]
+        subject[:cas_last_valid_ticket_service] = ticketless_url(@controller)
+
+        CASClient::Frameworks::Rails::Filter.filter(@controller).should eq(true)
       end
     end
   end
 
   context "controller request is missing format" do
     context "#unauthorized!" do
       it 'should not crash' do
-        request = double('mock request')
-        request.stub(:format).and_return(nil)
-
-        controller = mock_controller_with_session(request)
+        @controller.request.stub(:format).and_return(nil)
 
         CASClient::Frameworks::Rails::Filter.
           should_receive(:redirect_to_cas_for_authentication).
-          with(controller)
+          with(@controller)
 
-        CASClient::Frameworks::Rails::Filter.unauthorized!(controller)
+        CASClient::Frameworks::Rails::Filter.unauthorized!(@controller)
       end
     end
   end

spec/casclient/tickets/storage_spec.rb

@@ -4,25 +4,35 @@
 
 describe CASClient::Tickets::Storage::AbstractTicketStore do
   describe "#store_service_session_lookup" do
+    before do
+      @controller = build_controller_instance
+    end
+
     it "should raise an exception" do
-      expect { subject.store_service_session_lookup("service_ticket", mock_controller_with_session) }.to raise_exception 'Implement this in a subclass!'
+      expect {
+        subject.store_service_session_lookup("service_ticket", @controller)
+      }.to raise_exception 'Implement this in a subclass!'
     end
   end
+
   describe "#cleanup_service_session_lookup" do
     it "should raise an exception" do
       expect { subject.cleanup_service_session_lookup("service_ticket") }.to raise_exception 'Implement this in a subclass!'
     end
   end
+
   describe "#save_pgt_iou" do
     it "should raise an exception" do
       expect { subject.save_pgt_iou("pgt_iou", "pgt") }.to raise_exception 'Implement this in a subclass!'
     end
   end
+
   describe "#retrieve_pgt" do
     it "should raise an exception" do
       expect { subject.retrieve_pgt("pgt_iou") }.to raise_exception 'Implement this in a subclass!'
     end
   end
+
   describe "#get_session_for_service_ticket" do
     it "should raise an exception" do
       expect { subject.get_session_for_service_ticket("service_ticket") }.to raise_exception 'Implement this in a subclass!'