card 1.109.0 → 1.110.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ae89c5e6253fdbcea6b9ea9e1a5ca94b8f22f0c13c47186d8a2d66d6bfb525b
-  data.tar.gz: babc949cb5a33a9385369e62136b60591e96ac03b09a06660bce43d30165cfce
+  metadata.gz: abe5aee55e82a21646046cd81ce981f95e68ec7a5c013d065e4a49202a268e22
+  data.tar.gz: 35909d80d33bd11bc6084c52adab226d655f1052df391b6e4da86c3a2275a525
 SHA512:
-  metadata.gz: f70439a264188fa2f734ddf9ce6cbd8f7ca790bfcddde0c0accf8a2ffa9d2c575c90220d848678c7f1ac965e734ecf4a4d30e33aaed5b41345958210cd24db84
-  data.tar.gz: 6ff17cfaf5b5a7af5fcca9f95693b083b81aa781de06c244356c8b7e397e4621e7784995613252dae2c2d78406f0347f0977212cf91c79cd77c1b9917813e6ee
+  metadata.gz: 7e270754fe2e275c495bb908e9d2e6a4d0f955babc02b9368c28d6ab4a07198f63453d431b7b0cd6a5900c9e1a885447c78f74c3428848efd80c73097eb8fc76
+  data.tar.gz: de120f96396a0b25f6f49f4154c936b497a94e806b02b6634af4db31fb478348ddd4a8dee610085fc38d0dba2baef428df6b6998b7f71a25d4f7b16f05b92824

data/VERSION

@@ -1 +1 @@
-0.19.0
+0.20.0

data/config/locales/es.yml

@@ -133,7 +133,7 @@ es:
           type:
             error_cant_change_errors: "de %{name} no se puede cambiar; creando nuevos errores %{type_id}: %{error_messages}"
             error_no_such_type: No hay tal tipo
-            error_hard_templated: no se puede cambiar porque %{name} es una plantilla dificil de %{type_name}
+            error_structured: no se puede cambiar porque %{name} es una plantilla dificil de %{type_name}
           utils:
             exception_almost_deleted: Se evitó de forma muy estrecha eliminar el archivo actual
       set_pattern:
@@ -302,8 +302,7 @@ es:
             unsupported_view: vista (%{view}) no soportado para %{cardname}
             not_found_named: No pudo encontrar %{cardname}.
             not_found_no_name: la tarjeta solicitada
-            server_error: "\nWagn Hitch!  Error del Servidor. Yuck, perdon por eso.\nPara decirnos más y seguir la solución,\nagregue un ticket de soporte en %{ticket_link}\n"
-            se_hitch: 'Wagn Hitch :('
+            server_error: "\nError del Servidor. Yuck, perdon por eso.\nPara decirnos más y seguir la solución,\nagregue un ticket de soporte en %{ticket_link}\n"
             se_sorry: Error del Servidor. Yuck, perdón por eso.
             se_ticket: <a href="%{ticket_link}">Agregue un ticket de soporte</a> para decirnos más y seguir la solución.
             denial: Permiso denegado

data/db/seeds.rb

@@ -7,7 +7,6 @@ Card::Cache.reset_all
 
 # get rid of bad constants
 Card::Codename.reset_cache
-Card::Codename.generate_id_constants
 
 # TODO: explain why this is necessary
 # (card:seed:build breaks without it)

data/lib/card/auth/current.rb

@@ -36,7 +36,7 @@ class Card
       def signin cardish
         user_id = Card.id(cardish) || AnonymousID
         (session[session_user_key] = self.current_id = user_id).tap do
-          Env.update_cookie_setting !signed_in?
+          Env.update_session_options
         end
       end
 
@@ -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/permissions.rb

@@ -6,7 +6,7 @@ class Card
       # @return [true/false]
       def always_ok?
         case as_id
-        when WagnBotID then true # cannot disable
+        when DeckoBotID then true # cannot disable
         when nil       then false
         else
           always_ok_cached?

data/lib/card/auth/proxy.rb

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

data/lib/card/auth/setup.rb

@@ -41,8 +41,8 @@ class Card
       end
 
       def user_account_cql
-        # every deck starts with two accounts: WagnBot and Anonymous
-        { right: :account, creator_id: ["ne", Card::WagnBotID] }
+        # every deck starts with two accounts: DeckoBot and Anonymous
+        { right: :account, creator_id: ["ne", Card::DeckoBotID] }
       end
 
       def user_account_count

data/lib/card/cache/all.rb

@@ -92,7 +92,7 @@ class Card
       def expire_id cache
         return unless id.present?
 
-        cache.delete "~#{id}"
+        cache.delete id_string
       end
 
       def expire_view_cache_keys view_keys

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/codename.rb

@@ -81,6 +81,7 @@ class Card
       def reset_cache
         @codehash = nil
         ::Card.cache.delete "CODENAMES"
+        generate_id_constants
       end
 
       # @param codename [Symbol, String]

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

@@ -10,10 +10,10 @@ class Card
       end
 
       def save_location card
-        return unless save_location?(card)
+        return unless save_location? card
 
-        discard_locations_for card
-        location_history.push location_for_history(card)
+        location = request ? request.original_url : location_for_history(card)
+        location_history.push(location).uniq!
       end
 
       def previous_location
@@ -21,21 +21,18 @@ class Card
       end
 
       def discard_locations_for card
-        # quoting necessary because cards have things like "+*" in the names..
-        session[:history] = location_history.reject do |loc|
-          if (url_key = url_key_for_location(loc))
-            url_key.to_name.key == card.key
-          end
+        session[:history] = location_history.reject do |l|
+          location_cardname(l) == card.name
         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
 
@@ -43,11 +40,13 @@ class Card
         Env::Location.card_path card.name.url_key
       end
 
-      def url_key_for_location location
-        %r{/([^/]*$)} =~ location ? Regexp.last_match[1] : nil
+      def location_cardname location
+        URI.parse(location).path.sub(%r{^/}, "").sub(%r{/.*$}, "")&.cardname
       end
 
       def save_location? card
+        # return false unless Auth.signed_in? || Cardio.config.allow_anonymous_cookies
+
         !Env.ajax? && Env.html? && card.known? && (card.codename != :signin)
       end
     end

data/lib/card/env/support.rb

@@ -22,16 +22,17 @@ class Card
         if session.is_a? Hash
           @session = {}
         elsif request
-          update_cookie_setting false
+          update_session_options drop: false
           controller.reset_session
-          # destroy_cookie unless Cardio.config.anonymous_cookies
+          # destroy_cookie unless Cardio.config.allow_anonymous_cookies
         end
       end
 
-      def update_cookie_setting is_anonymous=true
-        return unless request && !Cardio.config.anonymous_cookies
+      def update_session_options drop: nil
+        return unless request
+        return if Cardio.config.allow_anonymous_cookies
 
-        request.session_options[:drop] = is_anonymous
+        request.session_options[:drop] = drop.nil? ? !Auth.signed_in? : drop
       end
 
       # private

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/error.rb

@@ -17,8 +17,8 @@ class Card
 
       def view_for_unknown setting_view
         if main? && voo.root?
-          root.error_status = 404
-          :not_found
+          root.error_status = page_status_for_unknown
+          page_view_for_unknown
         else
           setting_view || :unknown
         end
@@ -39,11 +39,21 @@ class Card
         yield
       end
 
+      private
+
       def rescue_view e, view
         method = loud_error? ? :loud_error : :quiet_error
         send method, e, view
       end
 
+      def page_status_for_unknown
+        404
+      end
+
+      def page_view_for_unknown
+        :not_found
+      end
+
       def error_cardname _exception
         if card&.name.present?
           safe_name

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