decko 0.11.7 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a66f5fefa04c2c0cdb0d972fb53a292ffa8db86c0cdaefbce4311df918793b32
-  data.tar.gz: 6a01a78d7177b1a29917373117db2d09a85c14737eb1c05f66db27b6ca79e4d8
+  metadata.gz: 8bb3b3da3fa9c6e8e1fe97ee9ab4fa406b7c3dcb5850db324c1404ac378de442
+  data.tar.gz: 4878e14c56ef66cc61cc376aa6c6f0a2cdbc9c0dc7e6b4d4308b140f8b688c91
 SHA512:
-  metadata.gz: 497737ef6f1fc5e506fc4c2e399134dbe2528d24a4cc688a9c140ad5d883822ae9d04340f10108f7f978b227f2daed69d819844208aa2d07536e6fdaa78e057f
-  data.tar.gz: 4d32fc214d767aaf52d34c6bff39d7595cf029daf6dad37febf95c4ed64e923d3ea51afed006d26152d8a5f8863484a7c31820e02f175b0110ac979d80498e71
+  metadata.gz: afbfc8a1b33c3e00f4734fb89c25c02abdadb6fb50e9b31b1056409123ccd9237a23069332ef1aea8f0c8f1372a6e47408e9deef742b123c817bffb08c48d736
+  data.tar.gz: a8a564f378ecbbb8ac75f0087f2f5e9daa93fd000962ded9e90779caf09fe9c6dcd543c150ea3a35dfcd03b05050c9a0b58782070c0a49d2016033bf14e8a60a

data/lib/card_controller.rb

@@ -6,6 +6,7 @@ class CardController < ActionController::Base
   include Rest
   include Response
   include Errors
+  extend Errors::Rescue
 
   # NOTE: including Card::Env::Location triggers card loading, which triggers mod loading,
   # which can include initializers that add to the CardController class.
@@ -22,4 +23,7 @@ class CardController < ActionController::Base
   before_action :load_card, except: [:asset]
   before_action :load_action, only: [:read]
   before_action :refresh_card, only: %i[create update delete]
+
+  rescue_from_class(*Card::Error::UserError.user_error_classes)
+  rescue_from_class StandardError if rescue_all?
 end

data/lib/card_controller/errors.rb

@@ -1,19 +1,20 @@
 # Decko's only controller.
 class CardController
-  class << self
-    def rescue_from_class *klasses
-      klasses.each do |klass|
-        rescue_from(klass) { |exception| handle_exception exception }
+  # controller error handling
+  module Errors
+    # controller class method to handle top-level error rescuing
+    module Rescue
+      def rescue_from_class *klasses
+        klasses.each do |klass|
+          rescue_from(klass) { |exception| handle_exception exception }
+        end
       end
-    end
 
-    def rescue_all?
-      Cardio.config.rescue_all_in_controller
+      def rescue_all?
+        Cardio.config.rescue_all_in_controller
+      end
     end
-  end
 
-  # controller error handling
-  module Errors
     def handle_exception exception
       raise exception if debug_exception?(exception)
 
@@ -30,7 +31,4 @@ class CardController
         Card[:debugger]&.content =~ /on/  # && !Card::Env.ajax?
     end
   end
-
-  rescue_from_class(*Card::Error::UserError.user_error_classes)
-  rescue_from_class StandardError if rescue_all?
 end

data/lib/decko.rb

@@ -2,21 +2,8 @@ module Decko
   DECKO_GEM_ROOT = File.expand_path("..", __dir__)
 
   class << self
-    def root
-      Rails.root
-    end
-
-    def application
-      Rails.application
-    end
-
-    def config
-      application.config
-    end
-
-    def paths
-      application.paths
-    end
+    delegate :application, :root, to: :Rails
+    delegate :config, :paths, to: :application
 
     def gem_root
       DECKO_GEM_ROOT

data/lib/decko/all.rb

@@ -1 +1,3 @@
+# backwards compatibility for old decks that require decko/all
+
 require "decko/application"

data/lib/decko/application.rb

@@ -1,16 +1,20 @@
 # -*- encoding : utf-8 -*-
 
-require "decko/engine"
-require_relative "config/initializers/sedate_parser"
+require "action_controller/railtie"
+require "cardio/application"
 
-Bundler.require :default, *Rails.groups
+# require_relative "config/initializers/sedate_parser"
 
 module Decko
-  class Application < Rails::Application
-    initializer :load_decko_environment_config,
+  # The application class from which all decko applications inherit
+  class Application < Cardio::Application
+    require "decko/engine"
+
+    card_environment_initializer
+
+    initializer "decko.load_environment_config",
                 before: :load_environment_config, group: :all do
-      add_path paths, "lib/decko/config/environments", glob: "#{Rails.env}.rb"
-      paths["lib/decko/config/environments"].existent.each do |environment|
+      paths["decko/config/environments"].existent.each do |environment|
         require environment
       end
     end
@@ -24,36 +28,9 @@ module Decko
       end
     end
 
-    def add_path paths, path, options={}
-      root = options.delete(:root) || Decko.gem_root
-      options[:with] = File.join(root, (options[:with] || path))
-      paths.add path, options
-    end
-
     def config
-      @config ||= begin
-        config = super
-
-        Cardio.set_config config
-
-        # any config settings below:
-        # (a) do not apply to Card used outside of a Decko context
-        # (b) cannot be overridden in a deck's application.rb, but
-        # (c) CAN be overridden in an environment file
-
-        # therefore, in general, they should be restricted to settings that
-        # (1) are specific to the web environment, and
-        # (2) should not be overridden
-        # ..and we should address (c) above!
-
-        # general card settings (overridable and not) should be in cardio.rb
-        # overridable decko-specific settings don't have a place yet
-        # but should probably follow the cardio pattern.
-
+      @config ||= super.tap do |config|
         # config.load_defaults "6.0"
-        config.autoloader = :zeitwerk
-        config.load_default = "6.0"
-        config.i18n.enforce_available_locales = true
         # config.active_record.raise_in_transactional_callbacks = true
 
         config.allow_concurrency = false
@@ -61,33 +38,22 @@ module Decko
         config.assets.version = "1.0"
 
         config.filter_parameters += [:password]
-
-        # Rails.autoloaders.log!
-        Rails.autoloaders.main.ignore(
-          File.join(Cardio.gem_root, "lib/card/seed_consts.rb")
-        )
-        config
+        config.autoload_paths += Dir["#{Decko.gem_root}/lib"]
+        decko_path_defaults config.paths
       end
     end
 
-    def paths
-      @paths ||= begin
-        paths = super
-        Cardio.set_paths paths
-
-        paths.add "files"
+    private
 
-        paths["app/models"] = []
-        paths["app/mailers"] = []
-        paths["app/controllers"] = []
+    def decko_path_defaults paths
+      paths.add "decko/config/environments",
+                with: File.join(Decko.gem_root, "config/environments"),
+                glob: "#{Rails.env}.rb"
 
-        unless paths["config/routes.rb"].existent.present?
-          add_path paths, "config/routes.rb",
-                   with: "rails/application-routes.rb"
-        end
+      return if paths["config/routes.rb"].existent.present?
 
-        paths
-      end
+      paths.add "config/routes.rb",
+                with: File.join(Decko.gem_root, "rails/application-routes.rb")
     end
   end
 end

data/lib/decko/cli.rb

@@ -6,12 +6,6 @@ require "decko/script_decko_loader"
 Decko::ScriptDeckoLoader.exec!
 
 require "rails/ruby_version_check"
-Signal.trap("INT") { puts; exit(1) }
-
-# if ARGV.first == 'plugin'
-#  ARGV.shift
-#  require 'decko/commands/plugin_new'
-# else
+Signal.trap("INT") { exit(1) }
 
 require "decko/commands/application"
-# end

data/lib/decko/commands.rb

@@ -1,121 +1,28 @@
-# add method in? to Object class
-require "active_support/core_ext/object/inclusion"
+ENV["CARDIO_COMMANDS"] = "NO_RUN"
 
-def load_rake_tasks
-  require "./config/environment"
-  require "rake"
-  Decko::Application.load_tasks
-end
-
-RAILS_COMMANDS = %w[ generate destroy plugin benchmarker profiler console
-                     server dbconsole application runner ].freeze
-DECKO_COMMANDS = %w[new cucumber rspec jasmine].freeze
-DECKO_DB_COMMANDS = %w[seed reseed load update].freeze
-
-ALIAS = {
-  "rs" => "rspec",
-  "cc" => "cucumber",
-  "jm" => "jasmine",
-  "g" => "generate",
-  "d" => "destroy",
-  "c" => "console",
-  "s" => "server",
-  "db" => "dbconsole",
-  "r" => "runner"
-}.freeze
-
-def supported_rails_command? arg
-  arg.in?(RAILS_COMMANDS) || ALIAS[arg].in?(RAILS_COMMANDS)
-end
-
-ARGV << "--help" if ARGV.empty?
+require "cardio/commands"
 
 module Decko
-  module Commands
-    class << self
-      def run_new
-        if ARGV.first.in?(["-h", "--help"])
-          require "decko/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_rspec
-        require "decko/commands/rspec_command"
-        RspecCommand.new(ARGV).run
-      end
-
-      def run_cucumber
-        require "decko/commands/cucumber_command"
-        CucumberCommand.new(ARGV).run
-      end
+  class Commands < Cardio::Commands
+    extend Cardio::Commands::Accessors
 
-      def run_db_task command
-        require "decko/commands/rake_command"
-        RakeCommand.new("decko:#{command}", ARGV).run
-      end
+    commands[:rails] << (aliases["s"] = "server")
+    commands[:custom] << (aliases["cc"] = "cucumber")
 
-      def run_jasmine
-        require "decko/commands/rake_command"
-        RakeCommand.new("spec:javascript", envs: "test").run
-      end
+    def run_cucumber
+      require "decko/commands/cucumber_command"
+      CucumberCommand.new(args).run
     end
-  end
-end
-
-command = ARGV.first
-command = ALIAS[command] || command
-if supported_rails_command? command
-  ENV["PRY_RESCUE_RAILS"] = "1" if ARGV.delete("--rescue")
-
-  # without this, the card generators don't list with: decko g --help
-  require "generators/card" if command == "generate"
-  require "rails/commands"
-else
-  ARGV.shift
-  case command
-  when "--version", "-v"
-    puts "Decko #{Card::Version.release}"
-  when *DECKO_COMMANDS
-    Decko::Commands.send("run_#{command}")
-  when *DECKO_DB_COMMANDS
-    Decko::Commands.run_db_task command
-  else
-    puts "Error: Command not recognized" unless command.in?(["-h", "--help"])
-    puts <<-EOT
-  Usage: decko COMMAND [ARGS]
 
-  The most common decko commands are:
-   new         Create a new Decko deck. "decko new my_deck" creates a
-               new deck called MyDeck in "./my_deck"
-   seed        Create and seed the database specified in config/database.yml
-
-   server      Start the Rails server (short-cut alias: "s")
-   console     Start the Rails console (short-cut alias: "c")
-   dbconsole   Start a console for the database specified in config/database.yml
-               (short-cut alias: "db")
-
-  For core developers
-   cucumber     Run cucumber features (short-cut alias: "cc")
-   rspec        Run rspec tests (short-cut alias: "rs")
-   update       Run card migrations
-   load         Load bootstrap data into database
+    def rake_prefix
+      "decko"
+    end
 
-  In addition to those, there are the standard rails commands:
-   generate     Generate new code (short-cut alias: "g")
-   application  Generate the Rails application code
-   destroy      Undo code generated with "generate" (short-cut alias: "d")
-   benchmarker  See how fast a piece of code runs
-   profiler     Get profile information from a piece of code
-   plugin       Install a plugin
-   runner       Run a piece of code in the application environment (short-cut alias: "r")
+    def run_rails
+      require "decko/generators" if command == "generate"
+      super
+    end
 
-  All commands can be run with -h (or --help) for more information.
-    EOT
-    exit(1)
+    new(ARGV).run
   end
 end

data/lib/decko/commands/application.rb

@@ -1,5 +1,5 @@
 require "rails/generators"
-require File.expand_path("../generators/deck/deck_generator", __dir__)
+require File.expand_path("../../../generators/deck/deck_generator", __FILE__)
 
 if ARGV.first != "new"
   ARGV[0] = "--help"
@@ -7,4 +7,4 @@ else
   ARGV.shift
 end
 
-Decko::Generators::Deck::DeckGenerator.start
+Cardio::Generators::Deck::DeckGenerator.start

data/lib/decko/commands/cucumber_command.rb

@@ -1,11 +1,14 @@
-require File.expand_path("command", __dir__)
+# load the application so we can look in mods
+require APP_PATH
+require "cardio/commands/command"
+require "cardio/mod/dirs"
 
 module Decko
-  module Commands
-    class CucumberCommand < Command
+  class Commands
+    class CucumberCommand < Cardio::Commands::Command
+      require "decko/commands/cucumber_command/parser"
+
       def initialize args
-        require "decko"
-        require "./config/environment"
         @decko_args, @cucumber_args = split_args args
         @opts = {}
         Parser.new(@opts).parse!(@decko_args)
@@ -44,5 +47,3 @@ module Decko
     end
   end
 end
-
-require File.expand_path("cucumber_command/parser", __dir__)

data/lib/decko/commands/cucumber_command/parser.rb

@@ -3,7 +3,7 @@
 require "optparse"
 
 module Decko
-  module Commands
+  class Commands
     class CucumberCommand
       class Parser < OptionParser
         class Flagger
@@ -34,7 +34,7 @@ module Decko
           super() do |parser|
             parser.banner = "Usage: decko cucumber [DECKO ARGS] -- [CUCUMBER ARGS]\n\n"
             parser.separator "\nDECKO ARGS"
-            opts[:env] = ["RAILS_ROOT=."]
+            opts[:env] = ["RAILS_ROOT=. RAILS_ENV=cucumber"]
             Flagger.new(parser, opts).add_flags
             parse_spring parser, opts
           end

data/lib/decko/engine.rb

@@ -1,15 +1,4 @@
-require "rails/all"
 require "cardio"
-
-# TODO: Move these to modules that use them
-require "htmlentities"
-require "coderay"
-require "haml"
-require "kaminari"
-require "bootstrap4-kaminari-views"
-require "diff/lcs"
-require "builder"
-
 require "decko"
 
 module Decko
@@ -19,13 +8,13 @@ module Decko
     paths.add "lib/tasks", with: "#{::Decko.gem_root}/lib/decko/tasks",
                            glob: "**/*.rake"
     paths["lib/tasks"] << "#{::Cardio.gem_root}/lib/card/tasks"
-    paths.add "lib/decko/config/initializers",
-              with: File.join(Decko.gem_root, "lib/decko/config/initializers"),
+    paths.add "decko/config/initializers",
+              with: File.join(Decko.gem_root, "config/initializers"),
               glob: "**/*.rb"
 
     initializer "decko.engine.load_config_initializers",
                 after: :load_config_initializers do
-      paths["lib/decko/config/initializers"].existent.sort.each do |initializer|
+      paths["decko/config/initializers"].existent.sort.each do |initializer|
         load(initializer)
       end
     end