ensure that confirmation email fragment is placed BEFORE querystring …

…for proper angularjs $location parsing. resolves lynndylanhurley/ng-token-auth#18.

Gemfile.lock

@@ -31,7 +31,7 @@ GIT
 PATH
   remote: .
   specs:
-    devise_token_auth (0.1.26)
+    devise_token_auth (0.1.27.beta1)
       devise (~> 3.2.4)
       rails (~> 4.1)
 

app/models/devise_token_auth/concerns/user.rb

@@ -135,10 +135,18 @@ def extend_batch_buffer(token, client_id)
   protected
 
 
+  # ensure that fragment comes AFTER querystring for proper $location
+  # parsing using AngularJS.
   def generate_url(url, params = {})
     uri = URI(url)
-    uri.query = params.to_query
-    uri.to_s
+
+    res = "#{uri.scheme}://#{uri.host}"
+    res += ":#{uri.port}" if (uri.port and uri.port != 80 and uri.port != 443)
+    res += "#{uri.path}" if uri.path
+    res += "##{uri.fragment}" if uri.fragment
+    res += "?#{params.to_query}"
+
+    return res
   end
 
 

lib/devise_token_auth/version.rb

@@ -1,3 +1,3 @@
 module DeviseTokenAuth
-  VERSION = "0.1.26"
+  VERSION = "0.1.27.beta1"
 end