card 1.104.1 → 1.105.0

data/lib/card/view/permission.rb

@@ -8,6 +8,8 @@ class Card
     #         # only render if user has permission to update card
     #         view :myview, perms: :update do...
     module Permission
+      CRUD = ::Set.new(%i[create read update delete]).freeze
+
       def view_perms
         @view_perms = setting(:perms) || :read
       end
@@ -47,11 +49,17 @@ class Card
         format.view_for_denial requested_view, task
       end
 
+      def crud? task
+        task.in? CRUD
+      end
+
       def denied_task
-        if view_perms.is_a? Proc
-          :read unless view_perms.call(format)  # read isn't quite right
-        else
-          Array.wrap(view_perms).find { |task| !format.ok? task }
+        Array.wrap(view_perms).find do |task|
+          if crud? task
+            !format.ok? task
+          else
+            !format.send task
+          end
         end
       end
     end

data/lib/card/view.rb

@@ -106,6 +106,10 @@ class Card
       !parent && !format.parent
     end
 
+    def depth
+      @depth ||= parent ? (parent.depth + 1) : 0
+    end
+
     # next voo object found tracing ancestry through parent voos and/or parent formats
     # @return [Card::View]
     def next_ancestor across_format=true

data/lib/card.rb

@@ -19,11 +19,11 @@ ActiveSupport.run_load_hooks(:before_card, self)
 # unique _name_, _key_, and _id_. Some cards also have a _codename_.
 #
 #       @card.name     # The name, a Card::Name object, is the most recognizable card
-# mark.
+#                      # mark.
 #       @card.key      # The key, a String, is a simple lower-case name variant.
 #       @card.id       # The id is an Integer.
 #       @card.codename # The codename, a Symbol, is the name by which a card can be
-# referred to in code.
+#                      # referred to in code.
 #
 # All names with the same key (including the key itself) are considered variants of each
 # other. No two cards can have names with the same key. {Card::Name} objects inherit from
@@ -117,10 +117,25 @@ class Card < Cardio::Record
   extend Cache::CardClass
   extend Director::CardClass
   extend Fetch::CardClass
+  extend Query::CardClass
+
+  cattr_accessor :action_specific_attributes, :set_specific_attributes
+
+  self.action_specific_attributes = [
+    :supercard,                   # [Card]
+    :superleft,                   # [Card]
+    :action,                      # [Symbol] :create, :update, or :delete
+    :current_action,              # [Card::Action]
+    :last_action_id_before_edit,  # [Integer]
+
+    :comment,      # TODO: refactor in favor of card[add], card[drop]
+    :silent_change # TODO: refactor following to use skip/trigger
+  ]
+
+  attr_accessor(*action_specific_attributes)
 
   include Dirty
   include DirtyNames
-  include Director::CardMethods
   include Name::All
   include Content::All
   include Set::CardMethods
@@ -139,36 +154,12 @@ class Card < Cardio::Record
   has_many :actions, -> { where(draft: [nil, false]).order :id }
   has_many :drafts, -> { where(draft: true).order :id }, class_name: :Action
 
-  cattr_accessor :action_specific_attributes, :set_specific_attributes
   alias_method :card_id, :id
 
   class << self
     delegate :config, :paths, to: Cardio
   end
 
-  self.action_specific_attributes = [
-    :supercard,
-    :superleft,
-    :action,                      # [Symbol] :create, :update, or :delete
-    :current_action,              # [Card::Action]
-    :last_action_id_before_edit,
-
-    :skip,                        # [Array] skip event(s) for all cards in act
-    :skip_in_action,              # [Array] skip event for just this card
-    :trigger,                     # [Array] trigger event(s) for all cards in act
-    :trigger_in_action,           # [Array] trigger event for just this card
-    :comment,                     # obviated soon
-
-    # TODO: refactor following to use skip/trigger
-    :update_all_users,            # if the above is wrong then this one too
-    :silent_change                # and this probably too
-  ]
-
-  attr_accessor(*action_specific_attributes)
-
-  self.action_specific_attributes +=
-    %i[skip_hash full_skip_hash trigger_hash full_trigger_hash]
-
   define_callbacks :select_action, :show_page, :act
 
   ActiveSupport.run_load_hooks :card, self

data/lib/cardio/cli.rb

@@ -2,6 +2,8 @@ require "rbconfig"
 require "colorize"
 require "cardio/script_loader"
 
+Cardio::ScriptLoader.script_name = "card"
+
 # 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!
@@ -9,4 +11,4 @@ Cardio::ScriptLoader.exec!
 require "rails/ruby_version_check"
 Signal.trap("INT") { exit(1) }
 
-require "cardio/commands/application"
+require "cardio/command/application"

data/lib/cardio/command/application.rb

@@ -0,0 +1,5 @@
+require "rails/generators"
+require File.expand_path("../../../generators/deck/deck_generator", __FILE__)
+require "cardio/command"
+
+Cardio::Command.run_non_deck_command ARGV.first, "cardio/commands"

data/lib/cardio/{commands/command.rb → command/command_base.rb}

@@ -1,7 +1,7 @@
 module Cardio
-  class Commands
+  class Command
     # shared handling of commands splitting cardio and original args with "--"
-    class Command
+    class CommandBase
       def run
         puts command
         exit_with_child_status command

data/lib/cardio/{commands → command}/custom.rb

@@ -2,13 +2,14 @@ require "optparse"
 require "cardio/version"
 
 module Cardio
-  class Commands
+  class Command
+    # Card-extensions of Rails command patterns
     module Custom
       private
 
       def run_new
         if !["-h", "--help"].intersection(args).empty?
-          require "cardio/commands/application"
+          require "cardio/command/application"
         else
           puts "Can't initialize a new deck within the directory of another, " \
                "please change to a non-deck directory first.\n"
@@ -22,33 +23,35 @@ module Cardio
       end
 
       def run_rspec
-        require "cardio/commands/rspec_command"
+        require "cardio/command/rspec_command"
         RspecCommand.new(args).run
       end
 
       # def run_jasmine
-      #   require "cardio/commands/rake_command"
+      #   require "cardio/command/rake_command"
       #   RakeCommand.new("spec:javascript", envs: "test").run
       # end
 
       def run_help
         puts "Usage:"
-        puts "  #{gem} COMMAND [OPTIONS]".green
+        puts "  #{Command.bin_name} COMMAND [OPTIONS]".green
         puts
         puts "Run commands with -h (or --help) for more info."
 
         %i[shark monkey].each do |group|
-          puts
-          puts "For " + "#{group}s".yellow + ":"
-          map.each do |command, conf|
-            next unless conf[:group] == group
-            puts command_help(command, conf)
-          end
-          puts
+          run_help_for_group group
         end
       end
 
-      private
+      def run_help_for_group group
+        puts
+        puts "For " + "#{group}s".yellow + ":"
+        map.each do |command, conf|
+          next unless conf[:group] == group
+          puts command_help(command, conf)
+        end
+        puts
+      end
 
       # formats command string for help text
       def command_help command, conf

data/lib/cardio/{commands → command}/rake_command/parser.rb

@@ -3,7 +3,7 @@
 # require "optparse"
 #
 # module Cardio
-#   class Commands
+#   class Command
 #     class RakeCommand
 #       # parse decko/card -specific options for rake
 #       class Parser < OptionParser
@@ -23,8 +23,8 @@
 #           super() do |parser|
 #             parser.banner =
 #               "Usage:\n" +
-#                 "  #{Commands.gem} #{command} [options]".green +
-#                 "\n\nRuns `rake #{Commands.gem}:#{command}` task."
+#                 "  #{Command.bin_name} #{command} [options]".green +
+#                 "\n\nRuns `rake #{Command.bin_name}:#{command}` task."
 #             parser_ons parser, command do |env_array|
 #               opts[:envs] = env_array
 #             end

data/lib/cardio/{commands → command}/rake_command.rb

@@ -1,9 +1,9 @@
-require File.expand_path("command", __dir__)
+require File.expand_path("command_base", __dir__)
 
 module Cardio
-  class Commands
+  class Command
     # enhance standard rake command with some decko/card -specific options
-    class RakeCommand < Command
+    class RakeCommand < CommandBase
       def initialize gem, command, args={}
         @command = command
         @task = "#{gem}:#{command}"
@@ -31,7 +31,7 @@ module Cardio
 
       def commands
         task_cmd = "bundle exec rake #{@task}"
-        task_cmd += " -- #{@args.join ' '}" if !@args.empty?
+        task_cmd += " -- #{@args.join ' '}" unless @args.empty?
         return [task_cmd] if !@envs || @envs.empty?
 
         # @envs.map do |env|

data/lib/cardio/{commands → command}/rspec_command/parser.rb

@@ -3,7 +3,7 @@
 require "optparse"
 
 module Cardio
-  class Commands
+  class Command
     class RspecCommand
       # parse decko/card -specific options for RSpec
       class Parser < OptionParser
@@ -59,7 +59,7 @@ module Cardio
 
         def other_options parser, opts
           parser.on("-s", "--[no-]simplecov", "Run with simplecov") do |s|
-            opts[:simplecov] = s ? "TMPSETS=true" : ""
+            opts[:simplecov] = s
           end
           parser.on("--rescue", "Run with pry-rescue") do
             process_rescue_opts opts

data/lib/cardio/{commands → command}/rspec_command.rb

@@ -1,9 +1,9 @@
-require File.expand_path("command", __dir__)
+require File.expand_path("command_base", __dir__)
 
 module Cardio
-  class Commands
+  class Command
     # enhance standard RSpec command with some decko/card -specific options
-    class RspecCommand < Command
+    class RspecCommand < CommandBase
       def initialize args
         require "rspec/core"
 
@@ -15,6 +15,7 @@ module Cardio
       def command
         "#{env_args} #{@opts[:executer]} #{@opts[:rescue]}" \
           "rspec #{@rspec_args.shelljoin} #{@opts[:files]}"
+        # .tap { |c| puts c.yellow }
       end
 
       private
@@ -24,12 +25,9 @@ module Cardio
       end
 
       def coverage
-        return if @opts[:simplecov]
-
-        # no coverage if rspec was started with file argument
-        return unless @opts[:files] || @rspec_args.any?
-
-        "COVERAGE=false"
+        "CARD_LOAD_STRATEGY=tmp_files" if @opts[:simplecov]
+        # # no coverage if rspec was started with file argument
+        # "CARD_SIMPLECOV=false" if @opts[:files] || @opts[:"no-simplecov"]
       end
     end
   end

data/lib/cardio/command.rb

@@ -0,0 +1,129 @@
+require "English"
+require "colorize"
+require "cardio/command/custom"
+
+module Cardio
+  # manage different types of commands that can be run via bin/card (and bin/decko)
+  class Command
+    include Custom
+
+    attr_reader :command, :args
+
+    class << self
+      attr_accessor :bin_name
+
+      def run_non_deck_command command, commands_script
+        if command == "new"
+          ARGV.shift
+          Cardio::Generators::Deck::DeckGenerator.start
+        elsif command.blank?
+          require commands_script
+        else
+          puts "ERROR: `#{bin_name} #{command}` " \
+               "cannot be run from outside deck".red
+        end
+      end
+    end
+
+    def map
+      @map ||= {
+        new: { desc: "create a new deck", group: :shark, via: :call },
+        setup: { desc: "populate a database", group: :shark, via: :rake },
+        update: { desc: "run data updates", group: :shark, alias: :u, via: :rake },
+        version: { desc: "#{gem} gem version", group: :shark, alias: :v, via: :call },
+        help: { desc: "show this text", group: :shark, alias: :h, via: :call },
+
+        console: { desc: "start a ruby console", group: :monkey, alias: :c },
+        dbconsole: { desc: "start a database console", group: :monkey, alias: :db },
+        runner: { desc: "run code in app environment", group: :monkey, alias: :r },
+        rspec: { desc: "run rspec tests", group: :monkey, alias: :rs, via: :call },
+        generate: { desc: "generate templated code", group: :monkey, alias: :g },
+        sow: { desc: "export card data to mod yaml", group: :monkey, via: :rake },
+        eat: { desc: "ingest card data from mod yaml", group: :monkey, via: :rake }
+      }
+    end
+
+    # TODO: review the following. see if any work well enough to include
+    #
+    #    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
+    #    jasmine
+
+    def initialize args
+      @args = args
+      @command = command_for_key args.first&.to_sym
+      ENV["PRY_RESCUE_RAILS"] = "1" if rescue?
+      @args.shift unless handler == :rails
+    end
+
+    def gem
+      "card"
+    end
+
+    def run
+      case handler
+      when :rails
+        run_rails
+      when :rake
+        run_rake
+      when :call
+        send "run_#{command}"
+      when :unknown
+        unknown_error
+      end
+      exit 0
+    end
+
+    private
+
+    def command_for_key key
+      return :help unless key
+      return key if map.key? key
+
+      map.each { |k, v| return k if v[:alias] == key }
+      @unknown = true
+      key
+    end
+
+    def rescue?
+      args.delete "--rescue"
+    end
+
+    def config
+      map[command]
+    end
+
+    def handler
+      @handler ||= @unknown ? :unknown : (config[:via] || :rails)
+    end
+
+    # runs all commands in "rails" list
+    def run_rails
+      require generator_requirement if command == :generate
+      require "rails/commands"
+    end
+
+    def generator_requirement
+      "cardio/generators"
+    end
+
+    # runs all commands in "rake" list
+    def run_rake
+      require "cardio/command/rake_command"
+      RakeCommand.new(gem, command, args).run
+    end
+
+    # ~~~~~~~~~~~~~~~~~~~~~ catch-all -------------- #
+
+    def unknown_error
+      puts "----------------------------------------------\n" \
+           "ERROR: Command not recognized: #{command}\n" \
+           "----------------------------------------------\n".red
+      run_help
+      exit 1
+    end
+  end
+end

data/lib/cardio/commands.rb

@@ -1,123 +1,24 @@
-require "English"
-require "colorize"
-require "cardio/commands/custom"
+require "cardio/command"
 
-module Cardio
-  # manage different types of commands that can be run via bin/card (and bin/decko)
-  class Commands
-    include Custom
-    
-    attr_reader :command, :args
-
-    class << self
-      attr_accessor :current
-
-      def gem
-        current&.gem
-      end
-    end
-
-    def map
-      @map ||= {
-        new: { desc: "create a new deck", group: :shark, via: :call },
-        seed: { desc: "populate a database", group: :shark, via: :rake },
-        update: { desc: "run data updates", group: :shark, alias: :u, via: :rake },
-        version: { desc: "#{gem} gem version", group: :shark, alias: :v, via: :call },
-        help: { desc: "show this text", group: :shark, alias: :h, via: :call},
-
-        console: { desc: "start a ruby console", group: :monkey, alias: :c },
-        dbconsole: { desc: "start a database console", group: :monkey, alias: :db },
-        runner: { desc: "run code in app environment", group: :monkey, alias: :r },
-        rspec: { desc: "run rspec tests", group: :monkey, alias: :rs, via: :call },
-        generate: { desc: "generate templated code", group: :monkey, alias: :g },
-        poop: { desc: "export card data to mod yaml", group: :monkey, via: :rake },
-        eat: { desc: "ingest card data from mod yaml", group: :monkey, via: :rake }
-      }
-    end
-
-    # TODO: review the following. see if any work well enough to include
-    #
-    #    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
-    #    jasmine
-
-    def initialize args
-      @args = args
-      @command = command_for_key args.first&.to_sym
-      ENV["PRY_RESCUE_RAILS"] = "1" if rescue?
-      @args.shift unless handler == :rails
-      Commands.current = self
-    end
-
-    def gem
-      "card"
-    end
-
-    def run
-      case handler
-      when :rails
-        run_rails
-      when :rake
-        run_rake
-      when :call
-        send "run_#{command}"
-      when :unknown
-        unknown_error
-      end
-      exit 0
-    end
+# NOTE: the distinction between Cardio::Commands and Cardio::Command is a little awkward
+# but not without some justification. Traditionally, there was only Cardio::Commands.
+# It was required by both script/card and decko/commands. The problem was that it called
+# the run command (see below), which was necessary in the script/card context but
+# problematic in the decko/commands context, where we wanted only the superclass instance
+# to call #run.
 
-    private
+# Since script/card is generated in installations and is hard to update, we didn't want
+# to change the name of the file it required, so we kept cardio/commands for that purpose
+# and made it inherit from Cardio::Commands, from which Decko::Commands also inherits.
 
-    def command_for_key key
-      return :help unless key
-      return key if map.key? key
+# We could have used CommandsBase (and may yet move to that), but it's worth noting
+# that this might have caused its own confusion with CommandBase, a base class for
+# classes that handle specific kinds of commands.
 
-      map.each { |k, v| return k if v[:alias] == key }
-      @unknown = true
-      key
-    end
-
-    def rescue?
-      args.delete "--rescue"
-    end
-
-    def config
-      map[command]
-    end
-
-    def handler
-      @handler ||= @unknown ? :unknown : (config[:via] || :rails)
-    end
-
-    # runs all commands in "rails" list
-    def run_rails
-      require generator_requirement if command == :generate
-      require "rails/commands"
-    end
-
-    def generator_requirement
-      "cardio/generators"
-    end
-
-    # runs all commands in "rake" list
-    def run_rake
-      require "cardio/commands/rake_command"
-      RakeCommand.new(gem, command, args).run
-    end
-
-    # ~~~~~~~~~~~~~~~~~~~~~ catch-all -------------- #
-
-    def unknown_error
-      puts "----------------------------------------------\n" \
-           "ERROR: Command not recognized: #{command}\n" \
-           "----------------------------------------------\n".red
-      run_help
-      exit 1
-    end
+module Cardio
+  # manage different types of commands that can be run via bin/card (and bin/decko)
+  class Commands < Command
+    Command.bin_name = "card"
 
     new(ARGV).run unless ENV["CARDIO_COMMANDS"] == "NO_RUN"
   end

data/lib/cardio/generators/deck_generator_loader.rb

@@ -1 +1,2 @@
+require "cardio/generators"
 require File.expand_path("../../../generators/deck/deck_generator", __FILE__)

data/lib/cardio/generators.rb

@@ -27,7 +27,7 @@ module Cardio
       end
 
       def banner_command
-        Commands.gem
+        Command.bin_name
       end
 
       # Override Rails namespace handling so we can put generators in `module Cardio`
@@ -50,7 +50,7 @@ module Rails
       end
 
       def help command="generate"
-        caller = Cardio::Commands.gem
+        caller = Command.bin_name
         puts "Usage:"
         puts "  #{caller} #{command} GENERATOR [args] [options]".green
         puts