card 1.93.13 → 1.94.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '0565498a57c12cee5413854a7abdcd5f419ae185'
-  data.tar.gz: 768181a64e6a5a025969c04eb256c23533e0ce07
+  metadata.gz: 8108ea9c272fbf1d35f39674c2fabc4f422154b9
+  data.tar.gz: 1c554ea42be6ddfded470c10d9c32baf1ddd686a
 SHA512:
-  metadata.gz: 1e854a627aefe2fff81b0af9e64954d96c3122da3c2a67e00ac9dc780d5c0638562fcb99364bc148895aa1f759e6cd67018ca1d1154f32ddc7570bb2d5dbf0cf
-  data.tar.gz: b7f5efe77ba0531054c4f378db9b1ef375d350ee831316665ae574ce5a24067c9e85367596552301fd8ef43b37ecae764016a3de7ea0e93adc22485dccc8ab4a
+  metadata.gz: '019228759816d0c42326e921ecfbd1393328b6e20c7e01fcc5f894593699481b87b604976b5a9ffaf23bbcee9295aa1d2c059089a6db0f6b43b87ff8c0a0cf8d'
+  data.tar.gz: 0c75e8da55c96f4b98f43e26c23666eeb8d832b434993f60cd55f541f79590ba3cd1bff1ab9e562474b7afc62ab68d2b75e6940fe1bd383fe03555d7b64695a0

data/VERSION

@@ -1 +1 @@
-0.3.13
+0.4.0

data/config/initializers/01_core_extensions/persistent_identifiers.rb

@@ -1,12 +1,20 @@
 module CoreExtensions
   # methods for codenames and numerical ids
+  # included in Integer and Symbol
   module PersistentIdentifier
+    # interpret symbol/integer as codename/id
     def card
       Card[self]
     end
 
+    # interpret symbol/integer as codename/id
     def cardname
       Card.quick_fetch(self).name
     end
+
+    # don't interpret symbol/integer as codename/id
+    def to_name
+      Card::Name.new to_s
+    end
   end
 end

data/config/locales/de.yml

@@ -421,6 +421,7 @@ de:
             cards_exist: Entschuldigung, diese Karten muss ein Kartentyp bleiben, solange es noch %{cardname}-Karten gibt.
             add_card: Füge %{cardname} hinzu
             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

data/config/locales/en.yml

@@ -431,6 +431,7 @@ en:
             cards_exist: Sorry, this card must remain a Cardtype so long as there are %{cardname} cards.
             add_card: Add %{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

data/lib/card.rb

@@ -139,7 +139,8 @@ class Card < ApplicationRecord
     # :remove_rule_stash,
     :last_action_id_before_edit,
     :only_storage_phase,           # used to save subcards
-    :changed_attributes
+    :changed_attributes,
+    :skip_event
   )
 
   def serializable_attributes

data/lib/card/cache.rb

@@ -97,7 +97,7 @@ class Card
       # (the non-standard caches)
       def reset_other
         Card::Codename.reset_cache
-        Card.delete_tmp_files
+        Cardio.delete_tmp_files!
       end
 
       # generate a cache key from an object

data/lib/card/content/clean.rb

@@ -10,14 +10,16 @@ class Card
 
       # allowed attributes
       allowed_tags.merge!(
-        "a" => %w(href title target),
-        "img" => %w(src alt title),
+        "a" => %w[href title target],
+        "img" => %w[src alt title],
         "code" => ["lang"],
         "blockquote" => ["cite"]
       )
 
       if Card.config.allow_inline_styles
-        allowed_tags["table"] += %w(cellpadding align border cellspacing)
+        allowed_tags["table"] += %w[cellpadding align border cellspacing data-mce-style]
+        allowed_tags["td"] += %w[scope data-mce-style]
+        allowed_tags["th"] += %w[scope data-mce-style]
       end
 
       allowed_tags.each_key do |k|
@@ -61,7 +63,7 @@ class Card
         return ['"', nil] unless all_attributes =~ /\b#{attrib}\s*=\s*(?=(.))/i
         q = '"'
         rest_value = $'
-        if (idx = %w(' ").index Regexp.last_match(1))
+        if (idx = %w[' "].index Regexp.last_match(1))
           q = Regexp.last_match(1)
         end
         reg_exp = ATTR_VALUE_RE[idx || 2]

data/lib/card/format/error.rb

@@ -14,7 +14,7 @@ class Card
 
       def error_cardname
         if card&.name.present?
-          card.name
+          safe_name
         else
           I18n.t :no_cardname, scope: [:lib, :card, :format, :error]
         end

data/lib/card/format/render.rb

@@ -49,7 +49,7 @@ class Card
       def add_debug_info view, method, rendered
         return rendered unless show_debug_info?
         <<-HTML
-          <view-debug view='#{card.name}##{view}' src='#{pretty_path method.source_location}' module='#{method.owner}'/>
+          <view-debug view='#{safe_name}##{view}' src='#{pretty_path method.source_location}' module='#{method.owner}'/>
           #{rendered}
         HTML
       end

data/lib/card/mod.rb

@@ -52,7 +52,12 @@ class Card
   module Mod
     class << self
       def load
-        Loader.load_mods
+        return if ENV["CARD_MODS"] == "none"
+        if Card.take
+          Loader.load_mods
+        else
+          Rails.logger.warn "empty database"
+        end
       end
 
       # @return an array of Rails::Path objects

data/lib/card/mod/loader.rb

@@ -44,6 +44,8 @@ class Card
           load_formats
           SetLoader.new.load
           load_initializers
+          # rescue
+          # raise Card::Error, "unrescued error loading mods"
         end
 
         def load_chunks

data/lib/card/name.rb

@@ -19,15 +19,35 @@ class Card
       def [] *cardish
         cardish = cardish.first if cardish.size <= 1
         case cardish
-        when Card            then cardish.name
-        when Symbol, Integer then Card.fetch_name(cardish)
-        when Array           then compose cardish
-        else                      cardish.to_name
+        when Card             then cardish.name
+        when Symbol, Integer  then Card.fetch_name(cardish)
+        when Array            then compose cardish
+        when String, NilClass then new cardish
+        else
+          raise ArgumentError, "#{cardish.class} not supported as name identifier"
         end
       end
 
+      def new str, validated_parts=nil
+        return compose str if str.is_a?(Array)
+
+        str = str.to_s
+        if !validated_parts && str.include?(joint)
+          compose Cardname.split_parts(str)
+        elsif special_prefix?(str)
+          Card.fetch_name str # handles ~ and :
+        else
+          super str
+        end
+      end
+
+      def special_prefix? str
+        str.start_with? "~", ":"
+      end
+
       def compose parts
-        new parts.flatten.map { |part| self[part] }.join(joint)
+        name_parts = parts.flatten.map { |part| self[part] }
+        new name_parts.join(joint), true
       end
 
       def url_key_to_standard key

data/lib/card/query/attributes.rb

@@ -27,18 +27,11 @@ class Card
       # content.
       # Example: { match: "name or content" } vs. { name: ["match", "a name"] }
       def match val
-        cxn = connection
         val.gsub!(/[^#{Card::Name::OK4KEY_RE}]+/, " ")
         return nil if val.strip.empty?
 
         val_list = val.split(/\s+/).map do |v|
-          name_or_content = [
-            "replace(#{table_alias}.name,'+',' ')",
-            "#{table_alias}.db_content"
-          ].map do |field|
-            %(#{field} #{cxn.match quote("[[:<:]]#{v}[[:>:]]")})
-          end
-          or_join name_or_content
+          name_or_content_match v
         end
         add_condition and_join(val_list)
       end
@@ -66,6 +59,18 @@ class Card
 
       private
 
+      def name_or_content_match val
+        cxn = connection
+        or_join(
+          [field_match("replace(#{table_alias}.name,'+',' ')", val, cxn),
+           field_match("#{table_alias}.db_content", val, cxn)]
+        )
+      end
+
+      def field_match field, val, cxn
+        %(#{field} #{cxn.match quote("[[:<:]]#{val}[[:>:]]")})
+      end
+
       def name_like patterns, extra_cond=""
         likes =
           Array(patterns).map do |pat|

data/lib/card/set/event.rb

@@ -98,7 +98,7 @@ class Card
       def set_event_callback object_method, kind, event, opts
         Card.class_eval do
           set_callback object_method, kind, event,
-                       prepend: true, if: proc { |c| c.event_applies?(opts) }
+                       prepend: true, if: proc { |c| c.event_applies?(event, opts) }
         end
       end
     end

data/lib/card/tasks/card.rake

@@ -105,4 +105,16 @@ namespace :card do
   task reset_machine_output: :environment do
     Card.reset_all_machines
   end
+
+  desc "refresh machine output"
+  task refresh_machine_output: :environment do
+    Card.reset_all_machines
+    Card::Auth.as_bot do
+      [%i[all script],
+       %i[all style],
+       %i[script_html5shiv_printshiv]].each do |name_parts|
+        Card[*name_parts].update_machine_output
+      end
+    end
+  end
 end

data/lib/card/tasks/card/migrate.rake

@@ -39,6 +39,7 @@ namespace :card do
     desc "migrate structure"
     task structure: :environment do
       ENV["SCHEMA"] ||= "#{Cardio.gem_root}/db/schema.rb"
+      ActiveRecord::Base.dump_schema_after_migration = false
       Cardio.schema_mode(:structure) do |paths|
         ActiveRecord::Migrator.migrations_paths = paths
         ActiveRecord::Migrator.migrate paths, version
@@ -49,6 +50,7 @@ namespace :card do
 
     desc "migrate core cards"
     task core_cards: :environment do
+      ActiveRecord::Base.dump_schema_after_migration = false
       require "card/migration/core"
       run_card_migration :core_cards
     end

data/lib/card/view/options.rb

@@ -41,7 +41,8 @@ class Card
         ],                 #   (Symbol<:always, :standard, :never>)
         none: [
           :skip_perms,     # do not check permissions for this view (Boolean)
-          :main_view       # this is main view of page (Boolean)
+          :main_view,      # this is main view of page (Boolean)
+          :layout          #
         ]
       }
       # Note: option values are strings unless otherwise noted

data/lib/cardio.rb

@@ -4,17 +4,15 @@ require "active_support/core_ext/numeric/time"
 djar = "delayed_job_active_record"
 require djar if Gem::Specification.find_all_by_name(djar).any?
 require "cardio/schema.rb"
+require "cardio/utils.rb"
 
 ActiveSupport.on_load :after_card do
-  if Card.take
-    Card::Mod.load
-  else
-    Rails.logger.warn "empty database"
-  end
+  Card::Mod.load
 end
 
 module Cardio
   extend Schema
+  extend Utils
   CARD_GEM_ROOT = File.expand_path("../..", __FILE__)
 
   mattr_reader :paths, :config
@@ -27,7 +25,9 @@ module Cardio
     def default_configs
       {
         read_only:              read_only?,
-        allow_inline_styles:    false,
+
+        # if you disable inline styles tinymce's formatting options stop working
+        allow_inline_styles:    true,
 
         recaptcha_public_key:   nil,
         recaptcha_private_key:  nil,

data/lib/cardio/utils.rb

@@ -0,0 +1,30 @@
+module Cardio
+  # Utilities that may need to be run even when mods are not loaded.
+  module Utils
+    def seed_test_db
+      system "env RAILS_ENV=test bundle exec rake db:fixtures:load"
+    end
+
+    # deletes tmp directory within files directory
+    # It's here because it gets called as part of cache clearing, which sometimes gets
+    # called in a context where card mods are not loaded.
+    # Why does cache clearing need to do this??
+    def delete_tmp_files! id=nil
+      raise "no files directory" unless files_dir
+      delete_tmp_files id
+    rescue StandardError
+      Rails.logger.info "failed to remove tmp files"
+    end
+
+    private
+
+    def delete_tmp_files id=nil
+      dir = [files_dir, "tmp", id.to_s].compact.join "/"
+      FileUtils.rm_rf dir, secure: true
+    end
+
+    def files_dir
+      @files_dir ||= Cardio.paths["files"].existent.first
+    end
+  end
+end

data/mod/account/set/self/signin.rb

@@ -24,7 +24,7 @@ format :html do
   end
 
   view :core, cache: :never do
-    voo.structure = true
+    voo.edit_structure = [signin_field(:email), signin_field(:password)]
     with_nest_mode :edit do
       card_form :update, recaptcha: :off do
         [
@@ -37,8 +37,7 @@ format :html do
   end
 
   def hidden_signin_fields
-    hidden_field_tag :success,
-                     "REDIRECT: #{Env.interrupted_action || '*previous'}"
+    hidden_field_tag :success, "REDIRECT: #{Env.interrupted_action || '*previous'}"
   end
 
   view :signin_buttons do
@@ -66,9 +65,8 @@ format :html do
 
   # FORGOT PASSWORD
   view :edit do
-    @forgot_password = true
     voo.title ||= card.i18n_signin(:forgot_password)
-    voo.structure ||= true
+    voo.edit_structure = [signin_field(:email)]
     voo.hide :help
     Auth.as_bot { super() }
   end
@@ -85,14 +83,6 @@ format :html do
     button_tag text, situation: "primary"
   end
 
-  view :content_formgroup do
-    fields = [signin_field(:email)]
-    fields << signin_field(:password) unless @forgot_password
-    voo.edit_structure = fields
-
-    super()
-  end
-
   def signin_field name
     nest_name = "".to_name.trait(name)
     [nest_name, { title: name.to_s, view: "titled",

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

@@ -48,7 +48,7 @@ format :html do
   end
 
   def signup_line
-    [ "<strong>#{card.name}</strong>",
+    [ "<strong>#{safe_name}</strong>",
       ("was" unless anonymous_signup?),
       "signed up on #{format_date card.created_at}"
     ].compact.join " "

data/mod/account/spec/set/self/signin_spec.rb

@@ -2,7 +2,7 @@
 
 # FIXME: need more specific assertions
 
-describe Card::Set::Self::Signin do
+RSpec.describe Card::Set::Self::Signin do
   before do
     @card = Card[:signin]
   end

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

@@ -9,6 +9,10 @@ format do
     name_variant card.name
   end
 
+  def safe_name
+    card&.name
+  end
+
   def name_variant name
     voo.variant ? name.to_name.vary(voo.variant) : name
   end
@@ -18,7 +22,7 @@ format do
   view(:url,      closed: true, perms: :none) { card_url _render_linkname }
 
   view :title, closed: true, perms: :none do
-    name_variant title_in_context(voo.title)
+    name_variant(title_in_context(voo.title))
   end
 
   view :url_link, closed: true, perms: :none do
@@ -66,8 +70,12 @@ format do
   # CONTENT VIEWS
 
   view :raw do
-    scard = voo.structure ? Card[voo.structure] : card
-    scard ? scard.content : _render_blank
+    structure_card&.content || _render_blank
+  end
+
+  def structure_card
+    return nil if voo.structure == true
+    voo.structure ? Card[voo.structure] : card
   end
 
   view :core, closed: true do