card 1.108.1 → 1.109.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae50e986081ed9e3618c1b92ccfbedfc19a9076529cb17360700506fd8acb054
-  data.tar.gz: c383ab4419aee1792ff33d7e667858a40f3063d6132d03f5bd9530725b56ac78
+  metadata.gz: 9ae89c5e6253fdbcea6b9ea9e1a5ca94b8f22f0c13c47186d8a2d66d6bfb525b
+  data.tar.gz: babc949cb5a33a9385369e62136b60591e96ac03b09a06660bce43d30165cfce
 SHA512:
-  metadata.gz: 1241479974329e34712f63ef0b3e00942a7a775a87c7e397bca3540114e1ef4a1757be95ee3dd7e8511963db768990e02b14dae74b8c31f1aea8b52ebffb948f
-  data.tar.gz: ea15daab38b40f7a41a272459f4c197724f22d9d7d37582ca30c70b01ad73b3140ade6fde2d990b6877fbc8beab9158e351622a2d8f7dd02029d5f8c32875a10
+  metadata.gz: f70439a264188fa2f734ddf9ce6cbd8f7ca790bfcddde0c0accf8a2ffa9d2c575c90220d848678c7f1ac965e734ecf4a4d30e33aaed5b41345958210cd24db84
+  data.tar.gz: 6ff17cfaf5b5a7af5fcca9f95693b083b81aa781de06c244356c8b7e397e4621e7784995613252dae2c2d78406f0347f0977212cf91c79cd77c1b9917813e6ee

data/VERSION

@@ -1 +1 @@
-0.18.1
+0.19.0

data/config/environments/development.rb

@@ -26,7 +26,7 @@ Cardio.application.class.configure do
   config.action_controller.perform_caching = false
 
   # Don't care if the mailer can't send
-  config.action_mailer.raise_delivery_errors = false
+  # config.action_mailer.raise_delivery_errors = false
 
   # Print deprecation notices to the Rails logger
   config.active_support.deprecation = :log

data/config/environments/production.rb

@@ -4,6 +4,7 @@ Cardio.application.class.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
   config.eager_load = true
+  config.view_cache = true
 
   # temporary fix for formerly autoloaded files that stopped autoloading in Rails 5
   # TODO: configure eager_load_paths explicitly (and remove this)
@@ -35,7 +36,8 @@ Cardio.application.class.configure do
   # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
   # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
 
-  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+  # Force all access to the app over SSL, use Strict-Transport-Security,
+  # and use secure cookies.
   # config.force_ssl = true
 
   # See everything in the log (default is :info)
@@ -50,7 +52,8 @@ Cardio.application.class.configure do
   # Enable serving of images, stylesheets, and JavaScripts from an asset server
   # config.action_controller.asset_host = "http://assets.example.com"
 
-  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
+  # Precompile additional assets (application.js, application.css,
+  # and all non-JS/CSS are already added)
   # config.assets.precompile += %w[application-all.css application-print.css barebones.css
   #                                html5shiv-printshiv.js]
 

data/config/initializers/01_core_extensions/array.rb

@@ -1,4 +1,5 @@
 module CoreExtensions
+  # extensions for Ruby Arrays
   module Array
     def to_pointer_content
       map do |item|

data/config/initializers/01_core_extensions/hash.rb

@@ -1,6 +1,9 @@
 module CoreExtensions
+  # extensions for Ruby Hashes
   module Hash
+    # extend ruby Hash class
     module ClassMethods
+      # nested ruby hashes
       module Nesting
         # create hash with default nested structures
         # @example
@@ -21,6 +24,7 @@ module CoreExtensions
       end
     end
 
+    # special ruby hash merging behavior
     module Merging
       # attach CSS classes
       # @example

data/config/initializers/02_patches/active_record.rb

@@ -37,7 +37,7 @@ module Patches
 
       # Remove :id column if not in *columns
       def cleaned_batch_items items, remove_id
-        items.map! { |row| row[1..-1] } if remove_id
+        items.map! { |row| row[1..] } if remove_id
       end
 
       def prepare_batch_pluck columns

data/config/initializers/core_extensions.rb

@@ -1,7 +1,6 @@
 # -*- encoding : utf-8 -*-
 
 # extend core Ruby object classes
-
 module CoreExtensions
   ::Kernel.include Kernel
   ::Object.include Object

data/config/initializers/deck_config.rb

@@ -1,3 +1,3 @@
-if File.exist? "config/deck.yml"
-  Cardio.application.config.x = OpenStruct.new(Cardio.application.config_for(:deck))
-end
+# if File.exist? "config/deck.yml"
+#   Cardio.application.config.x = OpenStruct.new(Cardio.application.config_for(:deck))
+# end

data/config/initializers/patches.rb

@@ -1,4 +1,4 @@
-module Kaminari #:nodoc: all
+module Kaminari # :nodoc: all
   module Helpers
     class Tag
       include Patches::Kaminari::Helpers::Tag
@@ -7,14 +7,14 @@ module Kaminari #:nodoc: all
 end
 
 if defined? BetterErrors
-  module BetterErrors #:nodoc: all
+  module BetterErrors # :nodoc: all
     class StackFrame
       # suppress_warnings { include Patches::BetterErrors::StackFrame::TmpPath }
     end
   end
 end
 
-module ActiveRecord #:nodoc: all
+module ActiveRecord # :nodoc: all
   class Relation
     include Patches::ActiveRecord::Relation
   end
@@ -48,14 +48,14 @@ module ActiveRecord #:nodoc: all
 end
 
 module ActiveJob
-  module Arguments #:nodoc: all
+  module Arguments # :nodoc: all
     class << self
       prepend Patches::ActiveJob::Arguments
     end
   end
 end
 
-module ActiveSupport #:nodoc: all
+module ActiveSupport # :nodoc: all
   module Callbacks
     class Callback
       prepend Patches::ActiveSupport::Callbacks::Callback
@@ -63,7 +63,7 @@ module ActiveSupport #:nodoc: all
   end
 end
 
-module Zeitwerk #:nodoc: all
+module Zeitwerk # :nodoc: all
   class Loader
     prepend Patches::Zeitwerk
   end

data/lib/card/auth/current.rb

@@ -34,14 +34,16 @@ class Card
 
       # set current user in process and session
       def signin cardish
-        session[session_user_key] =
-          self.current_id = Card.id(cardish) || Card::AnonymousID
+        user_id = Card.id(cardish) || AnonymousID
+        (session[session_user_key] = self.current_id = user_id).tap do
+          Env.update_cookie_setting !signed_in?
+        end
       end
 
       # current user is not anonymous
       # @return [true/false]
       def signed_in?
-        current_id != Card::AnonymousID
+        current_id != AnonymousID
       end
 
       # set current from token, api_key, or session
@@ -63,7 +65,7 @@ class Card
       # get session object from Env
       # return [Session]
       def session
-        Card::Env.session
+        Env.session
       end
 
       # find +\*account card by +\*email card
@@ -89,8 +91,8 @@ class Card
       # @return [+*account card, nil]
       def find_account_by fieldcode, value
         Auth.as_bot do
-          Card.search({ right_id: Card::AccountID,
-                        right_plus: [Card::Codename.id(fieldcode), { content: value }] },
+          Card.search({ right_id: AccountID,
+                        right_plus: [Codename.id(fieldcode), { content: value }] },
                       "find +:account with +#{fieldcode} (#{value})").first
         end
       end

data/lib/card/auth.rb

@@ -19,12 +19,9 @@ class Card
       # @return [+*account card, nil]
       def authenticate email, password
         account = Auth.find_account_by_email email
-        case
-        when !account                                 then nil
-        when !account.active?                         then nil
-        when Card.config.no_authentication            then account
-        when password_valid?(account, password.strip) then account
-        end
+        return nil unless account&.active?
+
+        account if not_required? || password_valid?(account, password.strip)
       end
 
       # check whether password is correct for account card
@@ -43,6 +40,10 @@ class Card
       def serialize
         { as_id: as_id, current_id: current_id }
       end
+
+      def not_required?
+        Card.config.no_authentication
+      end
     end
   end
 end

data/lib/card/cache/class_methods.rb

@@ -1,12 +1,10 @@
-
 class Card
   class Cache
     # class methods for Card::Cache
     module ClassMethods
       include Populate
 
-      attr_accessor :no_renewal
-      attr_accessor :counter
+      attr_accessor :no_renewal, :counter
 
       # create a new cache for the ruby class provided
       # @param klass [Class]
@@ -109,7 +107,7 @@ class Card
       end
 
       def tallies
-        "#{tally_total} Cache calls (" + counter.map { |k, v| "#{k}=#{v} " }.join + ")"
+        "#{tally_total} Cache calls (#{counter.map { |k, v| "#{k}=#{v} " }.join})"
       end
 
       private

data/lib/card/cache/shared.rb

@@ -82,7 +82,7 @@ class Card
       def read_multi keys
         map = keys.each_with_object({}) { |k, h| h[full_key k] = k }
         raw = @store.read_multi(*map.keys)
-        raw.each_with_object({}) { |(k, v), h| h[map[k]] = v }
+        raw.transform_keys { |k| map[k] }
       end
 
       # update an attribute of an object already in the cache

data/lib/card/cache/temporary.rb

@@ -11,7 +11,7 @@ class Card
     # Unlike the Shared cache, the Temporary cache can handle objects with
     # singleton classes.
     class Temporary
-      MAX_KEYS = 10_000
+      MAX_KEYS = Cardio.config.max_temporary_cache_keys
       attr_reader :store
 
       def initialize klass
@@ -80,7 +80,7 @@ class Card
       def within_key_counts
         if @reps >= MAX_KEYS && (@reps = @store.size) > MAX_KEYS
           Rails.logger.info "RESETTING temporary #{@klass} cache. " \
-                              "MAX_KEYS (#{MAX_KEYS}) exceeded"
+                            "MAX_KEYS (#{MAX_KEYS}) exceeded"
           reset
         end
         yield

data/lib/card/codename.rb

@@ -1,6 +1,5 @@
 # -*- encoding : utf-8 -*-
 
-# codename retrieval methods for cards
 class Card
   # @return [Symbol]
   def codename

data/lib/card/content/chunk/abstract.rb

@@ -7,6 +7,7 @@ class Card
     # match by its pattern.
     #
     module Chunk
+      # Abstract class used for all different types of chunks of card content
       class Abstract
         class_attribute :config
         attr_reader :text, :process_chunk

data/lib/card/content/chunk.rb

@@ -9,7 +9,6 @@ class Card
     # +pattern+ that states what sort of text it matches.
     # Chunks are initalized by passing in the result of a
     # match by its pattern.
-    #
     module Chunk
       mattr_accessor :raw_list, :prefix_regexp_by_list,
                      :prefix_map_by_list, :prefix_map_by_chunkname

data/lib/card/content/clean.rb

@@ -13,7 +13,9 @@ class Card
         "a" => %w[href title target],
         "img" => %w[src alt title],
         "code" => ["lang"],
-        "blockquote" => ["cite"]
+        "blockquote" => ["cite"],
+        "ol" => ["type"],
+        "ul" => ["type"]
       )
 
       if Cardio.config.allow_inline_styles
@@ -86,7 +88,7 @@ class Card
 
         rest_value = match[0]
         if attrib == "class"
-          rest_value.split(/\s+/).select { |s| s =~ /^w-/i }.join(" ")
+          rest_value.split(/\s+/).grep(/^w-/i).join " "
         else
           rest_value
         end

data/lib/card/content/diff/l_c_s.rb

@@ -51,8 +51,7 @@ class Card
         end
 
         def check_exclude_and_disjunction_pattern list
-          list.each_with_index.each_with_object([[], []]) do |pair, res|
-            element, index = pair
+          list.each_with_index.with_object([[], []]) do |(element, index), res|
             if element.match? @disjunction_pattern
               res[1] << { chunk_index: index, element: element, type: :disjunction }
             elsif element.match? @exclude_pattern

data/lib/card/content/diff/result.rb

@@ -3,7 +3,8 @@ class Card
     class Diff
       # Result object for Diff processing
       class Result
-        attr_accessor :complete, :summary, :dels_cnt, :adds_cnt
+        attr_accessor :complete, :dels_cnt, :adds_cnt
+        attr_writer :summary
 
         def initialize summary_opts=nil
           @dels_cnt = 0

data/lib/card/content/diff.rb

@@ -2,6 +2,7 @@
 
 class Card
   class Content
+    # handle comparisons of card content
     class Diff
       class << self
         def complete a, b, opts={}
@@ -57,7 +58,7 @@ class Card
         when :html
           opts[:exclude] = /^</
         when :text
-          opts[:reject] =  /^</
+          opts[:reject] = /^</
           opts[:postprocess] = proc { |word| word.gsub("\n", "<br>") }
         when :pointer
           opts[:preprocess] = proc { |word| word.gsub("[[", "").gsub("]]", "<br>") }

data/lib/card/content/parser.rb

@@ -38,7 +38,7 @@ class Card
         @chunk_class = Chunk.find_class_by_prefix @prefix, @chunk_list
 
         # get the chunk class from the prefix
-        content_slice = @content[@position..-1]
+        content_slice = @content[@position..]
         @chunk_class.full_match content_slice, @prefix
       end
 
@@ -59,7 +59,7 @@ class Card
       end
 
       def match_prefix prefix_regexp
-        prefix_match = @content[@position..-1].match(prefix_regexp)
+        prefix_match = @content[@position..].match(prefix_regexp)
         if prefix_match
           @prefix = prefix_match[0]
           # prefix of matched chunk
@@ -79,10 +79,8 @@ class Card
       def record_chunk
         @position += (@match.end(0) - @offset.to_i)
         # move scanning position up to end of chunk
-        if !@chunk_class.context_ok? @content, @chunk_start
-          # make sure there aren't contextual reasons for ignoring this chunk
-          false
-        else
+
+        if @chunk_class.context_ok? @content, @chunk_start
           @chunks << @interval_string unless @interval_string.empty?
           @interval_string = ""
           # add the nonchunk string to the chunk list and
@@ -93,13 +91,16 @@ class Card
           # NOTE: that the end of the chunk was the last place where a
           # chunk was found (so far)
           true
+        else
+          # make sure there aren't contextual reasons for ignoring this chunk
+          false
         end
       end
 
       def handle_remainder
         if @chunks.any? && @last_position < @content.size
           # handle any leftover nonchunk string at the end of content
-          @chunks << @content[@last_position..-1]
+          @chunks << @content[@last_position..]
         end
       end
     end

data/lib/card/content.rb

@@ -73,7 +73,7 @@ class Card
         when String then return # no chunks
         else
           Rails.logger.warn "unrecognized type for #each_chunk: " \
-                            " #{self.class} #{__getobj__.class}"
+                            "#{self.class} #{__getobj__.class}"
           return
         end
       send(iterator) { |item| yield item if item.is_a?(Chunk::Abstract) }

data/lib/card/director/subdirector_array.rb

@@ -1,5 +1,6 @@
 class Card
   class Director
+    # extends array with special methods for handling lists of card subdirectors
     class SubdirectorArray < Array
       def self.initialize_with_subcards parent
         dir_array = new(parent)

data/lib/card/director.rb

@@ -208,7 +208,7 @@ class Card
     def to_s level=1
       str = @card.name.to_s.clone
       if @subdirectors.present?
-        subs = subdirectors.map { |d| "  " * level + d.to_s(level + 1) }.join "\n"
+        subs = subdirectors.map { |d| ("  " * level) + d.to_s(level + 1) }.join "\n"
         str << "\n#{subs}"
       end
       str

data/lib/card/dirty/method_factory.rb

@@ -1,5 +1,6 @@
 class Card
   module Dirty
+    # handles special method definitions for dirty cards
     module MethodFactory
       def define_dirty_methods field
         define_method "#{field}_before_act" do

data/lib/card/env/location.rb

@@ -1,12 +1,11 @@
 class Card
   module Env
+    # shared methods for handling paths/urls
     module Location
       # card_path    makes a relative path site-absolute (if not already)
-      # card_url     makes it a full url (if not already)
-
       def card_path rel_path
         unless rel_path.is_a? String
-          Rails.logger.warn "Pass only strings to card_path. "\
+          Rails.logger.warn "Pass only strings to card_path. " \
                             "(#{rel_path} = #{rel_path.class})"
         end
         if rel_path.match? %r{^(https?:)?/}
@@ -16,6 +15,7 @@ class Card
         end
       end
 
+      # card_url     makes it a full url (if not already)
       def card_url rel
         rel.match?(/^https?:/) ? rel : "#{Env.origin}#{card_path rel}"
       end

data/lib/card/env/location_history.rb

@@ -13,19 +13,11 @@ class Card
         return unless save_location?(card)
 
         discard_locations_for card
-        session[:previous_location] =
-          Env::Location.card_path card.name.url_key
-        location_history.push previous_location
-      end
-
-      def save_location? card
-        !Env.ajax? && Env.html? && card.known? && (card.codename != :signin)
+        location_history.push location_for_history(card)
       end
 
       def previous_location
-        return unless location_history
-
-        session[:previous_location] ||= location_history.last
+        location_history&.last
       end
 
       def discard_locations_for card
@@ -35,7 +27,6 @@ class Card
             url_key.to_name.key == card.key
           end
         end.compact
-        session[:previous_location] = nil
       end
 
       def save_interrupted_action uri
@@ -46,9 +37,19 @@ class Card
         session.delete :interrupted_action
       end
 
+      private
+
+      def location_for_history card
+        Env::Location.card_path card.name.url_key
+      end
+
       def url_key_for_location location
         %r{/([^/]*$)} =~ location ? Regexp.last_match[1] : nil
       end
+
+      def save_location? card
+        !Env.ajax? && Env.html? && card.known? && (card.codename != :signin)
+      end
     end
   end
 end

data/lib/card/env/success/target.rb

@@ -14,11 +14,11 @@ class Card
           card(name_context) || @target || Card.fetch(name_context)
         end
 
-        # TODO: refactor to use cardish
         def mark= value
-          case value
-          when Integer then @id = value
-          when Card then @card = value
+          if (id = Card.id value)
+            @id = id
+          elsif value.is_a? Card
+            @card = value
           else
             self.target = value
           end

data/lib/card/env/support.rb

@@ -21,10 +21,32 @@ class Card
       def reset_session
         if session.is_a? Hash
           @session = {}
-        else
-          controller&.reset_session
+        elsif request
+          update_cookie_setting false
+          controller.reset_session
+          # destroy_cookie unless Cardio.config.anonymous_cookies
         end
       end
+
+      def update_cookie_setting is_anonymous=true
+        return unless request && !Cardio.config.anonymous_cookies
+
+        request.session_options[:drop] = is_anonymous
+      end
+
+      # private
+
+      # FIXME: not working
+      # the response generally works to destroy a cookie, but
+      # the deletion doesn't appear to work in a redirect. Since signing out
+      # has a redirect response, we're still left with a cookie
+      # def destroy_cookie
+      #   app = Cardio.application
+      #   app_name = app.class.name ? app.railtie_name.chomp("_application") : ""
+      #   expire_in_past = "expires=Thu, 01 Jan 1970 00:00:00 GMT;"
+      #   controller.response.set_header "SET-COOKIE",
+      #                                  "_#{app_name}_session=deleted; #{expire_in_past}"
+      # end
     end
   end
 end

data/lib/card/error.rb

@@ -78,6 +78,7 @@ class Card
     class BadQuery < UserError
     end
 
+    # error with url
     class BadAddress < UserError
       self.status_code = 404
       self.view = :bad_address

data/lib/card/fetch/store.rb

@@ -36,7 +36,7 @@ class Card
       end
 
       def needs_prep?
-        return unless card.present?
+        return false unless card.present?
 
         !(skip_modules? || card.patterns?)
       end

data/lib/card/format/error.rb

@@ -1,5 +1,6 @@
 class Card
   class Format
+    # permissions and errors in card format classes
     module Error
       def ok? task
         task = :create if task == :update && card.new_card?

data/lib/card/format/method_delegation.rb

@@ -1,5 +1,7 @@
 class Card
   class Format
+    # missing methods may be render calls or action view methods
+    # these methods sort that out
     module MethodDelegation
       RENDER_METHOD_RE =
         /^
@@ -40,7 +42,7 @@ class Card
         if (match = api_render? method)
           api_render match, opts
         else
-          delegate_to_action_view(method, opts, proc) { yield }
+          delegate_to_action_view method, opts, &proc
         end
       end
 
@@ -66,9 +68,9 @@ class Card
         end
       end
 
-      def delegate_to_action_view method, opts, proc
-        proc = proc { |*a| raw yield(*a) } if proc
-        response = action_view.send method, *opts, &proc
+      def delegate_to_action_view method, opts, &old_proc
+        new_proc = proc { |*a| raw yield(*a) } if old_proc
+        response = action_view.send method, *opts, &new_proc
         response.is_a?(String) ? action_view.raw(response) : response
       end
     end

data/lib/card/format/registration.rb

@@ -1,5 +1,7 @@
 class Card
   class Format
+    # handles format registry, tracking which formats (html, css, json, etc) are
+    # available
     module Registration
       def register format
         registered << format.to_s
@@ -7,11 +9,11 @@ class Card
       end
 
       def new card, opts={}
-        if self != Format
-          super
-        else
+        if self == Format
           klass = format_class opts
           self == klass ? super : klass.new(card, opts)
+        else
+          super
         end
       end
 

data/lib/card/format/wrapper.rb

@@ -1,5 +1,6 @@
 class Card
   class Format
+    # handles view wrapping, including with layouts and slots
     module Wrapper
       def with_wrapper
         if voo.layout.present?