decko 0.11.1 → 0.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 743d51677e0692862ed4f3f8603a741294d05e641b6e492779410121dea2c385
-  data.tar.gz: b6939290640e4bb8b7456f46aa78d4d01a389db6690881ba6fada4f57ffdca4a
+  metadata.gz: 99728f79ff5c295eb94e5978c8cde7d817d8d77529aab5ef2de84eb374f163a0
+  data.tar.gz: 233aaa6f69d3af91f4a802166a6153f1a8cb651641450e743e7c672c2bc01f4e
 SHA512:
-  metadata.gz: bcc1d2388acf0dc9665816a2b8eeca8dc473691f3f8506565bda2cd3d7ec0bc49602178016893d75ba94052fd16336477e46bde091dbe93ffae531b517580904
-  data.tar.gz: f5550792fe10468d0e89d3d1a6bdf9dac26134362f90d635306586f61c6e9e0340dead9f2e0bf27eb388bf00cd5387b1bdfb97ae640d9f429c5a4164f574dc86
+  metadata.gz: 251382ac224b1579d147c495472ca0ff289fe85f167ce928dd65bb66bfe29b4e2b9ead2b7927ebb0c011bbe17b5dd35c49478d7c761baf38aff8e188f3727feb
+  data.tar.gz: 88459337becaf40c3a5fd17ea4e6db21d32d76c2b05e9debfba7567fb37a569cd988ffacaf2e4acd90a719b807665b22a9bf99f4048394f82effaf922fe65c4b

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,13 +72,8 @@ 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
 
-    # (obviously) deprecated
-    def send_deprecated_asset
-      filename = [params[:mark], params[:format]].compact.join(".")
-      send_file asset_file_path(filename), x_sendfile: true
+      raise Card::Error, "tried to do soft redirect without a card"
     end
 
     def asset_file_path filename
@@ -107,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

@@ -63,7 +63,9 @@ module Decko
         config.filter_parameters += [:password]
 
         # Rails.autoloaders.log!
-        Rails.autoloaders.main.ignore(File.join(Cardio.gem_root, "lib/card/seed_consts.rb"))
+        Rails.autoloaders.main.ignore(
+          File.join(Cardio.gem_root, "lib/card/seed_consts.rb")
+        )
         config
       end
     end
@@ -77,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/cli.rb

@@ -3,7 +3,7 @@ require "decko/script_decko_loader"
 
 # If we are inside a Decko application this method performs an exec and thus
 # the rest of this script is not run.
-Decko::ScriptDeckoLoader.exec_script_decko!
+Decko::ScriptDeckoLoader.exec!
 
 require "rails/ruby_version_check"
 Signal.trap("INT") { puts; exit(1) }

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