card 1.109.1 → 1.110.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbc2d91a4b4e085e2dd391ba227f58cefe096a055354fb5850d5a983db9b389f
-  data.tar.gz: 0c8ced971a5730ae8f4898b967fb3063beb0ba4415957ead6c963619eabd7674
+  metadata.gz: abe5aee55e82a21646046cd81ce981f95e68ec7a5c013d065e4a49202a268e22
+  data.tar.gz: 35909d80d33bd11bc6084c52adab226d655f1052df391b6e4da86c3a2275a525
 SHA512:
-  metadata.gz: 8e92113ce1c6777355ba6f4e0d81936c0b2a80ff8718b50acca6782b9f029268e087183fc2a77c179805a4bb7e12a3b54f025acab6acde19df470f2215e51d1d
-  data.tar.gz: abba860d2387151ba48e3690fddb88c552e31c7770aa7a37fc75006db47f667a422a8632950e2e162742428f461144330a4d0e2487637c99889312106a07d18c
+  metadata.gz: 7e270754fe2e275c495bb908e9d2e6a4d0f955babc02b9368c28d6ab4a07198f63453d431b7b0cd6a5900c9e1a885447c78f74c3428848efd80c73097eb8fc76
+  data.tar.gz: de120f96396a0b25f6f49f4154c936b497a94e806b02b6634af4db31fb478348ddd4a8dee610085fc38d0dba2baef428df6b6998b7f71a25d4f7b16f05b92824

data/VERSION

@@ -1 +1 @@
-0.19.1
+0.20.0

data/lib/card/auth/current.rb

@@ -80,7 +80,7 @@ class Card
       end
 
       def session_user_key
-        "user_#{Cardio.database.underscore}".to_sym
+        :"user_#{Cardio.database.underscore}"
       end
 
       private

data/lib/card/auth/proxy.rb

@@ -24,8 +24,8 @@ class Card
       end
 
       # operate with the permissions of DeckoBot (administrator)
-      def as_bot &block
-        as Card::DeckoBotID, &block
+      def as_bot(&)
+        as(Card::DeckoBotID, &)
       end
 
       # id of proxy user

data/lib/card/cache/class_methods.rb

@@ -12,7 +12,7 @@ class Card
       def [] klass
         raise "nil klass" if klass.nil?
 
-        cache_by_class[klass] ||= new class: klass, store: (shared_cache || nil)
+        cache_by_class[klass] ||= new class: klass, store: shared_cache || nil
       end
 
       # clear the temporary caches and ensure we're using the latest stamp

data/lib/card/cache/shared.rb

@@ -16,6 +16,7 @@ class Card
     #
     class Shared
       extend SharedClass
+
       # @param opts [Hash]
       # @option opts [Rails::Cache] :store
       # @option opts [ruby Class] :class, typically ActiveRecord descendant
@@ -116,8 +117,8 @@ class Card
         @store.write full_key(key), value
       end
 
-      def fetch key, &block
-        @store.fetch full_key(key), &block
+      def fetch(key, &)
+        @store.fetch(full_key(key), &)
       end
 
       def delete key

data/lib/card/content/chunk.rb

@@ -72,9 +72,9 @@ class Card
         end
 
         def validate_chunk_list_key chunk_list_key
-          unless raw_list.key? chunk_list_key
+          return if raw_list.key? chunk_list_key
+
             raise ArgumentError, "invalid chunk list key: #{chunk_list_key}"
-          end
         end
       end
 

data/lib/card/content/parser.rb

@@ -60,7 +60,8 @@ class Card
 
       def match_prefix prefix_regexp
         prefix_match = @content[@position..].match(prefix_regexp)
-        if prefix_match
+        return unless prefix_match
+
           @prefix = prefix_match[0]
           # prefix of matched chunk
           @chunk_start = prefix_match.begin(0) + @position
@@ -73,7 +74,6 @@ class Card
           @position = @chunk_start
           # move scanning position up to beginning of chunk
           true
-        end
       end
 
       def record_chunk
@@ -98,10 +98,10 @@ class Card
       end
 
       def handle_remainder
-        if @chunks.any? && @last_position < @content.size
+        return unless @chunks.any? && @last_position < @content.size
+
           # handle any leftover nonchunk string at the end of content
           @chunks << @content[@last_position..]
-        end
       end
     end
   end

data/lib/card/content.rb

@@ -7,9 +7,7 @@ class Card
   # Each chunk has an object whose class inherits from {Card::Content::Chunk::Abstract}
   #
   class Content < SimpleDelegator
-    extend Clean
-
-    Chunk # trigger autoload
+    extend Clean # trigger autoload
 
     attr_reader :revision, :format, :chunks, :opts
 
@@ -47,8 +45,8 @@ class Card
     end
 
     # sends &block to #process_chunk on each Chunk object
-    def process_chunks &block
-      return custom_process_chunks(&block) if block_given?
+    def process_chunks(&)
+      return custom_process_chunks(&) if block_given?
 
       each_chunk(&:process_chunk)
     end
@@ -98,12 +96,12 @@ class Card
       "<#{__getobj__.class}:#{card}:#{self}>"
     end
 
-    def without_nests &block
-      without_chunks Chunk::Nest, &block
+    def without_nests(&)
+      without_chunks(Chunk::Nest, &)
     end
 
-    def without_references &block
-      without_chunks Chunk::Nest, Chunk::Link, Chunk::EscapedLiteral, &block
+    def without_references(&)
+      without_chunks(Chunk::Nest, Chunk::Link, Chunk::EscapedLiteral, &)
     end
 
     def without_chunks *chunk_classes

data/lib/card/director/all.rb

@@ -27,11 +27,11 @@ class Card
           end
       end
 
-      def act options={}, &block
+      def act(options={}, &)
         if act_card
-          add_to_act options, &block
+          add_to_act(options, &)
         else
-          start_new_act(&block)
+          start_new_act(&)
         end
       end
 
@@ -45,7 +45,7 @@ class Card
 
       def save! **args
         as_subcard = args.delete :as_subcard
-        act(as_subcard: as_subcard) { super **args }
+        act(as_subcard: as_subcard) { super(**args) }
       end
 
       def save *_args

data/lib/card/director/card_class.rb

@@ -107,11 +107,11 @@ class Card
         end
       end
 
-      def ensuring_purity card, other, opts, &block
+      def ensuring_purity(card, other, opts, &)
         if opts[:codename] && other
-          ensure_purity_advanced card, other, opts, &block
+          ensure_purity_advanced(card, other, opts, &)
         else
-          ensure_purity_simple card, &block
+          ensure_purity_simple(card, &)
         end
       end
 

data/lib/card/director/event_delay.rb

@@ -20,10 +20,10 @@ class Card
         Cardio.config.delaying == true
       end
 
-      def with_delay_act act_id, card, &block
+      def with_delay_act(act_id, card, &)
         return yield unless act_id && (self.act = Act.find act_id)
 
-        run_job_with_act act, card, &block
+        run_job_with_act(act, card, &)
       end
 
       def run_job_with_act act, card, &block

data/lib/card/director/phases.rb

@@ -31,10 +31,10 @@ class Card
 
       # Unlike other phases, the storage phase takes a block,
       # because it is called by an "around" callback
-      def storage_phase &block
+      def storage_phase(&)
         catch_up_to_stage :prepare_to_store # unless @abort
         # puts "before store #{@card.name}: abort:#{@abort}"
-        run_stage :store, &block # unless @abort
+        run_stage(:store, &) # unless @abort
         run_stage :finalize # unless @abort
         raise ActiveRecord::RecordInvalid, @card if @card.errors.any?
       ensure

data/lib/card/director/store.rb

@@ -21,14 +21,14 @@ class Card
       # the subcards as we do in the other phases.
       # Instead we have to call `save` on the subcards and use the ActiveRecord
       # :around_save callback.
-      def store &save_block
+      def store(&)
         raise Card::Error, "need block to store main card" if main? && !block_given?
 
         # the block is the ActiveRecord block from the around save callback that
         # saves the card
         if block_given?
           run_stage_callbacks :store
-          store_with_subcards(&save_block)
+          store_with_subcards(&)
         else
           trigger_storage_phase_callback
         end

data/lib/card/env/location_history.rb

@@ -26,13 +26,13 @@ class Card
         end.compact
       end
 
-      def save_interrupted_action uri
-        session[:interrupted_action] = uri
-      end
+      # def save_interrupted_action uri
+      #   session[:interrupted_action] = uri
+      # end
 
-      def interrupted_action
-        session.delete :interrupted_action
-      end
+      # def interrupted_action
+      #   session.delete :interrupted_action
+      # end
 
       private
 
@@ -41,7 +41,7 @@ class Card
       end
 
       def location_cardname location
-        URI.parse(location).path.sub(/^\//, "").sub(/\/.*$/, "")&.cardname
+        URI.parse(location).path.sub(%r{^/}, "").sub(%r{/.*$}, "")&.cardname
       end
 
       def save_location? card

data/lib/card/error.rb

@@ -27,7 +27,7 @@ class Card
         self.card = message
         message = message_from_card
       end
-      super message
+      super
     end
 
     def message_from_card
@@ -119,7 +119,7 @@ class Card
 
       def initialize status, msg=""
         @status = status
-        super msg
+        super(msg)
       end
     end
 

data/lib/card/fetch/card_class.rb

@@ -28,8 +28,8 @@ class Card
       #        new: { opts for Card#new }  Return a new card when not found
       #
       # @return [Card]
-      def fetch *args
-        f = Fetch.new(*args)
+      def fetch(*)
+        f = Fetch.new(*)
         f.retrieve_or_new
       rescue ActiveModel::RangeError => _e
         Card.new name: "card id out of range: #{f.mark}"

data/lib/card/format/card_action_view.rb

@@ -4,7 +4,7 @@ class Card
     class CardActionView < ActionView::Base
       class << self
         def new controller
-          super lookup_context, { _routes: nil }, controller
+          super(lookup_context, { _routes: nil }, controller)
         end
 
         def lookup_context

data/lib/card/format/content.rb

@@ -1,18 +1,18 @@
 class Card
   class Format
     module Content
-      def process_content override_content=nil, content_opts=nil, &block
+      def process_content(override_content=nil, content_opts=nil, &)
         content_obj = content_object override_content, content_opts
-        content_obj.process_chunks(&block)
+        content_obj.process_chunks(&)
         content_obj.to_s
       end
 
       # 1. Break out references (nests / links) into separate chunks
       # 2. yields the other (non-ref) content
       # 3. processes references
-      def safe_process_content override_content=nil, content_opts=nil, &block
+      def safe_process_content(override_content=nil, content_opts=nil, &)
         content_obj = content_object override_content, chunk_list: :references
-        process_content content_obj.without_references(&block), content_opts
+        process_content content_obj.without_references(&), content_opts
       end
 
       # nested by another card's content

data/lib/card/format/method_delegation.rb

@@ -38,11 +38,11 @@ class Card
       # TODO: make it so we fall back to super if action_view can't handle method.
       # It's not as easy as `elsif api_render? method`, because respond_to gives
       # false for many methods action view can actually handle, like `h`
-      def method_missing method, *opts, &proc
+      def method_missing(method, *opts, &)
         if (match = api_render? method)
           api_render match, opts
         else
-          delegate_to_action_view method, opts, &proc
+          delegate_to_action_view(method, opts, &)
         end
       end
 
@@ -54,8 +54,8 @@ class Card
         end
       end
 
-      def interpret_render_opts opts, &block
-        (opts[0] ? opts.shift.clone : {}).tap(&block)
+      def interpret_render_opts(opts, &)
+        (opts[0] ? opts.shift.clone : {}).tap(&)
       end
 
       def optional_render_opt opts, args

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

@@ -21,11 +21,11 @@ class Card
         # run block with new_mode as nest_mode, then return to prior mode
         # @param new_mode [Symbol] :normal, :compact, :edit, or :template
         # @return block result
-        def with_nest_mode new_mode, &block
+        def with_nest_mode(new_mode, &)
           if new_mode == @nest_mode
             yield
           else
-            with_altered_nest_mode new_mode, &block
+            with_altered_nest_mode(new_mode, &)
           end
         end
 

data/lib/card/format/render.rb

@@ -47,7 +47,7 @@ class Card
       end
 
       # see {Abstract::Format}
-      # (:default), :yes, :deep, :always, :never
+      # (:default), :yes, :deep, :force, :always, :never
       def view_cache_setting view
         voo&.cache || view_setting(:cache, view) || :default
       end
@@ -60,6 +60,7 @@ class Card
         return cached_content if Cardio.config.view_cache == :debug
 
         # stub_debugging do
+        # Rails.logger.info cached_content
         expand_stubs cached_content
         # end
       end
@@ -115,14 +116,14 @@ class Card
         Env.params[:debug] == "view"
       end
 
-      # def stub_debugging
-      #   result = yield
-      #   if Rails.env.development? && result.is_a?(String) && result =~ /StUb/
-      #     Rails.logger.debug "STUB IN RENDERED VIEW: #{card.name}: " \
-      #                       "#{voo.ok_view}\n#{result}"
-      #   end
-      #   result
-      # end
+      def stub_debugging
+        result = yield
+        if Rails.env.development? && result.is_a?(String) && result =~ /StUb/
+          Rails.logger.debug "STUB IN RENDERED VIEW: #{card.name}: " \
+                             "#{voo.ok_view}\n#{result}"
+        end
+        result
+      end
 
       def prepare_stub_nest stub_hash
         stub_card = Card.fetch_from_cast stub_hash[:cast]

data/lib/card/format/wrapper.rb

@@ -41,9 +41,9 @@ class Card
       def raise_wrap_error wrapper
         if wrapper.is_a? String
           raise Card::Error::UserError, "unknown layout card: #{wrapper}"
-        else
-          raise ArgumentError, "unknown wrapper: #{wrapper}"
         end
+
+          raise ArgumentError, "unknown wrapper: #{wrapper}"
       end
 
       def send_wrapper_method method_name, opts

data/lib/card/model/save_helper/save_helper_helper.rb

@@ -17,11 +17,11 @@ class Card
           Card.exist? name
         end
 
-        def method_missing method, *args
+        def method_missing(method, *)
           method_name, cardtype_card = extract_cardtype_from_method_name method
           return super unless method_name
 
-          sargs = standardize_args(*args).merge(type_id: cardtype_card.id)
+          sargs = standardize_args(*).merge(type_id: cardtype_card.id)
           if method_name == "ensure"
             Card.ensure sargs
           else

data/lib/card/model/save_helper.rb

@@ -12,8 +12,8 @@ class Card
       include SaveHelperHelper
       include SaveArguments
 
-      def with_user user_name, &block
-        Card::Auth.with(current_id: user_name.card_id, &block)
+      def with_user(user_name, &)
+        Card::Auth.with(current_id: user_name.card_id, &)
       end
 
       def create_card name_or_args, content_or_args=nil

data/lib/card/name/all/parts.rb

@@ -3,14 +3,14 @@ class Card
     module All
       # Card methods for handling name parts, eg A and B are both parts of A+B
       module Parts
-        def left *args
+        def left(*)
           case
           when simple?   then nil
           when superleft then superleft
           when name_is_changing? && name.to_name.trunk_name == name_before_act.to_name
             nil # prevent recursion when, eg, renaming A+B to A+B+C
           else
-            Card.fetch name.left, *args
+            Card.fetch(name.left, *)
           end
         end
 
@@ -18,16 +18,16 @@ class Card
           left(args) || Card.new(args.merge(name: name.left))
         end
 
-        def right *args
-          Card.fetch(name.right, *args) unless simple?
+        def right(*)
+          Card.fetch(name.right, *) unless simple?
         end
 
-        def trunk *args
-          simple? ? self : left(*args)
+        def trunk(*)
+          simple? ? self : left(*)
         end
 
-        def tag *args
-          simple? ? self : Card.fetch(name.right, *args)
+        def tag(*)
+          simple? ? self : Card.fetch(name.right, *)
         end
 
         def right_id= cardish
@@ -44,11 +44,11 @@ class Card
           when_id_exists(cardish) { |id| write_attribute attribute, id }
         end
 
-        def when_id_exists cardish, &block
+        def when_id_exists(cardish, &)
           if (card_id = Card.id cardish)
             yield card_id
           elsif cardish.is_a? Card
-            with_id_after_store cardish, &block
+            with_id_after_store(cardish, &)
           else
             yield cardish # eg nil
           end

data/lib/card/name/all.rb

@@ -24,7 +24,6 @@ class Card
         update_subcard_names @name
         write_attribute :name, (@name.simple? ? @name.s : nil)
         assign_side_ids
-        @name
       end
 
       def [] *args
@@ -70,7 +69,6 @@ class Card
           @key = newkey
         end
         clean_patterns
-        @key
       end
 
       private

data/lib/card/name.rb

@@ -40,7 +40,7 @@ class Card
         elsif (id = id_from_string str)  # handles ~[id] and :[codename]
           from_id_from_string id, str
         else
-          super str
+          super(str)
         end
       end
 
@@ -89,8 +89,8 @@ class Card
         new_from_parts(parts) { |part| new part }
       end
 
-      def new_from_parts parts, &block
-        name_parts = parts.flatten.map(&block)
+      def new_from_parts(parts, &)
+        name_parts = parts.flatten.map(&)
         new name_parts.join(joint), true
       end
 

data/lib/card/query/card_class.rb

@@ -2,9 +2,9 @@ class Card
   module Query
     # query-related methods with which to extend Card class
     module CardClass
-      def search spec, comment=nil, &block
+      def search(spec, comment=nil, &)
         results = ::Card::Query.run(spec, comment)
-        results.each(&block) if block_given? && results.is_a?(Array)
+        results.each(&) if block_given? && results.is_a?(Array)
         results
       end
 

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

@@ -103,7 +103,7 @@ class Card
         end
 
         def relate_multi_value_with_subcondition key, conj, val
-          send conj, (val.map { |v| { key => v } })
+          send(conj, val.map { |v| { key => v } })
         end
 
         def relate_multi_value_without_subcondition method, key, val

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

@@ -28,7 +28,7 @@ class Card
           case clause
           when Hash              then clause
           when Integer           then { id: clause }
-          when String            then { id: (Card::Lexicon.id(clause) || -2) }
+          when String            then { id: Card::Lexicon.id(clause) || -2 }
           when Symbol            then { id: Card::Codename.id(clause) }
           else raise Error::BadQuery, "Invalid clause: #{clause.inspect}"
           end

data/lib/card/query/card_query.rb

@@ -13,6 +13,7 @@ class Card
       include Sorting
       include Conjunctions
       include Custom
+
       # Query Execution
 
       # By default a query returns card objects. This is accomplished by returning
@@ -32,7 +33,7 @@ class Card
       end
 
       def initialize statement, comment=nil
-        super statement
+        super(statement)
         @comment = comment || default_comment
         interpret @statement
       end

data/lib/card/query/sql_statement/where.rb

@@ -3,7 +3,7 @@ class Card
     class SqlStatement
       # handle where clause in SqlStatement
       module Where
-        def where explicit=true
+        def where explicit: true
           conditions = [explicit_conditions(@query), implicit_conditions(@query)]
           conditions = conditions.reject(&:blank?).join " AND "
           "#{'WHERE ' if explicit}#{conditions}" unless conditions.blank?

data/lib/card/reference/all.rb

@@ -113,10 +113,10 @@ class Card
         end
       end
 
-      def each_reference_type ref_types, &block
+      def each_reference_type(ref_types, &)
         ref_types.delete PARTIAL_REF_CODE if ref_types.size > 1
         # partial references are not necessary if there are explicit references
-        ref_types.each(&block)
+        ref_types.each(&)
       end
 
       # invokes the given block for each reference in content with

data/lib/card/set/advanced_api.rb

@@ -9,16 +9,17 @@ class Card
 
       def setting_opts opts
         extend Card::Setting
+
         register_setting opts
       end
 
-      def ensure_set &block
+      def ensure_set(&)
         set_module = yield
         set_module = card_set_module_const_get(set_module) unless set_module.is_a?(Module)
       rescue NameError => e
         define_set_from_error e
         # try again - there might be another submodule that doesn't exist
-        ensure_set(&block)
+        ensure_set(&)
       else
         set_module.extend Card::Set
       end
@@ -32,7 +33,7 @@ class Card
 
       def attachment name, args
         include_set Abstract::Attachment
-        add_attributes name, "remote_#{name}_url".to_sym,
+        add_attributes name, :"remote_#{name}_url",
                        :action_id_of_cached_upload, :empty_ok,
                        :storage_type, :bucket, :mod
         mount_uploader name, (args[:uploader] || ::CarrierWave::FileCardUploader)