zh_kostev_ext 0.1.7 → 0.1.8

data/lib/controller_extensions/general_methods.rb

@@ -40,24 +40,42 @@ module ControllerExtensions
         end
 
         #redirects to back.
-        #You can specify REDIRECT_DEFAULT_PATH contant in ActionController::Base to setup default redirect path(by default REDIRECT_DEFAULT_PATH='/')
+        # You can specify REDIRECT_DEFAULT_PATH constant in ActionController::Base to setup default redirect path(by default REDIRECT_DEFAULT_PATH='/')
         #
-        #You can also pass params to redirect to method
-        #example
+        # You can also pass params to redirect to method
+        # Example
         # redirect_back_or_default :test_param => "test"
         def redirect_back_or_default(options = {})
-          redirect_to (session[:return_to] || ::REDIRECT_DEFAULT_PATH) + "#{'?' unless options.blank?}"+options.map { |key, value| "#{key}=#{value}" }.join("&")
+          url = (session[:return_to] || ::REDIRECT_DEFAULT_PATH)
+          url = add_params_to_url(url, options)
           session[:return_to] = nil
+          redirect_to url
         end
 
         private
         #stores request path if request is get and not ajax
         #
-        #example
+        # Example
         # after_filter :store_location
         def store_location
           session[:return_to] = request.url if request.get? && !request.xhr? && controller_name != "sessions"
         end
+
+        #add params to url. Prevent situation with identical param name
+        #
+        # Example:
+        #   add_params_to_url('localhost:3000?test=3', {:test => 5, :asd => 2} #result will be  'localhost:3000?test=5&asd=2'
+        def add_params_to_url(url, options)
+          main_url, main_params = url.split('?')
+          if main_params
+            main_params = Hash[main_params.split('&').map { |el| el.split("=") }]
+            main_params = main_params.symbolize_keys
+            options = options.symbolize_keys
+            options = main_params.merge(options)
+          end
+
+          main_url + "#{'?' unless options.blank?}"+options.map { |key, value| "#{key}=#{value}" }.join("&")
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zh_kostev_ext
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-16 00:00:00.000000000 Z
+date: 2012-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spreadsheet
@@ -136,7 +136,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 833124783
+      hash: -711035597
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: