card-mod-recaptcha 0.13.1 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fd159dcbb29e0f174b76ab6a32e0a197ae7f3fa05dc4052422177265d6bdbfc
-  data.tar.gz: 42eddcec77e69309c3126bf6a92114ac0831361d02a25a8e7051a7f5f0030734
+  metadata.gz: 1e074e697c924695550d3ad018f495223a7ed51f9191c6c8c2f5ecc0615353b9
+  data.tar.gz: 1851ce86647f9c47d875ca9c05eba8467b33f7f5e89b4dd20e436dcc6c24c2ce
 SHA512:
-  metadata.gz: 646da375d89aa7e772ef9dc0c3785e18e0821d3bd34f83b040611a5edb8f4856b82e1b7f2744fa10f527b1e280ced1eef4a20ca0d5ca681490aa0fb37980c3f4
-  data.tar.gz: 9fa222a2939140d6e12c7b6de04471292469c6197bcb3e336f7fa47447ada74953536944975551ae960dae2e165babff4d829c99c5729a07ef1b2e68c9292a16
+  metadata.gz: be552cc2a89f238128a42f16d1dbda8b5bf6bc8bac0ab5faaa5c6ffefe7a501670f1186feff0a3ce192a7a7f61f82884e22ad8da68d67ac98dd644c4b55483f0
+  data.tar.gz: 4690d2e675ad4cf4eed8d72da822d0692cc67a41d2ddac47535f7e10b3c796ca6fa8fde15e2a7c6d33606c63f8aface14a6cf10a12236e9d4867d228984303e4

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".

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-recaptcha
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.103.1
+        version: 1.103.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.103.1
+        version: 1.103.2
 - !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