card-mod-recaptcha 0.13.0 → 0.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d5a79c7dd93ee85cbf86649466fc1d4e52ad683483abb6c2b3e1a17c17020f8
-  data.tar.gz: 6f2d7a2cf2baba2c65a5d9f27b15c0cd8506795d43043a6c8d901de725c2e48c
+  metadata.gz: 402e8c4f2bf3d79cac2d4c46687cca5ed24948370de669ed38cea73ac3c760e7
+  data.tar.gz: e19882af8f375e644a4c10fc913320e77f0fafb3c2af83b81af8abfe0646ab8f
 SHA512:
-  metadata.gz: be6a92321fccd3c04b010773b9569a1344572ea6701edbb728492c50627758e6b299f803e39cafed5c42822df0bb7b2e8047df8db0f568c3a5bfe367c7e1415c
-  data.tar.gz: 5977f9eee5eb4522c8be928a1a4a1531c159880fdb4ecf88983ed30e7db097139508cbdb6e1bc5f97e2f8287197ab2449f6f3ee6f50395395296b61512d1895d
+  metadata.gz: c2488fec47bec58a5dd2225947b238e394c1b2782cd4bb454ad527927c93cdedc6c72ef4a04a1c51b4dadf60e1613db23dc63ac19117b51c96c8c8236355d2a0
+  data.tar.gz: 2930668ad5156378a37b19819453c7eedf5e50125e7f90b1e81566ac61930b88c2c56f1b3ca238c107488bcbab0ff779b56e4388e912149c82ec52cb7bcc6e89

data/init/late/recaptcha.rb

@@ -0,0 +1,59 @@
+# -*- encoding : utf-8 -*-
+
+require "recaptcha"
+
+# This initializer module is mostly here to avoid adding methods/vars to the Object
+# namespace
+module RecaptchaCard
+  @deprecated = {
+    recaptcha_site_key: :recaptcha_public_key,
+    recaptcha_secret_key: :recaptcha_private_key
+  }
+  @defaults = {
+    recaptcha_site_key: "6LdoqpgUAAAAAEdhJ4heI1h3XLlpXcDf0YubriCG",
+    recaptcha_secret_key: "6LdoqpgUAAAAAP4Sz1L5PY6VKrum_RFxq4-awj4BH"
+  }
+
+  mattr_accessor :using_card_defaults
+
+  class << self
+    def load_recaptcha_config setting
+      setting = "recaptcha_#{setting}".to_sym
+      Cardio.config.send "#{setting}=", recaptcha_setting_value(setting)
+    end
+
+    def using_defaults?
+      Cardio.config.recaptcha_site_key == @defaults[:recaptcha_site_key]
+    end
+
+    # card config overrides application.rb config overrides default
+    def recaptcha_setting_value setting
+      card_value(setting) ||                  # card content
+        config_value(setting) ||              # application.rb (current setting)
+        config_value(@deprecated[setting]) || # application.rb (deprecated setting)
+        @defaults[setting]
+    end
+
+    def config_value setting
+      Cardio.config.send setting
+    end
+
+    def card_value setting
+      return unless Card::Codename.exist? setting # prevents breakage in migrations
+
+      value = Card[setting]&.content
+      value if value.present?
+    end
+  end
+end
+
+ActiveSupport.on_load :after_card do
+  Recaptcha.configure do |config|
+    %i[site_key secret_key].each do |setting|
+      config.send "#{setting}=", RecaptchaCard.load_recaptcha_config(setting)
+    end
+    config.verify_url = "https://www.google.com/recaptcha/api/siteverify"
+  end
+end
+
+CardController.include ::Recaptcha::Verify

data/locales/en.yml

@@ -0,0 +1,9 @@
+en:
+  recaptcha_captcha_keys: You are configured to use %{captcha_link}, but for that to work you need new %{recaptcha_link}.
+  recaptcha_captcha_temp: Your captcha is currently working with temporary settings. This is fine for a local installation, but you will need new %{recaptcha_link} if you want to make this site public.
+  recaptcha_howto_add: Add your keys to %{recaptcha_settings}
+  recaptcha_howto_add_keys: "How to add new recaptcha keys:"
+  recaptcha_howto_go: Go to %{captcha_card}
+  recaptcha_howto_register: Register your domain at %{recaptcha_link}
+  recaptcha_howto_turn_off: 'How to turn captcha off:'
+  recaptcha_howto_update: Update all *captcha rules to "no".

data/set/self/admin_info.rb

@@ -1,4 +1,4 @@
-add_to_basket :warnings, :recaptcha_config_issues
+basket[:warnings] << :recaptcha_config_issues
 
 def recaptcha_config_issues?
   RecaptchaCard.using_defaults?

data/set/self/recaptcha_settings.rb

@@ -3,7 +3,7 @@ format :html do
     # LOCALIZE
     "Register your domain at Google's [[http://google.com/recaptcha|reCAPTCHA service]] "\
     "and enter your site key and secret key below.<br>"\
-    "If you want to turn catchas off then change all [[*captcha|captcha rules]] to 'no'."
+    "If you want to turn captchas off then change all [[*captcha|captcha rules]] to 'no'."
   end
 
   # def instructions title, steps

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-recaptcha
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.4
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-06 00:00:00.000000000 Z
+date: 2021-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.103.0
+        version: 1.103.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.103.0
+        version: 1.103.4
 - !ruby/object:Gem::Dependency
   name: recaptcha
   requirement: !ruby/object:Gem::Requirement
@@ -47,6 +47,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- init/late/recaptcha.rb
+- locales/en.yml
 - set/all/recaptcha.rb
 - set/self/admin_info.rb
 - set/self/captcha.rb