card 1.101.0 → 1.101.1

data/lib/card/query.rb

@@ -37,12 +37,13 @@ class Card
     require "card/query/clause"
     require "card/query/card_query"
     require "card/query/sql_statement"
+
     # Card::Query::CardQuery
-    # After conversion, ATTRIBUTES is a Hash where the key is the attribute
+    # After conversion, @attributes is a Hash where the key is the attribute
     # and the value is the attribute type:
     # { id: :basic, name: :basic, key: :basic ...}
     # This is used for rapid attribute type lookups in the interpretation phase.
-    ATTRIBUTES = {
+    @attributes = {
       # Each of the "basic" fields corresponds directly to a database field.
       # their values are translated fairly directly into SQL-safe values.
       # (These are referred to as "properties" in CQL documentation. Need to
@@ -87,6 +88,8 @@ class Card
     DEFAULT_ORDER_DIRS = { update: "desc", relevance: "desc" }.freeze
 
     class << self
+      attr_accessor :attributes
+
       def new statement, comment=nil
         Query::CardQuery.new statement, comment
       end
@@ -106,5 +109,7 @@ class Card
         txt
       end
     end
+
+    delegate :attributes, to: :class
   end
 end

data/lib/card/query/card_query/interpretation.rb

@@ -29,7 +29,7 @@ class Card
         def interpret_as_content? key
           # eg "match" is both operator and attribute;
           # interpret as attribute when "match" is key
-          OPERATORS.key?(key.to_s) && !ATTRIBUTES[key]
+          OPERATORS.key?(key.to_s) && !Query.attributes[key]
         end
 
         def interpret_as_modifier? key, val
@@ -43,7 +43,7 @@ class Card
         end
 
         def interpret_attributes attribute, val
-          attribute_type = ATTRIBUTES[attribute]
+          attribute_type = Query.attributes[attribute]
           if (method = INTERPRET_METHOD[attribute_type])
             send method, attribute, val
           else

data/lib/card/query/card_query/sorting.rb

@@ -16,10 +16,9 @@ class Card
         def sort val
           return nil unless full?
 
-          sort_field = val[:return] || "db_content"
-          val = val.clone
-          item = val.delete(:item) || "left"
-          sort_by val, item, sort_field
+          interpret_sort_hash val do |value, item, sort_field|
+            sort_by value, item, sort_field
+          end
         end
 
         def sort_by val, item, sort_field
@@ -95,6 +94,15 @@ class Card
           s.interpret val
           s
         end
+
+        private
+
+        def interpret_sort_hash val
+          val = val.symbolize_keys
+          item = val.delete(:item) || "left"
+          sort_field = val[:return] || "db_content"
+          yield val, item, sort_field
+        end
       end
     end
   end

data/lib/card/query/sql_statement.rb

@@ -79,7 +79,7 @@ class Card
       end
 
       def standard_full_field table, field
-        if ATTRIBUTES[field.to_sym] == :basic
+        if Query.attributes[field.to_sym] == :basic
           "#{table}.#{field}"
         else
           safe_sql field

data/lib/card/set/advanced_api.rb

@@ -10,17 +10,20 @@ class Card
       def ensure_set &block
         set_module = yield
         set_module = card_set_module_const_get(set_module) unless set_module.is_a?(Module)
-        set_module
-      rescue NameError => e
-        if e.message =~ /uninitialized constant (?:Card::Set::)?(.+)$/
-          define_set Regexp.last_match(1)
-        end
+      rescue NameError => error
+        define_set_from_error error
         # try again - there might be another submodule that doesn't exist
         ensure_set(&block)
       else
         set_module.extend Card::Set
       end
 
+      def define_set_from_error error
+        match = error.message.match(/uninitialized constant (?:Card::Set::)?(.+)$/)
+        return unless match
+        define_set match[1]
+      end
+
       def attachment name, args
         include_set Abstract::Attachment
         add_attributes name, "remote_#{name}_url".to_sym,

data/lib/card/set/event/options.rb

@@ -23,13 +23,21 @@ class Card
           if condition == :when
             validate_when_value val
           else
-            invalid = Array.wrap(val) - Api::OPTIONS[condition]
-            return if invalid.empty?
+            validate_standard_condition_value condition, val
+          end
+        end
 
-            raise ArgumentError,
-                  "invalid option#{'s' if invalid.size > 1} '#{invalid}' "\
+        def validate_standard_condition_value condition, val
+          invalid = invalid_condition_values condition, val
+          return if invalid.empty?
+
+          raise ArgumentError,
+                "invalid option#{'s' if invalid.size > 1} '#{invalid}' "\
                   "for condition '#{condition}' in event '#{@event}'"
-          end
+        end
+
+        def invalid_condition_values condition, val
+          Array.wrap(val) - Api::OPTIONS[condition]
         end
 
         def validate_when_value val

data/lib/card/set/format.rb

@@ -106,20 +106,27 @@ class Card
 
       def register_set_format format_class, mod
         if all_set?
-          all_set_format_mod! format_class, mod
+          register_all_set_format format_class, mod
         else
-          format_type = abstract_set? ? :abstract_format : :nonbase_format
-          # ready to include dynamically in set members' format singletons
-          format_hash = modules[format_type][format_class] ||= {}
-          format_hash[shortname] ||= []
-          format_hash[shortname] << mod
+          register_standard_set_format format_class, mod
         end
       end
 
       # make mod ready to include in base (non-set-specific) format classes
-      def all_set_format_mod! format_class, mod
-        modules[:base_format][format_class] ||= []
-        modules[:base_format][format_class] << mod
+      def register_all_set_format format_class, mod
+        add_to_array_val modules[:base_format], format_class, mod
+      end
+
+      def register_standard_set_format format_class, mod
+        format_type = abstract_set? ? :abstract_format : :nonbase_format
+        # ready to include dynamically in set members' format singletons
+        format_hash = modules[format_type][format_class] ||= {}
+        add_to_array_val format_hash, shortname, mod
+      end
+
+      def add_to_array_val hash, key, val
+        hash[key] ||= []
+        hash[key] << val
       end
 
       class << self

data/lib/card/set/trait.rb

@@ -28,7 +28,7 @@ class Card
 
       def add_attributes *args
         Card.set_specific_attributes ||= []
-        Card.set_specific_attributes += args.map(&:to_s)
+        Card.set_specific_attributes += args.map(&:to_sym)
         Card.set_specific_attributes.uniq!
       end
 
@@ -37,14 +37,11 @@ class Card
         Card::Set.traits[mod] || Card::Set.traits[mod] = {}
       end
 
-      def add_traits args, options
-        mod = self
-        mod_traits = get_traits mod
+      def add_traits traits, options
+        mod_traits = get_traits self
+        new_opts = new_trait_opts options
 
-        new_opts = options[:type] ? { type: options[:type] } : {}
-        new_opts[:default_content] = options[:default] if options[:default]
-
-        args.each do |trait|
+        traits.each do |trait|
           define_trait_card trait, new_opts
           define_trait_reader trait if options[:reader]
           define_trait_writer trait if options[:writer]
@@ -53,6 +50,12 @@ class Card
         end
       end
 
+      def new_trait_opts options
+        %i[type default_content].each_with_object({}).each do |key, hash|
+          hash[key] = options[key] if options[key]
+        end
+      end
+
       def define_trait_card trait, opts
         define_method "#{trait}_card" do
           fetch trait.to_sym, new: opts.clone, eager_cache: true

data/lib/card/subcards/add.rb

@@ -14,6 +14,8 @@ class Card
       #   add 'spoiler', content: 'John Snow is a Targaryen'
       #   add card_obj, delayed: true
 
+      include Args
+
       def << value
         add value
       end
@@ -61,7 +63,7 @@ class Card
       end
 
       def new_by_attributes name, attributes={}
-        attributes ||= {}
+        attributes = attributes&.symbolize_keys || {}
         absolute_name = absolutize_subcard_name name
         subcard_args = extract_subcard_args! attributes
         card = initialize_by_attributes absolute_name, attributes
@@ -75,31 +77,8 @@ class Card
         Card.assign_or_newish name, attributes, local_only: true
       end
 
-      # TODO: this method already exists as card instance method in
-      #   tracked_attributes.rb. Find a place for it where its accessible
-      #   for both. There is one important difference. The keys are symbols
-      # here instead of strings
-      def extract_subcard_args! args
-        subcards = args.delete(:subcards) || {}
-        if (subfields = args.delete(:subfields))
-          subfields.each_pair do |key, value|
-            subcards[normalize_subfield_key(key)] = value
-          end
-        end
-        args.keys.each do |key|
-          subcards[key] = args.delete(key) if key =~ /^\+/
-        end
-        subcards
-      end
-
       private
 
-      # ensure a leading '+'
-      def normalize_subfield_key key
-        key = Card::Codename.name(key) if key.is_a?(Symbol) && Card::Codename.exist?(key)
-        key.to_name.prepend_joint
-      end
-
       # Handles hash with several subcards
       def multi_add args
         args.each_pair do |key, val|

data/lib/card/subcards/args.rb

@@ -0,0 +1,42 @@
+class Card
+  class Subcards
+    # Handling shared subcard args processing
+    module Args
+      def extract_subcard_args! args
+        safe_subcard_args args do |subcards|
+          extract_explicit_subfields subcards, args
+          extract_implicit_subfields subcards, args
+        end
+      end
+
+      private
+
+      # FIXME: the following should be handled before it gets this far
+      def safe_subcard_args args
+        subcards = args.delete(:subcards) || {}
+        yield subcards
+        subcards.try(:to_unsafe_h) || subcards
+      end
+
+      def extract_explicit_subfields subcards, args
+        return unless (subfields = args.delete :subfields)
+
+        subfields.each_pair do |key, value|
+          subcards[normalize_subfield_key(key)] = value
+        end
+      end
+
+      # ensure a leading '+'
+      def normalize_subfield_key key
+        key = Card::Codename.name(key) if key.is_a?(Symbol) && Card::Codename.exist?(key)
+        key.to_name.prepend_joint
+      end
+
+      def extract_implicit_subfields subcards, args
+        args.each_key do |key|
+          subcards[key.to_s] = args.delete(key) if key.to_s.match?(/^\+/)
+        end
+      end
+    end
+  end
+end

data/lib/card/tasks/card/file_card_creator/output_helper.rb

@@ -14,17 +14,22 @@ class Card
         end
       end
 
-      def log_file_action path
-        status, color =
-          if File.exist?(path) && !@force
-            ["file exists (use 'force=true' to override)", :yellow]
-          else
-            status = File.exist?(path) ? "overridden" : "created"
-            yield
-            [status, :green]
-          end
+      def log_file_action path, &block
+        if File.exist?(path) && !@force
+          log_file_exists path
+        else
+          execute_and_log_file_action path, &block
+        end
+      end
+
+      def execute_and_log_file_action path
+        status = File.exist?(path) ? "overridden" : "created"
+        yield
+        color_puts status, :green, path
+      end
 
-        color_puts status, color, path
+      def log_file_exists path
+        color_puts "file exists (use 'force=true' to override)", :yellow, path
       end
 
       # insert content into a file at a given line number

data/lib/card/view/options.rb

@@ -30,7 +30,8 @@ class Card
           :nest_syntax,    # full nest syntax
           :wrap,           # wrap the nest with a wrapper
           :show,           # render these views when optional
-          :hide            # do not render these views when optional
+          :hide,           # do not render these views when optional
+          :unknown         # view to use if nested card is unknown
         ],                 #   show/hide can be view (Symbol), list of views (Array),
         #                      or comma separated views (String)
         # NOTE: although show and hide are in this non-inheriting group, they are

data/lib/card/view/permission.rb

@@ -28,11 +28,22 @@ class Card
         format.view_setting setting_name, view
       end
 
-      # by default views can't handle unknown cards, but this can be overridden in
-      # view definitions with the `unknown` directive
+      # views for unknown cards can be configured in view definitions
+      # or render/nest options (the latter take precedence)
       def alter_unknown
+        return if card.known?
+
+        unknown_from_options || unknown_from_view_definition
+      end
+
+      def unknown_from_options
+        unknown.to_sym if unknown.present?
+      end
+
+      def unknown_from_view_definition
         setting = setting(:unknown)
-        return if setting == true || card.known?
+        return if setting == true # use original view
+
         setting.is_a?(Symbol) ? setting : format.view_for_unknown(requested_view)
       end
 

data/lib/cardio.rb

@@ -39,70 +39,17 @@ module Cardio
       @cache ||= ::Rails.cache
     end
 
+    # TODO: many of these defaults should be in mods!
     def default_configs
-      {
-        read_only: read_only?,
-
-        # if you disable inline styles tinymce's formatting options stop working
-        allow_inline_styles: true,
-
-        delaying: nil,
-
-        recaptcha_public_key: nil, # deprecated; use recaptcha_site_key instead
-        recaptcha_private_key: nil, # deprecated; use recaptcha_secret_key instead
-        recaptcha_proxy: nil,
-        recaptcha_site_key: nil,
-        recaptcha_secret_key: nil,
-        recaptcha_minimum_score: 0.5,
-
-        google_analytics_key: nil,
-
-        override_host: nil,
-        override_protocol: nil,
-
-        no_authentication: false,
-        files_web_path: "files",
-
-        max_char_count: 200,
-        max_depth: 20,
-        email_defaults: nil,
-
-        token_expiry: 2.days,
-        acts_per_page: 10,
-        space_last_in_multispace: true,
-        closed_search_limit: 10,
-        paging_limit: 20,
-
-        non_createable_types: [%w[signup setting set session bootswatch_skin customized_bootswatch_skin]], # FIXME
-        view_cache: false,
-        rss_enabled: false,
-        double_click: :signed_in,
-
-        encoding: "utf-8",
-        request_logger: false,
-        performance_logger: false,
-        sql_comments: true,
-
-        file_storage: :local,
-        file_buckets: {},
-        file_default_bucket: nil,
-        protocol_and_host: nil,
-
-        rich_text_editor: :tinymce,
-
-        persistent_cache: true,
-        prepopulate_cache: false,
-        machine_refresh: :cautious, # options: eager, cautious, never
-        compress_javascript: true,
-
-        allow_irreversible_admin_tasks: false,
-        raise_all_rendering_errors: false,
-        rescue_all_in_controller: true,
-        navbox_match_start_only: true,
+      defaults_from_yaml.merge(
+        read_only: !ENV["DECKO_READ_ONLY"].nil?,
+        load_strategy: (ENV["REPO_TMPSETS"] || ENV["TMPSETS"] ? :tmp_files : :eval)
+      )
+    end
 
-        load_strategy: (ENV["REPO_TMPSETS"] || ENV["TMPSETS"] ? :tmp_files : :eval),
-        cache_set_module_list: false
-      }
+    def defaults_from_yaml
+      filename = File.expand_path "cardio/defaults.yml", __dir__
+      YAML.load_file filename
     end
 
     def set_config config
@@ -136,10 +83,6 @@ module Cardio
       config.watchable_dirs["#{mod_path}/set"] = [:rb]
     end
 
-    def read_only?
-      !ENV["DECKO_READ_ONLY"].nil?
-    end
-
     # In production mode set_config gets called twice.
     # The second call overrides all deck config settings
     # so don't change settings here if they already exist