lib/simple_captcha/view.rb in simple_captcha2-0.3.2 vs lib/simple_captcha/view.rb in simple_captcha2-0.3.3

@@ -63,26 +63,26 @@
     end
 
     private
 
       def simple_captcha_image(simple_captcha_key, options = {})
-        defaults = {}
-        defaults[:time] = options[:time] || Time.now.to_i
-
-        query = defaults.collect{ |key, value| "#{key}=#{value}" }.join('&')
-        url = "#{ENV['RAILS_RELATIVE_URL_ROOT']}/simple_captcha?code=#{simple_captcha_key}&#{query}"
-
+        url = simple_captcha_image_url simple_captcha_key, options: options
         id = simple_captcha_image_id(options)
         tag('img', :src => url, :alt => 'captcha', :id => id)
       end
 
       def simple_captcha_image_url(simple_captcha_key, options = {})
         defaults = {}
         defaults[:time] = options[:time] || Time.now.to_i
 
-        query = defaults.collect{ |key, value| "#{key}=#{value}" }.join('&')
-        "#{ENV['RAILS_RELATIVE_URL_ROOT']}/simple_captcha?code=#{simple_captcha_key}&#{query}"
+        query = defaults.to_query
+        path = "/simple_captcha?code=#{simple_captcha_key}&#{query}"
+        if defined?(request) && request
+          "#{request.protocol}#{request.host_with_port}#{ENV['RAILS_RELATIVE_URL_ROOT']}#{path}"
+        else
+          "#{ENV['RAILS_RELATIVE_URL_ROOT']}#{path}"
+        end
       end
 
       def simple_captcha_field(options={})
         html = {:autocomplete => 'off', :required => 'required'}
         html.merge!(options[:input_html] || {})
@@ -131,11 +131,11 @@
         end
 
         return value
       end
 
-      def simple_captcha_key(key_name = nil, request = request)
-        local_session = request.try(:session) || session
+      def simple_captcha_key(key_name = nil, prequest = request)
+        local_session = prequest.try(:session) || session
         if key_name.nil?
           local_session[:captcha] ||= SimpleCaptcha::Utils.generate_key(local_session[:id].to_s, 'captcha')
         else
           SimpleCaptcha::Utils.generate_key(local_session[:id].to_s, key_name)
         end