blogs_captcha 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cad6c7ee8510b81815207edbc73233be18c0853561396fee03b32a3f043ddd16
-  data.tar.gz: 0df555738484700779c4ac944a1d141cfe62252ce28274994580964f4f38d28e
+  metadata.gz: 57bc75ea05cf9b30bf5985c974b3b2f2c6365d4db0a55beb97ca5cbbc585f5a4
+  data.tar.gz: 21dfa9deeca2067ad4533f4fe00be2e03bf858c6934e617a6d5e6349590daca9
 SHA512:
-  metadata.gz: 295d60917fb5c2b690061ff82972d274cf0e61425870963bd27ce27b00d0c590575eed37130af02194e7ee1606728d8f73cf7a4817b35cc4b8e8f8f918209ca2
-  data.tar.gz: 7d30bf6af0232290ee1bf05ff6761408253343b3e3da46a8f45c24b882795e0a5a039225fe9bd408f7b97905a64366b9ea30a63e37eac2246486801fb7f04353
+  metadata.gz: 789ccb60f7d0764450bcd67bcf509f19ea844f37e7e956f21c8921e50c0169a04dd6476edff91bbec641994d15c98b46cc38151fc4bd7c0e81b7844599405fb0
+  data.tar.gz: d76b2fdd259e9728a4304fa952ed25d361f79fdd3a4dfd20da9b467f0beb347a891f0a8870fbfbab6fd9fc7bfcd51ccc06f738cb91fa1efa56375d750e92c737

data/app/controllers/blogs_captcha/captcha_controller.rb

@@ -4,7 +4,7 @@ module BlogsCaptcha
       return head :ok if request.head?
       headers['Cache-Control'] = 'no-cache, no-store, max-age=0, must-revalidate'
       headers['Pragma'] = 'no-cache'
-      data = generate_rucaptcha
+      data = generate_captcha
       opts = { disposition: 'inline', type: 'image/gif' }
       send_data data, opts
     end

data/lib/blogs_captcha/controller_helpers.rb

@@ -3,86 +3,35 @@ module BlogsCaptcha
     extend ActiveSupport::Concern
 
     included do
-      helper_method :verify_rucaptcha?
+      helper_method :verify_captcha?
     end
 
-    # session key of rucaptcha
-    def rucaptcha_sesion_key_key
-      session_id = session.respond_to?(:id) ? session.id : session[:session_id]
-      warning_when_session_invalid if session_id.blank?
-      ['rucaptcha-session', session_id].join(':')
+    def captcha_sesion_key_key
+      ['captcha-session', 'test'].join(':')
     end
 
     # Generate a new Captcha
-    def generate_rucaptcha
+    def generate_captcha
       res = BlogsCaptcha.generate()
       session_val = {
         code: res[0],
         time: Time.now.to_i
       }
-      RuCaptcha.cache.write(rucaptcha_sesion_key_key, session_val, expires_in: RuCaptcha.config.expires_in)
+      BlogsCaptcha.cache.write(captcha_sesion_key_key, session_val, expires_in: BlogsCaptcha.config.expires_in)
       res[1]
     end
 
-    # Verify captcha code
-    #
-    # params:
-    # resource - [optional] a ActiveModel object, if given will add validation error message to object.
-    # :keep_session - if true, RuCaptcha will not delete the captcha code session.
-    # :captcha - if given, the value of it will be used to verify the captcha,
-    #            if do not give or blank, the value of params[:_rucaptcha] will be used to verify the captcha
-    #
-    # exmaples:
-    #
-    #   verify_rucaptcha?
-    #   verify_rucaptcha?(user, keep_session: true)
-    #   verify_rucaptcha?(nil, keep_session: true)
-    #   verify_rucaptcha?(nil, captcha: params[:user][:captcha])
-    #
-    def verify_rucaptcha?(resource = nil, opts = {})
-      opts ||= {}
-
-      store_info = BlogsCaptcha.cache.read(rucaptcha_sesion_key_key)
-      # make sure move used key
-      BlogsCaptcha.cache.delete(rucaptcha_sesion_key_key) unless opts[:keep_session]
-
-      # Make sure session exist
-      if store_info.blank?
-        return add_rucaptcha_validation_error
-      end
-
-      # Make sure not expire
-      if (Time.now.to_i - store_info[:time]) > BlogsCaptcha.config.expires_in
-        return add_rucaptcha_validation_error
-      end
-
-      # Make sure parama have captcha
-      captcha = (opts[:captcha] || params[:_rucaptcha] || '').downcase.strip
-      if captcha.blank?
-        return add_rucaptcha_validation_error
-      end
-
-      if captcha != store_info[:code]
-        return add_rucaptcha_validation_error
-      end
-
-      true
+    def verify_captcha?(resource = nil, opts = {})
+      #TODO
     end
 
     private
 
-    def add_rucaptcha_validation_error
+    def add_captcha_validation_error
       if defined?(resource) && resource && resource.respond_to?(:errors)
-        resource.errors.add(:base, t('rucaptcha.invalid'))
+        resource.errors.add(:base, t('captcha.invalid'))
       end
       false
     end
-
-    def warning_when_session_invalid
-      Rails.logger.warn "
-        WARNING! The session.id is blank, RuCaptcha can't work properly, please keep session available.
-        More details about this: https://github.com/huacnlee/rucaptcha/pull/66
-      "
-    end
   end
 end

data/lib/blogs_captcha/version.rb

@@ -1,3 +1,3 @@
 module BlogsCaptcha
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blogs_captcha
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - ChinaHDJ