card 1.98.0 → 1.99.1

data/lib/card/auth/setup.rb

@@ -8,9 +8,10 @@ class Card
       # app is not totally set up yet
       # @return [true/false]
       def needs_setup?
+        # FIXME: - should not require a cache lookup with every request!!
         @simulating_setup_need || (
           !Card.cache.read(SETUP_COMPLETED_KEY) &&
-          !Card.cache.write(SETUP_COMPLETED_KEY, account_count > 2)
+          !Card.cache.write(SETUP_COMPLETED_KEY, user_account_count.positive?)
         )
         # every deck starts with two accounts: WagnBot and Anonymous
       end
@@ -24,15 +25,7 @@ class Card
       # for testing setup
       def hide_accounts! mode=true
         Card.cache.delete(SETUP_COMPLETED_KEY) if mode
-        @hidden_accounts = mode && (account_ids - [WagnBotID, AnonymousID])
-      end
-
-      def account_ids
-        as_bot do
-          Card.search right_id: AccountID,
-                      not: { left_id: ["in", WagnBotID, AnonymousID] },
-                      return: :id
-        end
+        @hidden_accounts = mode && user_account_ids
       end
 
       def instant_account_activation
@@ -44,8 +37,16 @@ class Card
 
       private
 
-      def account_count
-        wql = { right_id: AccountID }
+      def user_account_ids
+        as_bot { Card.search user_account_wql.merge(return: :id) }
+      end
+
+      def user_account_wql
+        { right_id: AccountID, creator_id: ["ne", WagnBotID] }
+      end
+
+      def user_account_count
+        wql = user_account_wql
         wql[:not] = { id: ["in"].concat(@hidden_accounts) } if @hidden_accounts
         as_bot { Card.count_by_wql wql }
       end

data/lib/card/auth/token.rb

@@ -0,0 +1,38 @@
+require "jwt"
+
+class Card
+  module Auth
+    # methods for setting current account
+    module Token
+      SECRET_KEY = Rails.application.secrets.secret_key_base.to_s
+
+      class << self
+        def encode user_id, extra_payload={}
+          payload = { user_id: user_id, exp: expiration }.merge(extra_payload)
+
+          JWT.encode payload, SECRET_KEY
+        end
+
+        # returns Hash if valid, String error message if not
+
+        def validate! token
+          payload = decode token
+          raise Card::Error::PermissionDenied, payload if payload.is_a? String
+
+          payload
+        end
+
+        def decode token
+          decoded = JWT.decode(token, SECRET_KEY)[0]
+          HashWithIndifferentAccess.new decoded
+        rescue JWT::DecodeError => error
+          error.message
+        end
+
+        def expiration
+          Card.config.token_expiry.from_now.to_i
+        end
+      end
+    end
+  end
+end

data/lib/card/content.rb

@@ -45,6 +45,10 @@ class Card
       each_chunk.select { |chunk| chunk.is_a?(chunk_type) }
     end
 
+    def has_chunk? chunk_type
+      each_chunk.any { |chunk| chunk.is_a?(chunk_type)}
+    end
+
     # sends &block to #process_chunk on each Chunk object
     def process_chunks &block
       return custom_process_chunks(&block) if block_given?
@@ -98,20 +102,43 @@ class Card
     end
 
     def without_nests
-      nests = []
-      find_chunks(Card::Content::Chunk::Nest).each_with_index do |chunk, i|
-        nests << chunk.text
-        chunk.burn_after_reading "{{#{i}}}"
+      without_chunks Card::Content::Chunk::Nest do |content|
+        yield content
       end
+    end
 
-      result = yield to_s
-      Chunk::Nest.gsub result do |nest_content|
-        nests[nest_content.to_i]
+    def without_references
+      without_chunks Card::Content::Chunk::Nest, Card::Content::Chunk::Link do |content|
+        yield content
       end
     end
 
+    def without_chunks *chunk_classes
+      chunk_classes = ::Set.new Array.wrap(chunk_classes)
+      stash = stash_chunks chunk_classes
+      processed = yield to_s
+      unstash_chunks processed, stash
+    end
+
     private
 
+    def stash_chunks chunk_classes
+      chunks = []
+      each_chunk do |chunk|
+        next unless chunk_classes.include? chunk.class
+
+        chunk.burn_after_reading "{{#{chunks.size}}}"
+        chunks << chunk.text
+      end
+      chunks
+    end
+
+    def unstash_chunks content, stashed_chunks
+      Chunk::Nest.gsub content do |nest_content|
+        stashed_chunks[nest_content.to_i]
+      end
+    end
+
     def resolve_format format_or_card
       if format_or_card.is_a?(Card)
         Format.new format_or_card, format: nil

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

@@ -34,7 +34,8 @@ class Card
     if not_in_callback?
       attribute_changed? attr
     else
-      saved_change_to_attribute?(attr) || will_save_change_to_attribute?(attr)
+      saved_change_to_attribute?(attr) ||
+        will_save_change_to_attribute?(attr)
     end
   end
 end

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
@@ -60,8 +61,9 @@ class Card
     class UserError < Error
       cattr_accessor :user_error_classes
       self.user_error_classes = [self,
-                                 ActiveRecord::RecordNotFound,
+                                 ActionController::BadRequest,
                                  ActionController::MissingFile,
+                                 ActiveRecord::RecordNotFound,
                                  ActiveRecord::RecordInvalid]
     end
 

data/lib/card/format.rb

@@ -81,7 +81,10 @@ class Card
     def template
       @template ||= begin
         c = controller
-        t = ActionView::Base.new c.class.view_paths, { _routes: c._routes }, c
+        lookup_context = ActionView::LookupContext.new c.class.view_paths
+        t = ActionView::Base.new(
+          lookup_context, { _routes: c._routes }, c
+        )
         t.extend c.class._helpers
         t
       end

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
 
@@ -59,7 +59,8 @@ class Card
 
       def quiet_error e, view
         # TODO: unify with Card::Error#report
-        Rails.logger.info "#{e.message}\n" + (e.backtrace * "\n")
+        Rails.logger.info e.message
+        Rails.logger.debug e.backtrace.join("\n")
         rendering_error e, view
       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/migration.rb

@@ -63,11 +63,9 @@ class Card
       Card::Cache.reset_all
       Cardio.schema_mode "" do
         Card::Auth.as_bot do
-          begin
-            yield
-          ensure
-            ::Card::Cache.reset_all
-          end
+          yield
+        ensure
+          ::Card::Cache.reset_all
         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/abstract_query/tie.rb

@@ -94,8 +94,8 @@ class Card
         def id_from_val val
           case val
           when Integer then val
-          when String  then Card.fetch_id(val)
-          when Symbol  then Card::Codename.id(val)
+          when String  then Card.fetch_id(val) || -999
+          when Symbol  then Card::Codename.id(val) || -999
           end
         end
       end

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

@@ -46,7 +46,25 @@ class Card
         end
 
         def field_match field, val, cxn
-          %(#{field} #{cxn.match quote("[[:<:]]#{val}[[:>:]]")})
+          %(#{field} #{cxn.match quote(wrap_with_word_boundary_check(val, cxn))})
+        end
+
+        def wrap_with_word_boundary_check val, cxn
+          if mysql_8_0_4?(cxn)
+            "\\b#{val}\\b"
+          else
+            "[[:<:]]#{val}[[:>:]]"
+          end
+        end
+
+        # Since version 8.0.4 mysql uses a different syntax for word boundaries in
+        # regular expresions
+        def mysql_8_0_4? cxn
+          return false unless cxn.class.name.include? "Mysql2"
+
+          mysql_version =
+            cxn.select_rows("SHOW VARIABLES WHERE Variable_name = 'version'")[0][1]
+          Gem::Version.new(mysql_version) >= Gem::Version.new("8.0.4")
         end
 
         # TODO: move sql to SqlStatement