card-mod-recaptcha 0.11.2 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8f94318b9abd3ea145bde09f44015d65825cddc4ca5ee4ea1ba49bd728dca90
-  data.tar.gz: 113dbb6d9f86f7b8df8c405822087c225b0678bda3dbdde1e50916aa365f9921
+  metadata.gz: 5c2b0d1c3a503a2e96ecc5deb5afa81ab72d6b614a27d7e0e98943ca9d53cb58
+  data.tar.gz: f4daf9215457fe80825410bccd50f631f551fe1388ae286d3c23bb86d8a2d0e1
 SHA512:
-  metadata.gz: 01a7541383d000e633216268565cc2cfb48c77f8caed2fd968aabb6bfcf588fb741ed6f1bb958433fcaf601f451348a0bccde323410eb14447f8cddf610b1f5a
-  data.tar.gz: a731b40026bef519717710ae46a1afd8b1177e98abe8c1728251591cc7edaff5ee4215ef931faecae46ee2f48aec36ad60e80fe21997c75c313c87fb54062b5a
+  metadata.gz: 119ad46d91612c8e84831d7ae808f5878cd5d0966fbd31cc518c3ce942b3f90b4408f4a8d3423e87fd606040f4738e910bc952648cc2da7fb08409090ec751f0
+  data.tar.gz: 8e22bd8cb728806aeea960b69b339cfae5a4c2d7d13ff5ddfb6d1bdfa91e81c3d48675210a8b57535169cbbdd54033c30c5d94cd7d3736ba70a5529d3b69f2c4

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

@@ -11,17 +11,17 @@ format :html do
         # %(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.)
-        tr :captcha_temp, 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.)
-        tr :captcha_keys, 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
     end
   end
 
   def add_recaptcha_keys_link
-    Card[:recaptcha_settings]&.format&.edit_link link_text: tr(:recaptcha_keys)
+    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,19 +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 tr(:howto_add_keys),
-  #                [tr(:howto_register,
-  #                    recaptcha_link: link_to_resource("http://google.com/recaptcha")),
-  #                 tr(:howto_add, 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 tr(:howto_turn_off),
-  #                [tr(:howto_go, captcha_card: link_to_card(:captcha)),
-  #                 tr(:howto_update)]
+  #   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.2
+  version: 0.12.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-15 00:00:00.000000000 Z
+date: 2021-07-05 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.2
+        version: 1.102.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.2
+        version: 1.102.0
 - !ruby/object:Gem::Dependency
   name: recaptcha
   requirement: !ruby/object:Gem::Requirement
@@ -50,6 +50,7 @@ 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
@@ -79,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.2.15
 signing_key:
 specification_version: 4
 summary: recaptcha support for decko