card 1.101.0 → 1.101.5

data/lib/card/fetch/results.rb

@@ -4,6 +4,7 @@ class Card
     module Results
       def results
         return if card.nil?
+
         card.new_card? ? new_result_card : finalize_result_card
       end
 
@@ -34,6 +35,7 @@ class Card
 
       def renew
         return if new_opts.blank?
+
         # Rails.logger.info "renewing: #{mark}, #{new_opts}"
         @card = card.dup
         @card.newish newish_opts
@@ -59,6 +61,7 @@ class Card
 
       def update_supercard
         return unless (sc = new_opts[:supercard])
+
         @card.supercard = sc
         @card.update_superleft @card.name
       end
@@ -67,6 +70,7 @@ class Card
         return true if new_opts.blank?
         return false if type_change? || name_change?
         return false if fancy_renew?
+
         quick_content
         true
       end
@@ -84,19 +88,23 @@ class Card
 
       def quick_content
         return unless (content = assignable_content(new_opts[:default_content]))
+
         @card.content = content
       end
 
       def name_change?
         return false unless (new_name = new_opts[:name]&.to_name)
         return false if new_name.relative? && mark.name? && mark.absolute?
+
         new_name.to_s != @card.name.to_s
       end
 
       def type_change?
         return true if @card.type_id.nil?
+
         type_id = type_id_from_new_opts
         return true if !type_id && supercard_might_change_type?
+
         type_id && (type_id != @card.type_id)
       end
 
@@ -118,6 +126,7 @@ class Card
       def assign_name_from_mark
         return if opts[:local_only]
         return unless mark&.to_s != card.name
+
         card.name = mark.to_s
       end
     end

data/lib/card/fetch/retrieve.rb

@@ -5,6 +5,7 @@ class Card
       # look for card in cache.  if that doesn't work, look in database
       def retrieve_existing
         return unless mark.present?
+
         retrieve_from_cache || retrieve_from_db
       end
 
@@ -26,6 +27,7 @@ class Card
 
       def retrieval_from_db_query
         return unless (query = retrieval_from_db_query_base)
+
         query[:trash] = false unless look_in_trash?
         query
       end

data/lib/card/fetch/store.rb

@@ -20,6 +20,7 @@ class Card
       # instantiate a card as a cache placeholder
       def new_for_cache
         return unless new_for_cache?
+
         args = { name: mark, skip_modules: true }
         args[:type_lookup] = :skip if skip_type_lookup?
         args.merge! new_opts.slice(:type, :type_id, :type_code) if eager_caching?

data/lib/card/format.rb

@@ -47,8 +47,7 @@ class Card
     def require_card_to_initialize!
       return if @card
 
-      msg = I18n.t :exception_init_without_card, scope: "lib.card.format"
-      raise Card::Error, msg
+      raise Card::Error, Cardio.t(:lib_exception_init_without_card)
     end
 
     def include_set_format_modules

data/lib/card/format/content.rb

@@ -2,7 +2,7 @@ class Card
   class Format
     module Content
       def process_content override_content=nil, content_opts=nil, &block
-        content_obj = content_object override_content , content_opts
+        content_obj = content_object override_content, content_opts
         content_obj.process_chunks(&block)
         content_obj.to_s
       end
@@ -82,8 +82,6 @@ class Card
         content ||= render_raw || ""
         Card::Content.new content, self, content_opts
       end
-
-
     end
   end
 end

data/lib/card/format/error.rb

@@ -8,6 +8,7 @@ class Card
 
       def anyone_can? task
         return false unless task.is_a? Symbol
+
         @anyone_can ||= {}
         @anyone_can[task] = card.anyone_can? task if @anyone_can[task].nil?
         @anyone_can[task]
@@ -29,7 +30,11 @@ class Card
       end
 
       def monitor_depth
-        raise Card::Error::UserError, tr(:too_deep) if depth >= Card.config.max_depth
+        if depth >= Card.config.max_depth
+          raise Card::Error::UserError,
+                t(:format_too_deep)
+        end
+
         yield
       end
 
@@ -42,7 +47,7 @@ class Card
         if card&.name.present?
           safe_name
         else
-          I18n.t :no_cardname, scope: %i[lib card format error]
+          Cardio.t :lib_no_cardname
         end
       end
 
@@ -71,8 +76,7 @@ class Card
         if exception.is_a? Card::Error::UserError
           exception.message
         else
-          tr :error_rendering, scope: %i[lib card format error],
-                               cardname: error_cardname(exception), view: view
+          t :lib_error_rendering, cardname: error_cardname(exception), view: view
         end
       end
     end

data/lib/card/format/method_delegation.rb

@@ -46,12 +46,20 @@ class Card
 
       def render_args underscore, bang, opts
         # opts is a list; args is a hash. we're using various inputs to build the hash
-        (opts[0] ? opts.shift.clone : {}).tap do |args|
-          args[:optional] = (opts.shift || args[:optional] || :show) unless bang
+        interpret_render_opts opts do |args|
+          args[:optional] = optional_render_opt opts, args unless bang
           args[:skip_perms] = true if underscore
         end
       end
 
+      def interpret_render_opts opts, &block
+        (opts[0] ? opts.shift.clone : {}).tap(&block)
+      end
+
+      def optional_render_opt opts, args
+        opts.shift || args[:optional] || :show
+      end
+
       def new_action_view
         CardActionView.new(controller).tap do |t|
           t.extend CardController._helpers

data/lib/card/format/nest.rb

@@ -2,16 +2,17 @@ class Card
   class Format
     # processing nests
     class Nest
-      include Fetch
+      include Nest::Fetch
 
       attr_accessor :format, :card, :view, :view_opts, :format_opts
+
       def initialize format, cardish, view_opts={}, format_opts={}
         @format = format
         @view_opts = view_opts
         @format_opts = format_opts.clone
         @override = @format_opts.delete(:override) != false
         @card ||= fetch_card cardish
-        # note: fetch_card can alter view and view_opts[:nest_name]
+        # NOTE: fetch_card can alter view and view_opts[:nest_name]
       end
 
       def prepare

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

@@ -24,8 +24,7 @@ class Card
         end
 
         def not_found_codename_error codename
-          ::I18n.t :exception_unknown_codename, codename: codename,
-                                                scope: "lib.card.codename"
+          Cardio.t :lib_exception_unknown_codename, codename: codename
         end
 
         def new_card cardish
@@ -44,12 +43,14 @@ class Card
         def new_supercard_args
           # special case.  gets absolutized incorrectly. fix in name?
           return {} if view_opts[:nest_name].strip.blank?
+
           { supercard: format.context_card }
         end
 
         def new_main_args
           nest_name = view_opts[:nest_name]
           return {} unless nest_name =~ /main/
+
           { name: nest_name.gsub(/^_main\+/, "+"),
             supercard: format.root.card }
         end

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

@@ -41,7 +41,7 @@ class Card
         # @param view [Symbol]
         # @return [Symbol ] viewname
         def modal_nest_view view
-          # Note: the subformat always has the same nest_mode as its parent format
+          # 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_nest

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

@@ -3,7 +3,7 @@ class Card
     module Nesting
       # Formats can have subformats. Lineage can be retraced through "parent" format.
       module Subformat
-        # note: while it is possible to have a subformat of a different class,
+        # NOTE: while it is possible to have a subformat of a different class,
         # the :format_class value takes precedence over :format.
         def subformat subcard, opts={}
           subcard = subformat_card subcard
@@ -56,6 +56,7 @@ class Card
 
         def subformat_card subcard
           return subcard if subcard.is_a? Card
+
           Card.fetch subcard, new: {}
         end
       end

data/lib/card/format/render.rb

@@ -65,8 +65,8 @@ class Card
       end
 
       def pretty_path source_location
-        source_location.first.gsub(%r{^.+mod\d+-([^/]+)}, '\1: ') + ":" +
-          source_location.second.to_s
+        "#{source_location.first.gsub(%r{^.+mod\d+-([^/]+)},
+                                      '\1: ')}:#{source_location.second}"
       end
 
       # :standard, :always, :never

data/lib/card/format/wrapper.rb

@@ -46,4 +46,4 @@ class Card
       end
     end
   end
-end
+end

data/lib/card/lexicon.rb

@@ -36,16 +36,17 @@ class Card
 
       def update card
         add card
-        cache.delete cache_key(card.old_lex)
+        cache.delete cache_key(card.lex_before_act)
       end
 
       # def delete card
       #   cache.delete card.id.to_s
-      #   cache.delete cache_key(card.old_lex)
+      #   cache.delete cache_key(card.lex_before_act)
       # end
 
       def lex_to_name lex
-        return lex unless lex&.is_a? Array
+        return lex unless lex.is_a? Array
+
         lex.map { |side_id| name side_id or return }.join(Card::Name.joint).to_name
       end
 
@@ -83,7 +84,7 @@ class Card
       end
 
       def cache_key lex
-        "L-" + (lex.is_a?(Array) ? lex.join("-") : lex.to_name.key)
+        "L-#{lex.is_a?(Array) ? lex.join('-') : lex.to_name.key}"
       end
     end
   end

data/lib/card/mark.rb

@@ -23,16 +23,7 @@ class Card
     def id_or_name parts
       mark = parts.flatten
       mark = mark.first if mark.size <= 1
-      id_from_mark(mark) || name_from_mark(mark)
-    end
-
-    def id_from_mark mark
-      case mark
-      when Integer then mark
-      when Symbol  then Card::Codename.id! mark
-      when String  then id_from_string mark
-      when Card    then mark.id
-      end
+      id_from_mark(mark) || Card::Name[mark]
     end
 
     # translates string identifiers into an id:
@@ -48,20 +39,31 @@ class Card
       end
     end
 
-    def bad_mark mark
-      case mark
+    def name_from_id_from_string id, string
+      fetch_name(id) { bad_mark string }
+    end
+
+    private
+
+    def bad_mark string
+      case string
       when ID_MARK_RE
         raise Card::Error::NotFound, "id doesn't exist: #{Regexp.last_match[:id]}"
       when CODENAME_MARK_RE
         raise Card::Error::CodenameNotFound,
               "codename doesn't exist: #{Regexp.last_match[:codename]}"
       else
-        raise Card::Error, "invalid mark: #{mark}"
+        raise Card::Error, "invalid mark: #{string}"
       end
     end
 
-    def name_from_mark mark
-      Card::Name[mark]
+    def id_from_mark mark
+      case mark
+      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
   end
 end

data/lib/card/model/save_helper.rb

@@ -9,22 +9,34 @@ class Card
     # All !-methods in this module rename existing cards
     # to resolve name conflicts)
     module SaveHelper
-      def with_user user_name
-        Card::Auth.with current_id: Card.fetch_id(user_name) do
-          yield
-        end
+      include SaveHelperHelper
+      include SaveArguments
+
+      def with_user user_name, &block
+        Card::Auth.with(current_id: Card.fetch_id(user_name), &block)
       end
 
       def create_card name_or_args, content_or_args=nil
         Card.create! create_args(name_or_args, content_or_args)
       end
 
+      # if card with same name exists move it out of the way
+      def create_card! name_or_args, content_or_args=nil
+        args = standardize_args name_or_args, content_or_args
+        create_card args.reverse_merge(rename_if_conflict: :old)
+      end
+
       def update_card name, content_or_args
         args = standardize_update_args name, content_or_args
         resolve_name_conflict args
         Card[name]&.update! args
       end
 
+      def update_card! name, content_or_args
+        args = standardize_update_args name, content_or_args
+        update_card name, args.reverse_merge(rename_if_conflict: :new)
+      end
+
       def create_or_update_card name_or_args, content_or_args=nil
         name = name_from_args name_or_args
 
@@ -51,12 +63,6 @@ class Card
         card.delete!
       end
 
-      def delete_code_card? name
-        return false if name.is_a?(Symbol) && !Codename.exist?(name)
-
-        Card.exist? name
-      end
-
       # create if card doesn't exist
       # updates existing card only if given attributes are different except the
       # name
@@ -77,10 +83,6 @@ class Card
         ensure_card_simplified name, args
       end
 
-      def codename_from_name name
-        name.downcase.tr(" ", "_").tr(":*", "")
-      end
-
       # create if card doesn't exist
       # updates existing card only if given attributes are different including
       # the name
@@ -112,33 +114,14 @@ class Card
         ensure_card [trait, :right, setting], card_args
       end
 
-      # if card with same name exists move it out of the way
-      def create_card! name_or_args, content_or_args=nil
-        args = standardize_args name_or_args, content_or_args
-        create_card args.reverse_merge(rename_if_conflict: :old)
-      end
-
-      def update_card! name, content_or_args
-        args = standardize_update_args name, content_or_args
-        update_card name, args.reverse_merge(rename_if_conflict: :new)
-      end
-
       def create_or_update_card! name_or_args, content_or_args=nil
         args = standardize_args name_or_args, content_or_args
         create_or_update args.reverse_merge(rename_if_conflict: :new)
       end
 
-      def add_style name, opts={}
-        name.sub!(/^style\:?\s?/, "") # in case name is given with prefix
-        # remove it so that we don't double it
-
-        add_coderule_item name, "style",
-                          opts[:type_id] || Card::ScssID,
-                          opts[:to] || "*all+*style"
-      end
-
+      # TODO: this is too specific for this
       def add_script name, opts={}
-        name.sub!(/^script\:?\s?/, "") # in case name is given with prefix
+        name.sub!(/^script:?\s?/, "") # in case name is given with prefix
         # remove it so that we don't double it
 
         add_coderule_item name, "script",
@@ -146,15 +129,6 @@ class Card
                           opts[:to] || "*all+*script"
       end
 
-      def add_coderule_item name, prefix, type_id, to
-        codename = "#{prefix}_#{name.tr(' ', '_').underscore}"
-        name = "#{prefix}: #{name}"
-
-        ensure_card name, type_id: type_id,
-                          codename: codename
-        Card[to].add_item! name
-      end
-
       alias_method :create, :create_card
       alias_method :update, :update_card
       alias_method :create_or_update, :create_or_update_card
@@ -164,146 +138,6 @@ class Card
       alias_method :ensure, :ensure_card
       alias_method :ensure!, :ensure_card!
       alias_method :delete, :delete_card
-
-      def method_missing method, *args
-        method_name, cardtype_card = extract_cardtype_from_method_name method
-        return super unless method_name
-
-        sargs = standardize_args(*args)
-        send "#{method_name}_card", sargs.merge(type_id: cardtype_card.id)
-      end
-
-      def respond_to_missing? method, _include_private=false
-        extract_cardtype_from_method_name(method) || super
-      end
-
-      def extract_cardtype_from_method_name method
-        return unless method =~ /^(?<method_name>create|ensure)_(?<type>.+?)(?:_card)?$/
-
-        type = Regexp.last_match[:type]
-        cardtype_card = Card::Codename[type.to_sym] ? Card[type.to_sym] : Card[type]
-        return unless cardtype_card&.type_id == Card::CardtypeID ||
-                      cardtype_card&.id == Card::SetID
-
-        [Regexp.last_match[:method_name], cardtype_card]
-      end
-
-      private
-
-      def ensure_card_simplified name, args
-        ensure_card_update(name, args) || Card.create!(add_name(name, args))
-      end
-
-      def ensure_card_update name, args
-        card = Card[name]
-        return unless card
-
-        ensure_attributes card, args
-        card
-      rescue Card::Error::CodenameNotFound => _e
-        false
-      end
-
-      def validate_setting setting
-        unless Card::Codename.exist?(setting) &&
-               Card.fetch_type_id(setting) == Card::SettingID
-          raise ArgumentError, "not a valid setting: #{setting}"
-        end
-      end
-
-      def normalize_trait_rule_args setting, value
-        return value if value.is_a? Hash
-
-        if Card.fetch_type_id([setting, :right, :default]) == Card::PointerID
-          value = Array(value).to_pointer_content
-        end
-        { content: value }
-      end
-
-      # @return args
-      def standardize_args name_or_args, content_or_args=nil, _ignore=nil
-        if name_or_args.is_a?(Hash)
-          name_or_args
-        else
-          add_name name_or_args, content_or_args || {}
-        end
-      end
-
-      def hashify value_or_hash, key
-        if value_or_hash.is_a?(Hash)
-          value_or_hash
-        elsif value_or_hash.nil?
-          {}
-        else
-          { key => value_or_hash }
-        end
-      end
-
-      def standardize_ensure_args name_or_args, content_or_args
-        name = name_or_args.is_a?(Hash) ? name_or_args[:name] : name_or_args
-        args = if name_or_args.is_a?(Hash)
-                 name_or_args
-               else
-                 hashify content_or_args, :content
-               end
-        [name, args]
-      end
-
-      def standardize_update_args name_or_args, content_or_args
-        return name_or_args if name_or_args.is_a?(Hash)
-
-        hashify content_or_args, :content
-      end
-
-      def create_args name_or_args, content_or_args=nil
-        args = standardize_args name_or_args, content_or_args
-        resolve_name_conflict args
-        args
-      end
-
-      def name_from_args name_or_args
-        name_or_args.is_a?(Hash) ? name_or_args[:name] : name_or_args
-      end
-
-      def add_name name, content_or_args
-        if content_or_args.is_a?(Hash)
-          content_or_args.reverse_merge name: name
-        else
-          { content: content_or_args, name: name }
-        end
-      end
-
-      def resolve_name_conflict args
-        rename = args.delete :rename_if_conflict
-        return unless args[:name] && rename
-
-        args[:name] = Card.uniquify_name args[:name], rename
-      end
-
-      def ensure_attributes card, args
-        subcards = card.extract_subcard_args! args
-        update_args = changing_args card, args
-
-        return if update_args.empty? && subcards.empty?
-
-        # FIXME: use ensure_attributes for subcards
-        card.update! update_args.merge(subcards: subcards, skip: :validate_renaming)
-      end
-
-      def changing_args card, args
-        args.select do |key, value|
-          if key =~ /^\+/
-            subfields[key] = value
-            false
-          elsif key.to_sym == :name
-            card.name.to_s != value
-          elsif value.is_a? ::File
-            # NOOP
-          else
-            card.send(key) != value
-          end
-        end
-      end
     end
   end
 end