card 1.99.2 → 1.99.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b41a6b143142f0b5adb047f9a9363d06e6d686ec47ebf97a22dc12f59c1a2ff1
-  data.tar.gz: 71f0a7d1e94054844efb5002c8e1d1667845d72e15db26d86653de51b26620eb
+  metadata.gz: 105d1d50c75e755f5fe1de82ab785a8cf386e31d4c7da52d1147239852dfdaf3
+  data.tar.gz: 3be62099be33d1a2eb38bd534e6bdb43a60b5845402a6b01f4df81ad2e6cb119
 SHA512:
-  metadata.gz: 0e82764e8ce1120475086fc0baa9177dbe9f5c1402b259d6193b5dc5eb0fb40cf5d8e6d662846fe034e49b2f6eb6dd90c3ffbfdc14d6030870dc6651e8ae243d
-  data.tar.gz: f1a56d7e98595cbeb01b40f5aa3db3e4eba2932245c28247175199fe04586837703ce2c9585331bd063163b005d9b0da782bc9914c131a306091432ef223f44f
+  metadata.gz: c49d546abd8cabfa8bc9bbb7b70eb0d9e78d85e0c02f6d22932d099b2ff08054cf0499f353e1d46bb0ff5bc784fee8c4b0b3a066966435e045aa730e4e4007d5
+  data.tar.gz: 697da3c3241d60ac22fa6bd68accda4efd7bd49392649537b2dd1cdbf077da06654d4698e66b74bec9c90fcca505bd3a30f0979fdfdbe1f096c8e79dedd13688

data/VERSION

@@ -1 +1 @@
-0.9.2
+0.9.3

data/lib/card.rb

@@ -96,7 +96,7 @@ class Card < ApplicationRecord
   extend ::Card::Dirty::MethodFactory
   include ::Card::Dirty
 
-  Card::Cache
+  Card::Cache # trigger autoload
 
   has_many :references_in,  class_name: :Reference, foreign_key: :referee_id
   has_many :references_out, class_name: :Reference, foreign_key: :referer_id

data/lib/card/auth/permissions.rb

@@ -2,11 +2,6 @@ class Card
   module Auth
     # singleton permission methods
     module Permissions
-      RECAPTCHA_DEFAULTS = {
-        recaptcha_site_key: "6LdoqpgUAAAAAEdhJ4heI1h3XLlpXcDf0YubriCG",
-        recaptcha_secret_key: "6LdoqpgUAAAAAP4Sz1L5PY6VKum_RFxq4-awj4BH"
-      }.freeze
-
       # user has "root" permissions
       # @return [true/false]
       def always_ok?

data/lib/card/content.rb

@@ -10,7 +10,7 @@ class Card
     extend Clean
     extend Truncate
 
-    Chunk
+    Chunk # trigger autoload
 
     attr_reader :revision, :format, :chunks, :opts
 
@@ -99,13 +99,13 @@ class Card
     end
 
     def without_nests
-      without_chunks Card::Content::Chunk::Nest do |content|
+      without_chunks Chunk::Nest do |content|
         yield content
       end
     end
 
     def without_references
-      without_chunks Card::Content::Chunk::Nest, Card::Content::Chunk::Link do |content|
+      without_chunks Chunk::Nest, Chunk::Link do |content|
         yield content
       end
     end

data/mod/account/set/type/signup.rb

@@ -31,7 +31,8 @@ event :approve_without_verification, :validate, on: :update, trigger: :required
 end
 
 event :act_as_current_for_integrate_stage, :integrate, on: :create do
-  Auth.signin id
+  # needs justification!
+  Auth.current_id = id
 end
 
 def account_subfield

data/mod/admin/set/self/admin_info.rb

@@ -1,36 +1,38 @@
+basket :warnings
+
+# For each warning in the basket (eg :my_warning), the core view
+# will run a test by appending a question mark (eg #my_warning?).
+# If it fails it will generate a message by appending message
+# (eg #my_warning_message).
+
+add_to_basket :warnings, :no_email_delivery
+
+def no_email_delivery?
+  Card.config.action_mailer.perform_deliveries == false
+end
+
 def clean_html?
   false
 end
 
 format :html do
   view :core do
-    warnings = []
-    warnings << email_warning if Card.config.action_mailer.perform_deliveries == false
-    if Card.config.recaptcha_site_key ==
-       Card::Auth::Permissions::RECAPTCHA_DEFAULTS[:recaptcha_site_key] &&
-       card.rule(:captcha) == "1"
-      warnings << recaptcha_warning
-    end
-    return "" if warnings.empty?
-
-    alert :warning, true do
-      warning_list warnings
+    warnings = card.warnings.map do |warning|
+      card.send("#{warning}?") ? send("#{warning}_message") : nil
     end
+    warnings.compact!
+    warnings.empty? ? "" : warning_alert(warnings)
   end
 
-  def warning_list warnings
-    # 'ADMINISTRATOR WARNING'
+  def warning_alert warnings
     admin_warn = I18n.t(:admin_warn, scope: "mod.admin.set.self.admin_info")
-    "<h5>#{admin_warn}</h5>" + list_tag(warnings)
-  end
-
-  def warning_list_with_auto_scope warnings
     # 'ADMINISTRATOR WARNING'
-    admin_warn = tr(:admin_warn)
-    "<h5>#{admin_warn}</h5>" + warnings.join("\n")
+    alert :warning, true do
+      "<h5>#{admin_warn}</h5>" + list_tag(warnings)
+    end
   end
 
-  def email_warning
+  def no_email_delivery_message
     # "Email delivery is turned off."
     # "Change settings in config/application.rb to send sign up notifications."
     I18n.t(:email_off,
@@ -38,29 +40,9 @@ format :html do
            path: "config/application.rb")
   end
 
-  def recaptcha_warning
-    warning =
-      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)
-      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))
-      end
-    <<-HTML
-      <p>#{warning}</p>
-    HTML
-  end
-
-  def add_recaptcha_keys_link
-    nest :recaptcha_settings,
-         view: :edit_link, title: I18n.t(:recaptcha_keys,
-                                         scope: "mod.admin.set.self.admin_info")
+  def warning_list_with_auto_scope warnings
+    # 'ADMINISTRATOR WARNING'
+    admin_warn = tr(:admin_warn)
+    "<h5>#{admin_warn}</h5>" + warnings.join("\n")
   end
 end

data/mod/basic_formats/set/all/base.rb

@@ -22,7 +22,6 @@ format do
   view(:linkname, compact: true, perms: :none) { card.name.url_key }
   view(:url,      compact: true, perms: :none) { card_url _render_linkname }
 
-
   view :url_link, compact: true, perms: :none do
     link_to_resource card_url(_render_linkname)
   end

data/mod/basic_formats/set/self/head.rb

@@ -13,7 +13,7 @@ format :html do
   end
 
   view :input do
-    "Content is can't be edited."
+    "Content can't be edited."
   end
 
   def escape_in_main

data/mod/core/set/abstract/haml_file.rb

@@ -10,6 +10,10 @@ def content
 end
 
 format :html do
+  view :input do
+    "Content is managed by code and cannot be edited"
+  end
+
   def haml_locals
     {}
   end

data/mod/history/set/all/history/last.rb

@@ -14,7 +14,7 @@ def last_change_on field, opts={}
   if no_last_change? action_id, opts[:before]
     nil
   elsif create_action_last_change? action_id
-    create_action.change field
+    create_action&.change field
   else
     last_change_from_action_id action_id, field, opts
   end
@@ -25,7 +25,7 @@ def no_last_change? action_id, before
 end
 
 def create_action_last_change? action_id
-  action_id == create_action.id || (!action_id && create_action.sole?)
+  action_id == create_action&.id || (!action_id && create_action&.sole?)
 end
 
 def last_change_from_action_id action_id, field, opts

data/mod/recaptcha/config/initializers/recaptcha.rb

@@ -0,0 +1,54 @@
+# -*- encoding : utf-8 -*-
+
+# 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

data/mod/recaptcha/set/self/admin_info.rb

@@ -0,0 +1,33 @@
+add_to_basket :warnings, :recaptcha_config_issues
+
+def recaptcha_config_issues?
+  RecaptchaCard.using_defaults?
+end
+
+format :html do
+  def recaptcha_config_issues_message
+    warning =
+      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)
+      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))
+      end
+    <<-HTML
+        <p>#{warning}</p>
+    HTML
+  end
+
+  def add_recaptcha_keys_link
+    nest :recaptcha_settings,
+         view: :edit_link, title: I18n.t(:recaptcha_keys,
+                                         scope: "mod.admin.set.self.admin_info")
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card
 version: !ruby/object:Gem::Version
-  version: 1.99.2
+  version: 1.99.3
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-12 00:00:00.000000000 Z
+date: 2020-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cardname
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.9.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.9.3
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -371,7 +371,6 @@ files:
 - config/initializers/mime_types.rb
 - config/initializers/notification.rb
 - config/initializers/patches.rb
-- config/initializers/recaptcha.rb
 - config/initializers/uuid_state_file.rb
 - config/initializers/zeitwerk.rb
 - config/locales/de.yml
@@ -1202,10 +1201,6 @@ files:
 - mod/admin/set/self/admin.rb
 - mod/admin/set/self/admin_info.rb
 - mod/admin/set/self/debugger.rb
-- mod/admin/set/self/recaptcha_proxy.rb
-- mod/admin/set/self/recaptcha_secret_key.rb
-- mod/admin/set/self/recaptcha_settings.rb
-- mod/admin/set/self/recaptcha_site_key.rb
 - mod/admin/set/self/trash.rb
 - mod/admin/set/self/version.rb
 - mod/admin/spec/set/self/admin_info_spec.rb
@@ -5301,7 +5296,13 @@ files:
 - mod/prosemirror_editor/set/self/script_prosemirror.rb
 - mod/prosemirror_editor/set/self/script_prosemirror_config.rb
 - mod/prosemirror_editor/set/self/style_prosemirror.rb
+- mod/recaptcha/config/initializers/recaptcha.rb
 - mod/recaptcha/set/all/recaptcha.rb
+- mod/recaptcha/set/self/admin_info.rb
+- mod/recaptcha/set/self/recaptcha_proxy.rb
+- mod/recaptcha/set/self/recaptcha_secret_key.rb
+- mod/recaptcha/set/self/recaptcha_settings.rb
+- mod/recaptcha/set/self/recaptcha_site_key.rb
 - mod/rules/lib/javascript/script_rules.js.coffee
 - mod/rules/set/right/self.rb
 - mod/rules/set/rstar/rule_user.rb

data/config/initializers/recaptcha.rb

@@ -1,46 +0,0 @@
-# -*- encoding : utf-8 -*-
-
-DEPRECATED = { site_key: :public_key, secret_key: :private_key }
-
-# card config overrides application.rb config overrides default
-def load_recaptcha_config setting
-  setting = "recaptcha_#{setting}".to_sym
-  Cardio.config.send(
-    "#{setting}=", load_recaptcha_card_config(setting) || # card content
-    Cardio.config.send(setting) ||                        # application.rb
-    (DEPRECATED[setting] && Cardio.config.send(DEPRECATED[setting])) ||
-    default_setting(setting)
-  )
-end
-
-def default_setting setting
-  # when creating the database (with `decko seed`) this is called
-  # but fails because Card::Auth doesn't exist
-  return unless Card.const_defined? "Auth"
-  Card::Auth::Permissions::RECAPTCHA_DEFAULTS[setting]
-end
-
-def card_table_ready?
-  # FIXME: this test should be more generally usable
-  ActiveRecord::Base.connection.table_exists?("cards") &&
-    Card.ancestors.include?(ActiveRecord::Base)
-end
-
-# use if card with value is present
-def load_recaptcha_card_config setting
-  card = Card.find_by_codename setting
-  card&.db_content.present? && card.db_content
-end
-
-ActiveSupport.on_load :after_card do
-  Recaptcha.configure do |config|
-    # the seed task runs initializers so we have to check
-    # if the cards table is ready before we use it here
-    if card_table_ready?
-      %i[site_key secret_key].each do |setting|
-        config.send "#{setting}=", load_recaptcha_config(setting)
-      end
-    end
-    config.verify_url = "https://www.google.com/recaptcha/api/siteverify"
-  end
-end