card 1.99.1 → 1.99.2

data/lib/card/content/chunk/abstract.rb

@@ -0,0 +1,88 @@
+class Card
+  class Content < SimpleDelegator
+    # A chunk is a pattern of text that can be protected
+    # and interrogated by a format. Each Chunk class has a
+    # +pattern+ that states what sort of text it matches.
+    # Chunks are initalized by passing in the result of a
+    # match by its pattern.
+    #
+    module Chunk
+      class Abstract
+        class_attribute :config
+        attr_reader :text, :process_chunk
+
+        class << self
+          # if the prefix regex matched check that chunk against the full regex
+          def full_match content, prefix=nil
+            content.match full_re(prefix)
+          end
+
+          def full_re _prefix
+            config[:full_re]
+          end
+
+          def context_ok? _content, _chunk_start
+            true
+          end
+        end
+
+        def reference_code
+          "I"
+        end
+
+        def initialize match, content
+          match = self.class.full_match(match) if match.is_a? String
+          @text = match[0]
+          @processed = nil
+          @content = content
+          interpret match, content
+        end
+
+        def interpret _match_string, _content
+          Rails.logger.info "no #interpret method found for chunk class: " \
+                            "#{self.class}"
+        end
+
+        def format
+          @content.format
+        end
+
+        def card
+          @content.card
+        end
+
+        def to_s
+          result
+        end
+
+        def result
+          burn_read || @process_chunk || @processed || @text
+        end
+
+        def burn_read
+          return unless @burn_read
+
+          tmp = @burn_read
+          @burn_read = nil
+          tmp
+        end
+
+        # Temporarily overrides the processed nest content for single-use
+        # After using the nest's result
+        # (for example via `to_s`) the original result is restored
+        def burn_after_reading text
+          @burn_read = text
+        end
+
+        def inspect
+          "<##{self.class}##{self}>"
+        end
+
+        def as_json _options={}
+          burn_read || @process_chunk || @processed ||
+            "not rendered #{self.class}, #{card&.name}"
+        end
+      end
+    end
+  end
+end

data/lib/card/content/clean.rb

@@ -16,7 +16,7 @@ class Card
         "blockquote" => ["cite"]
       )
 
-      if Card.config.allow_inline_styles
+      if Cardio.config.allow_inline_styles
         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]
@@ -24,7 +24,7 @@ class Card
 
       allowed_tags.each_key do |k|
         allowed_tags[k] << "class"
-        allowed_tags[k] << "style" if Card.config.allow_inline_styles
+        allowed_tags[k] << "style" if Cardio.config.allow_inline_styles
         allowed_tags[k]
       end
 
@@ -52,7 +52,7 @@ class Card
         end.gsub(/<\!--.*?-->/, "")
       end
 
-      if Card.config.space_last_in_multispace
+      if Cardio.config.space_last_in_multispace
         def clean_with_space_last! string, tags=ALLOWED_TAGS
           cwo = clean_without_space_last!(string, tags)
           cwo.gsub(/(?:^|\b) ((?:&nbsp;)+)/, '\1 ')

data/lib/card/content/diff/{lcs.rb → l_c_s.rb}

@@ -1,4 +1,4 @@
-require_dependency "card/content/diff/processor"
+# require "card/content/diff/processor"
 
 class Card
   class Content
@@ -55,12 +55,10 @@ class Card
         def check_exclude_and_disjunction_pattern list
           list.each_with_index.each_with_object([[], []]) do |pair, res|
             element, index = pair
-            if element.match @disjunction_pattern
-              res[1] << { chunk_index: index, element: element,
-                          type: :disjunction }
-            elsif element.match @exclude_pattern
-              res[1] << { chunk_index: index, element: element, type:
-                :excludee }
+            if element.match? @disjunction_pattern
+              res[1] << { chunk_index: index, element: element, type: :disjunction }
+            elsif element.match? @exclude_pattern
+              res[1] << { chunk_index: index, element: element, type: :excludee }
             else
               res[0] << element
             end

data/lib/card/content/parser.rb

@@ -1,4 +1,4 @@
-require_dependency "card/content/chunk"
+# require "card/content/chunk"
 
 class Card
   class Content

data/lib/card/dirty.rb

@@ -1,41 +1,35 @@
 class Card
-  def self.define_dirty_methods field
-    define_method "#{field}_before_act" do
-      attribute_before_act field
-    end
+  module Dirty
+    extend ::Card::Dirty::MethodFactory
 
-    define_method "#{field}_is_changing?" do
-      attribute_is_changing? field
+    %i[name db_content trash type_id].each do |field|
+      define_dirty_methods field
     end
-  end
-
-  %i[name db_content trash type_id].each do |field|
-    define_dirty_methods field
-  end
 
-  def attribute_before_act attr
-    if saved_change_to_attribute? attr
-      attribute_before_last_save attr
-    elsif will_save_change_to_attribute? attr
-      mutations_from_database.changed_values[attr]
-    elsif not_in_callback?
-      attribute_was attr
-    else
-      _read_attribute attr
+    def attribute_before_act attr
+      if saved_change_to_attribute? attr
+        attribute_before_last_save attr
+      elsif will_save_change_to_attribute? attr
+        mutations_from_database.changed_values[attr]
+      elsif not_in_callback?
+        attribute_was attr
+      else
+        _read_attribute attr
+      end
     end
-  end
 
-  def not_in_callback?
-    # or in integrate_with_delay stage
-    mutations_before_last_save.equal?(mutations_from_database)
-  end
+    def not_in_callback?
+      # or in integrate_with_delay stage
+      mutations_before_last_save.equal?(mutations_from_database)
+    end
 
-  def attribute_is_changing? attr
-    if not_in_callback?
-      attribute_changed? attr
-    else
-      saved_change_to_attribute?(attr) ||
-        will_save_change_to_attribute?(attr)
+    def attribute_is_changing? attr
+      if not_in_callback?
+        attribute_changed? attr
+      else
+        saved_change_to_attribute?(attr) ||
+          will_save_change_to_attribute?(attr)
+      end
     end
   end
 end

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.

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!

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