card-mod-recaptcha 0.13.1 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fd159dcbb29e0f174b76ab6a32e0a197ae7f3fa05dc4052422177265d6bdbfc
-  data.tar.gz: 42eddcec77e69309c3126bf6a92114ac0831361d02a25a8e7051a7f5f0030734
+  metadata.gz: 5691d38d9538c4916d88b4c315babc99d63588c7374e9b1ac022d88d72ffb88c
+  data.tar.gz: 1a174d8b9d3c50b9d7c8e9744f0b337fbda7cae217532edb203913183ae48c50
 SHA512:
-  metadata.gz: 646da375d89aa7e772ef9dc0c3785e18e0821d3bd34f83b040611a5edb8f4856b82e1b7f2744fa10f527b1e280ced1eef4a20ca0d5ca681490aa0fb37980c3f4
-  data.tar.gz: 9fa222a2939140d6e12c7b6de04471292469c6197bcb3e336f7fa47447ada74953536944975551ae960dae2e165babff4d829c99c5729a07ef1b2e68c9292a16
+  metadata.gz: 45c1be05045a6812bac4d020867cc8cded5ad8396106850ab9a35778b499b26b703d332772353864f123d7c3fd74e703ce5c26c8f1ecb7d0f6e8bdd5d98c0510
+  data.tar.gz: e5587257faacf48183060f05b9bf53b02b81afd7484301741956a977cac2284483a44423c754d6f2f8f9640bffd9696d3380e9babbc54aa9addb393043482a8b

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/de.yml

@@ -0,0 +1,10 @@
+de:
+  recaptcha_link_text: Recaptcha-Schlüssel
+  recaptcha_captcha_keys: Laut Einstellungen wird %{captcha_link} benutzt, aber damit das funktioniert, benötigen sie neue %{recaptcha_link}.
+  recaptcha_captcha_temp: Ihr Captcha läuft im Moment mit temporären Einstellungen. Für eine lokale Installation ist das in Ordnung, aber Sie werden einen neuen %{recaptcha_link} brauchen, wenn Sie diese Seite veröffentlichen.
+  recaptcha_howto_add: Fügen Sie ihre Schlüssel zu %{recaptcha_settings} hinzu.
+  recaptcha_howto_add_keys: "Wie man neue Recaptcha-Schlüssel hinzufügt:"
+  recaptcha_howto_go: Gehe zu %{captcha_card}
+  recaptcha_howto_register: Registriere Sie ihre Domain bei %{recaptcha_link}
+  recaptcha_howto_turn_off: 'Wie man Captchas ausschaltet:'
+  recaptcha_howto_update: Setze alle *captcha-Regel auf "nein".

data/locales/en.yml

@@ -0,0 +1,10 @@
+en:
+  recaptcha_link_text: recaptcha keys
+  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?
@@ -22,6 +22,6 @@ format :html do
   end
 
   def add_recaptcha_keys_link
-    Card[:recaptcha_settings]&.format&.edit_link link_text: t(:recaptcha_captcha_keys)
+    Card[:recaptcha_settings]&.format&.edit_link link_text: t(:recaptcha_link_text)
   end
 end

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.1
+  version: 0.14.0
 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-12-22 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.1
+        version: 1.104.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.103.1
+        version: 1.104.0
 - !ruby/object:Gem::Dependency
   name: recaptcha
   requirement: !ruby/object:Gem::Requirement
@@ -47,6 +47,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- init/late/recaptcha.rb
+- locales/de.yml
+- locales/en.yml
 - set/all/recaptcha.rb
 - set/self/admin_info.rb
 - set/self/captcha.rb
@@ -79,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: recaptcha support for decko