card 1.108.1 → 1.109.1

data/lib/card/set/helpers.rb

@@ -10,7 +10,7 @@ class Card
       # Card::Set::Type::User
       def shortname
         first = 2 # shortname eliminates Card::Set
-        last = first + num_set_parts(pattern_code)
+        last = pattern_code == :self ? -1 : (first + num_set_parts)
         set_name_parts[first..last].join "::"
       end
 
@@ -88,7 +88,7 @@ class Card
       end
 
       def test_set
-        # rubocop:disable Lint/Eval
+        # rubocop:disable Security/Eval
         ::Card::Set::Self.const_remove_if_defined :TestSet
         eval <<-RUBY, binding, __FILE__, __LINE__ + 1
           class ::Card::Set::Self
@@ -99,7 +99,7 @@ class Card
           end
         RUBY
         ::Card::Set::Self::TestSet
-        # rubocop:enable Lint/Eval
+        # rubocop:enable Security/Eval
       end
 
       def base_format_modules?
@@ -115,7 +115,7 @@ class Card
         Card::Set.modules[set_format_type_key][format_class][shortname] || []
       end
 
-      def num_set_parts pattern_code
+      def num_set_parts
         return 1 if pattern_code == :abstract
 
         Pattern.find(pattern_code).anchor_parts_count

data/lib/card/set/i18n_scanner.rb

@@ -1,23 +1,24 @@
 # lib/my_custom_scanner.rb
-require "i18n/tasks/scanners/file_scanner"
-class Card
-  module Set
-    class I18nScanner < ::I18n::Tasks::Scanners::FileScanner
-      include ::I18n::Tasks::Scanners::RelativeKeys
-      include ::I18n::Tasks::Scanners::OccurrenceFromPosition
-
-      # @return [Array<[absolute key, Results::Occurrence]>]
-      def scan_file path
-        text = read_file(path)
-
-        text.scan(/[^\w._-]tr[( ]\s*["':](\w+)/).map do |_match|
-          occurrence = occurrence_from_position(
-            path, text, Regexp.last_match.offset(0).first
-          )
-          [absolute_key(".#{_match[0]}", path), occurrence]
-        end
-      end
-    end
-    ::I18n::Tasks.add_scanner "Card::Set::I18nScanner"
-  end
-end
+# require "i18n/tasks/scanners/file_scanner"
+# class Card
+#   module Set
+#     class I18nScanner < ::I18n::Tasks::Scanners::FileScanner
+#       include ::I18n::Tasks::Scanners::RelativeKeys
+#       include ::I18n::Tasks::Scanners::OccurrenceFromPosition
+#
+#       # @return [Array<[absolute key, Results::Occurrence]>]
+#       def scan_file path
+#         text = read_file(path)
+#
+#         # tr()
+#         text.scan(/[^\w._-]tr[( ]\s*["':](\w+)/).map do |_match|
+#           occurrence = occurrence_from_position(
+#             path, text, Regexp.last_match.offset(0).first
+#           )
+#           [absolute_key(".#{_match[0]}", path), occurrence]
+#         end
+#       end
+#     end
+#     ::I18n::Tasks.add_scanner "Card::Set::I18nScanner"
+#   end
+# end

data/lib/card/set/i18n_scope.rb

@@ -1,5 +1,6 @@
 class Card
   module Set
+    # Adapt Internationalization(i18n) scope handling to infer mod prefixes.
     module I18nScope
       delegate :tmp_files?, to: Cardio::Mod::LoadStrategy
 
@@ -22,7 +23,7 @@ class Card
 
       def set_from_parts parts, index
         start_index = index + (tmp_files? ? 2 : 1)
-        parts[start_index..-1].join "."
+        parts[start_index..].join "."
       end
 
       def mod_from_parts parts, set_index
@@ -55,7 +56,7 @@ class Card
       #   this method returns ["core", "all", "event"]
       # def set_path_parts backtrace
       #   parts = path_parts backtrace
-      #   res = parts[path_mod_index(parts)..-1]
+      #   res = parts[path_mod_index(parts)..]
       #   res.delete_at 1
       # end
 
@@ -65,7 +66,7 @@ class Card
       #   this method returns ["core", "all", "event"]
       # def tmp_set_path_parts backtrace
       #   path_parts = find_tmp_set_path(backtrace).split(File::SEPARATOR)
-      #   res = path_parts[tmp_path_mod_index(path_parts)..-1]
+      #   res = path_parts[tmp_path_mod_index(path_parts)..]
       #   res[0] = mod_name_from_tmp_dir res.first
       #   res[-1] = res.last.split(".").first
       #   res

data/lib/card/set/pattern/all.rb

@@ -25,7 +25,7 @@ class Card
 
         # new cards do not
         def patterns
-          @patterns ||= (new_card? ? concrete_patterns[1..-1] : concrete_patterns)
+          @patterns ||= (new_card? ? concrete_patterns[1..] : concrete_patterns)
         end
 
         def reset_patterns

data/lib/card/set/pattern/base.rb

@@ -4,8 +4,7 @@ class Card
       # class from which set patterns inherit
       class Base
         extend ClassMethods
-        delegate :pattern_code, :pattern, :anchorless?, :anchor_parts_count,
-                 :assigns_type, to: :class
+        delegate :pattern_code, :pattern, :anchorless?, :assigns_type, to: :class
 
         def initialize card
           return if anchorless?
@@ -43,6 +42,10 @@ class Card
           end
         end
 
+        def anchor_parts_count
+          @anchor_parts_count ||= self.class.anchor_parts_count @anchor_name
+        end
+
         def anchor_parts
           return [@anchor_name] unless anchor_parts_count > 1
 
@@ -51,7 +54,7 @@ class Card
             parts
           else
             # handles cases where anchor is a compound card, eg A+B+*self
-            [@anchor_name[0..-anchor_parts_count]] + parts[(-anchor_parts_count + 1)..-1]
+            [@anchor_name[0..-anchor_parts_count]] + parts[(-anchor_parts_count + 1)..]
           end
         end
 

data/lib/card/set/pattern/class_methods.rb

@@ -38,7 +38,7 @@ class Card
           compound_only? ? card.name.compound? : true
         end
 
-        def anchor_parts_count
+        def anchor_parts_count _anchor_name=nil
           @anchor_parts_count ||= (anchorless? ? 0 : 1)
         end
 

data/lib/card/set/pattern.rb

@@ -39,7 +39,7 @@ class Card
         # list of codenames of pattern cards
         # @return [Array <Symbol>]
         def codes
-          @codes ||= concrete.map(&:pattern_code).to_set
+          @codes ||= concrete.to_set(&:pattern_code)
         end
 
         # list of lists of codenames in pattern load order

data/lib/card/set/required_field.rb

@@ -1,5 +1,8 @@
 class Card
   module Set
+    # supports requiring field cards
+    # for example, if A requires a B field, then you cannot create A without also
+    # creating A+B
     class RequiredField
       attr_reader :parent_set, :field, :options
 

data/lib/card/set/trait.rb

@@ -53,6 +53,7 @@ class Card
 
       def assign_trait_type trait, type
         return unless type && (parts = trait_module_key_parts trait)
+
         assign_type type, normalize_const(parts)
       end
 
@@ -71,7 +72,11 @@ class Card
       end
 
       def define_trait_card trait, opts
-        define_method "#{trait}_card" do
+        define_method "#{trait}_card" do |sub=false|
+          if sub && (card = subfield trait)
+            return card
+          end
+
           # opts = opts.clone.merge supercard: card
           fetch trait.to_sym, new: opts.clone, eager_cache: true
         end

data/lib/card/subcards/all.rb

@@ -30,7 +30,7 @@ class Card
       end
 
       def field field_name, args={}
-        if (sf = subcards.field field_name)
+        if (sf = subfield field_name)
           sf.assign_attributes args
           sf
         else
@@ -39,11 +39,19 @@ class Card
       end
 
       def field_content field_name
-        subcards.field(field_name)&.content
+        subfield(field_name)&.content
       end
 
-      def field? tag
-        fetch(tag) || subcards.field(tag).present?
+      def subfield field_name
+        subcards.field field_name
+      end
+
+      def subfield? field_name
+        subfield(field_name).present?
+      end
+
+      def field? field_name
+        fetch(field_name) || subfield?(field_name)
       end
 
       def drop_subcard name_or_card

data/lib/card/view/cache/cache_action.rb

@@ -74,7 +74,13 @@ class Card
 
         # @return [Symbol]
         def active_cache_action
-          active_cache_ok? ? active_cache_action_from_setting : :stub
+          if caching == :deep && cache_setting != :never
+            :yield
+          elsif active_cache_ok?
+            active_cache_action_from_setting
+          else
+            :stub
+          end
         end
 
         # @return [True/False]
@@ -89,7 +95,7 @@ class Card
           return true if caching == :deep || parent.present?
           # a parent voo means we're still in the same card
 
-          return unless (superformat_card = format.parent&.card)
+          return false unless (superformat_card = format.parent&.card)
 
           superformat_card.name == card.name.left_name
         end
@@ -120,7 +126,7 @@ class Card
         # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         # SHARED METHODS
 
-        # @return [Symbol] :standard, :always, or :never
+        # @return [Symbol] :always, :deep, or :never
         def cache_setting
           @cache_setting ||= format.view_cache_setting requested_view
         end

data/lib/card/view/cache.rb

@@ -215,15 +215,20 @@ class Card
       # If view is cached, retrieve it.  Otherwise render and store it.
       # Uses the primary cache API.
       def cache_fetch &block
-        caching do
+        with_caching do
           ensure_cache_key
+          # Rails.logger.debug "Fetching:::  #{cache_key}"
           self.class.cache.fetch cache_key, &block
         end
       end
 
       # keep track of nested cache fetching
-      def caching &block
-        self.class.caching(cache_setting, &block)
+       def with_caching &block
+        self.class.with_caching(cache_setting, &block)
+      end
+
+      def caching
+        self.class.caching
       end
 
       # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -261,7 +266,7 @@ class Card
       end
 
       def options_for_cache_key
-        hash_for_cache_key(live_options) + ";" + hash_for_cache_key(viz_hash)
+        "#{hash_for_cache_key(live_options)};#{hash_for_cache_key(viz_hash)}"
       end
 
       def hash_for_cache_key hash
@@ -293,24 +298,20 @@ class Card
       # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
       # cache-related Card::View class methods
       module ClassMethods
+        def caching
+          @caching
+        end
+
         def cache
           Card::Cache[Card::View]
         end
 
         def caching?
-          !@caching.nil?
+          !caching.nil?
         end
 
-        def caching setting, &block
-          return @caching unless block_given?
-
-          caching_mode setting, &block
-        end
-
-        private
-
-        def caching_mode setting
-          old_caching = @caching
+        def with_caching setting
+          old_caching = caching
           # puts "OPEN CACHING from #{old_caching} to #{setting}" unless @caching == :deep
           @caching = setting unless @caching == :deep
           yield
@@ -318,6 +319,7 @@ class Card
           # puts "CLOSE CACHING from #{@caching} to #{old_caching}"
           @caching = old_caching
         end
+
       end
     end
   end

data/lib/card/view/classy.rb

@@ -120,18 +120,18 @@ class Card
         [classes, class_list(:single_use).delete(klass)]
       end
 
+      OK_TYPES = { ancestor_format: [:public],
+                   self_format: %i[public format_private],
+                   self: %i[public format_private private] }.freeze
       def ok_types space
-        case space
-        when :ancestor_format then [:public]
-        when :self_format     then %i[public format_private]
-        when :self            then %i[public format_private private]
-        end
+        OK_TYPES[space]
       end
 
       def class_list type=:private
         unless type.in? %i[private format_private public single_use]
           raise ArgumentError, "#{type} not a valid class list"
         end
+
         @class_list ||= {}
         @class_list[type] ||= {}
       end

data/lib/card/view/options/key_lists.rb

@@ -1,6 +1,7 @@
 class Card
   class View
     module Options
+      # lists of view option keys
       module KeyLists
         # all standard option keys
         # @return [Array]

data/lib/card/view/options/voo_api.rb

@@ -165,7 +165,7 @@ class Card
 
         # adds the wrappers assigned to ok_view in view definition
         def process_view_wrappers
-          view_wrappers = format.view_setting(:wrap, ok_view)
+          view_wrappers = format.view_setting(:wrap, ok_view) if requested_view
           return unless view_wrappers.present?
 
           @live_options[:wrap] = Array.wrap(@live_options[:wrap])
@@ -197,7 +197,7 @@ class Card
         # @param opts [Hash] options hash
         # @return [Hash] options Hash
         def foreign_options_in opts
-          foreign_opts = opts.reject { |k, _v| Options.all_keys.include? k }
+          foreign_opts = opts.except(*Options.all_keys)
           foreign_opts.empty? ? nil : foreign_opts
         end
       end

data/lib/card/view/options.rb

@@ -52,6 +52,7 @@ class Card
           :structure,      # overrides the content of the card
           :title,          # overrides the name of the card
           :variant,        # override the standard name with a different variant
+          :joint,          # what joins the parts of a compound name ("+" by default)
           :input_type,     # inline_nests makes a form within standard content (Symbol)
           :type,           # set the default type of new cards
           :size,           # set an image size

data/lib/card/view.rb

@@ -76,7 +76,7 @@ class Card
     # be overridden, eg for the main view (top view of the main card on a page)
     # @return [Symbol] view name
     def requested_view
-      @requested_view ||= View.normalize live_options[:view]
+      @requested_view ||= View.normalize(live_options[:view] || @raw_view)
     end
 
     # the final view.  can be different from @requested_view when there are

data/lib/cardio/command/application.rb

@@ -1,5 +1,5 @@
 require "rails/generators"
-require File.expand_path("../../../generators/deck/deck_generator", __FILE__)
+require File.expand_path("../../generators/deck/deck_generator", __dir__)
 require "cardio/command"
 
 Cardio::Command.run_non_deck_command ARGV.first, "cardio/commands"

data/lib/cardio/command/custom.rb

@@ -8,14 +8,14 @@ module Cardio
       private
 
       def run_new
-        if !["-h", "--help"].intersection(args).empty?
-          ARGV.unshift "new"
-          require "cardio/command/application"
-        else
+        if ["-h", "--help"].intersection(args).empty?
           puts "Can't initialize a new deck within the directory of another, " \
                "please change to a non-deck directory first.\n"
           puts "Type '#{gem}' for help."
           exit 1
+        else
+          ARGV.unshift "new"
+          require "cardio/command/application"
         end
       end
 
@@ -46,9 +46,10 @@ module Cardio
 
       def run_help_for_group group
         puts
-        puts "For " + "#{group}s".yellow + ":"
+        puts "For #{"#{group}s".yellow}:"
         map.each do |command, conf|
           next unless conf[:group] == group
+
           puts command_help(command, conf)
         end
         puts
@@ -57,7 +58,7 @@ module Cardio
       # formats command string for help text
       def command_help command, conf
         alt = conf[:alias] ? "(or #{conf[:alias]})" : ""
-        "    " + command.to_s.ljust(12).light_cyan + alt.ljust(10) + conf[:desc]
+        "    #{command.to_s.ljust(12).light_cyan}#{alt.ljust(10)}#{conf[:desc]}"
       end
     end
   end

data/lib/cardio/command/rake_command.rb

@@ -6,6 +6,7 @@ module Cardio
     # enhance standard rake command with some decko/card -specific options
     class RakeCommand < CommandBase
       def initialize gem, command, args=[]
+        super()
         @command = command
         @task = "#{gem}:#{command}"
         @args = [args].flatten
@@ -33,8 +34,8 @@ module Cardio
       def commands
         task_cmd = "bundle exec rake #{@task}"
         task_cmd += " -- #{escape_args(@args).join ' '}" unless @args.empty?
-        puts task_cmd
-        return [task_cmd] if !@envs || @envs.empty?
+        puts task_cmd.yellow
+        [task_cmd] if !@envs || @envs.empty?
 
         # @envs.map do |env|
         #   "env RAILS_ENV=#{env} #{task_cmd}"

data/lib/cardio/command/rspec_command.rb

@@ -8,6 +8,7 @@ module Cardio
       def initialize args
         require "rspec/core"
 
+        super()
         cardio_args, @rspec_args = split_args args
         @opts = {}
         Parser.new(@opts).parse!(cardio_args)

data/lib/cardio/generators/deck_generator_loader.rb

@@ -1,2 +1,2 @@
 require "cardio/generators"
-require File.expand_path("../../../generators/deck/deck_generator", __FILE__)
+require File.expand_path("../../generators/deck/deck_generator", __dir__)

data/lib/cardio/generators.rb

@@ -11,9 +11,9 @@ module Cardio
     module ClassMethods
       def source_root path=nil
         if path
-          @_card_source_root = path
+          @source_root = path
         else
-          @_card_source_root ||= File.expand_path(
+          @source_root ||= File.expand_path(
             "../../generators/#{generator_name}/templates", __FILE__
           )
         end
@@ -33,7 +33,8 @@ module Cardio
       # Override Rails namespace handling so we can put generators in `module Cardio`
       def namespace name=nil
         return super if name
-        @namespace ||= super.sub(/cardio:/, "")
+
+        @namespace ||= super.sub("cardio:", "")
       end
     end
     delegate :banner_command, to: :class

data/lib/cardio/migration/port.rb

@@ -10,6 +10,7 @@ module Cardio
 
       def port
         return unless lease_connection.table_exists? old_deck_table
+
         rename_old_tables
         lease_connection.execute "INSERT INTO #{table} (#{select_nonduplicate_versions})"
         lease_connection.drop_table old_deck_table
@@ -25,6 +26,7 @@ module Cardio
       def rename_old_tables
         old_tables.each do |old_table_name|
           next unless lease_connection.table_exists? old_table_name
+
           lease_connection.rename_table old_table_name, table
         end
       end

data/lib/cardio/migration/stamp.rb

@@ -5,6 +5,7 @@ module Cardio
       def stamp
         mode do
           return unless (version = stampable_version) && (file = stamp_file)
+
           puts ">>  writing version: #{version} to #{file.path}"
           file.puts version
         end

data/lib/cardio/migration/transform.rb

@@ -32,6 +32,7 @@ module Cardio
 
       def contentedly
         return yield if ENV["NO_CARD_LOAD"]
+
         Card::Cache.reset_all
         Card::Auth.as_bot do
           yield

data/lib/cardio/migration.rb

@@ -1,6 +1,8 @@
 # -*- encoding : utf-8 -*-
 
 module Cardio
+  # Base class for both schema and transform card migrations,
+  # which are found in <mod>/data/schema and <mod>/data/transform respectively
   class Migration < ActiveRecord::Migration[6.1]
     include Assumption
     include Stamp

data/lib/cardio/mod/class_methods.rb

@@ -42,7 +42,6 @@ module Cardio
       def ensure_installed
         Card::Auth.as_bot do
           Card::Cache.reset_all
-          puts "installing card mods".green
           ensure_asset_lists do |hash|
             puts "ensuring mod and asset cards"
             Cardio.mods.each { |mod| ensure_asset_cards mod.ensure_card, hash }
@@ -108,7 +107,7 @@ module Cardio
 
       # @return [True/False]
       def gem_spec? spec
-        return unless spec
+        return false unless spec
 
         spec.name.match?(/^card-mod-/) || spec.metadata["card-mod"].present?
       end

data/lib/cardio/mod/dirs.rb

@@ -129,10 +129,8 @@ module Cardio
         end
       end
 
-      def each_subpath *subdirs
-        subpaths(*subdirs).each do |mod_name, subpath|
-          yield mod_name, subpath
-        end
+      def each_subpath *subdirs, &block
+        subpaths(*subdirs).each(&block)
       end
 
       private

data/lib/cardio/mod/eat/edibles.rb

@@ -15,7 +15,7 @@ module Cardio
           return yield unless @name
 
           yield.select do |edible|
-            if @name.match?(/^\:/)
+            if @name.match?(/^:/)
               explicit_codename_match? edible[:codename]
             else
               explicit_name_match? edible[:name]
@@ -24,7 +24,7 @@ module Cardio
         end
 
         def explicit_codename_match? codename
-          codename && (codename == @name[1..-1])
+          codename && (codename == @name[1..])
         end
 
         def explicit_name_match? name
@@ -98,7 +98,7 @@ module Cardio
 
         def mod_file mod, filename
           unless (mod_file_path = mod.subpath "data/files", filename)
-            raise StandardError, "#{filename} not found. "\
+            raise StandardError, "#{filename} not found. " \
                                  "Should be in data/files in #{mod.name} mod."
           end
           File.open mod_file_path
@@ -109,16 +109,18 @@ module Cardio
         end
 
         def pod_types
-          if @pod_type == :all
+          if all_pod_types?
             %i[real test]
           elsif @pod_type
             [@pod_type]
-          elsif Rails.env.test?
-            %i[real test]
           else
             [:real]
           end
         end
+
+        def all_pod_types?
+          @pod_type == :all || (Rails.env.test? && !@pod_type)
+        end
       end
     end
   end