card 1.101.2 → 1.102.0

data/lib/card/view/options.rb

@@ -51,11 +51,11 @@ class Card
           :structure,      # overrides the content of the card
           :title,          # overrides the name of the card
           :variant,        # override the canonical version of the name with a different
-                           # variant
+          # variant
           :input_type,     # inline_nests makes a form within standard content (Symbol)
           :type,           # set the default type of new cards
           :size,           # set an image size
-                           # (also used for character limit in one_line_content)
+          # (also used for character limit in one_line_content)
           :params,         # parameters for add button.  deprecated!
           :items,          # options for items (Hash)
           :cache,          # change view cache behaviour
@@ -71,7 +71,7 @@ class Card
           :layout          #
         ]
       }
-      # Note: option values are strings unless otherwise noted
+      # NOTE: option values are strings unless otherwise noted
 
       class << self
         attr_reader :keymap

data/lib/card/view/permission.rb

@@ -16,6 +16,7 @@ class Card
 
       def altered_view
         return if skip_check?
+
         alter_unknown || denial
       end
 

data/lib/cardio.rb

@@ -3,7 +3,6 @@
 require "active_support/core_ext/numeric/time"
 require "cardio/schema"
 require "cardio/utils"
-require "cardio/modfiles"
 require "cardio/delaying"
 
 ActiveSupport.on_load :after_card do
@@ -13,20 +12,24 @@ end
 module Cardio
   extend Schema
   extend Utils
-  extend Modfiles
   extend Delaying
   CARD_GEM_ROOT = File.expand_path("..", __dir__)
 
-  mattr_reader :paths, :config
-
   class << self
+    delegate :application, :root, to: :Rails
+    delegate :config, :paths, to: :application
+
+    def gem_root
+      CARD_GEM_ROOT
+    end
+
     def card_defined?
       const_defined? "Card"
     end
 
     def load_card?
       ActiveRecord::Base.connection && !card_defined?
-    rescue
+    rescue StandardError
       false
     end
 
@@ -39,125 +42,6 @@ module Cardio
       @cache ||= ::Rails.cache
     end
 
-    # TODO: many of these defaults should be in mods!
-    def default_configs
-      defaults_from_yaml.merge(
-        read_only: !ENV["DECKO_READ_ONLY"].nil?,
-        load_strategy: (ENV["REPO_TMPSETS"] || ENV["TMPSETS"] ? :tmp_files : :eval)
-      )
-    end
-
-    def defaults_from_yaml
-      filename = File.expand_path "cardio/defaults.yml", __dir__
-      YAML.load_file filename
-    end
-
-    def set_config config
-      @@config = config
-
-      add_lib_dirs_to_autoload_paths config
-
-      default_configs.each_pair do |setting, value|
-        set_default_value(config, setting, *value)
-      end
-    end
-
-    def add_lib_dirs_to_autoload_paths config
-      config.autoload_paths += Dir["#{gem_root}/lib"]
-
-      # TODO: this should use each_mod_path, but it's not available when this is run
-      # This means libs will not get autoloaded (and sets not watched) if the mod
-      # dir location is overridden in config
-      [gem_root, root].each { |dir| autoload_and_watch config, "#{dir}/mod/*" }
-      gem_mod_specs.each_value { |spec| autoload_and_watch config, spec.full_gem_path }
-
-      # the watchable_dirs are processes in
-      # set_clear_dependencies_hook hook in the railties gem in finisher.rb
-
-      # TODO: move this to the right place in decko
-      config.autoload_paths += Dir["#{Decko.gem_root}/lib"]
-    end
-
-    def autoload_and_watch config, mod_path
-      config.autoload_paths += Dir["#{mod_path}/lib"]
-      config.watchable_dirs["#{mod_path}/set"] = [:rb]
-    end
-
-    # In production mode set_config gets called twice.
-    # The second call overrides all deck config settings
-    # so don't change settings here if they already exist
-    def set_default_value config, setting, *value
-      config.send("#{setting}=", *value) unless config.respond_to? setting
-    end
-
-    def set_paths paths
-      @@paths = paths
-
-      add_tmppaths
-      add_path "mod"        # add card gem's mod path
-      paths["mod"] << "mod" # add deck's mod path
-
-      add_db_paths
-      add_initializer_paths
-      add_mod_initializer_paths
-    end
-
-    def add_tmppaths
-      %w[set set_pattern].each do |dir|
-        opts = tmppath_opts dir
-        add_path "tmp/#{dir}", opts if opts
-      end
-    end
-
-    def tmppath_opts dir
-      if ENV["REPO_TMPSETS"]
-        { with: "tmpsets/#{dir}" }
-      elsif ENV["TMPSETS"]
-        { root: root }
-      end
-    end
-
-    def add_db_paths
-      add_path "db"
-      add_path "db/migrate"
-      add_path "db/migrate_core_cards"
-      add_path "db/migrate_deck", root: root, with: "db/migrate"
-      add_path "db/migrate_deck_cards", root: root, with: "db/migrate_cards"
-      add_path "db/seeds.rb", with: "db/seeds.rb"
-    end
-
-    def add_initializer_paths
-      add_path "config/initializers", glob: "**/*.rb"
-      add_initializers root
-      each_mod_path { |mod_path| add_initializers mod_path, false, "core_initializers" }
-    end
-
-    def add_mod_initializer_paths
-      add_path "mod/config/initializers", glob: "**/*.rb"
-      each_mod_path { |mod_path| add_initializers mod_path, true }
-    end
-
-    def add_initializers base_dir, mod=false, init_dir="initializers"
-      Dir.glob("#{base_dir}/config/#{init_dir}").each do |initializers_dir|
-        path_mark = mod ? "mod/config/initializers" : "config/initializers"
-        paths[path_mark] << initializers_dir
-      end
-    end
-
-    def root
-      @@config.root
-    end
-
-    def gem_root
-      CARD_GEM_ROOT
-    end
-
-    def add_path path, options={}
-      root = options.delete(:root) || gem_root
-      options[:with] = File.join(root, (options[:with] || path))
-      paths.add path, options
-    end
-
     def future_stamp
       # # used in test data
       @future_stamp ||= Time.zone.local 2020, 1, 1, 0, 0, 0

data/lib/cardio/all.rb

@@ -0,0 +1,16 @@
+require "rails"
+require "cardio"
+require "cardio/mod"
+
+%w[
+  active_record/railtie
+  active_storage/engine
+  action_view/railtie
+  action_mailer/railtie
+  active_job/railtie
+  action_mailbox/engine
+  rails/test_unit/railtie
+  sprockets/railtie
+].each do |railtie|
+  require railtie
+end

data/lib/cardio/application.rb

@@ -0,0 +1,141 @@
+require "cardio/all"
+
+Bundler.require :default, *Rails.groups
+
+# these two have railties and likely need to be loaded before application so they
+# don't override configuration later
+require "haml"
+require "kaminari"
+
+require "bootstrap4-kaminari-views"
+
+module Cardio
+  # handles config and path defaults
+  class Application < Rails::Application
+    def self.card_environment_initializer
+      initializer "card.load_environment_config",
+                  before: :load_environment_config, group: :all do
+        paths["card/config/environments"].existent.each do |environment|
+          require environment
+        end
+      end
+    end
+    card_environment_initializer
+
+    def config
+      @config ||= super.tap do |config|
+        simple_configs config
+        coded_configs config
+      end
+    end
+
+    private
+
+    def simple_configs config
+      config_from_yaml.each_pair do |setting, value|
+        config.send "#{setting}=", *value
+      end
+    end
+
+    # TODO: many of these defaults should be in mods!
+    def config_from_yaml
+      YAML.load_file File.expand_path("defaults.yml", __dir__)
+    end
+
+    def coded_configs config
+      config.autoloader = :zeitwerk
+      config.i18n.enforce_available_locales = true
+      config.read_only = !ENV["DECKO_READ_ONLY"].nil?
+      config.load_strategy = (ENV["REPO_TMPSETS"] || ENV["TMPSETS"] ? :tmp_files : :eval)
+      config.autoload_paths += Dir["#{Cardio.gem_root}/lib"]
+      Paths.new(config).assign
+      Cardio::Mod.each_path do |mod_path|
+        config.autoload_paths += Dir["#{mod_path}/lib"]
+        config.watchable_dirs["#{mod_path}/set"] = %i[rb haml]
+      end
+    end
+
+    class Paths
+      attr_reader :config, :paths
+
+      def initialize config
+        @config = config
+        @paths = config.paths
+      end
+
+      def assign
+        add_tmppaths
+        add_path "mod"        # add card gem's mod path
+        paths["mod"] << "mod" # add deck's mod path
+        paths.add "files"
+
+        add_db_paths
+        add_initializer_paths
+        add_mod_initializer_paths
+        add_gem_environment_path
+
+        paths["app/models"] = []
+        paths["app/mailers"] = []
+        paths["app/controllers"] = []
+      end
+
+      def add_tmppaths
+        %w[set set_pattern].each do |dir|
+          opts = tmppath_opts dir
+          add_path "tmp/#{dir}", opts if opts
+        end
+      end
+
+      def tmppath_opts dir
+        if ENV["REPO_TMPSETS"]
+          { with: "tmpsets/#{dir}" }
+        elsif ENV["TMPSETS"]
+          { root: config.root }
+        end
+      end
+
+      def add_db_paths
+        add_path "db"
+        add_path "db/migrate"
+        add_path "db/migrate_core_cards"
+        add_path "db/migrate_deck", root: config.root, with: "db/migrate"
+        add_path "db/migrate_deck_cards", root: config.root, with: "db/migrate_cards"
+        add_path "db/seeds.rb", with: "db/seeds.rb"
+      end
+
+      def add_initializer_paths
+        add_path "config/initializers", glob: "**/*.rb"
+        add_initializers config.root
+        Cardio::Mod.each_path do |mod_path|
+          add_initializers mod_path, false, "core_initializers"
+        end
+      end
+
+      def add_mod_initializer_paths
+        add_path "mod/config/initializers", glob: "**/*.rb"
+        Cardio::Mod.each_path do |mod_path|
+          add_initializers mod_path, true
+        end
+      end
+
+      def add_initializers base_dir, mod=false, init_dir="initializers"
+        Dir.glob("#{base_dir}/config/#{init_dir}").each do |initializers_dir|
+          path_mark = mod ? "mod/config/initializers" : "config/initializers"
+          paths[path_mark] << initializers_dir
+        end
+      end
+
+      def add_gem_environment_path
+        add_path "card/config/environments",
+                 glob: "#{Rails.env}.rb",
+                 with: "config/environments"
+      end
+
+      def add_path path, options={}
+        root = options.delete(:root) || Cardio.gem_root
+        options[:with] = File.join(root, (options[:with] || path))
+        paths.add path, options
+      end
+    end
+  end
+end

data/lib/cardio/cli.rb

@@ -0,0 +1,11 @@
+require "rbconfig"
+require "cardio/script_loader"
+
+# If we are inside a Decko application this method performs an exec and thus
+# the rest of this script is not run.
+Cardio::ScriptLoader.exec!
+
+require "rails/ruby_version_check"
+Signal.trap("INT") { exit(1) }
+
+require "cardio/commands/application"

data/lib/cardio/commands.rb

@@ -0,0 +1,124 @@
+require "English"
+
+module Cardio
+  # manage different types of commands that can be run via bin/card and bin/decko
+  class Commands
+    attr_reader :command, :args
+
+    # class methods for commands
+    # (basically simulates cattr_reader, which isn't available here)
+    module Accessors
+      def aliases
+        @aliases ||= {
+          "rs" => "rspec",
+          "jm" => "jasmine",
+          "g"  => "generate",
+          "d"  => "destroy",
+          "c"  => "console",
+          "db" => "dbconsole",
+          "r"  => "runner",
+          "v"  => "version",
+          "h"  => "help"
+        }
+      end
+
+      def commands
+        @commands ||= {
+          rails:  %w[generate destroy plugin benchmarker profiler
+                     console dbconsole application runner],
+          rake:   %w[seed reseed load update],
+          custom: %w[new rspec jasmine version help]
+        }
+      end
+    end
+
+    extend Accessors
+
+    def initialize args
+      @args = args
+      @command = self.class.aliases[args.first] || args.first
+      ENV["PRY_RESCUE_RAILS"] = "1" if rescue?
+      @args.shift unless handler == :rails
+    end
+
+    def rescue?
+      args.delete "--rescue"
+    end
+
+    def handler
+      commands = self.class.commands
+      @handler ||= commands.keys.find { |k| commands[k].include? command }
+    end
+
+    def run
+      case handler
+      when :rails
+        run_rails
+      when :rake
+        run_rake
+      when :custom
+        send "run_#{command}"
+      else
+        unrecognized
+      end
+      exit 0
+    end
+
+    # runs all commands in "rails" list
+    def run_rails
+      require "rails/commands"
+    end
+
+    # runs all commands in "rake" list
+    def run_rake
+      require "cardio/commands/rake_command"
+      RakeCommand.new("#{rake_prefix}:#{command}", args).run
+    end
+
+    def rake_prefix
+      "card"
+    end
+
+    # ~~~~~~~~~ CUSTOM COMMANDS ~~~~~~~~~~~~ #
+
+    def run_help
+      puts File.read(File.expand_path("../commands/USAGE", __FILE__))
+    end
+
+    def run_new
+      if ["-h", "--help"].include? args.first
+        require "cardio/commands/application"
+      else
+        puts "Can't initialize a new deck within the directory of another, " \
+         "please change to a non-deck directory first.\n"
+        puts "Type 'decko' for help."
+        exit 1
+      end
+    end
+
+    def run_version
+      require "card/version"
+      puts "Decko #{Card::Version.release}"
+    end
+
+    def run_rspec
+      require "cardio/commands/rspec_command"
+      RspecCommand.new(args).run
+    end
+
+    def run_jasmine
+      require "cardio/commands/rake_command"
+      RakeCommand.new("spec:javascript", envs: "test").run
+    end
+
+    # ~~~~~~~~~~~~~~~~~~~~~ catch-all -------------- #
+
+    def unrecognized
+      puts "Error: Command not recognized: #{command}"
+      run_help
+      exit 1
+    end
+
+    new(ARGV).run unless ENV["CARDIO_COMMANDS"] == "NO_RUN"
+  end
+end