kaptcha 0.0.3 → 0.0.3.5

data/lib/core/kaptcha.rb

@@ -21,7 +21,6 @@ module Captcha
 
     # def __captcha__
       # title = self.human_captcha_desc
-      
     # end
 
 
@@ -35,6 +34,29 @@ module Captcha
     end
 
     def initialize(params={}, &block)
+      initialize_kaptcha params
+      super(params, &block)
+    end
+
+    def validate
+      unless captcha_form_result == captcha_code
+        initialize_kaptcha
+        return errors.add(:captcha_code, 'Пожалуйста, проверьте контрольный вопрос.') 
+      end
+      true
+    end
+
+    def captcha_desc
+      @@captcha_desc ||= raise 'Error occurred.'
+    end
+
+    def human_captcha_desc
+      @@human_captcha_desc ||= raise 'Error occurred.'
+    end
+
+  private
+
+    def initialize_kaptcha(params=nil)
       begin
         captcha_a = params[:captcha_code].split[0].to_i
       rescue NoMethodError
@@ -66,20 +88,6 @@ module Captcha
       @@human_captcha_desc = "Скажите, сколько будет #{captcha_a} #{@@human_captcha_operation} #{captcha_b} ?"
 
       @@captcha_code = captcha_a.send(captcha_operation, captcha_b)
-      super(params, &block)
-    end
-
-    def validate
-      return errors.add(:captcha_code, 'Пожалуйста, проверьте контрольный вопрос.') unless captcha_form_result == captcha_code
-      true
-    end
-
-    def captcha_desc
-      @@captcha_desc ||= raise 'Error occurred.'
-    end
-
-    def human_captcha_desc
-      @@human_captcha_desc ||= raise 'Error occurred.'
     end
 
   end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: kaptcha
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 73
   prerelease: 
   segments: 
   - 0
   - 0
   - 3
-  version: 0.0.3
+  - 5
+  version: 0.0.3.5
 platform: ruby
 authors: 
 - Bogdan Kulbida