card 1.99.1 → 1.99.6

data/lib/card/dirty/method_factory.rb

@@ -0,0 +1,15 @@
+class Card
+  module Dirty
+    module MethodFactory
+      def define_dirty_methods field
+        define_method "#{field}_before_act" do
+          attribute_before_act field
+        end
+
+        define_method "#{field}_is_changing?" do
+          attribute_is_changing? field
+        end
+      end
+    end
+  end
+end

data/lib/card/env.rb

@@ -1,6 +1,3 @@
-require_dependency "card/env/location"
-require_dependency "card/env/location_history"
-
 class Card
   # Card::Env is a module for containing the variable details of the environment
   # in which Card operates.
@@ -8,10 +5,9 @@ class Card
   # Env can differ for each request; Card.config should not.
   module Env
     extend LocationHistory
-
-    SERIALIZABLE_ATTRIBUTES = ::Set.new %i[
-      main_name params ip ajax html host protocol salt
-    ]
+    extend RequestAssignments
+    extend SlotOptions
+    extend Serialization
 
     class << self
       def reset args={}
@@ -41,13 +37,11 @@ class Card
         self[:params] ||= {}
       end
 
-      def slot_opts
-        # FIXME:  upgrade to safe parameters
-        self[:slot_opts] ||= begin
-          opts = params[:slot]&.clone || {}
-          opts = opts.to_unsafe_h if opts.is_a? ActionController::Parameters
-          opts.merge! shortcut_slot_opts
-          opts.deep_symbolize_keys.slice(*Card::View::Options.slot_keys)
+      def hash hashish
+        case hashish
+        when Hash then hashish.clone
+        when ActionController::Parameters then hashish.to_unsafe_h
+        else {}
         end
       end
 
@@ -68,7 +62,7 @@ class Card
       end
 
       def localhost?
-        self[:host] && self[:host] =~ /^localhost/
+        self[:host]&.match?(/^localhost/)
       end
 
       def ajax?
@@ -79,38 +73,8 @@ class Card
         !self[:controller] || self[:html]
       end
 
-      def serialize
-        @env.select { |k, _v| SERIALIZABLE_ATTRIBUTES.include?(k) }
-      end
-
-      # @param serialized_env [Hash]
-      def with serialized_env
-        tmp_env = serialize if @env
-        @env ||= {}
-        @env.update serialized_env
-        yield
-      ensure
-        @env.update tmp_env if tmp_env
-      end
-
       private
 
-      def assign_ajax c
-        c.request.xhr? || c.request.params[:simulate_xhr]
-      end
-
-      def assign_html c
-        [nil, "html"].member?(c.params[:format])
-      end
-
-      def assign_host c
-        Card.config.override_host || c.request.env["HTTP_HOST"]
-      end
-
-      def assign_protocol c
-        Card.config.override_protocol || c.request.protocol
-      end
-
       def method_missing method_id, *args
         case args.length
         when 0 then self[method_id]
@@ -118,17 +82,6 @@ class Card
         else super
         end
       end
-
-      def shortcut_slot_opts
-        opts = {}
-        opts[:size] = params[:size].to_sym if params[:size]
-        opts[:items] = { view: params[:item].to_sym } if slot_items_shortcut?
-        opts
-      end
-
-      def slot_items_shortcut?
-        params[:item].present? && !params.dig(:slot, :items, :view).present?
-      end
     end
   end
 end

data/lib/card/env/location.rb

@@ -21,10 +21,23 @@ class Card
       end
 
       def protocol_and_host
-        Card.config.protocol_and_host || "#{Card::Env[:protocol]}#{Card::Env[:host]}"
+        Card.config.protocol_and_host || "#{Env[:protocol]}#{Env[:host]}"
       end
 
-      extend Location # ??
+      def cardname_from_url url
+        m = url.match cardname_from_url_regexp
+        m ? Card::Name[m[:mark]] : nil
+      end
+
+      private
+
+      def cardname_from_url_regexp
+        return unless Env[:host]
+
+        %r{#{Regexp.escape Env[:host]}/(?<mark>[^\?]+)}
+      end
+
+      extend Location # allows calls on Location constant, eg Location.card_url
     end
   end
 end

data/lib/card/env/request_assignments.rb

@@ -0,0 +1,24 @@
+class Card
+  module Env
+    # environmental variables assigned based on request
+    module RequestAssignments
+      private
+
+      def assign_ajax c
+        c.request.xhr? || c.request.params[:simulate_xhr]
+      end
+
+      def assign_html c
+        [nil, "html"].member?(c.params[:format])
+      end
+
+      def assign_host c
+        Card.config.override_host || c.request.env["HTTP_HOST"]
+      end
+
+      def assign_protocol c
+        Card.config.override_protocol || c.request.protocol
+      end
+    end
+  end
+end

data/lib/card/env/serialization.rb

@@ -0,0 +1,24 @@
+class Card
+  module Env
+    # serializing environment (eg for delayed jobs)
+    module Serialization
+      SERIALIZABLE_ATTRIBUTES = ::Set.new %i[
+        main_name params ip ajax html host protocol salt
+      ]
+
+      # @param serialized_env [Hash]
+      def with serialized_env
+        tmp_env = serialize if @env
+        @env ||= {}
+        @env.update serialized_env
+        yield
+      ensure
+        @env.update tmp_env if tmp_env
+      end
+
+      def serialize
+        @env.select { |k, _v| SERIALIZABLE_ATTRIBUTES.include?(k) }
+      end
+    end
+  end
+end

data/lib/card/env/slot_options.rb

@@ -0,0 +1,30 @@
+class Card
+  module Env
+    # slot-related environmental variable handling
+    module SlotOptions
+      def slot_opts
+        # FIXME:  upgrade to safe parameters
+        self[:slot_opts] ||= interpret_slot_options
+      end
+
+      private
+
+      def interpret_slot_options
+        opts = hash params[:slot]
+        opts.merge! shortcut_slot_opts
+        opts.deep_symbolize_keys.slice(*Card::View::Options.slot_keys)
+      end
+
+      def shortcut_slot_opts
+        opts = {}
+        opts[:size] = params[:size].to_sym if params[:size]
+        opts[:items] = { view: params[:item].to_sym } if slot_items_shortcut?
+        opts
+      end
+
+      def slot_items_shortcut?
+        params[:item].present? && !params.dig(:slot, :items, :view).present?
+      end
+    end
+  end
+end

data/lib/card/error.rb

@@ -42,13 +42,17 @@ class Card
     # error attributable to code (as opposed to card configuration)
     class ServerError < Error
       def self.view
-        Card[:debugger]&.content =~ /on/ ? :debug_server_error : :server_error
+        debugger_on? ? :debug_server_error : :server_error
       end
 
       def self.status_code
         # Errors with status code 900 are displayed as modal instead of inside
         # the "card-notice" div``
-        Card[:debugger]&.content =~ /on/ ? 900 : 500
+        debugger_on? ? 900 : 500
+      end
+
+      def self.debugger_on?
+        Card::Codename[:debugger] && Card[:debugger]&.content =~ /on/
       end
 
       def report

data/lib/card/format.rb

@@ -10,10 +10,13 @@ class Card
   #
   # {Card::Mod} explains how to set up a mod.
   # {Card::Set::Format} explains how to use this and other format classes within a mod.
-  # {Card::Set::Abstract::Format} introduces the view API, which is organized with these
-  # format classes.
+  # {Card::Set::Format::AbstractFormat} introduces the view API, which is organized with
+  # these format classes.
   #
   class Format
+    extend ActiveSupport::Autoload
+    extend Registration
+
     include Card::Env::Location
     include Nesting
     include Render
@@ -22,8 +25,6 @@ class Card
     include Error
     include MethodDelegation
 
-    extend Registration
-
     cattr_accessor :registered, :aliases
     self.registered = []
     self.aliases = {}
@@ -40,7 +41,6 @@ class Card
       require_card_to_initialize!
       opts.each { |key, value| instance_variable_set "@#{key}", value }
       include_set_format_modules
-      self
     end
 
     def require_card_to_initialize!
@@ -94,6 +94,10 @@ class Card
       "text/plain"
     end
 
+    def escape_literal literal
+      literal
+    end
+
     def to_sym
       Card::Format.format_sym self
     end

data/lib/card/format/content.rb

@@ -11,7 +11,8 @@ class Card
       # for all nests. After executing the given block the original nests are put back in.
       # Placeholders are numbers in double curly brackets like {{2}}.
       def safe_process_content override_content=nil, content_opts=nil, &block
-        content_obj = content_object override_content, chunk_list: :references
+        content_obj =
+          content_object override_content, chunk_list: :references_keep_escaping
         result = content_obj.without_references(&block)
         process_content result, content_opts
       end

data/lib/card/format/error.rb

@@ -53,15 +53,20 @@ class Card
       end
 
       def loud_error e, view
+        log_error e if focal? && voo.root?
         card.errors.add "#{view} view", rendering_error(e, view) if card.errors.empty?
         raise e
       end
 
       def quiet_error e, view
         # TODO: unify with Card::Error#report
+        log_error e
+        rendering_error e, view
+      end
+
+      def log_error e
         Rails.logger.info e.message
         Rails.logger.debug e.backtrace.join("\n")
-        rendering_error e, view
       end
 
       def rendering_error exception, view

data/lib/card/format/nest/fetch.rb

@@ -34,7 +34,8 @@ class Card
         end
 
         def new_card_args
-          args = { name: view_opts[:nest_name], type: view_opts[:type] }
+          args = { name: view_opts[:nest_name] }
+          args[:type] = view_opts[:type] if view_opts[:type]
           args.merge(new_supercard_args)
               .merge(new_main_args)
               .merge(new_content_args)

data/lib/card/mark.rb

@@ -31,6 +31,7 @@ class Card
       when Integer then mark
       when Symbol  then Card::Codename.id! mark
       when String  then id_from_string mark
+      when Card    then mark.id
       end
     end
 

data/lib/card/migration.rb

@@ -70,6 +70,10 @@ class Card
       end
     end
 
+    # def disable_ddl_transaction #:nodoc:
+    #   true
+    # end
+
     def import_json filename, merge_opts={}
       Card::Mailer.perform_deliveries = false
       output_file = File.join data_path, "unmerged_#{filename}"

data/lib/card/mod.rb

@@ -1,6 +1,3 @@
-require_dependency "card/mod/loader"
-require_dependency "card/mod/dirs"
-
 class Card
   # A Card Mod (short for "module" or "modification") is a discrete piece of Decko
   # functionality. Mods are how the Decko community develops and shares code.
@@ -70,7 +67,7 @@ class Card
         return if ENV["CARD_MODS"] == "none"
 
         if Card.take
-          Loader.load_mods
+          Card::Mod::Loader.load_mods
         else
           Rails.logger.warn "empty database"
         end
@@ -78,7 +75,7 @@ class Card
 
       # @return an array of Rails::Path objects
       def dirs
-        @dirs ||= Dirs.new(Card.paths["mod"].existent)
+        @dirs ||= Mod::Dirs.new(Card.paths["mod"].existent)
       end
     end
   end

data/lib/card/mod/dirs.rb

@@ -153,6 +153,7 @@ class Card
         return unless File.exist? modfile_path
 
         eval File.read(modfile_path), binding
+        true
       end
 
       def load_from_dir

data/lib/card/mod/load_strategy.rb

@@ -1,10 +1,10 @@
 class Card
   module Mod
-    require_dependency "card/mod/load_strategy/eval"
-    require_dependency "card/mod/load_strategy/pattern_tmp_files"
-    require_dependency "card/mod/load_strategy/set_binding_magic"
-    require_dependency "card/mod/load_strategy/set_tmp_files"
-    require_dependency "card/mod/load_strategy/tmp_files"
+    # require "card/mod/load_strategy/eval"
+    # require "card/mod/load_strategy/pattern_tmp_files"
+    # require "card/mod/load_strategy/set_binding_magic"
+    # require "card/mod/load_strategy/set_tmp_files"
+    # require "card/mod/load_strategy/tmp_files"
 
     # Shared code for the three different load strategies: Eval, TmpFiles and BindingMagic
     class LoadStrategy
@@ -36,18 +36,29 @@ class Card
       end
 
       def each_file &block
-        @mod_dirs.each module_type do |base_dir|
-          if module_type == :set
-            # I'm not sure if we really need this ordering by pattern for sets -pk
-            Card::Set::Pattern.in_load_order.each do |pattern|
-              each_file_in_dir base_dir, pattern.to_s, &block
-            end
-          else
+        if module_type == :set
+          each_set_file(&block)
+        else
+          each_mod_dir module_type do |base_dir|
             each_file_in_dir base_dir, &block
           end
         end
       end
 
+      def each_set_file &block
+        each_mod_dir :set do |base_dir|
+          @loader.patterns.each do |pattern|
+            each_file_in_dir base_dir, pattern.to_s, &block
+          end
+        end
+      end
+
+      def each_mod_dir module_type
+        @mod_dirs.each module_type do |base_dir|
+          yield base_dir
+        end
+      end
+
       def each_file_in_dir base_dir, subdir=nil
         pattern = File.join(*[base_dir, subdir, "**/*.rb"].compact)
         Dir.glob(pattern).sort.each do |abs_path|

data/lib/card/mod/loader.rb

@@ -1,10 +1,5 @@
 # -*- encoding : utf-8 -*-
 
-require_dependency "card/set"
-require_dependency "card/set_pattern"
-require_dependency "card/mod/loader/set_loader"
-require_dependency "card/mod/loader/set_pattern_loader"
-
 class Card
   module Mod
     # Card::Mod::Loader is used to load all part of a mod,
@@ -17,7 +12,7 @@ class Card
     # The mods are given by a Mod::Dirs object.
     # SetLoader can use three different strategies to load the set modules.
     class Loader
-      def initialize load_strategy=nil, mod_dirs=nil
+      def initialize load_strategy: nil, mod_dirs: nil
         load_strategy ||= Cardio.config.load_strategy
         mod_dirs ||= Mod.dirs
         klass = load_strategy_class load_strategy
@@ -40,17 +35,20 @@ class Card
         attr_reader :module_type
 
         def load_mods
-          SetPatternLoader.new.load
           load_formats
-          SetLoader.new.load
+          Card::Mod::Loader::SetPatternLoader.new.load
+          Card::Mod::Loader::SetLoader.new.load
+          Card::Set.process_base_modules
           load_initializers
-          # rescue
-          # raise Card::Error, "unrescued error loading mods"
         end
 
-        def reload_mods
+        def reload_sets
           Card::Set::Pattern.reset
-          load_mods
+          Card::Set.reset_modules
+          Card::Mod::Loader::SetPatternLoader.new.load
+          Card::Mod::Loader::SetLoader.new(
+            patterns: Card::Set::Pattern.nonbase_loadable_codes
+          ).load
         end
 
         def load_chunks
@@ -84,7 +82,9 @@ class Card
         def load_dir dir
           Dir["#{dir}/*.rb"].sort.each do |file|
             # puts Benchmark.measure("from #load_dir: rd: #{file}") {
-            require_dependency file
+            # require file
+            # "require" breaks the reloading in development env
+            load file
             # }.format('%n: %t %r')
           end
         end