card 1.98.3 → 1.99.0

data/lib/card/content/clean.rb

@@ -35,7 +35,8 @@ class Card
       ## Method that cleans the String of HTML tags
       ## and attributes outside of the allowed list.
       def clean! string, tags=ALLOWED_TAGS
-        string.gsub(%r{<(/*)(\w+)([^>]*)>}) do
+        # $LAST_MATCH_INFO is nil if string is a SafeBuffer
+        string.to_str.gsub(%r{<(/*)(\w+)([^>]*)>}) do |raw|
           raw = $LAST_MATCH_INFO
           tag = raw[2].downcase
           if (attrs = tags[tag])

data/lib/card/content/truncate.rb

@@ -16,6 +16,8 @@ class Card
         polish wordstring
       end
 
+      private
+
       def truncate input, words
         wordlist = input.to_s.split
         l = words.to_i - 1

data/lib/card/env/success.rb

@@ -40,17 +40,8 @@ class Card
         end
       end
 
-      def hard_redirect?
-        @redirect == true || @redirect == "true"
-      end
-
-      # reset card object and override params with success params
-      def soft_redirect?
-        @redirect == :soft
-      end
-
       def reload?
-        @reload == true || @reload == "true"
+        @reload.to_s == "true"
       end
 
       # TODO: refactor to use cardish
@@ -125,8 +116,6 @@ class Card
       def []= key, value
         if respond_to? "#{key}="
           send "#{key}=", value
-        elsif key.to_sym == :soft_redirect
-          @redirect = :soft
         else
           @params.send "#{key}=", value
         end
@@ -135,8 +124,6 @@ class Card
       def [] key
         if respond_to? key.to_sym
           send key.to_sym
-        elsif key.to_sym == :soft_redirect
-          @redirect == :soft
         else
           @params.send key.to_sym
         end

data/lib/card/error.rb

@@ -32,6 +32,7 @@ class Card
 
     def report
       Rails.logger.info "exception = #{self.class}: #{message}"
+      Rails.logger.debug backtrace.join("\n")
     end
 
     def card_message_text

data/lib/card/format/content.rb

@@ -11,8 +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: :nest_only
-        result = content_obj.without_nests(&block)
+        content_obj = content_object override_content, chunk_list: :references
+        result = content_obj.without_references(&block)
         process_content result, content_opts
       end
 

data/lib/card/format/error.rb

@@ -20,7 +20,7 @@ class Card
           root.error_status = 404
           :not_found
         else
-          :missing
+          :unknown
         end
       end
 

data/lib/card/format/nest.rb

@@ -73,7 +73,7 @@ class Card
       def content_view?
         # TODO: this should be specified in view definition
         %i[
-          bar expanded_bar core content titled open closed open_content
+          bar expanded_bar core content titled open closed open_content one_line_content
         ].member? @view.to_sym
       end
     end

data/lib/card/format/nesting.rb

@@ -50,12 +50,12 @@ class Card
       private
 
       def nest_invisible?
-        nest_mode == :closed && @char_count && (@char_count > max_char_count)
+        nest_mode == :compact && @char_count && (@char_count > max_char_count)
       end
 
       def count_chars
         result = yield
-        return result unless nest_mode == :closed && result
+        return result unless nest_mode == :compact && result
 
         @char_count ||= 0
         @char_count += result.length

data/lib/card/format/nesting/mode.rb

@@ -3,23 +3,23 @@ class Card
     module Nesting
       # Nest modes are states that can alter a nest's view
       module Mode
-        # A nest can be rendered in one of four modes: normal, closed, edit, or template.
+        # A nest can be rendered in one of four modes: normal, compact, edit, or template.
 
         # In _normal_ mode nests are rendered in the requested view without alteration.
-        # In _closed_ mode nest rendering is altered to fit within a single line
+        # In _compact_ mode nest rendering is altered to fit within a single line
         # In _edit_ mode, a nest's view is replaced (where applicable) with a form
         #    element to edit content
         # In _template_ mode, the view is replaced with a link to a nest editor to edit
         #    rules and options for that nest
 
         # current nest mode
-        # @return [Symbol] :normal, :closed, :edit, or :template
+        # @return [Symbol] :normal, :compact, :edit, or :template
         def nest_mode
           @nest_mode ||= parent ? parent.nest_mode : :normal
         end
 
         # run block with new_mode as nest_mode, then return to prior mode
-        # @param new_mode [Symbol] :normal, :closed, :edit, or :template
+        # @param new_mode [Symbol] :normal, :compact, :edit, or :template
         # @return block result
         def with_nest_mode new_mode, &block
           if new_mode == @nest_mode
@@ -44,8 +44,8 @@ class Card
           # Note: the subformat always has the same nest_mode as its parent format
           case nest_mode
           when :edit     then view_in_edit_mode(view)
-          when :template then :template_rule
-          when :closed   then view_in_closed_mode(view)
+          when :template then :template_nest
+          when :compact   then view_in_compact_mode(view)
           else view
           end
         end
@@ -65,22 +65,22 @@ class Card
             card.key.blank?                      # eg {{_self|type}} on new cards
         end
 
-        # the view that should be used when nested in closed mode
+        # the view that should be used when nested in compact mode
         # @param view [Symbol]
         # @return [Symbol] viewname
-        def view_in_closed_mode view
-          configured_view_in_closed_mode(view) ||
-            (card.known? ? :closed_content : :closed_missing)
+        def view_in_compact_mode view
+          configured_view_in_compact_mode(view) ||
+            (card.known? ? :one_line_content : :compact_missing)
         end
 
-        # the view configured in view definition for use when nested in closed mode
+        # the view configured in view definition for use when nested in compact mode
         # @param view [Symbol]
         # @return [Symbol] viewname
-        def configured_view_in_closed_mode view
-          closed_config = view_setting(:closed, view)
-          return view if closed_config == true
+        def configured_view_in_compact_mode view
+          compact_config = view_setting(:compact, view)
+          return view if compact_config == true
 
-          closed_config
+          compact_config
         end
       end
     end

data/lib/card/mod/loader.rb

@@ -48,6 +48,11 @@ class Card
           # raise Card::Error, "unrescued error loading mods"
         end
 
+        def reload_mods
+          Card::Set::Pattern.reset
+          load_mods
+        end
+
         def load_chunks
           Mod.dirs.each(:chunk) do |dir|
             load_dir dir

data/lib/card/model/save_helper.rb

@@ -290,6 +290,8 @@ class Card
             false
           elsif key.to_sym == :name
             card.name.to_s != value
+          elsif value.is_a? ::File
+            # NOOP
           else
             card.send(key) != value
           end

data/lib/card/query.rb

@@ -55,6 +55,7 @@ class Card
                           updater_of updated_by
                           link_to linked_to_by
                           include included_by
+                          nest nested_by
 
                           refer_to referred_to_by
                           member_of member

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

@@ -14,7 +14,8 @@ class Card
         {
           refer_to: %w[L I],
           link_to: "L",
-          include: "I"
+          include: "I",
+          nest: "I"
         }.each do |methodname, reftype|
           define_reference_method methodname, reftype, :referee, :referer_id
         end
@@ -22,7 +23,8 @@ class Card
         {
           referred_to_by: %w[L I],
           linked_to_by: "L",
-          included_by: "I"
+          included_by: "I",
+          nested_by: "I"
         }.each do |methodname, reftype|
           define_reference_method methodname, reftype, :referer, :referee_id
         end

data/lib/card/seed_consts.rb

@@ -15,5 +15,5 @@ unless defined? CARD_TEST_SEED_PATH
 end
 
 unless defined? CARD_TEST_SEED_SCRIPT_PATH
-  CARD_TEST_SEED_SCRIPT_PATH = File.join(Cardio.gem_root, "db", "seed", "test", "seed.rb")
+  CARD_TEST_SEED_SCRIPT_PATH = File.join(Cardio.gem_root, "db", "test_seed.rb")
 end

data/lib/card/set/format/abstract_format.rb

@@ -48,7 +48,7 @@ class Card
         #   You should certainly {Card::View::Cache learn more about caching} if you want
         #   to develop mods that are safe in a caching environment.
         #
-        # * __:closed__ [True/False]. Is view acceptable for rendering inside `closed`
+        # * __:compact__ [True/False]. Is view acceptable for rendering inside `compact`
         #   view?  Default is false.
         #
         # * __:denial__ [Symbol]. View to render if permission is denied. Value can be
@@ -70,10 +70,8 @@ class Card
         #       etc)
         #     * a *Symbol*: name of view to render
         #
-        # * __:wrap__ wrap view dynamically. Value is Symbol for wrapper. See {Wrapper}
-        #
-        # * DEPRECATED __:commentable__ [True/False].  Render this view for unknown cards
-        #   if comment box is showing and user has comment permission.
+        # * __:wrap__ wrap view dynamically. Value is Symbol for wrapper or Hash with
+        #   wrappers and wrapper options. See {Wrapper}
         #
         def view viewname, *args, &block
           def_opts = process_view_opts viewname, args

data/lib/card/set/format/abstract_format/view_opts.rb

@@ -14,7 +14,7 @@ class Card
 
           # view setting values can be accessed from Format objects (eg within format
           # blocks in set modules) using #view_setting(:setting_name, :view_name)
-          VIEW_SETTINGS = %i[cache commentable closed denial perms unknown wrap].freeze
+          VIEW_SETTINGS = %i[cache compact denial perms unknown wrap].freeze
 
           # view def opts are used in defining views but are not available
           # at any later point

data/lib/card/set/required_field.rb

@@ -32,7 +32,7 @@ class Card
       def create_field_delete_event
         field_set.class_exec(self) do |required|
           event required.field_event_name(:delete), :validate, on: :delete do
-            return if left&.singleton_class&.include?(required.parent_set)
+            return if left&.trash || left&.singleton_class&.include?(required.parent_set)
 
             errors.add required.field, "can't be deleted; required field of #{left.name}" # LOCALIZE
           end
@@ -43,6 +43,8 @@ class Card
         field_set.class_exec(self) do |required|
           event required.field_event_name(:update), :validate,
                 on: :update, changing: :name do
+            return if superleft&.attribute_is_changing? :name
+
             parent = Card.fetch(name_before_act.to_name.left)
             return if !parent || parent&.singleton_class&.include?(required.parent_set)
 
@@ -53,8 +55,11 @@ class Card
 
       def create_parent_event
         parent_set.class_exec(self) do |required|
-          event required.parent_event_name, :validate, on: :save do
-            return if field? required.field
+          event required.parent_event_name, :validate, on: :create do
+            return if field?(required.field) || left&.type_id == CardtypeID
+
+            # Without the Cardtype exemption, we can get errors on type plus right sets
+            # Need a better solution so we can require fields on cardtype+X cards, too.
 
             errors.add required.field, "required" # LOCALIZE
           end

data/lib/card/set_pattern.rb

@@ -2,6 +2,11 @@ class Card
   module Set
     class Pattern
       class << self
+        def reset
+          Card.set_patterns = []
+          @card_keys = @in_load_order = nil
+        end
+
         def find pattern_code
           Card.set_patterns.find { |sub| sub.pattern_code == pattern_code }
         end
@@ -67,6 +72,11 @@ class Card
 
             ([pattern_code] + anchor_codes).map { |code| code.to_s.camelize }.join "::"
           end
+
+          # label for set pattern if no anchor is given
+          def generic_label
+            label nil
+          end
         end
 
         # Instance methods

data/lib/card/view/cache/stub.rb

@@ -1,3 +1,5 @@
+require "msgpack"
+
 class Card
   class View
     module Cache
@@ -9,30 +11,11 @@ class Card
       #
       # A stub must contain all the information necessary to produce the view as intended.
       module Stub
-        class << self
-          def escape stub_json
-            stub_json.gsub "(", "_OParEN_"
-          end
-
-          def unescape stub_json
-            stub_json.gsub "_OParEN_", "("
-          end
-
-          # FIXME: escaping and unescaping stubs should not be necessary
-          # It's used to avoid problems with altered views, but altering views is
-          # unsafe and should be eliminated.  See {Card::View::Cache}.
-        end
-
         private
 
         # @return [String]
         def stub
-          "(stub)#{Stub.escape stub_json}(/stub)".html_safe
-        end
-
-        # @return [String] the stub_hash as JSON
-        def stub_json
-          JSON.generate stub_hash
+          "(StUb#{stub_hash.to_json}sTuB)".html_safe
         end
 
         # @return [Hash]

data/lib/card/view/options.rb

@@ -6,8 +6,8 @@ class Card
     #
     #      {{cardname|hide:menu}}
     #
-    # These options and others are available to monkeys when rendering views via
-    # #render or #nest.
+    # These options and others are available to monkeys when rendering views
+    # via #render or #nest.
     #
     #      nest "cardname", hide: :menu
     #      render :viewname, hide: :menu
@@ -51,9 +51,10 @@ class Card
           :title,          # overrides the name of the card
           :variant,        # override the canonical version of the name with a different
                            # variant
-          :editor,         # inline_nests makes a form within standard content (Symbol)
+          :input_type,     # inline_nests makes a form within standard content (Symbol)
           :type,           # set the default type of new cards
           :size,           # set an image size
+                           # (also used for character limit in one_line_content)
           :params,         # parameters for add button.  deprecated!
           :items,          # options for items (Hash)
           :cache,          # change view cache behaviour

data/lib/card/view/options/voo_api.rb

@@ -75,7 +75,7 @@ class Card
           try "normalize_#{option_key}", value
         end
 
-        def normalize_editor value
+        def normalize_input_type value
           value&.to_sym
         end
 

data/lib/cardio.rb

@@ -18,6 +18,12 @@ module Cardio
   mattr_reader :paths, :config
 
   class << self
+    def load_card?
+      ActiveRecord::Base.connection && !defined?(Card)
+    rescue
+      false
+    end
+
     def cache
       @cache ||= ::Rails.cache
     end
@@ -77,7 +83,7 @@ module Cardio
         allow_irreversible_admin_tasks: false,
         raise_all_rendering_errors:     false,
         rescue_all_in_controller:       true,
-        navbox_match_start_only:        :true,
+        navbox_match_start_only:        true,
         load_strategy:                  :eval
       }
     end

data/mod/Modfile

@@ -17,6 +17,7 @@ mod 'email'
 mod 'follow'
 mod 'developer'
 mod 'carrierwave'
+mod 'media'
 mod 'search'
 mod 'standard'
 mod 'rules'

data/mod/account/set/abstract/account_field.rb

@@ -0,0 +1,15 @@
+
+# allow account owner to update account field content
+def ok_to_update
+  return true if own_account? && !name_changed? && !type_id_changed?
+
+  super
+end
+
+# force inherit permission on create
+# (cannot be done with rule, because sets are not addressable)
+def applicable_permission_rule_id _direct_rule, action
+  return left_permission_rule_id action if action == :create
+
+  super
+end