card 1.104.2 → 1.105.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c315f9b25036d3cfe0a8689bf7f8bde71a68715a4dbacf742e5d1cffe999e8f5
-  data.tar.gz: fb9f8e44f73b7a8236d14a33b04ba653adaac3eadad49db3abb5bfbb11d03eb6
+  metadata.gz: c27e643a91315f8bfd6fc3fba7c744848203ba221637e03808a35f7d21869bec
+  data.tar.gz: 6792846d1b8853ab5681db115b60a5fdb0753771b90af28572b00208ef1a147d
 SHA512:
-  metadata.gz: 3e72cb6beab5d390e721a574d861cc4de210888fbc2f6b9a1f59f30f7b3c4f578e70871f6418dd31d0ed6264192bbd05d74f91cf877f5938312fc0d1648a3c58
-  data.tar.gz: 47d0f5bbefbeabdf939a65074e91f46f3b917c6c4f9508d7bb63ed012f1e6e2ddc71fbe69bed6482139fc11f5c009f10e2be7704d6350091535ce6c688e042fc
+  metadata.gz: 736423e17a671d1cdd5281fea9ba90ceaf6f37ab55bcbe52ac5ef8f0c91649a93d9e6e38d24fd841dba3966379162fdd55e0a3b71be7bab9fb7697c40fafef1b
+  data.tar.gz: 4e6de86094dfad8e899383d005bb78fa8d9a21d0e73f4d2799c49db683b8a08a37d711fb45be7325240fb77d0a284f9539206f35ccb107e29bdc6766fc1470d6

data/README.md

@@ -1,7 +1,7 @@
 <!--
 # @title README - Card
 -->
-# A Developer's introduction to the Decko/Card code base
+# An intro to Decko Monkeying
 
 New folks should start here after playing with Decko but before digging into
 code.
@@ -42,11 +42,10 @@ want.
 
 Ruby-on-Rails developers reading this will find lots of familiar patterns in
 Decko, which indeed depends upon rails gems. **Although Decko is a Rails
-descendant and owes a ton to the Rails community, it is not Rails.** Unlike
-Rails, Decko is not an implementation of the "MVC" (Model-View-Controller)
-architectural pattern (see Architecture below). More concretely, while Rails'
-core pattern is adding new things (especially models, views, and controllers),
-Decko's core pattern is subdividing existing things into new Sets.
+descendant and owes a ton to the Rails community, it is not Rails.** Rails developers'
+primary activities are adding and editing core MVC (Model-View-Controller) structures.
+Decko Monkeys, by contrast, mostly work by code associated with *subsets* of the 
+Card model called *Sets*.
 
 Deck-coders do create lots of card views (though they're quite different from
 Rails views), but we rarely if ever create new controllers or ActiveRecord

data/VERSION

@@ -1 +1 @@
-0.14.2
+0.15.0

data/config/environments/development.rb

@@ -71,7 +71,7 @@ Cardio.application.class.configure do
   # with SQLite, MySQL, and PostgreSQL)
   #  config.active_record.auto_explain_threshold_in_seconds = 0.5
 
-  #  if File.exists?(File.join(Rails.root,'tmp', 'debug.txt'))
+  #  if File.exist?(File.join(Rails.root,'tmp', 'debug.txt'))
   #    require 'ruby-debug'
   #    Debugger.wait_connection = true
   #    Debugger.start_remote

data/config/environments/test.rb

@@ -3,6 +3,7 @@
 Cardio.application.class.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
+  config.seed_type = :test
   config.eager_load = false
 
   config.asset_refresh = :never

data/config/initializers/01_core_extensions/object.rb

@@ -1,5 +1,11 @@
 module CoreExtensions
   module Object
+    def number?
+      true if Float(self)
+    rescue StandardError
+      false
+    end
+
     def deep_clone
       case self
       when Integer, Float, NilClass, FalseClass, TrueClass, Symbol
@@ -34,6 +40,10 @@ module CoreExtensions
       Card.id self
     end
 
+    def codename
+      Card::Codename[card_id]
+    end
+
     def name?
       # Although we want to check for instances of class Card::Name we can't use that
       # class because it is renewed with every request

data/config/initializers/01_core_extensions/string.rb

@@ -0,0 +1,9 @@
+# extend core Ruby object classes
+module CoreExtensions
+  # extend core String class
+  module String
+    def url?
+      start_with?("http://", "https://")
+    end
+  end
+end

data/config/initializers/core_extensions.rb

@@ -6,6 +6,7 @@ module CoreExtensions
   ::Kernel.include Kernel
   ::Object.include Object
   ::Module.include Module
+  ::String.include String
   ::Array.include Array
   ::Hash.include Hash::Merging
   ::Symbol.include PersistentIdentifier

data/db/migrate/{20160122153608_new_indeces.rb → 20160122153608_new_indices.rb}

@@ -1,5 +1,5 @@
-# add new indeces for datetime and ref_type fields
-class NewIndeces < ActiveRecord::Migration[4.2]
+# add new indices for datetime and ref_type fields
+class NewIndices < ActiveRecord::Migration[4.2]
   def change
     add_index "card_references", ["ref_type"],
               name: "card_references_ref_type_index" # using: :btree

data/db/migrate/{20200805200729_add_unique_pair_indeces.rb → 20200805200729_add_unique_pair_indices.rb}

@@ -1,4 +1,4 @@
-class AddUniquePairIndeces < ActiveRecord::Migration[6.0]
+class AddUniquePairIndices < ActiveRecord::Migration[6.0]
   def change
     stash_duplicate_cards
     delete_duplicate_virtuals

data/db/migrate/20221031182227_remove_referee_key_requirement.rb

@@ -0,0 +1,11 @@
+# -*- encoding : utf-8 -*-
+
+class RemoveRefereeKeyRequirement < ActiveRecord::Migration[6.0]
+  def up
+    change_column_null :card_references, :referee_key, true
+  end
+
+  def down
+    change_column_null :card_references, :referee_key, false
+  end
+end

data/db/migrate_core_cards/20130920291703_update_stylesheets.rb

@@ -2,14 +2,6 @@
 
 class UpdateStylesheets < Cardio::Migration::Core
   def up
-    dir = File.join data_path, "1.12_stylesheets"
-    %w[common traditional].each do |sheetname|
-      card = Card["style: #{sheetname}"]
-      card.update! content: File.read("#{dir}/#{sheetname}.scss") if card&.pristine?
-    end
-
-    if (c = Card["*all+*style+file"])
-      c.delete!
-    end
+    Card["*all+*style+file"]&.delete!
   end
 end

data/db/migrate_core_cards/20140307231621_user_data_to_cards.rb

@@ -5,38 +5,6 @@ end
 
 class UserDataToCards < Cardio::Migration::Core
   def up
-    puts "adding new codename cards"
-    %i[password token salt status signin stats].each do |codename|
-      Card.create! name: "*#{codename}", codename: codename
-    end
-
-    puts "setting read permissions for account cards (Administrator)"
-    %i[password token salt status email account].each do |codename|
-      rule_name = [codename, :right, :read].map { |code| Card[code].name } * "+"
-      rule_card = Card.fetch rule_name, new: {}
-      rule_card.content = "[[Administrator]]"
-      rule_card.save!
-    end
-
-    puts "making email and password fields default to Phrase cards"
-    %i[email password].each do |field|
-      rulename = [field, :right, :default].map { |code| Card[code].name } * "+"
-      Card.create! name: rulename, type_id: Card::PhraseID
-    end
-
-    puts "signin permissions"
-    %i[read update].each do |setting|
-      rulename = [:signin, :self, setting].map { |code| Card[code].name } * "+"
-      Card.create! name: rulename, content: "[[#{Card[:anyone].name}]]"
-    end
-
-    puts "supporting legacy handling of +*email on User cards"
-    oldname = %i[email right structure].map { |code| Card[code].name } * "+"
-    newname = %i[user email type_plus_right structure].map do |code|
-      Card[code].name
-    end * "+"
-    Card[oldname].update! name: newname
-
     puts "importing all user details (for those not in trash) into +*account attributes"
     User.all.each do |user|
       base = Card[user.card_id]
@@ -45,7 +13,7 @@ class UserDataToCards < Cardio::Migration::Core
       puts "~ importing details for #{base.name}"
       date_args = { created_at: user.created_at, updated_at: user.updated_at }
       %i[email salt password status].each do |field|
-        cardname = "#{base.name}+#{Card[:account].name}+#{Card[field].name}"
+        cardname = [base.name, :account, field].cardname
         user_field = (field == :password ? :crypted_password : field)
         next unless (content = user.send(user_field))
 
@@ -58,8 +26,3 @@ class UserDataToCards < Cardio::Migration::Core
     end
   end
 end
-
-# FIXME
-# before 1.13!
-# but add read permission migration for *stats and
-# structure for *stats+*right

data/db/migrate_core_cards/20161103154836_update_keys.rb

@@ -1,4 +1,4 @@
-# -*- encoding : utf-8 -*-
+l# -*- encoding : utf-8 -*-
 
 class UpdateKeys < Cardio::Migration::Core
   def up

data/db/migrate_core_cards/20180905061537_migrate_layouts.rb

@@ -39,7 +39,7 @@ class MigrateLayouts < Cardio::Migration::Core
 
     each_layout_set layout_card do |set_name|
       puts "creating head rule for '#{set_name}'"
-      ensure_card [set_name, :head], content: head, type_id: Card::HtmlID
+      Card.ensure name: [set_name, :head], content: head, type_id: Card::HtmlID
     end
   end
 

data/db/migrate_core_cards/20190125125150_add_script_rules_card.rb

@@ -2,7 +2,7 @@
 
 class AddScriptRulesCard < Cardio::Migration::Core
   def up
-    ensure_card name: "script: rules",
+    Card.ensure name: "script: rules",
                 type_id: Card::CoffeeScriptID,
                 codename: "script_rules"
   end

data/db/migrate_core_cards/20190320091257_upgrade_recaptcha_to_v3.rb

@@ -19,7 +19,7 @@ class UpgradeRecaptchaToV3 < Cardio::Migration::Core
                    codename: "recaptcha_#{new_name}_key"
     end
 
-    ensure_card [Card[:recaptcha_settings].name, "minimum score"],
+    Card.ensure name: [Card[:recaptcha_settings].name, "minimum score"],
                 codename: "recaptcha_minimum_score",
                 type_id: Card::NumberID
   end

data/db/migrate_core_cards/20190502130029_add_shark_and_help_desk_role.rb

@@ -2,13 +2,6 @@
 
 class AddSharkAndHelpDeskRole < Cardio::Migration::Core
   def up
-    # delete_code_card :eagle
-    ensure_role "Shark", codename: "shark"
-    ensure_role "Help Desk", codename: "help_desk"
-
-    ensure_card "*account settings",
-                codename: "account_settings", type_id: Card::BasicID
-
     update_card! "Decker Menu", name: "Shark Menu"
     update_card! :ace, name: "*ace"
     update_card! "*google_analytics_key", name: "*google analytics key"
@@ -19,17 +12,6 @@ class AddSharkAndHelpDeskRole < Cardio::Migration::Core
     remove_redundant_permissions
     add_shark_permissions
     add_help_desk_permissions
-
-    merge_cards %w[role+*type+*structure
-                   administrator+dashboard administrator+description
-                   shark+dashboard shark+description
-                   help_desk+dashboard help_desk+description
-                   anyone_signed_in+dashboard
-                   *recaptcha_settings+*self+*structure
-                   *account_settings+*right+*structure
-                   *getting_started+shark
-                   right_thin_sidebar_layout left_sidebar_layout
-                   *getting_started]
   end
 
   private
@@ -87,7 +69,7 @@ class AddSharkAndHelpDeskRole < Cardio::Migration::Core
 
   def add_help_desk_permissions
     %w[*account *email *password *salt *status *token].each do |name|
-      ensure_card [name, :right, :read], "Help Desk"
+      Card.ensure name: [name, :right, :read], content: "Help Desk"
     end
 
     ["*account", "*email", "*password", "*help", "*add help", "*status",
@@ -98,7 +80,7 @@ class AddSharkAndHelpDeskRole < Cardio::Migration::Core
 
   def ensure_cud_permissions name, set, content, actions: %i[create update delete]
     actions.each do |action|
-      ensure_card [name, set, action].compact, content
+      Card.ensure name: [name, set, action].compact, content: content
     end
   end
 end

data/db/migrate_core_cards/20190528131330_enabled_roles.rb

@@ -2,9 +2,6 @@
 
 class EnabledRoles < Cardio::Migration::Core
   def up
-    ensure_trait "*enabled roles", "enabled_roles",
-                 default: { type_id: Card::SessionID }
-
     Card.search type_id: Card::SessionID do |card|
       card.update_column :trash, true unless card.codename.present?
     end

data/db/migrate_core_cards/20190625153616_pointer_overhaul.rb

@@ -11,8 +11,6 @@ class PointerOverhaul < Cardio::Migration::Core
                           codename: "mirror_list"
     end
     update "Pointer", name: "List", codename: "list" unless Card::Codename[:list]
-    ensure_code_card "Pointer", type_id: Card::CardtypeID
-    ensure_code_card "Link list", type_id: Card::CardtypeID
     Card::Cache.reset_all
     ensure_list_card "list+*input+*type plus right+*options",
                      content: ["List", "Multiselect", "Checkbox", "Filtered list"]

data/db/migrate_core_cards/20190718140126_add_guides.rb

@@ -13,7 +13,7 @@ class AddGuides < Cardio::Migration
   MD
 
   def up
-    ensure_card "*guide", codename: "guide", type_id: Card::SettingID
+    Card.ensure name: "*guide", codename: "guide", type_id: Card::SettingID
     Card::Cache.reset_all
   end
 end

data/db/migrate_core_cards/20190822093633_move_help_text_to_code.rb

@@ -6,7 +6,7 @@ class MoveHelpTextToCode < Cardio::Migration::Core
     Card::Cache.reset_all
 
     # avoid that "list" as input option gets the description of the cardtype "list"
-    ensure_card %i[input right options_label], "options description"
+    Card.ensure name: %i[input right options_label], content: "options description"
 
     remove_setting_help_rules
     remove_search_help_rules

data/db/migrate_core_cards/20190829205148_remove_add_help.rb

@@ -6,7 +6,7 @@ class RemoveAddHelp < Cardio::Migration::Core
                 left: { type_id: Card::SetID }).each do |card|
       next if Card.exists? [card.left, :help]
 
-      ensure_card [card.left, :help], content: card.content
+      Card.ensure name: [card.left, :help], content: card.content
     end
     delete_code_card :add_help
     Card::Cache.reset_all

data/db/migrate_core_cards/20190902193208_input_type.rb

@@ -9,7 +9,7 @@ class InputType < Cardio::Migration::Core
 
     Card::Cache.reset_all
 
-    ensure_card %i[all content_option_view], content: "smart_label"
+    Card.ensure name: %i[all content_option_view], content: "smart_label"
     Card.search right: :content_option_view, left: { not: :all }, &:delete!
   end
 end

data/db/migrate_core_cards/20190909104250_add_cardtype_input_types.rb

@@ -2,9 +2,9 @@
 
 class AddCardtypeInputTypes < Cardio::Migration::Core
   def up
-    ensure_card %i[input_type right default],
+    Card.ensure name: %i[input_type right default],
                 type_id: Card::PointerID
-    ensure_card %i[content_option_view right default],
+    Card.ensure name: %i[content_option_view right default],
                 type_id: "smart label"
   end
 end

data/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2021_11_28_040849) do
+ActiveRecord::Schema.define(version: 2022_10_31_182227) do
 
   create_table "card_actions", id: :integer, charset: "utf8mb3", force: :cascade do |t|
     t.integer "card_id"
@@ -42,7 +42,7 @@ ActiveRecord::Schema.define(version: 2021_11_28_040849) do
 
   create_table "card_references", id: :integer, charset: "utf8mb3", force: :cascade do |t|
     t.integer "referer_id", default: 0, null: false
-    t.string "referee_key", default: "", null: false
+    t.string "referee_key", default: ""
     t.integer "referee_id"
     t.string "ref_type", limit: 1, default: "", null: false
     t.integer "is_present"

data/db/seeds.rb

@@ -1,4 +1,17 @@
 require "cardio/seed"
 require "active_record/fixtures"
-ActiveRecord::FixtureSet.create_fixtures Cardio::Seed.path, Cardio::Seed::TABLES
+
+Cardio::Seed.load
+
+Card::Cache.reset_all
+
+# get rid of bad constants
+Card::Codename.reset_cache
+Card::Codename.generate_id_constants
+
+# TODO: explain why this is necessary
+# (card:seed:build breaks without it)
+# I think it has something to do with Card being partially loaded by the
+# ActiveRecord::FixtureSet handling in Cardio::Seed.load, but if that's the case
+# this might not be a complete enough fix.
 Cardio::Mod::Loader.load_mods

data/db/version.txt

@@ -1 +1 @@
-20211128040849
+20221031182227

data/lib/card/auth/current.rb

@@ -26,8 +26,10 @@ class Card
       alias_method :current, :current_card
 
       def current_roles
-        @current_roles ||= [Card.fetch_name(:anyone_signed_in),
-                            current.fetch(:roles)&.item_names].flatten.compact
+        return [] unless signed_in?
+
+        @current_roles ||= [:anyone_signed_in.cardname] +
+                           Set::Self::Role.role_ids(current_id).map(&:cardname)
       end
 
       # set current user in process and session

data/lib/card/auth/permissions.rb

@@ -20,7 +20,7 @@ class Card
           Auth.as_bot do
             Card.search(
               { type: Card::CardtypeID, return: :name,
-                not: { codename: ["in"] + Card.config.non_createable_types } },
+                not: { codename: ["in"] + Set.basket[:non_createable_types] } },
               "find createable types"
             )
           end

data/lib/card/auth/setup.rb

@@ -42,7 +42,7 @@ class Card
 
       def user_account_cql
         # every deck starts with two accounts: WagnBot and Anonymous
-        { right_id: Card::AccountID, creator_id: ["ne", Card::WagnBotID] }
+        { right: :account, creator_id: ["ne", Card::WagnBotID] }
       end
 
       def user_account_count

data/lib/card/auth/token.rb

@@ -25,7 +25,7 @@ class Card
         def decode token
           decoded = JWT.decode(token, SECRET_KEY)[0]
           HashWithIndifferentAccess.new decoded
-        rescue JWT::DecodeError => e
+        rescue StandardError => e
           e.message
         end
 

data/lib/card/cache/persistent.rb

@@ -25,6 +25,7 @@ class Card
       # @option opts [String] :database
       def initialize opts
         @store = opts[:store]
+        @file_cache = @store.is_a? ActiveSupport::Cache::FileStore
         @klass = opts[:class]
         @class_key = @klass.to_s.to_name.key
         @database = opts[:database] || Cardio.database
@@ -72,7 +73,9 @@ class Card
       # @param key [String]
       # @return [String]
       def full_key key
-        "#{prefix}/#{key}"
+        fk = "#{prefix}/#{key}"
+        fk.tr! "*", "X" if @file_cache # save for windows fs
+        fk
       end
 
       def read key

data/lib/card/codename.rb

@@ -44,11 +44,7 @@ class Card
       end
 
       def name codename=nil
-        return super() if codename.nil?
-
-        name! codename
-      rescue Error::CodenameNotFound => _e
-        yield if block_given?
+        id(codename)&.cardname
       end
 
       def card codename
@@ -86,7 +82,7 @@ class Card
       # @param codename [Symbol, String]
       # @return [Card::Name]
       def name! codename
-        Card::Name[codename.to_sym]
+        id!(codename)&.cardname
       end
 
       def generate_id_constants

data/lib/card/content/all.rb

@@ -16,7 +16,7 @@ class Card
       end
 
       def standard_content
-        db_content || (new_card? && template.db_content)
+        db_content || (new_card? ? default_content : "")
       end
 
       def standardize_content value
@@ -24,7 +24,7 @@ class Card
       end
 
       def structured_content
-        structure && template.db_content
+        structure && default_content
       end
 
       def refresh_content

data/lib/card/content/clean.rb

@@ -1,6 +1,6 @@
 class Card
   class Content
-    # tools for cleaning content, especially for restricing unwanted HTML
+    # tools for cleaning content, especially for restricting unwanted HTML
     module Clean
       allowed_tags = {}
       %w[

data/lib/card/content/parser.rb

@@ -1,5 +1,3 @@
-# require "card/content/chunk"
-
 class Card
   class Content
     # The Content::Parser breaks content strings into an Array of "chunks",

data/lib/card/content.rb

@@ -8,7 +8,6 @@ class Card
   #
   class Content < SimpleDelegator
     extend Clean
-    extend Truncate
 
     Chunk # trigger autoload
 
@@ -150,7 +149,7 @@ class Card
 
     def unstash_chunks content, stashed_chunks
       Chunk::Nest.gsub content do |nest_content|
-        number?(nest_content) ? stashed_chunks[nest_content.to_i] : "{{#{nest_content}}}"
+        nest_content.number? ? stashed_chunks[nest_content.to_i] : "{{#{nest_content}}}"
       end
     end
 
@@ -161,11 +160,5 @@ class Card
         format_or_card
       end
     end
-
-    def number? str
-      true if Float(str)
-    rescue StandardError
-      false
-    end
   end
 end

data/lib/card/director/all.rb

@@ -2,6 +2,31 @@ class Card
   class Director
     # director-related Card instance methods
     module All
+      attr_writer :director
+
+      delegate :validation_phase, :storage_phase, :integration_phase,
+               :validation_phase_callback?, :integration_phase_callback?, to: :director
+
+      def director
+        @director ||= Director.fetch self
+      end
+
+      def prepare_for_phases
+        reset_patterns
+        include_set_modules
+      end
+
+      def identify_action
+        @action =
+          if trash && trash_changed?
+            :delete
+          elsif new_card?
+            :create
+          else
+            :update
+          end
+      end
+
       def act options={}, &block
         if act_card
           add_to_act options, &block
@@ -39,11 +64,53 @@ class Card
         act { super }
       end
 
+      def save_if_needed
+        validate
+        save if save_needed?
+      end
+
+      def save_if_needed!
+        validate
+        save! if save_needed?
+      end
+
+      def save_needed?
+        # (
+        new? || test_field_changing? || subcards.cards.any?(&:save_needed?)
+        # ).tap do |r|
+        #   # binding.pry if r
+        #   puts "save needed for #{name}".yellow if r && !new?
+        # end
+      end
+
       alias_method :update_attributes, :update
       alias_method :update_attributes!, :update!
 
+      def restore_changes_information
+        # restores changes for integration phase
+        # (rails cleared them in an after_create/after_update hook which is
+        #  executed before the integration phase)
+        return unless saved_changes.present?
+
+        @mutations_from_database = mutations_before_last_save
+      end
+
+      def clear_action_specific_attributes
+        self.class.action_specific_attributes.each do |attr|
+          instance_variable_set "@#{attr}", nil
+        end
+      end
+
       private
 
+      def test_field_changing?
+        save_test_fields.any? { |fld| send "#{fld}_is_changing?" }
+      end
+
+      def save_test_fields
+        %i[name db_content trash type_id codename]
+      end
+
       def start_new_act &block
         self.director = nil
         Director.run_act(self) do