Empact-authlogic_rpx 1.1.6 → 1.1.7

data/Empact-authlogic_rpx.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{Empact-authlogic_rpx}
-  s.version = "1.1.6"
+  s.version = "1.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Gallagher / tardate"]
@@ -52,6 +52,7 @@ Gem::Specification.new do |s|
      "test/test_helper.rb",
      "test/test_internal_mapping_helper.rb",
      "test/unit/acts_as_authentic_settings_test.rb",
+     "test/unit/helpers_test.rb",
      "test/unit/session_settings_test.rb",
      "test/unit/session_validation_test.rb",
      "test/unit/verify_rpx_mock_test.rb"
@@ -76,6 +77,7 @@ Gem::Specification.new do |s|
      "test/test_helper.rb",
      "test/test_internal_mapping_helper.rb",
      "test/unit/acts_as_authentic_settings_test.rb",
+     "test/unit/helpers_test.rb",
      "test/unit/session_settings_test.rb",
      "test/unit/session_validation_test.rb",
      "test/unit/verify_rpx_mock_test.rb"

data/VERSION

@@ -1 +1 @@
-1.1.6
+1.1.7

data/lib/authlogic_rpx/helper.rb

@@ -36,7 +36,8 @@ module AuthlogicRpx
     private
     
     def build_token_url!( options )
-      options.delete( :return_url ) + (options[:return_url].to_s.include?('?') ? '&' : '?') + (
+      url = options.delete( :return_url )
+      url + (url.include?('?') ? '&' : '?') + (
         { :authenticity_token => form_authenticity_token, :add_rpx => options.delete( :add_rpx ) }.collect { |n| "#{n[0]}=#{ u(n[1]) }" if n[1] }
 			).compact.join('&')
     end

data/test/unit/helpers_test.rb

@@ -0,0 +1,23 @@
+require File.dirname(__FILE__) + '/../test_helper.rb'
+
+class HelpersTest < ActiveSupport::TestCase
+  class HelpersContext
+    def form_authenticity_token
+      'foo'
+    end
+
+    def u(something)
+      something
+    end
+
+    include AuthlogicRpx::Helper
+  end
+
+  must "generate a return url with an authenticity token" do
+    assert_true HelpersContext.new.send(:build_token_url!, :return_url => '/').include?('/?authenticity_token=')
+  end
+
+  must "not repeat ? when params exist" do
+    assert_equal 1, HelpersContext.new.send(:build_token_url!, :return_url => '/?myparam=bar').count('?')
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 6
-  version: 1.1.6
+  - 7
+  version: 1.1.7
 platform: ruby
 authors: 
 - Paul Gallagher / tardate
@@ -90,6 +90,7 @@ files:
 - test/test_helper.rb
 - test/test_internal_mapping_helper.rb
 - test/unit/acts_as_authentic_settings_test.rb
+- test/unit/helpers_test.rb
 - test/unit/session_settings_test.rb
 - test/unit/session_validation_test.rb
 - test/unit/verify_rpx_mock_test.rb
@@ -138,6 +139,7 @@ test_files:
 - test/test_helper.rb
 - test/test_internal_mapping_helper.rb
 - test/unit/acts_as_authentic_settings_test.rb
+- test/unit/helpers_test.rb
 - test/unit/session_settings_test.rb
 - test/unit/session_validation_test.rb
 - test/unit/verify_rpx_mock_test.rb