decko 0.13.3 → 0.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b82215085ce662ffdbc50f1471804250cee8e8a44a408d73c9bae14297694b34
-  data.tar.gz: 7e5f0e5202b6ab9b4336f2a4036e7a051d9680b1a12c04e5956cf7597680b91e
+  metadata.gz: 3c6db755b2db7ac79e35bb2b9d5f2b8b38edaeb528985cd00631c5b0e6f883e2
+  data.tar.gz: 7a6b0e083047509d211e77a8fd68e5c22bc2bc081d40c933f3777ee17e498aa3
 SHA512:
-  metadata.gz: c9a6477f01c6631fab7789cf1c3cc19070beaf88c358ffaa33036c1e2e1b96421e0a0578df4b505f7721fadfcd76a5b46efdc4034f0a8558bc2a34e3e129ee81
-  data.tar.gz: b18037ed8779e84de2e66dcdfeabdf0285a4b30d6cbb7dd989f3fd1193e16939ee5d4a3b20ad6c89920862addd2b501106cc34cb4f0e21f22ee3bb8e07049f9f
+  metadata.gz: 04ad5d539b80b8c5ae27f2c1bcc8d716c6a4a5ec36283410797320896f861a8124e141901bcdd0cc7e45522c46d516840c155e20b0812f6182353cd131c8c50c
+  data.tar.gz: bb637881c97f37183f475c952ee2af0ef71b5cc8089bbd854d729d72a9963c54038ace067b2ec238a9215daab02d97bd41114d1356d1a55c6830af905114ce8a

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/response.rb

@@ -54,7 +54,8 @@ class CardController
       # Card::Cache.renew
       @card = success.target
       require_card_for_soft_redirect!
-      self.params = Card::Env[:params] = soft_redirect_params
+      self.params = soft_redirect_params
+      Card::Env.reset self
       load_action
       show
     end

data/lib/card_controller/rest.rb

@@ -29,9 +29,9 @@ class CardController
     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
+      Card::Env.reset self
     end
 
     def authenticate
@@ -39,6 +39,8 @@ class CardController
     end
 
     def authenticators
+      return {} unless request
+
       { token: token_from_header || params[:token] }
     end
 
@@ -62,7 +64,7 @@ class CardController
 
     # TODO: refactor this away this when new layout handling is ready
     def record_as_main
-      Card::Env[:main_name] = params[:main] || card&.name || ""
+      Card::Env.main_name = params[:main] || card&.name || ""
     end
 
     def refresh_card

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/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/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

data/lib/rake_tasks/decko.rake

@@ -94,13 +94,15 @@ 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 " \
@@ -112,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.3
+  version: 0.14.2
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-24 00:00:00.000000000 Z
+date: 2022-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -32,28 +32,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.103.3
+        version: 1.104.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.103.3
+        version: 1.104.2
 - !ruby/object:Gem::Dependency
   name: card-mod-defaults
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.3
+        version: 0.14.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.3
+        version: 0.14.2
 description: a wiki approach to structured data, dynamic interaction,  and web design
 email:
 - info@decko.org
@@ -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