card 1.101.4 → 1.101.5

data/lib/card/director.rb

@@ -202,7 +202,7 @@ class Card
     def main_director
       return self if main?
 
-      Director.act_director || (@parent&.main_director)
+      Director.act_director || @parent&.main_director
     end
 
     def to_s level=1

data/lib/card/director/all.rb

@@ -44,10 +44,10 @@ class Card
 
       private
 
-      def start_new_act
+      def start_new_act &block
         self.director = nil
         Director.run_act(self) do
-          run_callbacks(:act) { yield }
+          run_callbacks(:act, &block)
         end
       end
 

data/lib/card/director/card_methods.rb

@@ -2,6 +2,7 @@ class Card
   class Director
     module CardMethods
       attr_writer :director
+
       delegate :validation_phase, :storage_phase, :integration_phase,
                :validation_phase_callback?, :integration_phase_callback?, to: :director
 

data/lib/card/director/event_delay.rb

@@ -8,11 +8,11 @@ class Card
       # effect that params changes in the CardController get lost
       # (a crucial example are success params that are processed in
       # CardController#soft_redirect)
-      def contextualize_delayed_event act_id, card, env, auth
+      def contextualize_delayed_event act_id, card, env, auth, &block
         return yield unless delaying?
 
         with_env_and_auth env, auth do
-          with_delay_act(act_id, card) { yield }
+          with_delay_act(act_id, card, &block)
         end
       end
 
@@ -32,11 +32,9 @@ class Card
         end
       end
 
-      def with_env_and_auth env, auth
+      def with_env_and_auth env, auth, &block
         Card::Auth.with auth do
-          Card::Env.with env do
-            yield
-          end
+          Card::Env.with env, &block
         end
       end
     end

data/lib/card/director/run.rb

@@ -40,6 +40,7 @@ class Card
         @stage ||= -1
         return false if in_or_after?(next_stage) || ahead_of_parent?(next_stage)
         return false unless valid_card? next_stage
+
         check_skipped_stage next_stage
         true
       end
@@ -50,6 +51,7 @@ class Card
 
       def check_skipped_stage stage
         return unless before? previous_stage_index(stage)
+
         raise Card::Error, "stage #{previous_stage_symbol stage} was " \
                            "skipped for card #{@card}"
       end

data/lib/card/director/stages.rb

@@ -22,9 +22,9 @@ class Card
 
       def stage_index stage
         case stage
-        when Symbol then
+        when Symbol
           STAGE_INDEX[stage]
-        when Integer then
+        when Integer
           stage
         else
           raise Card::Error, "not a valid stage: #{stage}"
@@ -33,6 +33,7 @@ class Card
 
       def stage_ok? opts
         return false unless stage
+
         test = %i[during before after].find { |t| opts[t] }
         test ? send("#{test}?", opts[t]) : true
       end

data/lib/card/env/location.rb

@@ -9,7 +9,7 @@ class Card
           Rails.logger.warn "Pass only strings to card_path. "\
                             "(#{rel_path} = #{rel_path.class})"
         end
-        if rel_path =~ %r{^(https?\:)?/}
+        if rel_path.match? %r{^(https?:)?/}
           rel_path
         else
           "#{Card.config.relative_url_root}/#{rel_path}"
@@ -17,7 +17,7 @@ class Card
       end
 
       def card_url rel
-        rel =~ /^https?\:/ ? rel : "#{protocol_and_host}#{card_path rel}"
+        rel.match?(/^https?:/) ? rel : "#{protocol_and_host}#{card_path rel}"
       end
 
       def protocol_and_host
@@ -26,6 +26,7 @@ class Card
 
       def cardname_from_url url
         return unless (cardname = cardname_from_url_regexp)
+
         m = url.match cardname
         m ? Card::Name[m[:mark]] : nil
       end
@@ -35,7 +36,7 @@ class Card
       def cardname_from_url_regexp
         return unless Env[:host]
 
-        %r{#{Regexp.escape Env[:host]}/(?<mark>[^\?]+)}
+        %r{#{Regexp.escape Env[:host]}/(?<mark>[^?]+)}
       end
 
       extend Location # allows calls on Location constant, eg Location.card_url

data/lib/card/fetch.rb

@@ -10,7 +10,6 @@ class Card
     # see arg options in all/fetch
     def initialize *args
       normalize_args args
-      absolutize_mark
       validate_opts!
     end
 
@@ -31,15 +30,19 @@ class Card
     def normalize_args args
       @opts = args.last.is_a?(Hash) ? args.pop : {}
       @mark = Card.id_or_name args
+      normalize_mark
     end
 
-    def absolutize_mark
-      return unless mark.name? && (supercard = opts.dig(:new, :supercard))
-      @mark = mark.absolute_name supercard.name
+    def normalize_mark
+      return unless mark.name?
+
+      supercard = opts.dig :new, :supercard
+      @mark = mark.absolute_name supercard.name if supercard
     end
 
     def validate_opts!
       return unless opts[:new] && opts[:skip_virtual]
+
       raise Card::Error, "fetch called with new args and skip_virtual"
     end
 

data/lib/card/fetch/all.rb

@@ -23,6 +23,7 @@ class Card
       def refresh force=false
         return self unless force || frozen? || readonly?
         return unless id
+
         fresh_card = self.class.find id
         fresh_card.include_set_modules
         fresh_card

data/lib/card/fetch/card_class.rb

@@ -11,12 +11,14 @@ class Card
       # * virtual cards
       #
       # @param args [Integer, String, Card::Name, Symbol, Array]
-      #    one or more of the three unique identifiers
-      #      1. a numeric id (Integer)
-      #      2. a name/key (String or Card::Name)
-      #      3. a codename (Symbol)
+      #    Initials args must be one or more "marks," which uniquely idenfify cards:
+      #      1. a name/key. (String or Card::Name)
+      #      2. a numeric id. Can be (a) an Integer or (b) a String with an integer
+      #         prefixed with a tilde, eg "~1234"
+      #      3. a codename. Can be (a) a Symbol or (b) a String with a colon prefix,
+      #         eg :mycodename
       #    If you pass more then one mark or an array of marks they get joined with a '+'.
-      #    The final argument can be a hash to set the following options
+      #    The final argument can be a Hash to set the following options
       #      :skip_virtual               Real cards only
       #      :skip_modules               Don't load Set modules
       #      :look_in_trash              Return trashed card objects
@@ -24,9 +26,10 @@ class Card
       #      new: { opts for Card#new }  Return a new card when not found
       # @return [Card]
       def fetch *args
-        Card::Fetch.new(*args)&.retrieve_or_new
+        f = Card::Fetch.new(*args)
+        f.retrieve_or_new
       rescue ActiveModel::RangeError => _e
-        return Card.new name: "card id out of range: #{f.mark}"
+        Card.new name: "card id out of range: #{f.mark}"
       end
 
       # fetch only real (no virtual) cards
@@ -83,8 +86,8 @@ class Card
         elsif block_given?
           yield.to_name
         end
-      rescue => error
-        rescue_fetch_name error, &block
+      rescue StandardError => e
+        rescue_fetch_name e, &block
       end
 
       # @param mark - see #fetch
@@ -93,38 +96,43 @@ class Card
         fetch(*mark, skip_modules: true)&.type_id
       end
 
-      # a fetch method to support the needs of the card controller.
-      # should be in Decko?
-      def controller_fetch args
-        card_opts = controller_fetch_opts args
-        if args[:action] == "create"
+      # Specialized fetching appropriate for cards requested by URI
+      # @param params [Hash] hash in the style of parameters expected by Decko
+      # @option params [Hash] :card arguments for Card.new
+      # @option params [String] :mark.
+      # @option params [String] :type shortcut for card[:type]
+      # @option params [True/False] :look_in_trash - passed to Card.fetch
+      # @option params [True/False] :assign - override attributes of fetched card with
+      #   card hash
+      def uri_fetch params
+        card_opts = uri_fetch_opts params
+        if params[:action] == "create"
           # FIXME: we currently need a "new" card to catch duplicates
           # (otherwise save will just act like a normal update)
           # We may need a "#create" instance method to handle this checking?
           Card.new card_opts
         else
-          standard_controller_fetch args, card_opts
+          standard_uri_fetch params, card_opts
         end
       end
 
       private
 
-      def standard_controller_fetch args, card_opts
-        mark = args[:mark] || card_opts[:name]
-        card = Card.fetch mark, skip_modules: true,
-                                look_in_trash: args[:look_in_trash],
-                                new: card_opts
-        card.assign_attributes card_opts if args[:assign] && card&.real?
+      def standard_uri_fetch params, card_opts
+        mark = params[:mark] || card_opts[:name]
+        card = fetch mark, new: card_opts,
+                           skip_modules: true,
+                           look_in_trash: params[:look_in_trash]
+        card.assign_attributes card_opts if params[:assign] && card&.real?
         card&.include_set_modules
         card
       end
 
-      def controller_fetch_opts args
-        opts = Env.hash args[:card]
-        opts[:type] ||= args[:type] if args[:type]
-        # for /new/:type shortcut.  we should handle in routing and deprecate this
-        opts[:name] ||= Name.url_key_to_standard args[:mark]
-        opts
+      def uri_fetch_opts params
+        Env.hash(params[:card]).tap do |opts|
+          opts[:type] ||= params[:type] if params[:type] # for /new/:type shortcut.
+          opts[:name] ||= Name[params[:mark]]&.tr "_", " "
+        end
       end
 
       def rescue_fetch_name error, &block

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/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, t(:format_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
 

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

@@ -5,13 +5,14 @@ class Card
       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