devise_cas_authenticatable 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fd1ffe6c25dc2058cd0af67774f494903499870
-  data.tar.gz: 860044267583de954f4c642d41cb938ad329b5c5
+  metadata.gz: afd477a0c8c3fbfdc6c1b7d93d716653511a2c0b
+  data.tar.gz: ab099c67e758e660a4ddf79237ccf7c172a18b00
 SHA512:
-  metadata.gz: b99de7fc043aad27818675b314fb652815e1f926eb53782c7ca414b5ee6c289bc6fb796ff32c3be795a1335616bd591aa4abb0721cd09393c167b4fce5e5c0b7
-  data.tar.gz: aebd6374f1595782c13f466b0fdea694913362bf84c08586134b1ff17dd1c4997654fac4f006526542b70115d9b040420db8670d7f478a909565f4b4e368c16d
+  metadata.gz: ded65e626018cddabb73244ef1c40c81534a5c5b564bc13d929e9041a0c186b061f9c4d89293da5c95d50e41a91c1de5be10c9dbebdd5694cf7dc3255a53e194
+  data.tar.gz: fcd19457ddfaa198c4832df3f6d85d75303835973e4fd1bbec899bf6af28e93160611d02390ce82a3302eb5ef50e9c80fbfe1923669f0c5289989bcf05402431

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog for devise\_cas\_authenticatable
 
+## Version 1.5.0 - July 27, 2015
+
+* Generation of cas_action_url is now done by a customizable class, so you can use Rails routes to provide this (thanks to @eturino again!)
+
 ## Version 1.4.1 - July 23, 2015
 
 * Internal refactor to avoid conflicting with common route names, specifically logout_url (thanks to @eturino!)

data/README.md

@@ -13,21 +13,14 @@ using [rubycas-server](http://github.com/gunark/rubycas-server)).
 Requirements
 ------------
 
-- Rails 2.3 or greater (works with 3.x and 4.x versions as well)
-- Devise 1.0 or greater
+- Rails 3.0 or greater (works with 4.x versions as well)
+- Devise 1.2 or greater
 - rubycas-client
 
 Installation
 ------------
 
-    gem install --pre devise_cas_authenticatable
-
-and in your config/environment.rb (on Rails 2.3):
-
-    config.gem 'devise', :version => '~> 1.0.6'
-    config.gem 'devise_cas_authenticatable'
-
-or Gemfile (Rails 3.x):
+Add to your Gemfile:
 
     gem 'devise'
     gem 'devise_cas_authenticatable'

data/devise_cas_authenticatable.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{devise_cas_authenticatable}
-  s.version = "1.4.1"
+  s.version = "1.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nat Budin", "Jeremy Haile"]

data/lib/devise_cas_authenticatable.rb

@@ -7,6 +7,8 @@ require 'devise_cas_authenticatable/exceptions'
 
 require 'devise_cas_authenticatable/single_sign_out'
 
+require 'devise_cas_authenticatable/cas_action_url_factory_base'
+
 require 'rubycas-client'
 
 require 'devise_cas_authenticatable/railtie' if defined?(Rails::Railtie)
@@ -111,24 +113,11 @@ module Devise
   
   private
   def self.cas_action_url(base_url, mapping, action)
-    u = URI.parse(base_url)
-    u.query = nil
-    u.path = if mapping.respond_to?(:fullpath)
-      if ENV['RAILS_RELATIVE_URL_ROOT']
-        ENV['RAILS_RELATIVE_URL_ROOT'] + mapping.fullpath
-      else
-        mapping.fullpath
-      end
-    else
-      if ENV['RAILS_RELATIVE_URL_ROOT']
-        ENV['RAILS_RELATIVE_URL_ROOT'] + mapping.raw_path
-      else
-        mapping.raw_path
-      end
-    end
-    u.path << "/" unless u.path =~ /\/$/
-    u.path << action
-    u.to_s
+    cas_action_url_factory_class.new(base_url, mapping, action).call
+  end
+
+  def self.cas_action_url_factory_class
+    @cas_action_url_factory_class ||= CasActionUrlFactoryBase.prepare_class
   end
 end
 

data/lib/devise_cas_authenticatable/cas_action_url_factory_base.rb

@@ -0,0 +1,65 @@
+module Devise
+  class CasActionUrlFactoryBase
+    attr_reader :base_url, :mapping, :action
+
+    def self.prepare_class
+      Class.new(self) do
+        include Rails.application.routes.url_helpers
+        include Rails.application.routes.mounted_helpers if Rails.application.routes.try(:mounted_helpers)
+      end
+    end
+
+    def initialize(base_url, mapping, action)
+      @base_url = base_url
+      @mapping  = mapping
+      @action   = action
+    end
+
+    def call
+      uri      = URI.parse(base_url).tap { |uri| uri.query = nil }
+      uri.path = load_base_path
+      uri.to_s
+    end
+
+    alias_method :build, :call
+
+    private
+    def load_base_path
+      load_routes_path || load_mapping_path
+    end
+
+    def load_routes_path
+      router_name = mapping.router_name || Devise.available_router_name
+      context     = send(router_name)
+
+      route = "#{mapping.singular}_#{action}_path"
+      if context.respond_to? route
+        context.send route
+      else
+        nil
+      end
+    rescue NameError, NoMethodError
+      nil
+    end
+
+    def load_mapping_path
+      path = mapping_fullpath || mapping_raw_path
+      path << "/" unless path =~ /\/$/
+      path << action
+      path
+    end
+
+    def mapping_fullpath
+      return nil unless mapping.respond_to?(:fullpath)
+      "#{rails_relative_url_root}#{mapping.fullpath}"
+    end
+
+    def mapping_raw_path
+      "#{rails_relative_url_root}#{mapping.raw_path}"
+    end
+
+    def rails_relative_url_root
+      ENV['RAILS_RELATIVE_URL_ROOT']
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise_cas_authenticatable
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Nat Budin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-23 00:00:00.000000000 Z
+date: 2015-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -220,6 +220,7 @@ files:
 - app/views/devise/cas_sessions/unregistered.html.erb
 - devise_cas_authenticatable.gemspec
 - lib/devise_cas_authenticatable.rb
+- lib/devise_cas_authenticatable/cas_action_url_factory_base.rb
 - lib/devise_cas_authenticatable/exceptions.rb
 - lib/devise_cas_authenticatable/model.rb
 - lib/devise_cas_authenticatable/railtie.rb