card-mod-recaptcha 0.11.1 → 0.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 604e78a3af0d05a4644acece19a7815f32f0e54f69b2c4d2ff494cd704925c6c
-  data.tar.gz: c0be11d31319b5d2e4ef6e3b5ae8d001e32c9ca09b857528d067f7eb3df200b8
+  metadata.gz: 942a3a1cb161b129458b799367870e41a2ae7a6ced5d345f47d0123459b857af
+  data.tar.gz: 73deb8c3a2a822cc4199dff4b04158d9f79d4b751df88be688eb355aa844e846
 SHA512:
-  metadata.gz: 4b24e931bd1b756da764a575c7f9a2eb39d35623be4372245da6326d9e21b30de1a2840752c51ecd362347937920d708be2407c71ab84811410a991aba583ac9
-  data.tar.gz: 24285c59887bdb2cef238fddd0918d55595b8e4cde1cf3cbd2f9ed408b0593ef8699fa6a7b54d6ebb297089b592687b6d7c13cc586b19536cef625b142b6d946
+  metadata.gz: 708c271e374709066a21319414bbd32a4a9fca9d35ef2583f10076a5e04a4b5ad42a75e6d686ff9a2f574525951405a1c5ece49dcb72868e63e4e1f3ca025d16
+  data.tar.gz: '00597b202ddd79e86ba13ca25a57ac477915f8916c40861f7dd022c97757c3fb05d57e96915766ad818a19c8427e44aed57de48db89cd141278c6656729d1bdf'

data/config/initializers/recaptcha.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 require "recaptcha"
 
 # This initializer module is mostly here to avoid adding methods/vars to the Object
@@ -39,6 +40,7 @@ module RecaptchaCard
 
     def card_value setting
       return unless Card::Codename.exist? setting # prevents breakage in migrations
+
       value = Card[setting]&.content
       value if value.present?
     end
@@ -53,3 +55,5 @@ ActiveSupport.on_load :after_card do
     config.verify_url = "https://www.google.com/recaptcha/api/siteverify"
   end
 end
+
+CardController.include ::Recaptcha::Verify

data/set/all/recaptcha.rb

@@ -33,9 +33,9 @@ def add_recaptcha_errors error_codes
 end
 
 def recaptcha_success? result
-  result['success'] &&
-    (result['score'].to_f >= Cardio.config.recaptcha_minimum_score) &&
-    (result['action'].to_sym == action.to_sym)
+  result["success"] &&
+    (result["score"].to_f >= Cardio.config.recaptcha_minimum_score) &&
+    (result["action"].to_sym == action.to_sym)
 end
 
 def recaptcha_response
@@ -55,16 +55,16 @@ event :recaptcha, :validate, when: :validate_recaptcha? do
 end
 
 def handle_recaptcha_config_errors
-  if Env.params[:recaptcha_token] == "grecaptcha-undefined"
+  case Env.params[:recaptcha_token]
+  when "grecaptcha-undefined"
     errors.add "recaptcha", "needs correct v3 configuration" # LOCALILZE
-  elsif Env.params[:recaptcha_token] == "recaptcha-token-field-missing"
+  when "recaptcha-token-field-missing"
     raise Card::Error, "recaptcha token field missing" # LOCALILZE
   else
     yield
   end
 end
 
-
 def validate_recaptcha?
   !@supercard && !Env[:recaptcha_used] && recaptcha_on?
 end

data/set/self/admin_info.rb

@@ -6,27 +6,22 @@ end
 
 format :html do
   def recaptcha_config_issues_message
-    warning =
+    wrap_with :p do
       if Card::Env.localhost?
         # %(Your captcha is currently working with temporary settings.
         #   This is fine for a local installation, but you will need new
         #   recaptcha keys if you want to make this site public.)
-        I18n.t(:captcha_temp, scope: "mod.admin.set.self.admin_info",
-                              recaptcha_link: add_recaptcha_keys_link)
+        t :recaptcha_captcha_temp, recaptcha_link: add_recaptcha_keys_link
       else
         # %(You are configured to use [[*captcha]], but for that to work
         #   you need new recaptcha keys.)
-        I18n.t(:captcha_keys, scope: "mod.admin.set.self.admin_info",
-                              recaptcha_link: add_recaptcha_keys_link,
-                              captcha_link: link_to_card(:captcha))
+        t :recaptcha_captcha_keys, recaptcha_link: add_recaptcha_keys_link,
+                                   captcha_link: link_to_card(:captcha)
       end
-    <<-HTML
-        <p>#{warning}</p>
-    HTML
+    end
   end
 
   def add_recaptcha_keys_link
-    link_text = I18n.t :recaptcha_keys, scope: "mod.admin.set.self.admin_info"
-    Card[:recaptcha_settings]&.format&.edit_link link_text: link_text
+    Card[:recaptcha_settings]&.format&.edit_link link_text: t(:recaptcha_captcha_keys)
   end
 end

data/set/self/captcha.rb

@@ -0,0 +1,5 @@
+setting_opts group: :permission,
+             position: 5,
+             help_text: "Anti-spam setting.  Requires non-signed-in users to complete a "\
+                        "[[http://decko.org/captcha|captcha]] before adding or editing "\
+                        "cards (where permitted)."

data/set/self/recaptcha_settings.rb

@@ -12,33 +12,20 @@ format :html do
   # end
   #
   #       <h5>#{instructions}</h5>
-  #       #{howto_add_new_recaptcha_keys}
+  #       #{howto_add_keys}
   #       #{howto_turn_captcha_off}
   #
   # def howto_add_new_recaptcha_keys
-  #   instructions(
-  #     I18n.t(:howto_add_keys, scope: "mod.admin.set.self.admin_info"),
-  #     [
-  #       I18n.t(:howto_register,
-  #              scope: "mod.admin.set.self.admin_info",
-  #              recaptcha_link: link_to_resource("http://google.com/recaptcha")),
-  #       I18n.t(:howto_add,
-  #              scope: "mod.admin.set.self.admin_info",
-  #              recaptcha_settings: link_to_card(:recaptcha_settings))
-  #     ]
-  #   )
+  #   instructions t(:recaptcha_howto_add_keys),
+  #                [t(:recaptcha_howto_register,
+  #                   recaptcha_link: link_to_resource("http://google.com/recaptcha")),
+  #                 t(:recaptcha_howto_add,
+  #                   recaptcha_settings: link_to_card(:recaptcha_settings))]
   # end
   #
   # def howto_turn_captcha_off
-  #   instructions(
-  #     I18n.t(:howto_turn_off, scope: "mod.admin.set.self.admin_info"),
-  #     [
-  #       I18n.t(:howto_go,
-  #              scope: "mod.admin.set.self.admin_info",
-  #              captcha_card: link_to_card(:captcha)),
-  #       I18n.t(:howto_update,
-  #              scope: "mod.admin.set.self.admin_info")
-  #     ]
-  #   )
+  #   instructions t(:recaptcha_howto_turn_off),
+  #                [t(:recaptcha_howto_go, captcha_card: link_to_card(:captcha)),
+  #                 t(:recaptcha_howto_update)]
   # end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-recaptcha
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.6
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-02 00:00:00.000000000 Z
+date: 2021-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.1
+        version: 1.101.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.1
+        version: 1.101.6
 - !ruby/object:Gem::Dependency
   name: recaptcha
   requirement: !ruby/object:Gem::Requirement
@@ -50,14 +50,20 @@ files:
 - config/initializers/recaptcha.rb
 - set/all/recaptcha.rb
 - set/self/admin_info.rb
+- set/self/captcha.rb
 - set/self/recaptcha_proxy.rb
 - set/self/recaptcha_secret_key.rb
 - set/self/recaptcha_settings.rb
 - set/self/recaptcha_site_key.rb
-homepage: http://decko.org
+homepage: https://decko.org
 licenses:
 - GPL-3.0
 metadata:
+  source_code_uri: https://github.com/decko-commons/decko
+  homepage_uri: https://decko.org
+  bug_tracker_uri: https://github.com/decko-commons/decko/issues
+  wiki_uri: https://decko.org
+  documentation_url: http://docs.decko.org/
   card-mod: recaptcha
 post_install_message:
 rdoc_options: []
@@ -74,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: recaptcha support for decko