Merge pull request #17 from rubycas/fix/util

Replace empty? by blank? as nil doesn't respond for empty?

Author: Robert Mitwicki

lib/rubycas-server-core/util.rb

@@ -6,7 +6,7 @@ module Util
     extend self
 
     def build_ticketed_url(url, ticket)
-      return '' if url.empty?
+      return '' if url.blank?
       parsed = URI.parse(url)
       query = parsed.query.to_s
       params = query.split('&')
@@ -17,14 +17,14 @@ def build_ticketed_url(url, ticket)
 
     PARAM_REGEX = /(?:service|gateway|renew|ticket)=[^&]+/
     def clean_service_url(dirty_url)
-      return '' if dirty_url.empty?
+      return '' if dirty_url.blank?
       parsed = URI.parse(dirty_url)
       query = parsed.query.to_s # we really only care about the query portion of the url
       query.gsub!(PARAM_REGEX, '')
       query.gsub!(/[\/\?&]$/, '')
       query.gsub!(/&&/, '&')
       query.gsub!(/^&/, '')
-      parsed.query = query.empty? ? nil : query
+      parsed.query = query.blank? ? nil : query
       parsed.to_s
     end
 

spec/rubycas-server-core/util_spec.rb

@@ -22,13 +22,21 @@
     it 'must return an empty string when no service url is present' do
       expect(Util.build_ticketed_url('', ticket)).to eq('')
     end
+
+    it 'must return an empty string when service url is nil' do
+      expect(Util.build_ticketed_url(nil, ticket)).to eq('')
+    end
   end
 
   describe '.clean_service_url' do
     it 'must return an empty string when an empty value is passed' do
       expect(Util.clean_service_url('')).to eq('')
     end
 
+    it 'must return an empty string when an nil value is passed' do
+      expect(Util.clean_service_url(nil)).to eq('')
+    end
+
     it 'must strip off a trailing ?' do
       cleaned = Util.clean_service_url('http://www.google.com?')
       expect(cleaned).to eq('http://www.google.com')