decko 0.13.1 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8df78fb22e3357c499c3710236720260e5aba276321a046e1c6a99d166258abc
-  data.tar.gz: d5cbf64a237d86ea8694211423c2f4432bfad79995388fed507127abd3c90f6b
+  metadata.gz: 374e72f93b06c868af36ce94255cd88573b20284f71cc99f815eeed5f502aa31
+  data.tar.gz: b4a860c333ba45b4a22e695e0bf1cba3bd658f367001de86b27b972f97de1705
 SHA512:
-  metadata.gz: f157196de583874b449572b460821b200550b42a2acb0f5b868b9ca1335bc7819fd4ff4cae3eacfbc4c2e30f5ba84a9450d40611e5d2e67435906ea68767c69e
-  data.tar.gz: 369220b0ea762abe606e99fdef886eb01b0e338495781ee8a36a48b73d53f1bbde862762a5c6729d09064acf764c553dcbbd73beb197ce394cfe9772a90299e0
+  metadata.gz: 87c4be03b2f1dc4dc02129f2be0cd317b5c58a0b19594c04adbe5b03ff223225aee722db14f072e8c9c268c5d7eebe77ade2673d8eee58014833b85731c34858
+  data.tar.gz: 1eb886dbacb449a9f1a7c064b3849459d9130b3ff10986f05afac56ea6260b960c26d05e63d87c61b1062c71a7edbf42ac6903e98f5b4d87f0b7797425d5fdb0

data/config/environments/cucumber.rb

@@ -6,7 +6,7 @@ Decko.application.class.configure do
 
   config.eager_load = false
 
-  config.machine_refresh = :never
+  config.asset_refresh = :never
 
   # IMPORTANT: Setting config.cache_classes to false is known to
   # break Cucumber's use_transactional_fixtures method.

data/config/initializers/cypress.rb

@@ -1,5 +1,6 @@
 if defined?(CypressOnRails)
   require "simplecov"
+  SimpleCov.start
 
   CypressOnRails.configure do |c|
     c.cypress_folder = File.join Decko.gem_root, "spec", "cypress"

data/lib/card_controller/mark.rb

@@ -21,7 +21,8 @@ class CardController
 
     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")
+      # mark.valid_encoding? ? mark : mark.force_encoding("ISO-8859-1").encode("UTF-8")
+      mark
     end
 
     def implicit_mark

data/lib/card_controller/rest.rb

@@ -1,11 +1,8 @@
 class CardController
-  # RESTful action methods for card
+  # helper method for RESTful action methods for card
   module Rest
     include ActionController::HttpAuthentication::Token
 
-    # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    #  PUBLIC METHODS
-
     def create
       handle { card.save! }
     end
@@ -29,13 +26,10 @@ class CardController
       render body: body, status: 404
     end
 
-    # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    #  PRIVATE METHODS
-
     private
 
     def setup
-      Card::Machine.refresh_assets unless params[:explicit_file]
+      Card::Assets.refresh_assets unless params[:explicit_file]
       Card::Cache.renew
       Card::Env.reset controller: self
     end
@@ -45,6 +39,8 @@ class CardController
     end
 
     def authenticators
+      return {} unless request
+
       { token: token_from_header || params[:token] }
     end
 

data/lib/decko/commands.rb

@@ -4,23 +4,28 @@ require "cardio/commands"
 
 module Decko
   class Commands < Cardio::Commands
-    extend Cardio::Commands::Accessors
+    def map
+      @map ||= super.merge(
+        server: { desc: "start a local web server", group: :shark, alias: :s },
+        cucumber: { desc: "run cucumber tests", group: :monkey, alias: :cc, via: :call}
+      )
+    end
+
+    def generator_requirement
+      "decko/generators"
+    end
 
-    commands[:rails] << (aliases["s"] = "server")
-    commands[:custom] << (aliases["cc"] = "cucumber")
+    def gem
+      "decko"
+    end
 
     def run_cucumber
       require "decko/commands/cucumber_command"
       CucumberCommand.new(args).run
     end
 
-    def rake_prefix
-      "decko"
-    end
-
-    def run_rails
-      require "decko/generators" if command == "generate"
-      super
+    def run_version
+      puts "Decko #{Cardio::Version.release}".light_cyan
     end
 
     new(ARGV).run

data/lib/decko/generators.rb

@@ -1,17 +1,3 @@
 # -*- encoding : utf-8 -*-
 
 require "cardio/generators"
-require "cardio/generators/class_methods"
-
-# note: despite the decko file name the base class is Cardio
-module Cardio
-  module Generators
-    # main definition of this module is in card gem
-    module ClassMethods
-      # generator USAGE docs will use "decko" rather than "card" when called with decko
-      def banner_command
-        "decko"
-      end
-    end
-  end
-end

data/lib/decko/mods_spec_helper.rb

@@ -15,10 +15,6 @@ CardSpecLoader.prefork do
   CardSpecLoader.rspec_config
 end
 
-CardSpecLoader.each_run do
-  # This code will be run each time you run your specs.
-end
-
 CardSpecLoader.helper
 
 Decko::ModsSpecHelper = :needs_a_value_so_spring_loader_is_happy

data/lib/decko/railtie.rb

@@ -12,7 +12,12 @@ module Decko
         c.autoload_paths += Dir["#{gem_root}/lib"]
 
         c.paths.tap do |p|
-          p["lib/tasks"].unshift "#{gem_root}/lib/decko/tasks"
+          # if this directory is named lib/tasks, it will get run by decko/engine,
+          # which currently breaks because of the aliases to card tasks, which
+          # aren't available there.
+          #
+          # Ideally we'd fix that and follow the naming convention.
+          p["lib/tasks"] << "#{gem_root}/lib/rake_tasks"
 
           p["config/environments"].unshift "#{gem_root}/config/environments"
           p["config/initializers"].unshift "#{gem_root}/config/initializers"

data/lib/generators/deck/deck_generator.rb

@@ -5,6 +5,7 @@ module Cardio
     module Deck
       # Create new Decks (Decko Applications)
       class DeckGenerator
+        extend ClassMethods
         # TODO: move decko-specific deck components here (eg cucumber)
       end
     end

data/lib/{decko/tasks → rake_tasks}/db.rake

@@ -8,7 +8,7 @@ unless Rake::TaskManager.methods.include?(:redefine_task)
   module Rake
     module TaskManager
       def redefine_task task_class, args, &block
-        task_name, arg_names, deps = resolve_args(args)
+        task_name, _arg_names, deps = resolve_args(args)
         task_name = task_class.scope_name(@scope, task_name)
         deps = [deps] unless deps.respond_to?(:to_ary)
         deps = deps.map(&:to_s)
@@ -32,7 +32,8 @@ end
 
 namespace :db do
   namespace :fixtures do
-    desc "Load fixtures into the current environment's database.  Load specific fixtures using FIXTURES=x,y"
+    desc "Load fixtures into the current environment's database. " \
+         "Load specific fixtures using FIXTURES=x,y"
     task load: :environment do
       require "active_record/fixtures"
       fixture_path = File.join(Cardio.gem_root, "db", "seed", "test", "fixtures")

data/lib/{decko/tasks → rake_tasks}/decko/seed.rake

@@ -6,7 +6,9 @@ namespace :decko do
     task update: :environment do
       ENV["STAMP_MIGRATIONS"] = "true"
       ENV["GENERATE_FIXTURES"] = "true"
-      %w[reseed update mod:install seed:clean seed:supplement seed:dump].each do |task|
+      %w[reseed update
+         mod:uninstall mod:install seed:make_asset_output_coded
+         seed:clean seed:supplement seed:dump].each do |task|
         Rake::Task["decko:#{task}"].invoke
       end
     end
@@ -24,7 +26,8 @@ namespace :decko do
       # change actors so we can delete unwanted user cards that made changes
       Card::Act.update_all actor_id: Card::WagnBotID
       delete_ignored_cards
-      clean_machines
+      refresh_assets
+      Card::Assets.make_output_coded
       # clean_unwanted_cards
       Card.empty_trash
     end
@@ -41,53 +44,22 @@ namespace :decko do
       end
     end
 
-    task clean_machines: :environment do
-      clean_machines
+    task refresh_assets: :environment do
+      refresh_assets
     end
 
-    def clean_machines
-      puts "clean machines"
-      Card::Machine.reset_all
-      reseed_machine_output
-      clean_inputs_and_outputs
-    end
-
-    def reseed_machine_output
-      machine_seed_names.each do |name|
-        puts "coding machine output for #{name}"
-        Card[name].make_machine_output_coded
-      end
-      Card.search(type_id: Card::ModScriptAssetsID) do |card|
-        card.make_machine_output_coded true
-      end
-    end
-
-    def clean_inputs_and_outputs
-      # FIXME: can this be associated with the machine module somehow?
-      %w[machine_input machine_output machine_cache].each do |codename|
-        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
+    def refresh_assets
+      puts "refresh assets"
+      Card::Auth.as_bot do
+        Card.where(right_id: :asset_input.card_id).delete_all
       end
+      Card::Cache.reset_all
+      Cardio.config.compress_assets = true
+      Card::Assets.refresh_assets force: true
     end
 
-    def reserved_output? name
-      machine_seed_member?(name) &&
-        (name.right_name.key == :machine_output.cardname.key)
-    end
-
-    def machine_seed_member? name
-      machine_seed_names.member?(name.left_name.key) || name.match(/^mod:/)
-    end
-
-    def machine_seed_names
-      @machine_seed_names ||=
-        [%i[all style], [:script_html5shiv_printshiv]].map do |name|
-          Card::Name[*name]
-        end
+    task make_asset_output_coded: :environment do
+      Card::Assets.make_output_coded
     end
 
     # def clean_files
@@ -165,30 +137,3 @@ namespace :decko do
     end
   end
 end
-
-# desc "copy files from template database to standard mod and update cards"
-# task copy_mod_files: :environment do
-#   # mark mod files as mod files
-#   Card::Auth.as_bot do
-#     each_file_card  do |card|
-#       # make card a mod file card
-#       mod_name =
-#         card.left&.type_id == Card::SkinID ? "bootstrap" : "standard"
-#       card.update! storage_type: :coded,
-#                               mod: mod_name,
-#                               empty_ok: true
-#     end
-#   end
-# # end
-
-# def each_file_card
-#   Card.search(type: %w[in Image File], ne: "").each do |card|
-#     if card.coded? || card.codename == "new_file" ||
-#        card.codename == "new_image"
-#       puts "skipping #{card.name}: already in code"
-#     else
-#       puts "working on #{card.name}"
-#       yield card
-#     end
-#   end
-# end

data/lib/{decko/tasks → rake_tasks}/decko.rake

@@ -94,16 +94,19 @@ decko_namespace = namespace :decko do
       decko_namespace["migrate"].invoke
       decko_namespace["reset_tmp"].invoke
       Card::Cache.reset_all
+      Rake::Task["card:mod:uninstall"].invoke
       Rake::Task["card:mod:install"].invoke
       Rake::Task["card:mod:symlink"].invoke
     end
   end
 
-  alias_task "mod:symlink", "card:mod:symlink"
-  alias_task "mod:install", "card:mod:install"
+  %i[list symlink missing uninstall install].each do |task|
+    alias_task "mod:#{task}", "card:mod:#{task}"
+  end
   alias_task :migrate, "card:migrate"
 
-  desc "insert existing card migrations into schema_migrations_cards to avoid re-migrating"
+  desc "insert existing card migrations into schema_migrations_cards " \
+       "to avoid re-migrating"
   task :assume_card_migrations do
     require "decko/engine"
     Cardio::Schema.assume_migrated_upto_version :core_cards
@@ -111,8 +114,7 @@ decko_namespace = namespace :decko do
 
   def seed with_cache_reset: true
     ENV["SCHEMA"] ||= "#{Cardio.gem_root}/db/schema.rb"
-    # FIXME: this should be an option, but should not happen on standard
-    # creates!
+    # FIXME: this should be an option, but should not happen on standard creates!
     begin
       Rake::Task["db:drop"].invoke
     rescue StandardError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decko
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.14.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-06 00:00:00.000000000 Z
+date: 2021-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -18,42 +18,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.3.1
+        version: 6.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.3.1
+        version: 6.1.4
 - !ruby/object:Gem::Dependency
   name: card
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.103.1
+        version: 1.104.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.103.1
+        version: 1.104.0
 - !ruby/object:Gem::Dependency
   name: card-mod-defaults
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.14.0
 description: a wiki approach to structured data, dynamic interaction,  and web design
 email:
 - info@decko.org
@@ -111,15 +111,15 @@ files:
 - lib/decko/swagger.rb
 - lib/decko/swagger/input_yml/layout.yml
 - lib/decko/swagger/output.yml
-- lib/decko/tasks/alias.rb
-- lib/decko/tasks/cucumber.rake
-- lib/decko/tasks/db.rake
-- lib/decko/tasks/decko.rake
-- lib/decko/tasks/decko/benchmark.rake
-- lib/decko/tasks/decko/docs.rake
-- lib/decko/tasks/decko/seed.rake
-- lib/decko/tasks/decko/tmpsets.rake
 - lib/generators/deck/deck_generator.rb
+- lib/rake_tasks/alias.rb
+- lib/rake_tasks/cucumber.rake
+- lib/rake_tasks/db.rake
+- lib/rake_tasks/decko.rake
+- lib/rake_tasks/decko/benchmark.rake
+- lib/rake_tasks/decko/docs.rake
+- lib/rake_tasks/decko/seed.rake
+- lib/rake_tasks/decko/tmpsets.rake
 homepage: https://decko.org
 licenses:
 - GPL-3.0
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: structured wiki web platform