card 1.104.2 → 1.105.0

data/lib/cardio/utils.rb

@@ -2,8 +2,18 @@ module Cardio
   # Utilities that may need to be run even when mods are not loaded.
   module Utils
     class << self
+      def empty_trash
+        delete_trashed_files
+        Card.where(trash: true).in_batches.update_all(left_id: nil, right_id: nil)
+        Card.where(trash: true).in_batches.delete_all
+        Card::Action.delete_cardless
+        Card::Change.delete_actionless
+        Card::Act.delete_actionless
+        Card::Reference.clean
+      end
+
       def seed_test_db
-        system "env RAILS_ENV=test bundle exec rake db:fixtures:load"
+        system "env RAILS_ENV=test bundle exec rake db:seed:replant"
       end
 
       # deletes tmp directory within files directory
@@ -20,6 +30,23 @@ module Cardio
 
       private
 
+      # deletes any file not associated with a real card.
+      def delete_trashed_files
+        dir = Cardio.paths["files"].existent.first
+        # TODO: handle cloud files
+        return unless dir
+
+        (all_trashed_card_ids & all_file_ids).each do |file_id|
+          delete_files_with_id dir, file_id
+        end
+      end
+
+      def delete_files_with_id dir, file_id
+        raise Card::Error, t(:core_exception_almost_deleted) if Card.exists?(file_id)
+
+        ::FileUtils.rm_rf "#{dir}/#{file_id}", secure: true
+      end
+
       def delete_tmp_files id=nil
         dir = [files_dir, "tmp", id.to_s].compact.join "/"
         FileUtils.rm_rf dir, secure: true
@@ -28,6 +55,17 @@ module Cardio
       def files_dir
         @files_dir ||= Cardio.paths["files"].existent.first
       end
+
+      def all_file_ids
+        dir = Card.paths["files"].existent.first
+        Dir.entries(dir)[2..-1].map(&:to_i)
+      end
+
+      def all_trashed_card_ids
+        trashed_card_sql = %( select id from cards where trash is true )
+        sql_results = Card.connection.select_all(trashed_card_sql)
+        sql_results.map(&:values).flatten.map(&:to_i)
+      end
     end
   end
 end

data/lib/generators/deck/deck_generator.rb

@@ -1,4 +1,5 @@
 require "rails/generators/app_base"
+require "cardio/generators/deck_generator_loader"
 
 module Cardio
   module Generators
@@ -11,6 +12,8 @@ module Cardio
         include RailsOverrides
         include DeckHelper
 
+        extend ClassMethods
+
         source_root File.expand_path("templates", __dir__)
 
         # All but the first aliases should be considered deprecated
@@ -28,7 +31,7 @@ module Cardio
                      type: :string, aliases: %w[-R -g --gem-path],
                      default: "", group: :runtime,
                      desc: "Path to local decko repository " \
-                           "(Default, use env DECKO_REPO_PATH)"
+                           "(Can also set via DECKO_REPO_PATH)"
 
         class_option :database,
                      type: :string, aliases: %w[-D -d], default: "mysql",
@@ -43,7 +46,7 @@ module Cardio
         public_task :create_root
 
         def self.banner
-          "decko new #{arguments.map(&:usage).join(' ')} [options]"
+          "#{banner_command} new #{arguments.map(&:usage).join(' ')} [options]"
         end
 
         # Generator works its way through each public method below

data/lib/generators/deck/templates/config/puma.rb

@@ -5,7 +5,7 @@ threads min_threads_count, max_threads_count
 
 preload_app!
 
-rackup      DefaultRackup
+# rackup      DefaultRackup
 port        ENV["PORT"]     || 3000
 environment ENV["RACK_ENV"] || "development"
 

data/lib/generators/deck/templates/script/decko_rspec

@@ -4,5 +4,5 @@
 ENV["RAILS_ENV"] = "test"
 ENV["RAILS_ROOT"] = "."
 BUNDLE_GEMFILE = File.expand_path "../../Gemfile",  __FILE__
-ARGV.insert 0, "rspec", "--no-simplecov", "--"
+ARGV.insert 0, "rspec", "--"
 load File.expand_path("../decko",  __FILE__)

data/lib/generators/deck/templates/simplecov.rb.erb

@@ -1,5 +1,5 @@
 
-if ENV["<%= 'REPO_' if platypus? %>TMPSETS"] && ENV["COVERAGE"] != "false"
+if (ENV["CARD_LOAD_STRATEGY"] == "tmp_files") && ENV["CARD_SIMPLECOV"] != "false"
   SimpleCov.start do
     def add_mod_groups dir_pattern
       Dir[dir_pattern].each do |path|
@@ -9,18 +9,20 @@ if ENV["<%= 'REPO_' if platypus? %>TMPSETS"] && ENV["COVERAGE"] != "false"
     end
     <% if platypus? %>
     root "<%= expanded_repo_path %>"
+    add_mod_groups "#{root}/{card/,}/mod/*"
+
+    add_group "Cardname", "cardname/lib"
+    add_group "Card", "card/lib"
+    add_group "Decko", "decko/lib"
+    add_group "Set Patterns", "tmp/set_pattern"
 
     add_filter "/generators/"
     add_filter "_spec_helper"
-    add_filter "test_seed"
-
-    add_group "Card", "card/"
-    add_group "Cardname", "cardname"
-    add_group "Decko", "decko"
-
-    add_mod_groups "#{root}/{card/,}/mod/*"
     <% else %>
     add_mod_groups "mod/*"
+
+    add_filter "tmp/set/gem"
+    add_filter "tmp/set_pattern"
     <% end %>
     add_filter "/spec/"
     add_filter "/features/"

data/lib/generators/mod/USAGE

@@ -2,7 +2,7 @@ Description:
     Generates new mod
 
 Example:
-    <%= banner_command %> generate card:mod clothing
+    <%= banner_command %> generate mod clothing
 
     This will create:
 

data/lib/generators/set/USAGE

@@ -2,7 +2,7 @@ Description:
     Generates new set files in mods and matching specs.
 
 Examples:
-    <%= banner_command %> generate card:set clothing type tshirt
+    <%= banner_command %> generate set clothing type tshirt
 
     This will create:
 
@@ -17,7 +17,7 @@ Examples:
                 tshirt_spec.rb
 
 
-    <%= banner_command %> generate card:set clothing type_plus_right basic about tshirt
+    <%= banner_command %> generate set clothing type_plus_right basic about tshirt
 
     This will create:
 

data/mod/core/data/fixtures/real/card_actions.yml

@@ -0,0 +1,78 @@
+---
+card_actions_001:
+  id: 1
+  card_id: 1
+  card_act_id: 1
+  super_action_id:
+  action_type: 0
+  draft: false
+card_actions_002:
+  id: 2
+  card_id: 2
+  card_act_id: 1
+  super_action_id:
+  action_type: 0
+  draft: false
+card_actions_003:
+  id: 3
+  card_id: 3
+  card_act_id: 1
+  super_action_id:
+  action_type: 0
+  draft: false
+card_actions_004:
+  id: 4
+  card_id: 4
+  card_act_id: 1
+  super_action_id:
+  action_type: 0
+  draft: false
+card_actions_005:
+  id: 5
+  card_id: 5
+  card_act_id: 1
+  super_action_id:
+  action_type: 0
+  draft: false
+card_actions_006:
+  id: 6
+  card_id: 6
+  card_act_id: 1
+  super_action_id:
+  action_type: 0
+  draft: false
+card_actions_007:
+  id: 7
+  card_id: 7
+  card_act_id: 1
+  super_action_id:
+  action_type: 0
+  draft: false
+card_actions_008:
+  id: 8
+  card_id: 8
+  card_act_id: 1
+  super_action_id:
+  action_type: 0
+  draft: false
+card_actions_009:
+  id: 9
+  card_id: 9
+  card_act_id: 1
+  super_action_id:
+  action_type: 0
+  draft: false
+card_actions_010:
+  id: 10
+  card_id: 10
+  card_act_id: 1
+  super_action_id:
+  action_type: 0
+  draft: false
+card_actions_011:
+  id: 11
+  card_id: 11
+  card_act_id: 1
+  super_action_id:
+  action_type: 0
+  draft: false

data/{db/seed/new → mod/core/data/fixtures/real}/card_acts.yml

@@ -1,7 +1,7 @@
 ---
 card_acts_001:
-  id: 101118
+  id: 104999
   card_id: 1
   actor_id: 1
-  acted_at: 2021-11-29 18:32:36.000000000 Z
+  acted_at: 2022-04-01 14:38:11.000000000 Z
   ip_address:

data/mod/core/data/fixtures/real/card_references.yml

@@ -0,0 +1,8 @@
+---
+card_references_001:
+  id: 1
+  referer_id: 500
+  referee_key: decko_bot
+  referee_id: 1
+  ref_type: L
+  is_present: 1

data/mod/core/data/fixtures/real/cards.yml

@@ -0,0 +1,135 @@
+---
+cards_001:
+  id: 1
+  name: Decko Bot
+  key: decko_bot
+  codename: wagn_bot
+  creator_id: 1
+  updater_id: 1
+  read_rule_class: "*all"
+  read_rule_id: 10
+  trash: false
+  type_id: 2
+  db_content: ""
+cards_002:
+  id: 2
+  name: RichText
+  key: rich_text
+  codename: basic
+  creator_id: 1
+  updater_id: 1
+  read_rule_class: "*all"
+  read_rule_id: 10
+  trash: false
+  type_id: 3
+  db_content: ""
+cards_003:
+  id: 3
+  name: Cardtype
+  key: cardtype
+  codename: cardtype
+  creator_id: 1
+  updater_id: 1
+  read_rule_class: "*all"
+  read_rule_id: 10
+  trash: false
+  type_id: 3
+  db_content: ""
+cards_004:
+  id: 4
+  name: List
+  key: list
+  codename: list
+  creator_id: 1
+  updater_id: 1
+  read_rule_class: "*all"
+  read_rule_id: 10
+  trash: false
+  type_id: 3
+  db_content: ""
+cards_005:
+  id: 5
+  name: Set
+  key: set
+  codename: set
+  creator_id: 1
+  updater_id: 1
+  read_rule_class: "*all"
+  read_rule_id: 10
+  trash: false
+  type_id: 2
+  db_content: ""
+cards_006:
+  id: 6
+  name: Setting
+  key: setting
+  codename: setting
+  creator_id: 1
+  updater_id: 1
+  read_rule_class: "*all"
+  read_rule_id: 10
+  trash: false
+  type_id: 3
+  db_content: ""
+cards_007:
+  id: 7
+  name: "*all"
+  key: "*all"
+  codename: all
+  creator_id: 1
+  updater_id: 1
+  read_rule_class: "*all"
+  read_rule_id: 10
+  trash: false
+  type_id: 5
+  db_content: "{}"
+cards_008:
+  id: 8
+  name: "*default"
+  key: "*default"
+  codename: default
+  creator_id: 1
+  updater_id: 1
+  read_rule_class: "*all"
+  read_rule_id: 10
+  trash: false
+  type_id: 6
+  db_content: ""
+cards_009:
+  id: 9
+  name: "*read"
+  key: "*read"
+  codename: read
+  creator_id: 1
+  updater_id: 1
+  read_rule_class: "*all"
+  read_rule_id: 10
+  trash: false
+  type_id: 6
+  db_content: ""
+
+# *all+*read
+cards_010:
+  id: 10
+  left_id: 7
+  right_id: 9
+  creator_id: 1
+  updater_id: 1
+  read_rule_class: "*all"
+  read_rule_id: 10
+  trash: false
+  type_id: 4
+  db_content: Decko Bot
+# *all+*default
+cards_011:
+  id: 11
+  left_id: 7
+  right_id: 8
+  creator_id: 1
+  updater_id: 1
+  read_rule_class: "*all"
+  read_rule_id: 10
+  trash: false
+  type_id: 2
+  db_content: ""
+

data/mod/core/data/real.yml

@@ -0,0 +1,79 @@
+---
+
+- :name: description
+  :codename: description
+
+- :name: "*admin"
+  :codename: admin
+
+- :name: Cardtype
+  :type: :cardtype
+  :codename: cardtype
+  :fields:
+    :description: |-
+      <p>
+        Every card has a type, which shapes the kind of information it holds.
+        [[http://decko.org/card_types|more]]
+      </p>
+- :name: Decko Bot
+  :codename: wagn_bot
+  :content: |-
+    <p>
+      This is the account that makes any automated updates &mdash; cards
+      created when someone signs up, link updates when renaming cards, etc.
+    </p>
+
+- :name: Mod
+  :type: :cardtype
+  :codename: mod
+- :name: Setting
+  :type: :cardtype
+  :codename: setting
+
+
+- :name: "*version"
+  :codename: version
+- :name: "*autoname"
+  :type: :setting
+  :codename: autoname
+
+# user needed early because of references to UserID in preference cache
+- :name: User
+  :type: :cardtype
+  :codename: user
+  :fields:
+    :description: |-
+      {{_l|name}} cards can support accounts, profile pages, and more.
+      [[http://decko.org/Users|more]]
+
+
+# Set Pattern Cards
+
+- :name: "*all"
+  :type: :set
+  :codename: all
+  :content: "{}"
+- :name: "*all plus"
+  :type: :set
+  :codename: all_plus
+  :content: '{"compound":true}'
+- :name: "*type"
+  :codename: type
+- :name: "*star"
+  :type: :set
+  :codename: star
+  :content: '{"complete":"*"}'
+- :name: "*rstar"
+  :type: :set
+  :codename: rstar
+  :content: '{"right":{"complete":"*"}}'
+- :name: "*rule"
+  :type: :set
+  :codename: rule
+- :name: "*type plus right"
+  :codename: type_plus_right
+- :name: "*right"
+  :codename: right
+- :name: "*self"
+  :codename: self
+

data/mod/core/data/test/cardtype.yml

@@ -0,0 +1,38 @@
+- :name: Cardtype A
+  :type: :cardtype
+  :codename: cardtype_a
+- :name: Cardtype B
+  :type: :cardtype
+  :codename: cardtype_b
+- :name: Cardtype C
+  :type: :cardtype
+  :codename: cardtype_c
+- :name: Cardtype D
+  :type: :cardtype
+  :codename: cardtype_d
+- :name: Cardtype E
+  :type: :cardtype
+  :codename: cardtype_e
+- :name: Cardtype F
+  :type: :cardtype
+  :codename: cardtype_f
+
+- :name: type-a-card
+  :type: :cardtype_a
+  :content: type_a_content
+- :name: type-b-card
+  :type: :cardtype_b
+  :content: type_b_content
+- :name: type-c-card
+  :type: :cardtype_c
+  :content: type_c_content
+- :name: type-d-card
+  :type: :cardtype_d
+  :content: type_d_content
+- :name: type-e-card
+  :type: :cardtype_e
+  :content: type_e_content
+- :name: type-f-card
+  :type: :cardtype_f
+  :content: type_f_content
+

data/mod/core/data/test/sample.yml

@@ -0,0 +1,50 @@
+- :name: Sample Cardtype
+  :type: :cardtype
+- :name: Sample CSS
+  :type: :css
+- :name: Sample CoffeeScript
+  :type: :coffee_script
+- :name: Sample Date
+  :type: :date
+- :name: Sample Email template
+  :type: :email_template
+- :name: Sample HTML
+  :type: :html
+- :name: Sample JSON
+  :type: :json
+- :name: Sample JavaScript
+  :type: :java_script
+- :name: Sample Layout
+  :type: :layout_type
+  :content: "{{_main}}"
+- :name: Sample Link list
+  :type: :link_list
+- :name: Sample List
+  :type: :list
+- :name: Sample Markdown
+  :type: :markdown
+- :name: Sample Nest list
+  :type: :nest_list
+- :name: Sample Notification template
+  :type: :notification_template
+- :name: Sample Phrase
+  :type: :phrase
+- :name: Sample PlainText
+  :type: :plain_text
+- :name: Sample Pointer
+  :type: :pointer
+- :name: Sample RichText
+- :name: Sample Role
+  :type: :role
+- :name: Sample SCSS
+  :type: :scss
+- :name: Sample Search
+  :type: :search_type
+- :name: Sample Skin
+  :type: :skin
+- :name: Sample Toggle
+  :type: :toggle
+- :name: Sample Twitter template
+  :type: :twitter_template
+- :name: Sample URI
+  :type: :uri

data/mod/core/data/test/user.yml

@@ -0,0 +1,41 @@
+---
+- :name: Joe Admin
+  :type: :user
+  :content: I'm number one
+  :conflict: :defer
+  :fields:
+    :account:
+      :fields:
+        :email: joe@admin.com
+        :password: joe_pass
+- :name: Joe User
+  :type: :user
+  :content: I'm number two
+  :user: Joe Admin
+  :conflict: :defer
+  :fields:
+    :account:
+      :fields:
+        :email: joe@user.com
+        :password: joe_pass
+- :name: Joe Camel
+  :type: :user
+  :content: Mr. Buttz
+  :conflict: :defer
+  :fields:
+    :account:
+      :fields:
+        :email: joe@camel.com
+        :password: joe_pass
+- :name: No Count
+  :type: :user
+  :content: I got no account
+- :name: Sample User
+  :type: :user
+  :conflict: :defer
+  :fields:
+    :account:
+      :fields:
+        :email: sample@user.com
+        :password: sample_pass
+