shibboleth-rails 0.3.11 → 0.4.0

data/lib/shibboleth-rails/controller_additions.rb

@@ -28,12 +28,11 @@ module Shibboleth::Rails
         session.delete('new')
       else
         session['new'] = true
-        if Rails.env.production? or Rails.env.staging?
-          redirect_to [request.protocol, request.host,
-            '/Shibboleth.sso/Login?target=', CGI.escape(requested_url)].join
+
+        if request.xhr?
+          render :json => {:login_url => login_url}, :status => 401
         else
-          session['target'] = requested_url
-          redirect_to new_user_session_url, :notice => 'Login first, please.'
+          redirect_to login_url
         end
       end
     end
@@ -45,6 +44,16 @@ module Shibboleth::Rails
         request.protocol + request.host + request.request_uri
       end
     end
+
+    def login_url
+      if Rails.env.production? || Rails.env.staging?
+        [request.protocol, request.host, '/Shibboleth.sso/Login?target=', CGI.escape(requested_url)].join
+      else
+        session['target'] = requested_url
+        new_user_session_url
+      end
+    end
+
   end
 
 end

data/lib/shibboleth-rails/version.rb

@@ -1,5 +1,5 @@
 module Shibboleth
   module Rails
-    VERSION = "0.3.11"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: shibboleth-rails
 version: !ruby/object:Gem::Version 
-  hash: 5
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 11
-  version: 0.3.11
+  version: 0.4.0
 platform: ruby
 authors: 
 - mikegee
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-16 00:00:00 Z
+date: 2012-03-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -25,10 +20,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
         version: "3.0"
   type: :runtime
   version_requirements: *id001
@@ -70,23 +61,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   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: shibboleth-rails
-rubygems_version: 1.8.15
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: This Rails plugin integrates Shibboletth single signon.