card 1.108.1 → 1.109.0

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

data/lib/cardio/mod/eat.rb

@@ -19,13 +19,13 @@ module Cardio
         @verbose = !verbose.nil?
       end
 
-      def up
+      def run
         handle_up do
           edibles.each do |edible|
             track edible do
               current_user edible.delete(:user)
               time_machine edible.delete(:time) do
-                Card.ensure edible
+                Card.ensure! edible
               end
             end
           end
@@ -35,10 +35,10 @@ module Cardio
       private
 
       # if output mod given,
-      def handle_up
+      def handle_up &block
         Card::Cache.reset_all
         Card::Mailer.perform_deliveries = false
-        Card::Auth.as_bot { yield }
+        Card::Auth.as_bot(&block)
         :success
       rescue StandardError => e
         e.message
@@ -76,7 +76,8 @@ module Cardio
         case value
         when /^[+-]\d+$/
           # plus or minus an integer (safe to eval)
-          eval "#{Time.now.to_i} #{value}", binding, __FILE__, __LINE__
+          eval "#{Time.now.to_i} #{value}", # 1741296981 +1  (e.g.)
+               binding, __FILE__, __LINE__ - 1
         when Integer
           value
         else

data/lib/cardio/mod/load_strategy/set_binding_magic.rb

@@ -39,7 +39,7 @@ module Cardio
         mod.name.split("::").each do |part|
           m, b =
             eval(
-              "[ #{part} , #{part}.module_eval('binding') ]",
+              "[ #{part} , #{part}.module_eval('binding') ]",  # [ History , History.module_eval('binding') ]
               b
             )
         end

data/lib/cardio/mod/load_strategy/tmp_files.rb

@@ -24,9 +24,10 @@ module Cardio
         end
 
         def rewrite_tmp_files?
-          return @rewrite if defined? @rewrite
+          return @rewrite_tmp_files if defined? @rewrite_tmp_files
 
-          @rewrite = !(Rails.env.production? && Card.paths["tmp/set"].existent.first)
+          @rewrite_tmp_files =
+            !(Rails.env.production? && Card.paths["tmp/set"].existent.first)
         end
 
         def write_tmp_file from_file, to_file, const_parts

data/lib/cardio/mod/load_strategy.rb

@@ -33,6 +33,7 @@ module Cardio
       end
 
       attr_reader :loader
+
       delegate :template_class, :pattern_groups, :each_file, :mod_dirs, :parts_from_path,
                to: :loader
 

data/lib/cardio/mod/loader/set_pattern_loader.rb

@@ -1,6 +1,9 @@
 module Cardio
   class Mod
     class Loader
+      # arguably overkill, the set pattern loader makes set patterns use
+      # directory/file-aware loading much as set patterns do. Since they are so
+      # rarely added, this optimization should probably be deprecated
       class SetPatternLoader < Loader
         def template_class
           SetPatternTemplate
@@ -17,6 +20,7 @@ module Cardio
         end
       end
 
+      # templates for set pattern modules
       class SetPatternTemplate < ModuleTemplate
         def to_const
           return Object if simple_load?

data/lib/cardio/mod/loader/set_template.rb

@@ -28,9 +28,9 @@ module Cardio
             format_name = Regexp.last_match(1)
             format_name = format_name.blank? ? nil : format_name.to_sym
             "module #{module_name format_name}; " \
-            "module_parent.send :register_set_format, "\
-            "#{format_class format_name}, self; "\
-            "extend Card::Set::AbstractFormat"
+              "module_parent.send :register_set_format, " \
+              "#{format_class format_name}, self; " \
+              "extend Card::Set::AbstractFormat"
           end
         end
 
@@ -92,7 +92,7 @@ module Cardio
         def pattern_label *anchors
           anchor_count = pattern_class.anchor_parts_count
           label = pattern_class.label(pattern_anchor(*anchors, anchor_count))
-          remainder = anchors[anchor_count..-1]
+          remainder = anchors[anchor_count..]
           label += " (#{remainder.join ', '})" if remainder.any?
           label
         end
@@ -125,6 +125,16 @@ module Cardio
         def postamble
           "end;" * (@modules.size + 3)
         end
+
+        #   [set_registration, ends].compact.join "\n"
+        # end
+        #
+        # def set_registration
+        #   "Card::Set.register_set self" unless helper_module?
+        # end
+        #
+        # def ends
+        # end
       end
     end
   end

data/lib/cardio/mod/loader.rb

@@ -28,7 +28,7 @@ module Cardio
         end
 
         def load_initializers
-          Cardio.config.paths["late/initializers"].existent.sort.each do |init|
+          Cardio.config.paths["late/initializers"].existent.each do |init|
             load init
           end
         end
@@ -60,7 +60,7 @@ module Cardio
 
       def parts_from_path path
         # remove file extension and number prefixes
-        parts = path.gsub(/\.rb/, "").gsub(%r{(?<=\A|/)\d+_}, "").split(File::SEPARATOR)
+        parts = path.gsub(/\.rb$/, "").gsub(%r{(?<=\A|/)\d+_}, "").split(File::SEPARATOR)
         parts.map(&:camelize)
       end
 

data/lib/cardio/mod/sow/card_source.rb

@@ -1,7 +1,7 @@
 module Cardio
   class Mod
     class Sow
-      # Fetch sow data form cards
+      # Fetch sow data from cards
       module CardSource
         def new_data_from_cards
           cards.map { |c| c.pod_hash field_tags: field_tag_marks }

data/lib/cardio/mod/sow/remote_source.rb

@@ -0,0 +1,32 @@
+module Cardio
+  class Mod
+    class Sow
+      # Fetch sow data from remote
+      module RemoteSource
+        def remote_source
+          @remote_source ||=
+            if @remote
+              raise Card::Error::NotFound, "must specify name (-n)" unless @name
+
+              URI.join(@remote, "/#{@name.cardname.url_key}/", "pod.yml")
+            else
+              @url
+            end
+        end
+
+        def pod_from_url
+          parsed_yaml = parse_pod_yaml yaml_from_url
+          Array.wrap(parsed_yaml)
+        rescue Psych::SyntaxError
+          raise "Url #{@remote_source} provided invalid yaml"
+        end
+
+        def yaml_from_url
+          @yaml_from_url ||= URI.open(@remote_source).read
+        rescue OpenURI::HTTPError => e
+          raise "#{@remote_source} not available\n#{e}"
+        end
+      end
+    end
+  end
+end

data/lib/cardio/mod/sow.rb

@@ -7,25 +7,25 @@ module Cardio
     class Sow
       include YamlDump
       include CardSource
+      include RemoteSource
 
       def initialize **args
         @mod = args[:mod]
         @name = args[:name]
         @cql = args[:cql]
         @url = args[:url]
+        @remote = args[:remote]
         @podtype = args[:podtype] || (Rails.env.test? ? :test : :real)
         @items = args[:items]
         @field_tags = args[:field_tags]
       end
 
       # if output mod given,
-      def out
+      def run
         Card::Cache.reset_all
         @mod ? dump(output_hash) : puts(new_data.to_yaml.yellow)
         :success
-      rescue Card::Error::NotFound => e
-        e.message
-      rescue JSON::ParserError => e
+      rescue Card::Error::NotFound, JSON::ParserError => e
         e.message
       end
 
@@ -42,8 +42,11 @@ module Cardio
 
       # @return [Array <Hash>]
       def new_data
-        @new_data ||=
-          @url ? pod_hash_from_url : new_data_from_cards
+        @new_data ||= fetch_new_data
+      end
+
+      def fetch_new_data
+        remote_source ? pod_from_url : new_data_from_cards
       end
 
       def merge_data
@@ -72,11 +75,8 @@ module Cardio
 
       def old_data
         return unless File.exist? filename
-        parse_pod_yaml File.read(filename)
-      end
 
-      def pod_hash_from_url
-        parse_pod_yaml URI.open(@url).read
+        parse_pod_yaml File.read(filename)
       end
 
       def parse_pod_yaml pod_yaml

data/lib/cardio/railtie.rb

@@ -38,6 +38,7 @@ module Cardio
     config.raise_all_rendering_errors = false
 
     config.cache_set_module_list = false
+    config.max_temporary_cache_keys = 10_000
 
     config.i18n.enforce_available_locales = true
     config.read_only = !ENV["DECKO_READ_ONLY"].nil?

data/lib/cardio/script_loader.rb

@@ -46,7 +46,7 @@ module Cardio
 
       def in_application_subdirectory? path=Pathname.new(Dir.pwd)
         File.exist?(File.join(path, script)) ||
-          !path.root? && in_application_subdirectory?(path.parent)
+          (!path.root? && in_application_subdirectory?(path.parent))
       end
     end
 

data/lib/cardio/seed.rb

@@ -64,7 +64,7 @@ module Cardio
 
       def write_seed_file table
         filename = File.join default_path, "#{table}.yml"
-        File.open(filename, "w") { |file| file.write yield }
+        File.write(filename, yield)
       end
 
       def yamlize_records table

data/lib/cardio/utils.rb

@@ -58,7 +58,7 @@ module Cardio
 
       def all_file_ids
         dir = Card.paths["files"].existent.first
-        Dir.entries(dir)[2..-1].map(&:to_i)
+        Dir.entries(dir)[2..].map(&:to_i)
       end
 
       def all_trashed_card_ids

data/lib/cardio/version.rb

@@ -1,12 +1,13 @@
 # -*- encoding : utf-8 -*-
 
 module Cardio
+  # handle version numbers for releases
   module Version
     class << self
       CARD_MINOR = { 0 => 90, 1 => 1000 }.freeze # can remove and hardcode after 1.0
 
       def release
-        @version ||= File.read(File.expand_path("../../VERSION", __dir__)).strip
+        @release ||= File.read(File.expand_path("../../VERSION", __dir__)).strip
       end
 
       def card_release

data/lib/cardio.rb

@@ -8,6 +8,9 @@ ActiveSupport.on_load :after_card do
   Cardio::Mod.load
 end
 
+# Cardio is a quick loading module and is at the heart (get it?) of
+# card loading and configuration because it is useful long before the Card class is
+# (or card objects are)
 module Cardio
   extend Delaying
 

data/lib/generators/deck/templates/config.ru.erb

@@ -8,4 +8,4 @@ if Rails.env.profile?
 end
 
 <% end -%>
-run <%= app_const %>
+run Cardio.application.class

data/mod/core/config/locales/en.yml

@@ -8,6 +8,7 @@ en:
   core_error_cant_alter: can't alter this type; %{name} cards still exist
   core_error_cant_change_errors: "of %{name} can't be changed; errors creating new %{type_id}: %{error_messages}"
   core_error_code_in_use: codename %{codename} already in use
+  core_codename_must_be_simple: only simple cards can have codenames
   core_error_hard_templated: can't be changed because %{name} is hard templated to %{type_name}
   core_error_indestructible: "%{name} is an indestructible rule"
   core_error_invalid_character_in_cardtype: "may not contain any of the following characters: %{banned}"

data/mod/core/data/schema/20141001105348_move_revisions_to_actions.rb

@@ -3,7 +3,7 @@ class MoveRevisionsToActions < Cardio::Migration::Schema
     belongs_to :tmp_card, foreign_key: :card_id
     self.table_name = "card_revisions"
     def self.delete_cardless
-      left_join = "LEFT JOIN cards "\
+      left_join = "LEFT JOIN cards " \
                   "ON card_revisions.card_id = cards.id"
       TmpRevision.joins(left_join).where("cards.id IS NULL").delete_all
     end
@@ -55,7 +55,7 @@ class MoveRevisionsToActions < Cardio::Migration::Schema
 
   def create_create_action rev
     TmpAction.connection.execute(
-      "INSERT INTO card_actions (id, card_id, card_act_id, action_type) VALUES "\
+      "INSERT INTO card_actions (id, card_id, card_act_id, action_type) VALUES " \
       "('#{rev.id}', '#{rev.card_id}', '#{rev.id}', 0)")
     if (tmp_card = rev.tmp_card)
       TmpChange.connection.execute "INSERT INTO card_changes (card_action_id, field, value) VALUES

data/mod/core/data/schema/20241017160402_unique_codename.rb

@@ -2,6 +2,7 @@
 
 class UniqueCodename < Cardio::Migration::Schema
   def up
+    remove_blank_codenames
     remove_index :cards, name: "cards_codename_index"
     add_index :cards, :codename, name: "cards_codename_index", unique: true
   end
@@ -10,4 +11,11 @@ class UniqueCodename < Cardio::Migration::Schema
     remove_index :cards, name: "cards_codename_index"
     add_index :cards, :codename, name: "cards_codename_index"
   end
+
+  private
+
+  def remove_blank_codenames
+    Cardio::Record.connection
+                  .execute "UPDATE cards SET codename = null where codename = ''"
+  end
 end

data/mod/core/data/transform/20150724123438_update_file_and_image_cards.rb

@@ -88,7 +88,7 @@ class UpdateFileAndImageCards < Cardio::Migration::Transform
   def get_new_file_name filename
     original_filename = filename
     if filename =~ /^(icon|small|medium|large|original)-([^.]+).(.+)$/
-      filename = "#{Regexp.last_match(2)}-#{Regexp.last_match(1)}."\
+      filename = "#{Regexp.last_match(2)}-#{Regexp.last_match(1)}." \
                  "#{Regexp.last_match(3)}"
     end
     filename = filename.downcase

data/mod/core/lib/tasks/card/export.rake

@@ -0,0 +1,28 @@
+require "csv"
+
+namespace :card do
+  namespace :export do
+    desc "export all cards to csv"
+    task csv: :environment do
+      parse_options :csv do
+        add_opt :f, :file, "file name"
+      end
+      filename = options[:file] || "cards.csv"
+      puts "Exporting all card data to #{filename}..."
+      File.write(filename) { |f| f.write to_csv }
+    end
+  end
+end
+
+private
+
+def to_csv
+  attributes = %w[id name codename type content]
+
+  CSV.generate(headers: true) do |csv|
+    csv << attributes
+    Card.all.each do |card|
+      csv << attributes.map { |attr| card.send(attr) }
+    end
+  end
+end

data/mod/core/lib/tasks/card/migrate.rake

@@ -1,4 +1,3 @@
-
 namespace :card do
   desc "migrate structure and cards"
   task migrate: :environment do
@@ -47,6 +46,7 @@ namespace :card do
 
     task port: :environment do
       puts "porting"
+      ENV["NO_CARD_LOAD"] = "true"
       Cardio::Migration.port_all
     end
 
@@ -60,7 +60,7 @@ namespace :card do
     end
 
     def version
-      ENV["VERSION"] ? ENV["VERSION"].to_i : nil
+      ENV["VERSION"]&.to_i
     end
   end
 end
@@ -109,7 +109,7 @@ end
 # FIXME: too general
 # intent is to find Record classes; this gets a lot more.
 def load_mod_lib
-  Dir.glob(Cardio.root.join("mod/*/lib/*.rb")).sort.each { |x| require x }
+  Dir.glob(Cardio.root.join("mod/*/lib/*.rb")).each { |x| require x }
 end
 
 def without_dumping

data/mod/core/lib/tasks/card/seed.rake

@@ -34,6 +34,7 @@ namespace :card do
 
     # desc "dump db to fixtures"
     task dump: :environment do
+      puts "dumping".green
       Card::Cache.reset_all
       Cardio::Seed.dump
     end
@@ -54,7 +55,7 @@ namespace :card do
     end
 
     def invoke_card_task task
-      puts "invoking: #{task}".green
+      puts "invoking: #{task}"
       Rake::Task["card:#{task}"].invoke
     end
   end