card 1.97.0.1 → 1.99.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b2e447c1b60d117cd089591bb6d4b80a5529a54
-  data.tar.gz: cc433aa364ee224cfeee9d7d9d43ff159f62994b
+  metadata.gz: eeeb9b091c1ba4ba4a19952639c917a7ad212144
+  data.tar.gz: d985620049eaca51f1bdbf1e6838ed28993f0643
 SHA512:
-  metadata.gz: 68dce4a96f89f3e828046aafaeb92b0765f4222d0614f169e89f1fa3fdd44d024f86c537fc343e008bcd7336692eb4370d75749c39c5deb6de51acecd108f37d
-  data.tar.gz: f29d069cb0a75d53fbe05a0fed95d158e171b1dac122e9cdd841b0cbab79a2a934287e1b80018e26695fda183c1a16efc5bf1917b8a91694213583a299d092f5
+  metadata.gz: 878603101a1aa503616f7fea944513d490931abb05530ba18ad344795d2c8e173be4cfa9582cb1e09aab34c11806e11f18ab446e5e23fb86ab16523eb7eb30f0
+  data.tar.gz: a13e08715c72c33f5598335986ab667fce7cab449908018676b1c2aa81ad2edf87fec4da8f5ffa25da9924b6c1a75f7a155ce6651d4f77b5fbbd479bec369327

data/.yardopts

@@ -1,10 +1,12 @@
-lib/**/*.rb                       \
-mod/*/format/*.rb                 \
-mod/*/chunk/*.rb                  \
-mod/*/lib/**/*.rb                 \
-tmpsets/set*/**/*.rb -            \
-**/*.rdoc                         \
-GPL                               \
-LICENSE                           \
+lib/**/*.rb
+mod/*/format/*.rb
+mod/*/chunk/*.rb
+mod/*/lib/**/*.rb
+tmpsets/set*/**/*.rb -
+**/*.rdoc
+*.md
+mod/*/*.md
+GPL
+LICENSE
 VERSION
 --markup markdown

data/LICENSE

@@ -1,4 +1,3 @@
-Card
 Copyright (C) 2013 Grass Commons
 
 This program is free software; you can redistribute it and/or

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.9.0

data/config/locales/de.yml

@@ -342,9 +342,9 @@ de:
               sign_up: registrieren
               read_only: Wir sind im Moment im Nur-Lese-Modus. Versuche es später noch einmal.
               sorry: Sorry!
-              need_permission_task: You need permission to %{task} this.
+              need_permission_task: Sie habe nicht die Berechtigung, %{task}.
               to_do_that: das zu tun
-              denied_task: zu %{denied_task} dies
+              denied_task: dies zu %{denied_task}
             form:
               unsupported_action_class: "unsupported card_form action class: %{actionclass}"
               submit: Speichern
@@ -445,15 +445,9 @@ de:
           cardtype:
             cards_exist: Entschuldigung, diese Karten muss ein Kartentyp bleiben, solange es noch %{cardname}-Karten gibt.
             add_card: Füge %{cardname} hinzu
+            configure_card: Configuriere %{cardname}
             error_cant_alter: kann dieseh Typ nicht ändern; es gibt noch %{name}-Karten
             error_invalid_character_in_cardtype: "die folgenden Zeichen sind nicht erlaubt: %{banned}"
-          list:
-            type_right: benötigt einen Kartentypnamen als rechten Teil
-            conflict_item_type: name conflicts with list items' type; delete content first
-            only_type_allowed: "%{cardname} has wrong cardtype; only cards of type %{cardtype} are allowed"
-          listed_by:
-            cardtype_right: benötigt einen Kartentypnamen als rechten Teil
-            only_type: "%{cardname} hat falschen Kartentyp; nur Karten mit Typ %{cardtype} sind erlaubt"
           number:
             not_numeric: "'%{content}' ist nicht numerisch"
           search_type:
@@ -481,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})
@@ -503,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
@@ -533,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.
@@ -578,8 +572,9 @@ de:
           admin_info:
             email_off: E-Mail-Versand ist ausgeschaltet. Ändere die Einstellungen in %{path}, damit Benachrichtigungen verschickt werden, wenn sich neue Nutzer registrieren.
             admin_warn: ADMINISTRATOR WARNUNG
-            captcha_temp: Dein Deck arbeitet mit provisorischen Captcha-Einstellungen. Das ist kein Problem für eine lokale Installation, aber falls du diese Seite online stellst, benötigst Du neue Recaptcha-Schlüssel.
-            captcha_keys: Dein Deck ist so konfiguriert, dass es [[*captcha]] nutzt, aber damit das funktioniert, benötigst Du neue Recaptcha-Schlüssel.
+            captcha_temp: Dein Deck arbeitet mit provisorischen Captcha-Einstellungen. Das ist kein Problem für eine lokale Installation, aber falls du diese Seite online stellst, benötigst Du neue %{recaptcha_link}.
+            captcha_keys: Dein Deck ist so konfiguriert, dass es %{captcha_link} nutzt, aber damit das funktioniert, benötigst Du neue %{recaptcha_link}.
+            recaptcha_keys: Recaptcha-Schlüssel
             instructions: Anleitungen
             howto_add_keys: "Neue Recaptcha-Schlüssel hinzufügen:"
             howto_register: Registriere deine Domain bei %{recaptcha_link}
@@ -587,4 +582,13 @@ de:
             howto_turn_off: 'Captcha ausschalten:'
             howto_go: Gehe zu %{captcha_card}
             howto_update: Ändere alle *captcha-Regeln zu "no".
-
+    :pointer:
+      set:
+        type:
+          mirrored_list:
+            cardtype_right: benötigt einen Kartentypnamen als rechten Teil
+            conflict_item_type: name conflicts with list items' type; delete content first
+            only_type_allowed: "%{cardname} has wrong cardtype; only cards of type %{cardtype} are allowed"
+          mirror_listed:
+            cardtype_right: benötigt einen Kartentypnamen als rechten Teil
+            only_type: "%{cardname} hat falschen Kartentyp; nur Karten mit Typ %{cardtype} sind erlaubt"

data/config/locales/en.yml

@@ -352,7 +352,7 @@ en:
               sign_up: sign up
               read_only: We are currently in read-only mode.  Please try again later.
               sorry: Sorry!
-              need_permission_task: You need permission to %{task} this.
+              need_permission_task: You need permission %{task}.
               to_do_that: to do that
               denied_task: to %{denied_task} this
             form:
@@ -419,15 +419,9 @@ en:
           cardtype:
             cards_exist: Sorry, this card must remain a Cardtype so long as there are %{cardname} cards.
             add_card: Add %{cardname}
+            configure_card: Configure %{cardname}
             error_cant_alter: can't alter this type; %{name} cards still exist
             error_invalid_character_in_cardtype: "may not contain any of the following characters: %{banned}"
-          list:
-            type_right: must have a cardtype name as right part
-            conflict_item_type: name conflicts with list items' type; delete content first
-            only_type_allowed: "%{cardname} has wrong cardtype; only cards of type %{cardtype} are allowed"
-          listed_by:
-            cardtype_right: must have a cardtype name as right part
-            only_type: "%{cardname} has wrong cardtype; only cards of type %{cardtype} are allowed"
           number:
             not_numeric: "'%{content}' is not numeric"
           search_type:
@@ -454,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
@@ -482,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})
@@ -504,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
@@ -550,8 +544,9 @@ en:
           admin_info:
             email_off: Email delivery is turned off. Change settings in %{path} to send sign up notifications.
             admin_warn: ADMINISTRATOR WARNING
-            captcha_temp: 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.
-            captcha_keys: You are configured to use [[*captcha]], but for that to work you need new recaptcha keys.
+            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.
+            captcha_keys: You are configured to use %{captcha_link}, but for that to work you need new %{recaptcha_link}.
+            recaptcha_keys: recaptcha keys
             instructions: Instructions
             howto_add_keys: "How to add new recaptcha keys:"
             howto_register: Register your domain at %{recaptcha_link}
@@ -559,6 +554,16 @@ en:
             howto_turn_off: 'How to turn captcha off:'
             howto_go: Go to %{captcha_card}
             howto_update: Update all *captcha rules to "no".
+    :pointer:
+      set:
+        type:
+          mirrored_list:
+            cardtype_right: must have a cardtype name as right part
+            conflict_item_type: name conflicts with list items' type; delete content first
+            only_type_allowed: "%{cardname} has wrong cardtype; only cards of type %{cardtype} are allowed"
+          mirror_list:
+            cardtype_right: must have a cardtype name as right part
+            only_type: "%{cardname} has wrong cardtype; only cards of type %{cardtype} are allowed"
     :edit:
       set:
         all:

data/config/locales/es.yml

@@ -82,7 +82,7 @@ es:
           built_in: "Diseños incorporados: %{built_in_layouts}"
       set:
         all:
-          codename: 
+          codename:
             only_admins_codename: solo los administradores pueden establecer el nombre clave
             error_code_in_use: nombre clave %{codename} ya esta en uso
           event:
@@ -199,7 +199,7 @@ es:
           json:
             invalid_json: invalid json
     :bootstrap:
-      set: 
+      set:
         type:
             customized_bootswatch_skin:
               not_valid_theme: no es un tema valido %{theme_name}
@@ -232,7 +232,7 @@ es:
         abstract:
           permission:
             search_roles_by_name: Roles por Nombre
-            use_lefts_rule: Usar la regla %{tag} 
+            use_lefts_rule: Usar la regla %{tag}
             groups: Grupos
             individuals: Individuos
             inherit_links: Heredar ( %{links} )
@@ -351,7 +351,7 @@ es:
               sign_up: Regístrate
               read_only: Actualmente estamos en modo de solo lectura. Por favor, inténtelo de nuevo más tarde.
               sorry: Lo siento!
-              need_permission_task: Necesitas permiso para %{task} esto.
+              need_permission_task: Necesitas permiso %{task}.
               to_do_that: para hacer eso
               denied_task: a %{denied_task} esto
             form:
@@ -456,13 +456,6 @@ es:
             add_card: Agregar %{cardname}
             error_cant_alter: no puede alterar este tipo; %{name} las tarjetas todavía existen
             error_invalid_character_in_cardtype: "no puede contener ninguno de los siguientes caracteres: %{banned}"
-          list:
-            type_right: debe tener un nombre de cardtype como parte derecha
-            conflict_item_type: el nombre entra en conflicto con elementos de la lista' tipo; eliminar contenido primero
-            only_type_allowed: "%{cardname} tiene un tipo de tarjeta incorrecto; solo cartas de tipo %{cardtype} están permitidos"
-          listed_by:
-            cardtype_right: debe tener un nombre de tipo de tarjeta como parte derecha
-            only_type: "%{cardname} tiene un cardtype incorrecto; solo cartas de tipo %{cardtype} están permitidos"
           number:
             not_numeric: "'%{content}' no es numerico"
           search_type:
@@ -489,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
@@ -517,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})
@@ -539,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
@@ -583,8 +576,9 @@ es:
           admin_info:
             email_off: La entrega del correo electrónico está desactivada. Cambie la configuración en %{path} para enviar notificaciones de registro.
             admin_warn: ADVERTENCIA DEL ADMINISTRADOR
-            captcha_temp: Su captcha actualmente está trabajando con configuraciones temporales. Esto está bien para una instalación local, pero necesitará nuevas claves recaptcha si desea que este sitio sea público.
-            captcha_keys: Está configurado para usar [[*captcha]], pero para que funcione necesita nuevas claves recaptcha.
+            captcha_temp: Su captcha actualmente está trabajando con configuraciones temporales. Esto está bien para una instalación local, pero necesitará nuevas %{recaptcha_link} si desea que este sitio sea público.
+            captcha_keys: Está configurado para usar %{captcha_link}, pero para que funcione necesita nuevas %{recaptcha_link}.
+            recaptcha_keys: claves recaptcha
             instructions: Instrucciones
             howto_add_keys: "Cómo agregar nuevas claves recaptcha:"
             howto_register: Registre su dominio en %{recaptcha_link}
@@ -592,5 +586,14 @@ es:
             howto_turn_off: 'Cómo desactivar el captcha:'
             howto_go: Ir a %{captcha_card}
             howto_update: Actualice todas las reglas *captcha a "no".
+    :pointer:
+      set:
+        mirrored_list:
+          cardtype_right: debe tener un nombre de cardtype como parte derecha
+          conflict_item_type: el nombre entra en conflicto con elementos de la lista' tipo; eliminar contenido primero
+          only_type_allowed: "%{cardname} tiene un tipo de tarjeta incorrecto; solo cartas de tipo %{cardtype} están permitidos"
+        mirror_list:
+          cardtype_right: debe tener un nombre de tipo de tarjeta como parte derecha
+          only_type: "%{cardname} tiene un cardtype incorrecto; solo cartas de tipo %{cardtype} están permitidos"
 
 

data/db/migrate_core_cards/20150116220620_add_markdown_type.rb

@@ -0,0 +1,7 @@
+# -*- encoding : utf-8 -*-
+
+class AddMarkdownType < Card::Migration
+  def up
+    ensure_card :name=>'Markdown', :codename=>'markdown', :type_id=>Card::CardtypeID
+  end
+end

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/20180905061537_migrate_layouts.rb

@@ -0,0 +1,75 @@
+# -*- encoding : utf-8 -*-
+
+class MigrateLayouts < Card::Migration::Core
+  def up
+    Card.search referred_to_by: { right: :layout } do |card|
+      create_head_rules card
+      update_layout_card card
+    end
+  end
+
+  # strip layout content down to body tag
+  def update_layout_card card
+    body = body_tag card
+    missing "body", card unless body.present?
+
+    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] || 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
+    head = find_head_content layout_card
+    return missing "head", layout_card unless head
+
+    each_layout_set layout_card do |set_name|
+      puts "creating head rule for '#{set_name}'"
+      ensure_card [set_name, :head], content: head, type_id: Card::HtmlID
+    end
+  end
+
+  def find_head_content card
+    head_tag(card) || find_nested_head(card)
+  end
+
+  def head_tag card
+    if (match = card.content.match(/<head>(.*)<\/head>/mi))
+      match[1].strip
+    end
+  end
+
+  def missing obj, card
+    puts "warning: couldn't find #{obj} in layout '#{card.name}'"
+  end
+
+  def each_layout_set layout_card
+    Card.search(link_to: layout_card.name) do |rule|
+      yield rule.name.left
+    end
+  end
+
+  private
+
+  def find_nested_head card
+    # we go only one level deep
+    Card::Content.new(card.content, card, chunk_list: :nest_only).each_chunk do |chunk|
+      nested = chunk.referee_card
+      return head_tag(nested) if nested&.content&.match?(/<head>/i)
+    end
+    nil
+  end
+end