card 1.98.3 → 1.99.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 835df1fe634ac86b362129fc1848a32b625ac056
-  data.tar.gz: 4c89dfc65e3c9d4b088189fb087b63b23f9a98e8
+  metadata.gz: eeeb9b091c1ba4ba4a19952639c917a7ad212144
+  data.tar.gz: d985620049eaca51f1bdbf1e6838ed28993f0643
 SHA512:
-  metadata.gz: fe19dedcf5116d8ed7025da14b75dff968afc102e9fed7610e884101ef233493b1b498893c22be9d69cdf4d53e48ca24d35f9f0dad52ba04a03f7c76054e9112
-  data.tar.gz: f235a00bd3c284f298dabbe9ae2a2ef7c6e955ca0ab96982d7f7afa8f121c9bcd9916814b0b556dcac339f228f57d64e2a03c8070a87e55ee4f7ef4b769f4f7d
+  metadata.gz: 878603101a1aa503616f7fea944513d490931abb05530ba18ad344795d2c8e173be4cfa9582cb1e09aab34c11806e11f18ab446e5e23fb86ab16523eb7eb30f0
+  data.tar.gz: a13e08715c72c33f5598335986ab667fce7cab449908018676b1c2aa81ad2edf87fec4da8f5ffa25da9924b6c1a75f7a155ce6651d4f77b5fbbd479bec369327

data/VERSION

@@ -1 +1 @@
-0.8.3
+0.9.0

data/config/locales/de.yml

@@ -475,9 +475,8 @@ de:
       set:
         right:
           account:
-            error_not_allowed: nicht erlaubt für diese Karte
-            sorry_email_reset: Entschuldigung, %{error_msg}. Please check your email for a new password reset link.
-            required: erforderlich
+            events:
+              sorry_email_reset: Entschuldigung, %{error_msg}. Please check your email for a new password reset link.
           email:
             error_invalid_address: ungültige Adresse
             search_email_duplicate: E-Mail-Duplikat? (%{content})
@@ -497,7 +496,7 @@ de:
             db_card: Database Card Inspect
           status:
             deny_not_change_own_account: Du bist nicht berechtigt den Status deines eigenen Accounts zu ändern.
-          token:
+          api_key:
             private_data: Private data
             error_token_not_found: kein Token gefunden
             error_token_expired: Token abgelaufen
@@ -527,13 +526,14 @@ de:
             error_not_recognized: unbekannt
         type:
           signup:
-            sign_up: Registrieren
-            invite: Einladen
+            views:
+              sign_up: Registrieren
+              invite: Einladen
+              missing_account: "ERROR: Signup-Karte ohne Account"
             send_invite: Sende Einladung
             first_last_help: üblicherweise Vor- und Nachname
             signed_up_on: "%{name} hat sich registriert am %{date}"
             was_signed_up_on: "%{name} wurde registriert am %{date}"
-            missing_account: "ERROR: Signup-Karte ohne Account"
             send: Senden
             resend: Wieder senden
             verification: Eine E-Mail zur Verifikation wurde verschickt.

data/config/locales/en.yml

@@ -448,13 +448,14 @@ en:
       set:
         type:
           signup:
-            sign_up: Sign up
-            invite: Invite
+            views:
+              sign_up: Sign up
+              invite: Invite
+              missing_account: "ERROR: signup card missing account"
             send_invite: Send Invitation
             first_last_help: usually first and last name
             signed_up_on: "%{name} signed up on %{date}"
             was_signed_up_on: "%{name} was signed up on %{date}"
-            missing_account: "ERROR: signup card missing account"
             send: Send
             resend: Resend
             verification: A verification email has been sent
@@ -476,9 +477,8 @@ en:
             setting_up: Lege an
         right:
           account:
-            error_not_allowed: not allowed on this card
-            sorry_email_reset: Sorry, %{error_msg}. Please check your email for a new password reset link.
-            required: required
+            events:
+              sorry_email_reset: Sorry, %{error_msg}. Please check your email for a new password reset link.
           email:
             error_invalid_address: must be valid address
             search_email_duplicate: email duplicate? (%{content})
@@ -498,7 +498,7 @@ en:
             db_card: Database Card Inspect
           status:
             deny_not_change_own_account: change the status of your own account
-          token:
+          api_key:
             private_data: Private data
             error_token_not_found: no token found
             error_token_expired: expired token

data/config/locales/es.yml

@@ -482,13 +482,14 @@ es:
       set:
         type:
           signup:
-            sign_up: Regístrate
-            invite: Invitación
+            views:
+              sign_up: Regístrate
+              invite: Invitación
+              missing_account: "ERROR: tarjeta de registro cuenta faltante"
             send_invite: Enviar invitacion
             first_last_help: usualmente nombre y apellido
             signed_up_on: "%{name} se registró en %{date}"
             was_signed_up_on: "%{name} se registró en %{date}"
-            missing_account: "ERROR: tarjeta de registro cuenta faltante"
             send: Enviar
             resend: Reenviar
             verification: Se envió un correo electrónico de verificación
@@ -510,9 +511,8 @@ es:
             setting_up: Ponte
         right:
           account:
-            error_not_allowed: no permitido en esta tarjeta
-            sorry_email_reset: Lo siento, %{error_msg}. Por favor revise su correo electrónico para un nuevo enlace de restablecimiento de contraseña.
-            required: requerido
+            events:
+              sorry_email_reset: Lo siento, %{error_msg}. Por favor revise su correo electrónico para un nuevo enlace de restablecimiento de contraseña.
           email:
             error_invalid_address: debe ser una dirección válida
             search_email_duplicate: correo electrónico duplicado? (%{content})
@@ -532,7 +532,7 @@ es:
             db_card: Inspección de tarjeta de base de datos
           status:
             deny_not_change_own_account: cambiar el estado de su propia cuenta
-          token:
+          api_key:
             private_data: Datos privados
             error_token_not_found: token no encontrado
             error_token_expired: token caducado

data/db/migrate_core_cards/20150610180019_add_recaptcha_key_and_admin_info_cards.rb

@@ -48,10 +48,10 @@ class AddRecaptchaKeyAndAdminInfoCards < Card::Migration::Core
   end
 
   def admin_only args
-    create_or_update args.reverse_merge(type_id: Card::PhraseID)
+    create_or_update! args.reverse_merge(type_id: Card::PhraseID)
     %w(*read *update *delete).each do |perm|
-      create_or_update name: "#{args[:name]}+*self+#{perm}",
-                       content: "[[Administrator]]"
+      create_or_update! name: "#{args[:name]}+*self+#{perm}",
+                        content: "[[Administrator]]"
     end
   end
 end

data/db/migrate_core_cards/20160801143221_change_bootstrap_card_type_to_scss.rb

@@ -2,7 +2,7 @@
 
 class ChangeBootstrapCardTypeToScss < Card::Migration::Core
   def up
-    create_or_update name: "*machine cache", codename: "machine_cache"
+    create_or_update! name: "*machine cache", codename: "machine_cache"
     if (card = Card[:bootstrap_cards])
       card.update! type_id: Card::ScssID
     end

data/db/migrate_core_cards/20160804112510_reorganize_scripts.rb

@@ -2,7 +2,7 @@
 
 class ReorganizeScripts < Card::Migration::Core
   def up
-    create_or_update name: "*machine cache", codename: "machine_cache"
+    create_or_update! name: "*machine cache", codename: "machine_cache"
     ensure_card name: "script: mods", type_id: Card::PointerID,
                 codename: "script_mods"
     ensure_card name: "script: editors", type_id: Card::PointerID,

data/db/migrate_core_cards/20160908154210_add_trash_card.rb

@@ -2,6 +2,6 @@
 
 class AddTrashCard < Card::Migration::Core
   def up
-    create_or_update name: "*trash", codename: "trash"
+    create_or_update! name: "*trash", codename: "trash"
   end
 end

data/db/migrate_core_cards/20180508210903_add_json_type.rb

@@ -3,8 +3,8 @@
 class AddJsonType < Card::Migration::Core
   def up
     ensure_card "json", codename: "json", type_id: Card::CardtypeID
-    update_card :ace, type_id: Card::JsonID
-    update_card :prose_mirror, type_id: Card::JsonID
-    update_card :tiny_mce, type_id: Card::JsonID
+    update_card! :ace, type_id: Card::JsonID
+    update_card! :prose_mirror, type_id: Card::JsonID
+    update_card! :tiny_mce, type_id: Card::JsonID
   end
 end

data/db/migrate_core_cards/20180712042655_head_rule.rb

@@ -2,7 +2,7 @@
 
 class HeadRule < Card::Migration::Core
   def up
-    update_card :head, type_id: Card::SettingID
+    update_card! :head, type_id: Card::SettingID
     ensure_card [:all, :head],
                 type_id: Card::HTMLID,
                 content: "{{*head|core}}"

data/db/migrate_core_cards/{20180905061536_migrate_layouts.rb → 20180905061537_migrate_layouts.rb}

@@ -15,10 +15,21 @@ class MigrateLayouts < Card::Migration::Core
 
     puts "updating layout '#{card.name}'"
     card.update! content: body.to_s
+  rescue Card::Error => e
+    card.update! type_id: Card::HtmlID, content: body.to_s
+    puts "failed to complete layout upgrade for '#{card.name}': #{e.message}.\n" \
+         "To fix, go to /#{card.name.url_key}?view=edit and change type to Layout. \n" \
+         "You will need to make sure the layout content includes a main nest ({{_main}})."
   end
 
   def body_tag card
-    card.content[/<body[^>]+>.*<\/body>/mi]
+    card.content[/<body[^>]*>.*<\/body>/mi] || add_body_tag(card)
+  end
+
+  def add_body_tag card
+    content = card.content.gsub('<!DOCTYPE HTML>', '')
+                          .gsub(/\{\{\*head[^}]*\}\}/i, '').strip
+    "<body>\n  #{content}\n</body>"
   end
 
   def create_head_rules layout_card

data/db/migrate_core_cards/20190204195039_add_rule_card.rb

@@ -3,5 +3,8 @@
 class AddRuleCard < Card::Migration::Core
   def up
     ensure_card "*rule", codename: "rule", type_id: Card::SetID
+
+    # the following re-registers set patterns, now including the rule pattern
+    Card::Mod::Loader.reload_mods
   end
 end

data/db/migrate_core_cards/20190320091257_upgrade_recaptcha_to_v3.rb

@@ -2,8 +2,8 @@
 
 class UpgradeRecaptchaToV3 < Card::Migration::Core
   def up
-    update_card [:recaptcha_settings, :self, :structure],
-                content: <<-STRING
+    update_card! [:recaptcha_settings, :self, :structure],
+                 content: <<-STRING
 {{+site key}}
 {{+secret key}}
 {{+minimum score}}
@@ -14,10 +14,9 @@ class UpgradeRecaptchaToV3 < Card::Migration::Core
       codename = "recaptcha_#{old_name}_key".to_sym
       next unless Card::Codename[codename]
 
-      update_card codename,
-                  name: "#{Card[:recaptcha_settings].name}+#{new_name} key",
-                  codename: "recaptcha_#{new_name}_key"
-
+      update_card! codename,
+                   name: "#{Card[:recaptcha_settings].name}+#{new_name} key",
+                   codename: "recaptcha_#{new_name}_key"
     end
 
     ensure_card [Card[:recaptcha_settings].name, "minimum score"],

data/db/migrate_core_cards/20190417142612_reorganize_scripts_2.rb

@@ -4,9 +4,9 @@ class ReorganizeScripts2 < Card::Migration::Core
   def up
     delete_code_card :script_card_menu
     if Card::Codename[:script_slot]
-      update_card :script_slot, name: "script: decko",
-                                codename: "script_decko",
-                                update_referers: true
+      update_card! :script_slot, name: "script: decko",
+                                 codename: "script_decko",
+                                 update_referers: true
     end
     if (card = Card[:all, :script])
       card.drop_item "script: card menu"

data/db/migrate_core_cards/20190502130029_add_shark_and_help_desk_role.rb

@@ -3,16 +3,15 @@
 class AddSharkAndHelpDeskRole < Card::Migration::Core
   def up
     # delete_code_card :eagle
-    # update :anyone_signed_in, name: "Eagle", update_referers: true
     ensure_role "Shark", codename: "shark"
     ensure_role "Help Desk", codename: "help_desk"
 
     ensure_card "*account settings",
                 codename: "account_settings", type_id: Card::BasicID
 
-    update_card "Decker Menu", name: "Shark Menu", update_referers: true
-    update_card :ace, name: "*ace"
-    update_card "*google_analytics_key", name: "*google analytics key"
+    update_card! "Decker Menu", name: "Shark Menu", update_referers: true
+    update_card! :ace, name: "*ace"
+    update_card! "*google_analytics_key", name: "*google analytics key"
 
     remove_deprecated_cards
     delete_right_read_permissions
@@ -25,7 +24,7 @@ class AddSharkAndHelpDeskRole < Card::Migration::Core
                 administrator+dashboard administrator+description
                 shark+dashboard shark+description
                 help_desk+dashboard help_desk+description
-                anyone_signed_in+dashboard eagle+description
+                anyone_signed_in+dashboard
                 *recaptcha_settings+*self+*structure
                 *account_settings+*right+*structure
                 *getting_started+shark

data/db/migrate_core_cards/20190618110446_add_dropdown_divider.rb

@@ -3,6 +3,6 @@
 class AddDropdownDivider < Card::Migration::Core
   def up
     ensure_code_card "*dropdown divider", type_id: Card::HtmlID
-    merge_pristine_cards %w[*main_menu *getting_started+link]
+    merge_pristine_cards %w[*main_menu *getting_started_link]
   end
 end

data/db/migrate_core_cards/20190710090209_homepage_tweaks.rb

@@ -0,0 +1,17 @@
+# -*- encoding : utf-8 -*-
+
+class HomepageTweaks < Card::Migration::Core
+  def up
+    merge_cards ["*getting started", "*main menu", "*getting started links"]
+    update_card! :wagn_bot, name: "Decko Bot", update_referers: true
+    delete_code_card :customized_skin
+    delete_code_card :bootswatch_theme
+    unless Card.fetch_name(:basic) == "RichText"
+      update_card! :basic, name: "RichText", update_referers: true
+    end
+    unless Card.fetch_name(:json) == "JSON"
+      update_card! :json, name: "JSON", update_referers: true
+    end
+    delete_card "*getting started+links"
+  end
+end

data/db/migrate_core_cards/20190820155833_update_cardtype_type_structure.rb

@@ -0,0 +1,7 @@
+# -*- encoding : utf-8 -*-
+
+class UpdateCardtypeTypeStructure < Card::Migration::Core
+  def up
+    merge_cards %w[cardtype+*type+*structure Administrator+dashboard Shark+dashboard]
+  end
+end

data/db/migrate_core_cards/20190822093633_move_help_text_to_code.rb

@@ -0,0 +1,38 @@
+# -*- encoding : utf-8 -*-
+
+class MoveHelpTextToCode < Card::Migration::Core
+  def up
+    update_card! "*sidebar", codename: "sidebar"
+    Card::Cache.reset_all
+
+    # avoid that "list" as input option gets the description of the cardtype "list"
+    ensure_card [:input, :right, :options_label], "options description"
+
+
+    remove_setting_help_rules
+    remove_search_help_rules
+    remove_self_help_rules :favicon, :tiny_mce, :favicon, :datepicker, "*debugger",
+                           :prose_mirror, :sidebar
+  end
+
+  def remove_search_help_rules
+    %i[created edited children includes refers_to links_to included_by linked_to_by
+       referred_to_by mates editors follow].each do |trait|
+      delete_card [trait, :right, :help]
+    end
+  end
+
+  def remove_setting_help_rules
+    %i[script input read update create delete accountable add_help autoname captcha create
+       default structure comment follow_fields options thanks layout options_label help
+       head table_of_contents style on_create on_update on_delete].each do |trait|
+      delete_card [trait, :right, :help]
+    end
+  end
+
+  def remove_self_help_rules *anchors
+    anchors.each do |a|
+      delete_card [a, :self, :help]
+    end
+  end
+end

data/db/migrate_core_cards/20190823220018_cleanup_for_decko_1_0.rb

@@ -0,0 +1,21 @@
+# -*- encoding : utf-8 -*-
+
+class CleanupForDecko10 < Card::Migration::Core
+  def up
+    ensure_card "Cards with account", codename: "cards_with_account",
+                content: '{"right_plus": "*account"}'
+
+    %i[delete create update comment].each do |perm|
+      delete_card [perm, :right, :options]
+    end
+    delete_card "*missing link"
+    # delete_card "tags"
+    delete_card "*tagged"
+    merge_cards "*account"
+    update_card! "*included by",
+                 name: "*nested by", codename: "nested_by", update_referers: true
+    update_card! "*includes",
+                 name: "*nests", codename: "nests", update_referers: true
+    ensure_card "*members", codename: "members"
+  end
+end

data/db/migrate_core_cards/20190826132738_add_more_guides.rb

@@ -0,0 +1,7 @@
+# -*- encoding : utf-8 -*-
+
+class AddMoreGuides < Card::Migration::Core
+  def up
+    merge_cards %w[Cardtype+*type+*guide *structure+*right+*guide]
+  end
+end

data/db/migrate_core_cards/20190829093961_cardtype_grouping.rb

@@ -0,0 +1,16 @@
+# -*- encoding : utf-8 -*-
+
+class CardtypeGrouping < Card::Migration::Core
+  CONTENT =
+    <<-EOT
+      {{+description|content}}
+      
+      {{_|add_button}} {{_|configure_button}}
+      
+      {{_|grouped_list}}
+    EOT
+
+  def up
+    ensure_card [:cardtype, :self, :structure], content: CONTENT
+  end
+end

data/db/migrate_core_cards/20190829205148_remove_add_help.rb

@@ -0,0 +1,14 @@
+# -*- encoding : utf-8 -*-
+
+class RemoveAddHelp < Card::Migration::Core
+  def up
+    Card.search(right: { codename: "add_help" },
+                left: { type_id: Card::SetID }).each do |card|
+      next if Card.exists? [card.left, :help]
+
+      ensure_card [card.left, :help], content: card.content
+    end
+    delete_code_card :add_help
+    Card::Cache.reset_all
+  end
+end

data/db/migrate_core_cards/20190830131820_setting_settings_aside.rb

@@ -0,0 +1,17 @@
+# -*- encoding : utf-8 -*-
+
+class SettingSettingsAside < Card::Migration::Core
+  def up
+    ensure_card %i[account right create], "Administrator"
+    ensure_card %i[signup account type_plus_right create], "_left"
+    ensure_card %i[user account type_plus_right create], "_left"
+
+    %i[email password status token salt].each do |field|
+      # now handled by inheritance
+      delete_card [field, :right, :create]
+    end
+
+    delete_code_card :accountable
+    delete_code_card :comment
+  end
+end