decko 0.11.4 → 0.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98dd5887f73f65f3b84bab40ddf902f93c56dfbfeea2da826d8eaa2aee9d7bd4
-  data.tar.gz: b4c0bdf1ee67823675b78aa04ab11dc4f69f5a6b45f35ae85775dad115b965be
+  metadata.gz: 1c726ee70f0d8daba2891b23aab64090c43d088cc3300290a52eddee922dc7d0
+  data.tar.gz: c3e610b82510c510d2dfb16ecd1c408fe0be17c7e0b1d1209ce92432d52513e9
 SHA512:
-  metadata.gz: 2a9f0f9de1c86d450689c19766436f7d001437603a55bbd7c040ce0655fd60004408357ebe5deb5577836dcb08aa2c89cfd6233066dc1812a62c4204327f9482
-  data.tar.gz: 61af0fa92f3dae055ca3c8278cde3a924e1882dc13dccd46d16ff130c69323396b476c5be7fca2dc560dd6b12b36f8ce5e3f6999ce3ea2f39733eb8c02f5398c
+  metadata.gz: 8c18ed07879923d174cea1cc75a860406a5f6548dfbc56dfe4d27610ee64d29ce0df3cbfdd500362b2ce2780948d48f2e54aac487d437141e0b91c29a78d9935
+  data.tar.gz: a76d39182e7d95ac2192a4a90017dd337f07d786379379dc3a5166765a2f7241b3abc8b025ae8a7210aa0dd7431552dab7c1ce877acc4c394801d4cd410e2250

data/bin/decko

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 
-git_path = File.expand_path("../../../.git", __FILE__)
+git_path = File.expand_path("../../.git", __dir__)
 
 if File.exist?(git_path)
-  railties_path = File.expand_path("../../lib", __FILE__)
+  railties_path = File.expand_path("../lib", __dir__)
   $LOAD_PATH.unshift(railties_path)
 end
 require "decko/cli"

data/lib/card_controller.rb

@@ -0,0 +1,25 @@
+# -*- encoding : utf-8 -*-
+
+# Decko's only controller.
+class CardController < ActionController::Base
+  include Mark
+  include Rest
+  include Response
+  include Errors
+
+  # NOTE: including Card::Env::Location triggers card loading, which triggers mod loading,
+  # which can include initializers that add to the CardController class.
+  # It's important that it come *after* the modules above, so that mod modules
+  # can override them.
+  include ::Card::Env::Location
+
+  layout nil
+  attr_reader :card
+
+  before_action :setup, except: [:asset]
+  before_action :authenticate, except: [:asset]
+  before_action :load_mark, only: [:read]
+  before_action :load_card, except: [:asset]
+  before_action :load_action, only: [:read]
+  before_action :refresh_card, only: %i[create update delete]
+end

data/{rails/controllers → lib}/card_controller/errors.rb

@@ -16,6 +16,7 @@ class CardController
   module Errors
     def handle_exception exception
       raise exception if debug_exception?(exception)
+
       @card ||= Card.new
       error = Card::Error.report exception, card
       show error.class.view, error.class.status_code

data/lib/card_controller/mark.rb

@@ -0,0 +1,66 @@
+class CardController
+  # methods for interpretation of card marks requested
+  module Mark
+    private
+
+    def load_mark
+      params[:mark] = interpret_mark params[:mark]
+    end
+
+    def interpret_mark mark
+      case mark
+      when "*previous"
+        # Why support this? It's only needed in Success, right? Deprecate?
+        hard_redirect Card::Env.previous_location
+      when nil
+        implicit_mark
+      else
+        explicit_mark mark
+      end
+    end
+
+    def explicit_mark mark
+      # we should find the place where we produce these bad urls
+      mark.valid_encoding? ? mark : mark.force_encoding("ISO-8859-1").encode("UTF-8")
+    end
+
+    def implicit_mark
+      case
+      when initial_setup
+        ""
+      when (name = mark_from_card_hash)
+        name
+      when view_does_not_require_name?
+        ""
+      else
+        home_mark
+      end
+    end
+
+    def home_mark
+      Card::Rule.global_setting(:home) || "Home"
+    end
+
+    def view_does_not_require_name?
+      return false unless (view = params[:view]&.to_sym)
+
+      Card::Set::Format::AbstractFormat::ViewOpts.unknown_ok[view]
+    end
+
+    def mark_from_card_hash
+      params.dig :card, :name
+    end
+
+    # alters params
+    def initial_setup
+      return unless Card::Auth.needs_setup? && Card::Env.html?
+
+      prepare_setup_card!
+    end
+
+    def prepare_setup_card!
+      params[:card] = { type_id: Card.default_accounted_type_id }
+      params[:view] = "setup"
+    end
+  end
+end

data/lib/{decko → card_controller}/response.rb

@@ -1,4 +1,4 @@
-module Decko
+class CardController
   # methods for managing decko responses
   module Response
     def response_format
@@ -72,6 +72,7 @@ module Decko
 
     def require_card_for_soft_redirect!
       return if card.is_a? Card
+
       raise Card::Error, "tried to do soft redirect without a card"
     end
 
@@ -101,64 +102,13 @@ module Decko
     end
 
     def format_name_from_params
-      if explicit_file_format?       then :file
-      elsif params[:format].present? then params[:format].to_sym
-      else                                request.format.to_sym
-      end
+      return :file if explicit_file_format?
+
+      (params[:format].present? ? params[:format] : request.format).to_sym
     end
 
     def explicit_file_format?
       params[:explicit_file] || !Card::Format.registered.member?(request.format)
     end
-
-    def interpret_mark mark
-      case mark
-      when "*previous"
-        # Why support this? It's only needed in Success, right? Deprecate?
-        return hard_redirect(Card::Env.previous_location)
-      when nil
-        implicit_mark
-      else
-        explicit_mark mark
-      end
-    end
-
-    def explicit_mark mark
-      # we should find the place where we produce these bad urls
-      mark.valid_encoding? ? mark : mark.force_encoding("ISO-8859-1").encode("UTF-8")
-    end
-
-    def implicit_mark
-      case
-      when initial_setup                    then ""
-      when (name = params.dig :card, :name) then name
-      when view_does_not_require_name?      then ""
-      else                                       home_mark
-      end
-    end
-
-    def home_mark
-      Card::Rule.global_setting(:home) || "Home"
-    end
-
-    def view_does_not_require_name?
-      return false unless (view = params[:view]&.to_sym)
-      Card::Set::Format::AbstractFormat::ViewOpts.unknown_ok[view]
-    end
-
-    # alters params
-    def initial_setup
-      return unless initial_setup?
-      prepare_setup_card!
-    end
-
-    def initial_setup?
-      Card::Auth.needs_setup? && Card::Env.html?
-    end
-
-    def prepare_setup_card!
-      params[:card] = { type_id: Card.default_accounted_type_id }
-      params[:view] = "setup"
-    end
   end
 end

data/lib/card_controller/rest.rb

@@ -0,0 +1,105 @@
+class CardController
+  # RESTful action methods for card
+  module Rest
+    # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    #  PUBLIC METHODS
+
+    def create
+      handle { card.save! }
+    end
+
+    def read
+      show
+    end
+
+    def update
+      card.new_card? ? create : handle { card.update! params[:card]&.to_unsafe_h }
+    end
+
+    def delete
+      handle { card.delete! }
+    end
+
+    # @deprecated
+    def asset
+      body = "Decko installation error: missing asset symlinks"
+      Rails.logger.info "#{body}.\n  >>> Try `rake decko:update_assets_symlink`"
+      render body: body, status: 404
+    end
+
+    # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    #  PRIVATE METHODS
+
+    private
+
+    def setup
+      Card::Machine.refresh_script_and_style unless params[:explicit_file]
+      Card::Cache.renew
+      Card::Env.reset controller: self
+    end
+
+    def authenticate
+      Card::Auth.signin_with params
+    end
+
+    def load_card
+      @card = Card.uri_fetch params
+      raise Card::Error::NotFound unless card
+
+      record_as_main
+    end
+
+    def load_action
+      card.select_action_by_params params
+      return unless params[:edit_draft] && card.drafts.present?
+
+      card.content = card.last_draft_content
+    end
+
+    # TODO: refactor this away this when new layout handling is ready
+    def record_as_main
+      Card::Env[:main_name] = params[:main] || card&.name || ""
+    end
+
+    def refresh_card
+      @card = card.refresh
+    end
+
+    # ----------( HELPER METHODS ) -------------
+
+    def handle
+      Card::Env.success card.name
+      yield ? cud_success : raise(Card::Error::UserError)
+    end
+
+    # successful create, update, or delete act
+    def cud_success
+      success = Card::Env.success.in_context card.name
+      if success.reload?
+        reload # instruct JSON to reload
+      else
+        redirect_cud_success success
+      end
+    end
+
+    def show view=nil, status=200
+      card.action = :read
+      format = load_format status
+      result = render_page format, view
+      status = format.error_status || status
+      respond format, result, status
+    end
+
+    def render_page format, view
+      view ||= view_from_params
+      card.act do
+        format.page self, view, Card::Env.slot_opts
+      end
+    end
+
+    def view_from_params
+      %i[view v].each { |k| return params[k] if params[k].present? }
+      nil
+    end
+  end
+end

data/lib/decko.rb

@@ -1,6 +1,5 @@
-
 module Decko
-  DECKO_GEM_ROOT = File.expand_path("../..", __FILE__)
+  DECKO_GEM_ROOT = File.expand_path("..", __dir__)
 
   class << self
     def root

data/lib/decko/application.rb

@@ -79,6 +79,7 @@ module Decko
 
         paths["app/models"] = []
         paths["app/mailers"] = []
+        paths["app/controllers"] = []
 
         unless paths["config/routes.rb"].existent.present?
           add_path paths, "config/routes.rb",

data/lib/decko/commands.rb

@@ -7,21 +7,21 @@ def load_rake_tasks
   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
+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",
+  "g" => "generate",
+  "d" => "destroy",
+  "c" => "console",
+  "s" => "server",
   "db" => "dbconsole",
-  "r"  => "runner"
+  "r" => "runner"
 }.freeze
 
 def supported_rails_command? arg

data/lib/decko/commands/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__)
 
 if ARGV.first != "new"
   ARGV[0] = "--help"

data/lib/decko/commands/cucumber_command.rb

@@ -1,4 +1,4 @@
-require File.expand_path("../command", __FILE__)
+require File.expand_path("command", __dir__)
 
 module Decko
   module Commands
@@ -45,4 +45,4 @@ module Decko
   end
 end
 
-require File.expand_path("../cucumber_command/parser", __FILE__)
+require File.expand_path("cucumber_command/parser", __dir__)

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

@@ -1,38 +1,42 @@
 # -*- encoding : utf-8 -*-
+
 require "optparse"
 
 module Decko
   module Commands
     class CucumberCommand
       class Parser < OptionParser
+        class Flagger
+          def initialize parser, opts
+            @parser = parser
+            @opts = opts
+          end
+
+          def add_flags
+            add_flag "DEBUG", "-d", "--debug", "Drop into debugger on failure"
+            add_flag "FAST", "-f", "--fast", "Stop on first failure"
+            add_flag "LAUNCH", "-l", "--launchy", "Open page on failure"
+            add_flag "STEP", "-s", "--step", "Pause after each step"
+          end
+
+          def add_flag flag, *args
+            @parser.on(*args) { |a| @opts[:env] << "#{flag}=1" if a }
+          end
+        end
+
+        def parse_spring parser, opts
+          parser.on("--[no-]spring", "Run with spring") do |spring|
+            opts[:executer] = spring ? "spring" : "bundle exec"
+          end
+        end
+
         def initialize opts
           super() do |parser|
             parser.banner = "Usage: decko cucumber [DECKO ARGS] -- [CUCUMBER ARGS]\n\n"
-            parser.separator <<-EOT.strip_heredoc
-
-               DECKO ARGS
-            EOT
+            parser.separator "\nDECKO ARGS"
             opts[:env] = ["RAILS_ROOT=."]
-            parser.on("-d", "--debug", "Drop into debugger on failure") do |a|
-              opts[:env] << "DEBUG=1" if a
-            end
-            parser.on("-f", "--fast", "Stop on first failure") do |a|
-              opts[:env] << "FAST=1" if a
-            end
-            parser.on("-l", "--launchy", "Open page on failure") do |a|
-              opts[:env] << "LAUNCHY=1" if a
-            end
-            parser.on("-s", "--step", "Pause after each step") do |a|
-              opts[:env] << "STEP=1" if a
-            end
-            parser.on("--[no-]spring", "Run with spring") do |spring|
-              opts[:executer] =
-                if spring
-                 "spring"
-                else
-                 "bundle exec"
-                end
-            end
+            Flagger.new(parser, opts).add_flags
+            parse_spring parser, opts
           end
         end
       end

data/lib/decko/commands/rake_command.rb

@@ -1,4 +1,4 @@
-require File.expand_path("../command", __FILE__)
+require File.expand_path("command", __dir__)
 # require "pry"
 
 module Decko
@@ -30,6 +30,7 @@ module Decko
       def commands
         task_cmd = "bundle exec rake #{@task}"
         return [task_cmd] if !@envs || @envs.empty?
+
         @envs.map do |env|
           "env RAILS_ENV=#{env} #{task_cmd}"
         end
@@ -38,4 +39,4 @@ module Decko
   end
 end
 
-require File.expand_path("../rake_command/parser", __FILE__)
+require File.expand_path("rake_command/parser", __dir__)

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

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 require "optparse"
 
 module Decko
@@ -24,7 +25,7 @@ module Decko
             end
             parser.on("--all", "-a",
                       "#{command} production, test, and development database") do
-              opts[:envs] = %w(production development test)
+              opts[:envs] = %w[production development test]
             end
           end
         end

data/lib/decko/commands/rspec_command.rb

@@ -1,4 +1,4 @@
-require File.expand_path("../command", __FILE__)
+require File.expand_path("command", __dir__)
 
 module Decko
   module Commands
@@ -33,4 +33,4 @@ module Decko
   end
 end
 
-require File.expand_path("../rspec_command/parser", __FILE__)
+require File.expand_path("rspec_command/parser", __dir__)

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

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 require "optparse"
 
 module Decko

data/lib/decko/config/environments/cucumber.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 Decko.application.class.configure do
   # Edit at your own peril - it's recommended to regenerate this file
   # in the future when you upgrade to a newer version of Cucumber.

data/lib/decko/config/environments/development.rb

@@ -89,7 +89,7 @@ Decko.application.class.configure do
   rescue LoadError
   end
 
-  #config.session_store :cookie_store
+  # config.session_store :cookie_store
 end
 
 # Paperclip.options[:command_path] = "/opt/local/bin"

data/lib/decko/config/environments/production.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 Decko.application.class.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
@@ -50,7 +51,8 @@ Decko.application.class.configure do
   # config.action_controller.asset_host = "http://assets.example.com"
 
   # 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)
+  config.assets.precompile += %w[application-all.css application-print.css barebones.css
+                                 html5shiv-printshiv.js]
 
   # Disable delivery errors, bad email addresses will be ignored
   # config.action_mailer.raise_delivery_errors = false

data/lib/decko/config/environments/profile.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 Decko.application.class.configure do
   # Settings specified here will take precedence over those in config/environment.rb
   # The profile environment should match the same settings

data/lib/decko/config/environments/test.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 Decko.application.class.configure do
   # Settings specified here will take precedence over those in config/application.rb
 

data/lib/decko/config/initializers/secret_token.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 # Be sure to restart your server when you modify this file.
 
 # Your secret key for verifying the integrity of signed cookies.

data/lib/decko/config/initializers/sedate_parser.rb

@@ -1,7 +1,8 @@
 # Hack to get rid of annoying parser warnings
 module Parser
   def self.warn msg
-    return if msg =~ %r{^warning: (?:parser/current|[\d\.]+-compliant syntax|please see)}
-    super
+    super unless msg.match?(
+      %r{^warning: (?:parser/current|[\d.]+-compliant syntax|please see)}
+    )
   end
 end

data/lib/decko/engine.rb

@@ -1,4 +1,3 @@
-
 require "rails/all"
 require "cardio"
 
@@ -15,7 +14,6 @@ require "decko"
 
 module Decko
   class Engine < ::Rails::Engine
-    paths.add "app/controllers",  with: "rails/controllers", eager_load: true
     paths.add "gem-assets",       with: "rails/assets"
     paths.add "config/routes.rb", with: "rails/engine-routes.rb"
     paths.add "lib/tasks", with: "#{::Decko.gem_root}/lib/decko/tasks",

data/lib/decko/generators/deck/deck_generator.rb

@@ -11,7 +11,7 @@ module Decko
         include RailsOverrides
         include DeckHelper
 
-        source_root File.expand_path("../templates", __FILE__)
+        source_root File.expand_path("templates", __dir__)
 
         # All but the first aliases should be considered deprecated
         class_option "monkey",
@@ -123,6 +123,7 @@ module Decko
 
         def database_gemfile_entry
           return [] if options[:skip_active_record]
+
           gem_name, gem_version = gem_for_database
           msg = "Use #{options[:database]} as the database for Active Record"
           GemfileEntry.version gem_name, gem_version, msg

data/lib/decko/generators/deck/deck_generator/interactive.rb

@@ -52,8 +52,8 @@ module Decko
           end
 
           def build_option key, desc, command
-            command &&= " " * (65 - desc.size) + "[" + command + "]"
-            "  #{key} - #{desc}#{command if command}"
+            command &&= "#{' ' * (65 - desc.size)}[#{command}]"
+            "  #{key} - #{desc}#{command}"
           end
 
           def add_config_options
@@ -108,9 +108,9 @@ module Decko
           def add_after_seed_options
             @menu["x"][:desc] = "exit"
             @menu["r"] = {
-              desc:    "run decko server",
+              desc: "run decko server",
               command: "decko server",
-              code:    proc { bundle_exec "decko server" }
+              code: proc { bundle_exec "decko server" }
             }
           end
         end

data/lib/decko/script_decko_loader.rb

@@ -10,6 +10,7 @@ module Decko
       def exec!
         cwd = Dir.pwd
         return unless continue?
+
         exec_decko_script
         recurse cwd
       rescue SystemCallError

data/lib/decko/tasks/alias.rb

@@ -16,16 +16,15 @@ def link_task task, from: nil, to: nil, namespace: nil
   case task
   when Hash
     task.each do |key, val|
-      link_task val, from: from, to: to ,
-                  namespace: append_to_namespace(namespace, key)
-
+      link_task val, from: from, to: to,
+                     namespace: append_to_namespace(namespace, key)
     end
   when Array
     task.each do |t|
-     link_task t, from: from, to: to, namespace: namespace
+      link_task t, from: from, to: to, namespace: namespace
     end
   else
     shared_part = append_to_namespace namespace, task
     alias_task "#{from}:#{shared_part}", "#{to}:#{shared_part}"
   end
-end
+end

data/lib/decko/tasks/cucumber.rake

@@ -5,61 +5,69 @@
 # files.
 
 unless ARGV.any? { |a| a =~ /^gems/ } # Don't load anything when running the gems:* tasks
+  vendored_cucumber_bin =
+    Dir["#{Rails.root}/vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
+  unless vendored_cucumber_bin.nil?
+    $LOAD_PATH.unshift("#{File.dirname(vendored_cucumber_bin)}/../lib")
+  end
 
-  vendored_cucumber_bin = Dir["#{Rails.root}/vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
-$LOAD_PATH.unshift(File.dirname(vendored_cucumber_bin) + "/../lib") unless vendored_cucumber_bin.nil?
-
-begin
-  require "cucumber/rake/task"
+  begin
+    require "cucumber/rake/task"
 
-  namespace :cucumber do
-    Cucumber::Rake::Task.new({ ok: "db:test:prepare" }, "Run features that should pass") do |t|
-      t.binary = vendored_cucumber_bin # If nil, the gem's binary is used.
-      t.fork = true # You may get faster startup if you set this to false
-      t.profile = "default"
-    end
+    namespace :cucumber do
+      Cucumber::Rake::Task.new({ ok: "db:test:prepare" },
+                               "Run features that should pass") do |t|
+        t.binary = vendored_cucumber_bin # If nil, the gem's binary is used.
+        t.fork = true # You may get faster startup if you set this to false
+        t.profile = "default"
+      end
 
-    Cucumber::Rake::Task.new({ wip: "db:test:prepare" }, "Run features that are being worked on") do |t|
-      t.binary = vendored_cucumber_bin
-      t.fork = true # You may get faster startup if you set this to false
-      t.profile = "wip"
-    end
+      Cucumber::Rake::Task.new({ wip: "db:test:prepare" },
+                               "Run features that are being worked on") do |t|
+        t.binary = vendored_cucumber_bin
+        t.fork = true # You may get faster startup if you set this to false
+        t.profile = "wip"
+      end
 
-    Cucumber::Rake::Task.new({ rerun: "db:test:prepare" }, "Record failing features and run only them if any exist") do |t|
-      t.binary = vendored_cucumber_bin
-      t.fork = true # You may get faster startup if you set this to false
-      t.profile = "rerun"
-    end
+      Cucumber::Rake::Task.new(
+        { rerun: "db:test:prepare" },
+        "Record failing features and run only them if any exist"
+      ) do |t|
+        t.binary = vendored_cucumber_bin
+        t.fork = true # You may get faster startup if you set this to false
+        t.profile = "rerun"
+      end
 
-    desc "Run all features"
-    task all: [:ok, :wip]
+      desc "Run all features"
+      task all: %i[ok wip]
 
-    task :statsetup do
-      require "rails/code_statistics"
-      ::STATS_DIRECTORIES << %w(Cucumber\ features features) if File.exist?("features")
-      ::CodeStatistics::TEST_TYPES << "Cucumber features" if File.exist?("features")
-      ::STATS_DIRECTORIES << %w(Mods mods) if File.exist?("mods") # hack!  should be elsewhere
+      task :statsetup do
+        require "rails/code_statistics"
+        ::STATS_DIRECTORIES << %w[Cucumber\ features features] if File.exist?("features")
+        ::CodeStatistics::TEST_TYPES << "Cucumber features" if File.exist?("features")
+        ::STATS_DIRECTORIES << %w[Mods mods] if File.exist?("mods")
+      end
     end
-  end
-  desc "Alias for cucumber:ok"
-  task cucumber: "cucumber:ok"
+    desc "Alias for cucumber:ok"
+    task cucumber: "cucumber:ok"
 
-  task default: :cucumber
+    task default: :cucumber
 
-  task features: :cucumber do
-    STDERR.puts "*** The 'features' task is deprecated. See rake -T cucumber ***"
-  end
+    task features: :cucumber do
+      warn "*** The 'features' task is deprecated. See rake -T cucumber ***"
+    end
 
-  # In case we don't have ActiveRecord, append a no-op task that we can depend upon.
-  task "db:test:prepare" do
-  end
+    # In case we don't have ActiveRecord, append a no-op task that we can depend upon.
+    task "db:test:prepare" do
+    end
 
-  task stats: "cucumber:statsetup"
-rescue LoadError
-  desc "cucumber rake task not available (cucumber not installed)"
-  task :cucumber do
-    abort "Cucumber rake task is not available. Be sure to install cucumber as a gem or plugin"
+    task stats: "cucumber:statsetup"
+  rescue LoadError
+    desc "cucumber rake task not available (cucumber not installed)"
+    task :cucumber do
+      abort "Cucumber rake task is not available. " \
+            "Be sure to install cucumber as a gem or plugin"
+    end
   end
-end
 
 end

data/lib/decko/tasks/db.rake

@@ -19,6 +19,7 @@ unless Rake::TaskManager.methods.include?(:redefine_task)
         task
       end
     end
+
     class Task
       class << self
         def redefine_task args, &block
@@ -36,8 +37,14 @@ namespace :db do
       require "active_record/fixtures"
       fixture_path = File.join(Cardio.gem_root, "db", "seed", "test", "fixtures")
       ActiveRecord::Base.establish_connection(::Rails.env.to_sym)
-      (ENV["FIXTURES"] ? ENV["FIXTURES"].split(/,/) : Dir.glob(File.join(fixture_path, "*.{yml,csv}"))).each do |fixture_file|
-        ActiveRecord::FixtureSet.create_fixtures(fixture_path, File.basename(fixture_file, ".*"))
+      (if ENV["FIXTURES"]
+         ENV["FIXTURES"].split(/,/)
+       else
+         Dir.glob(File.join(fixture_path,
+                            "*.{yml,csv}"))
+       end).each do |fixture_file|
+        ActiveRecord::FixtureSet.create_fixtures(fixture_path,
+                                                 File.basename(fixture_file, ".*"))
       end
     end
   end

data/lib/decko/tasks/decko.rake

@@ -5,9 +5,9 @@ require "card/seed_consts"
 CARD_TASKS =
   [
     :migrate,
-    { migrate: [:cards, :structure, :core_cards, :deck_cards, :redo, :stamp] },
+    { migrate: %i[cards structure core_cards deck_cards redo stamp] },
     :reset_cache
-  ]
+  ].freeze
 
 link_task CARD_TASKS, from: :decko, to: :card
 
@@ -80,6 +80,7 @@ decko_namespace = namespace :decko do
     if Decko.paths["tmp"].existent
       Dir.foreach(tmp_dir) do |filename|
         next if filename.starts_with? "."
+
         FileUtils.rm_rf File.join(tmp_dir, filename), secure: true
       end
     else
@@ -111,6 +112,7 @@ decko_namespace = namespace :decko do
 
   def prepped_asset_path
     return if Rails.root.to_s == Decko.gem_root # inside decko gem
+
     assets_path = File.join Rails.public_path, "assets"
     if File.symlink?(assets_path) || !File.directory?(assets_path)
       FileUtils.rm_rf assets_path
@@ -133,7 +135,7 @@ decko_namespace = namespace :decko do
     # creates!
     begin
       Rake::Task["db:drop"].invoke
-    rescue
+    rescue StandardError
       puts "not dropped"
     end
 
@@ -152,7 +154,7 @@ end
 
 def failing_loudly task
   yield
-rescue
+rescue StandardError
   # TODO: fix this so that message appears *after* the errors.
   # Solution should ensure that rake still exits with error code 1!
   raise "\n>>>>>> FAILURE! #{task} did not complete successfully." \

data/lib/decko/tasks/decko/seed.rake

@@ -33,6 +33,7 @@ namespace :decko do
 
     def delete_ignored_cards
       return unless (ignore = Card["*ignore"])
+
       Card::Auth.as_bot do
         ignore.item_cards.each(&:delete!)
       end
@@ -62,6 +63,7 @@ namespace :decko do
         Card.search(right: { codename: codename }).each do |card|
           FileUtils.rm_rf File.join("files", card.id.to_s), secure: true
           next if reserved_output? card.name
+
           card.delete!
         end
       end
@@ -116,6 +118,7 @@ namespace :decko do
 
     def add_test_data
       return unless Rails.env == "test"
+
       load CARD_TEST_SEED_SCRIPT_PATH
       SharedData.add_test_data
     end

data/rails/engine-routes.rb

@@ -37,7 +37,7 @@ Decko::Engine.routes.draw do
 
   # explicit GET alternatives for transactions
   %w[create read update delete asset].each do |action|
-    get "(card)/#{action}(/:mark(.:format))"  => "card", action: action
+    get "(card)/#{action}(/:mark(.:format))" => "card", action: action
   end
 
   # for super-explicit over-achievers

data/script/decko

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
 
-APP_PATH = File.expand_path("../../config/application",  __FILE__)
-require File.expand_path("../../config/boot",  __FILE__)
+APP_PATH = File.expand_path("../config/application",  __dir__)
+require File.expand_path("../config/boot",  __dir__)
 require "decko/commands"

data/script/rails

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+# This command will automatically be run when you run "rails"
 
-APP_PATH = File.expand_path("../../config/application",  __FILE__)
-require File.expand_path("../../config/boot",  __FILE__)
-require "rails/commands"
+# APP_PATH = File.expand_path("../config/application",  __dir__)
+# require File.expand_path("../config/boot",  __dir__)
+# require "rails/commands"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decko
 version: !ruby/object:Gem::Version
-  version: 0.11.4
+  version: 0.11.5
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-05 00:00:00.000000000 Z
+date: 2021-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.4
+        version: 1.101.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.4
+        version: 1.101.5
 - !ruby/object:Gem::Dependency
   name: card-mod-defaults
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 0.11.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.4
+        version: 0.11.5
 description: a wiki approach to structured data, dynamic interaction,  and web design
 email:
 - info@decko.org
@@ -66,6 +66,11 @@ files:
 - app/assets/images/smoothness/ui-icons_888888_256x240.png
 - app/assets/images/smoothness/ui-icons_cd0a0a_256x240.png
 - bin/decko
+- lib/card_controller.rb
+- lib/card_controller/errors.rb
+- lib/card_controller/mark.rb
+- lib/card_controller/response.rb
+- lib/card_controller/rest.rb
 - lib/decko.rb
 - lib/decko/all.rb
 - lib/decko/application.rb
@@ -131,7 +136,6 @@ files:
 - lib/decko/generators/deck/templates/spec/javascripts/support/decko_jasmine.yml.erb
 - lib/decko/generators/deck/templates/spec/spec_helper.rb
 - lib/decko/mods_spec_helper.rb
-- lib/decko/response.rb
 - lib/decko/rest_spec_helper.rb
 - lib/decko/script_decko_loader.rb
 - lib/decko/swagger.rb
@@ -150,14 +154,10 @@ files:
 - rails/assets/jasmine/500.html
 - rails/assets/jasmine/card_form.html
 - rails/assets/jquery.min.map
-- rails/controllers/application_controller.rb
-- rails/controllers/card_controller.rb
-- rails/controllers/card_controller/errors.rb
 - rails/engine-routes.rb
 - script/autospec
 - script/decko
 - script/rails
-- script/test_filter
 homepage: https://decko.org
 licenses:
 - GPL-3.0

data/rails/controllers/application_controller.rb

@@ -1,2 +0,0 @@
-class ApplicationController < ActionController::Base
-end

data/rails/controllers/card_controller.rb

@@ -1,122 +0,0 @@
-# -*- encoding : utf-8 -*-
-
-# Decko's only controller.
-class CardController < ApplicationController
-  include ::Card::Env::Location
-  include ::Recaptcha::Verify
-  include ::Decko::Response
-  include Errors
-
-  layout nil
-  attr_reader :card
-
-  # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  #  PUBLIC METHODS
-
-  def create
-    handle { card.save! }
-  end
-
-  def read
-    show
-  end
-
-  def update
-    card.new_card? ? create : handle { card.update! params[:card]&.to_unsafe_h }
-  end
-
-  def delete
-    handle { card.delete! }
-  end
-
-  def asset
-    body = "Decko installation error: missing asset symlinks"
-    Rails.logger.info "#{body}.\n  >>> Try `rake decko:update_assets_symlink`"
-    render body: body, status: 404
-  end
-
-  # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  #  PRIVATE METHODS
-
-  private
-
-  #-------( FILTERS )
-
-  before_action :setup, except: [:asset]
-  before_action :authenticate, except: [:asset]
-  before_action :load_mark, only: [:read]
-  before_action :load_card, except: [:asset]
-  before_action :load_action, only: [:read]
-  before_action :refresh_card, only: [:create, :update, :delete]
-
-  def setup
-    Card::Machine.refresh_script_and_style unless params[:explicit_file]
-    Card::Cache.renew
-    Card::Env.reset controller: self
-  end
-
-  def authenticate
-    Card::Auth.signin_with params
-  end
-
-  def load_mark
-    params[:mark] = interpret_mark params[:mark]
-  end
-
-  def load_card
-    @card = Card.controller_fetch params
-    raise Card::Error::NotFound unless card
-    record_as_main
-  end
-
-  def load_action
-    card.select_action_by_params params
-    card.content = card.last_draft_content if params[:edit_draft] && card.drafts.present?
-  end
-
-  # TODO: refactor this away this when new layout handling is ready
-  def record_as_main
-    Card::Env[:main_name] = params[:main] || card&.name || ""
-  end
-
-  def refresh_card
-    @card = card.refresh
-  end
-
-  # ----------( HELPER METHODS ) -------------
-
-  def handle
-    Card::Env.success card.name
-    yield ? cud_success : raise(Card::Error::UserError)
-  end
-
-  # successful create, update, or delete act
-  def cud_success
-    success = Card::Env.success.in_context card.name
-    if success.reload?
-      reload # instruct JSON to reload
-    else
-      redirect_cud_success success
-    end
-  end
-
-  def show view=nil, status=200
-    card.action = :read
-    format = load_format status
-    result = render_page format, view
-    status = format.error_status || status
-    respond format, result, status
-  end
-
-  def render_page format, view
-    view ||= view_from_params
-    card.act do
-      format.page self, view, Card::Env.slot_opts
-    end
-  end
-
-  def view_from_params
-    %i[view v].each { |k| return params[k] if params[k].present? }
-    nil
-  end
-end

data/script/test_filter

@@ -1,25 +0,0 @@
-#!/usr/local/bin/ruby
-
-STDOUT.sync = true
-errors_filename = "./log/err.out"
-err_out = File.new(errors_filename, "a")
-
-ARGF.each_line do |l|
-  error_section = false
-  if error_section
-    error_section = false if l =~ /^\s*$/
-  elsif l =~ /^\s*\d+\)\s*$/
-    error_section = true
-  elsif l =~ /^\*{40,}$/ ||
-        l =~ /^be removed from a future version of RSpec\.$/ ||
-        l =~ /^\* simple_matcher is deprecated\.$/ ||
-        l =~ /^\* please use Matcher DSL \(http\:\/\/rspec\.rubyforge\.org\/rspec\/1\.3.0\/classes\/Spec\/Matchers\.html\) instead\.$/
-    err_out << l if err_out
-    next
-  elsif l =~ /^([\.\[\]F\*\s]*)((\/| \(called from create_or_update_thumbnail|DEPRECATION WARN|The \{\{key\}\} interpolation syntax in|from \/).*\n?$)/
-    STDOUT << Regexp.last_match(1)
-    err_out << Regexp.last_match(2) if err_out
-    next
-  end
-  STDOUT << l
-end