simple_captcha2 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82daa59541bc47e50ecfb13d95b1672d953b0b79
-  data.tar.gz: 217de8368d88deb6720440ee8a69124ddbbcef83
+  metadata.gz: f7e289c77c2ba483a5f6a97578cc107ce7b6429d
+  data.tar.gz: e9bbd53602642e958644e2daeefaca5f260cab40
 SHA512:
-  metadata.gz: 0885a9d47688ebeb81930e1cb7716ad3c7aa3c453f67c067961985f05b232ee8b53c930709899c340ec3c172d921388cdd93410aafbdfaaa155db5f1fac57cba
-  data.tar.gz: f293939ccb2a80ce257ea200ed711fcfbbfd13bd5ed2cf526136d23b25187ac63a86a7b439b228140cbe13e2fac15845539c3dcec846901dde1b7887b7194d89
+  metadata.gz: 5da26157f9f1dbc8df22fed158939865e01b813e94506dda4ee329359fd5bee28f64c5e576b7c13604a582fa09e43884dd7550330f224f761165cf936d4c30c2
+  data.tar.gz: 2e5330b6f248b00862c1eb36c4c6568ff743ced1e42f2ed8ba020300db067b1a8bad39926808e694b369314f6de16b4ac663e7108e9c6f97311a072c8224e424

data/lib/simple_captcha.rb

@@ -63,6 +63,12 @@ module SimpleCaptcha
   mattr_accessor :noise
   @@noise = 0
 
+  mattr_accessor :extra_response_headers
+  @@extra_response_headers = {}
+
+  mattr_accessor :partial_path
+  @@partial_path = 'simple_captcha/simple_captcha'
+
   def self.add_image_style(name, params = [])
     SimpleCaptcha::ImageHelpers.image_styles.update(name.to_s => params)
   end

data/lib/simple_captcha/form_builder.rb

@@ -36,7 +36,7 @@ module SimpleCaptcha
           html[:placeholder] = options[:placeholder] || I18n.t('simple_captcha.placeholder')
 
           text_field(:captcha, html) +
-          hidden_field(:captcha_key, {:value => options[:field_value]})
+          hidden_field(:captcha_key, {:value => options[:field_value], :id => simple_captch_hidden_field_id(options)})
         end
     end
   end

data/lib/simple_captcha/middleware.rb

@@ -79,12 +79,13 @@ module SimpleCaptcha
 
         status = 200
         id = request.params['id']
+        captcha_hidden_field_id = simple_captch_hidden_field_id(id)
 
         body = %Q{
                     $("##{id}").attr('src', '#{url}');
-                    $("#captcha_key").attr('value', '#{key}');
+                    $("##{ captcha_hidden_field_id }").attr('value', '#{key}');
                   }
-        headers = {'Content-Type' => 'text/javascript; charset=utf-8', "Content-Disposition" => "inline; filename='captcha.js'", "Content-Length" => body.length.to_s}
+        headers = {'Content-Type' => 'text/javascript; charset=utf-8', "Content-Disposition" => "inline; filename='captcha.js'", "Content-Length" => body.length.to_s}.merge(SimpleCaptcha.extra_response_headers)
         [status, headers, [body]]
       end
   end

data/lib/simple_captcha/utils.rb

@@ -29,7 +29,7 @@ module SimpleCaptcha #:nodoc
     end
 
     def self.generate_key(*args)
-      args << Time.now.to_s
+      args << (Time.now.to_f * 1_000_000_000).to_s
       Digest::SHA1.hexdigest(args.join)
     end
   end

data/lib/simple_captcha/version.rb

@@ -1,3 +1,3 @@
 module SimpleCaptcha
-  VERSION = "0.3.3".freeze
+  VERSION = "0.3.4".freeze
 end

data/lib/simple_captcha/view.rb

@@ -42,7 +42,11 @@ module SimpleCaptcha #:nodoc
     # Find more detailed examples with sample images here on my blog http://EXPRESSICA.com
     #
     # All Feedbacks/CommentS/Issues/Queries are welcome.
-    def show_simple_captcha(options={})
+    def show_simple_captcha(options = {})
+      render :partial => SimpleCaptcha.partial_path, :locals => { :simple_captcha_options => simple_captcha_options(options) }
+    end
+
+    def simple_captcha_options(options = {})
       key = simple_captcha_key(options[:object])
       if options[:multiple] === false
         # It's not the first captcha, we only need to return the key
@@ -58,8 +62,6 @@ module SimpleCaptcha #:nodoc
         :field => simple_captcha_field(options),
         :refresh_button => simple_captcha_refresh_button(options),
       }.merge(options)
-
-      render :partial => 'simple_captcha/simple_captcha', :locals => { :simple_captcha_options => defaults }
     end
 
     private
@@ -76,6 +78,10 @@ module SimpleCaptcha #:nodoc
 
         query = defaults.to_query
         path = "/simple_captcha?code=#{simple_captcha_key}&#{query}"
+        build_url(options, path)
+      end
+
+      def build_url(options, path)
         if defined?(request) && request
           "#{request.protocol}#{request.host_with_port}#{ENV['RAILS_RELATIVE_URL_ROOT']}#{path}"
         else
@@ -90,10 +96,10 @@ module SimpleCaptcha #:nodoc
 
         if options[:object]
           text_field(options[:object], :captcha, html.merge(:value => '')) +
-          hidden_field(options[:object], :captcha_key, {:value => options[:field_value]})
+          hidden_field(options[:object], :captcha_key, {:value => options[:field_value], :id => simple_captch_hidden_field_id(options)})
         else
           text_field_tag(:captcha, nil, html) +
-          hidden_field_tag(:captcha_key, options[:field_value])
+          hidden_field_tag(:captcha_key, options[:field_value], :id => simple_captch_hidden_field_id(options))
         end
       end
 
@@ -103,13 +109,19 @@ module SimpleCaptcha #:nodoc
 
         text = options[:refresh_button_text] || I18n.t('simple_captcha.refresh_button_text', default: 'Refresh')
 
-        link_to(text, "#{ENV['RAILS_RELATIVE_URL_ROOT']}/simple_captcha?id=#{simple_captcha_image_id(options)}", html)
+        url = build_url(options, "/simple_captcha?id=#{simple_captcha_image_id(options)}")
+        link_to(text, url, html)
       end
 
       def simple_captcha_image_id(options={})
         "simple_captcha-#{options[:field_value][0..10]}"
       end
 
+      def simple_captch_hidden_field_id(image_id)
+        image_id = simple_captcha_image_id(image_id) if image_id.is_a?(Hash)
+        "simple-captcha-hidden-field-#{ image_id }"
+      end
+
       def set_simple_captcha_data(key, options={})
         code_type = options[:code_type]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_captcha2
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Pavlo Galeta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-28 00:00:00.000000000 Z
+date: 2015-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails