card 1.99.1 → 1.99.6

data/lib/card/subcards/add.rb

@@ -73,7 +73,7 @@ class Card
       end
 
       def initialize_by_attributes name, attributes
-        Card.assign_or_initialize_by name, attributes, local_only: true
+        Card.assign_or_newish name, attributes, local_only: true
       end
 
       # TODO: this method already exists as card instance method in
@@ -105,12 +105,15 @@ class Card
       def multi_add args
         args.each_pair do |key, val|
           case val
-          when String then new_by_attributes key, content: val
+          when String, Array, Integer
+            new_by_attributes key, content: val
           when Card
             val.name = absolutize_subcard_name key
             new_by_card val
-          when nil then next
-          else new_by_attributes key, val
+          when nil
+            next
+          else
+            new_by_attributes key, val
           end
         end
       end

data/lib/card/tasks/card.rake

@@ -118,5 +118,6 @@ namespace :card do
         Card[*name_parts].update_machine_output
       end
     end
+    Card::Cache.reset_all # should not be necessary but breaking without...
   end
 end

data/lib/card/tasks/card/migrate.rake

@@ -24,7 +24,7 @@ def reset_column_information mod=false
 end
 
 def load_mod_lib
-  Dir.glob(Cardio.root.join("mod/*/lib/*.rb")).each { |x| require_dependency x }
+  Dir.glob(Cardio.root.join("mod/*/lib/*.rb")).each { |x| require x }
 end
 
 def without_dumping

data/lib/card/view.rb

@@ -1,8 +1,3 @@
-require_dependency "card/view/cache"
-require_dependency "card/view/options"
-require_dependency "card/view/classy"
-require_dependency "card/view/permission"
-
 class Card
   # Card::View manages {Options view options}, {Cache view caching}, and
   # {Permission view permissions}.
@@ -25,11 +20,11 @@ class Card
   #
   class View
     include Options
-    include Cache
+    include ::Card::View::Cache
     include Classy
     include Permission
 
-    extend Cache::ClassMethods
+    extend ::Card::View::Cache::ClassMethods
 
     attr_reader :format, :parent, :card
 

data/lib/card/view/cache.rb

@@ -166,6 +166,9 @@ class Card
     # cached and retrieved even when it's rendered inside another cached view.
     #
     module Cache
+      require "card/view/cache/cache_action"
+      require "card/view/cache/stub"
+
       include CacheAction
       include Stub
 
@@ -211,8 +214,8 @@ class Card
       # Uses the primary cache API.
       def cache_fetch
         caching do
+          ensure_cache_key
           self.class.cache.fetch cache_key do
-            register_cache_key
             yield
           end
         end
@@ -237,8 +240,8 @@ class Card
       end
 
       # Registers the cached view for later clearing in the event of related card changes
-      def register_cache_key
-        card.register_view_cache_key cache_key
+      def ensure_cache_key
+        card.ensure_view_cache_key cache_key
       end
 
       def options_for_cache_key

data/lib/card/view/cache/cache_action.rb

@@ -112,11 +112,8 @@ class Card
         # altered view requests and altered cards are not cacheable
         # @return [True/False]
         def clean_enough_to_cache?
-          requested_view == ok_view && !card.unknown? && !card.db_content_changed?
-          # unknown views may be safe if we add type_id to the cache key for unknown
-          # (or all new?) cards.
-          #
-          #
+          #  requested_view == ok_view && !card.unknown? && !card.db_content_changed?
+          requested_view == ok_view && card.view_cache_clean?
         end
       end
     end

data/lib/card/view/cache/stub.rb

@@ -16,6 +16,11 @@ class Card
         # @return [String]
         def stub
           "(StUb#{stub_hash.to_json}sTuB)".html_safe
+          # "(StUb#{bin_to_hex stub_hash.to_msgpack}sTuB)".html_safe
+        end
+
+        def bin_to_hex string
+          string.unpack("H*").first
         end
 
         # @return [Hash]

data/lib/card/view/classy.rb

@@ -97,6 +97,15 @@ class Card
 
       private
 
+      def ancestor_extra_classes klass, space
+        if parent
+          parent_space = space == :self ? :self_format : :ancestor_format
+          parent.deep_extra_classes(klass, parent_space)
+        else
+          next_format_ancestor&.deep_extra_classes(klass, :ancestor_format)
+        end
+      end
+
       def storage_voo scope
         # When we climb up the voo tree and cross a nest boundary then we can jump only
         # to the root voo of the parent format. Hence we have to add classes to the root
@@ -117,15 +126,6 @@ class Card
         [classes, class_list(:single_use).delete(klass)]
       end
 
-      def ancestor_extra_classes klass, space
-        if parent
-          parent_space = space == :self ? :self_format : :ancestor_format
-          parent.deep_extra_classes(klass, parent_space)
-        else
-          next_format_ancestor&.deep_extra_classes(klass, :ancestor_format)
-        end
-      end
-
       def ok_types space
         case space
         when :ancestor_format then [:public]

data/lib/card/view/options/voo_api.rb

@@ -52,14 +52,6 @@ class Card
           normalized_options.merge(view: requested_view).slice(*Options.slot_keys)
         end
 
-        # def inherit key
-        #   if live_options.key? key
-        #     live_options[key]
-        #   elsif (ancestor = next_ancestor)
-        #     ancestor.inherit key
-        #   end
-        # end
-
         # ACCESSOR_HELPERS
         # methods that follow the normalize_#{key} pattern are called by accessors
         # (arguably that should be done during normalization!)

data/lib/cardio.rb

@@ -13,84 +13,94 @@ end
 module Cardio
   extend Schema
   extend Utils
-  CARD_GEM_ROOT = File.expand_path("../..", __FILE__)
+  CARD_GEM_ROOT = File.expand_path("..", __dir__)
 
   mattr_reader :paths, :config
 
   class << self
+    def card_defined?
+      const_defined? "Card"
+    end
+
     def load_card?
-      ActiveRecord::Base.connection && !defined?(Card)
+      ActiveRecord::Base.connection && !card_defined?
     rescue
       false
     end
 
+    def load_card!
+      require "card"
+      ActiveSupport.run_load_hooks :after_card
+    end
+
     def cache
       @cache ||= ::Rails.cache
     end
 
     def default_configs
       {
-        read_only:              read_only?,
+        read_only: read_only?,
 
         # if you disable inline styles tinymce's formatting options stop working
-        allow_inline_styles:    true,
+        allow_inline_styles: true,
 
-        recaptcha_public_key:   nil, # deprecated; uese recaptcha_site_key instead
-        recaptcha_private_key:  nil, # deprecated; use secret_site_key instead
-        recaptcha_proxy:        nil,
-        recaptcha_site_key:     nil,
-        recaptcha_secret_key:   nil,
+        recaptcha_public_key: nil, # deprecated; use recaptcha_site_key instead
+        recaptcha_private_key: nil, # deprecated; use recaptcha_secret_key instead
+        recaptcha_proxy: nil,
+        recaptcha_site_key: nil,
+        recaptcha_secret_key: nil,
         recaptcha_minimum_score: 0.5,
 
-        override_host:          nil,
-        override_protocol:      nil,
+        override_host: nil,
+        override_protocol: nil,
 
-        no_authentication:      false,
-        files_web_path:         "files",
+        no_authentication: false,
+        files_web_path: "files",
 
-        max_char_count:         200,
-        max_depth:              20,
-        email_defaults:         nil,
+        max_char_count: 200,
+        max_depth: 20,
+        email_defaults: nil,
 
-        token_expiry:           2.days,
-        acts_per_page:          10,
+        token_expiry: 2.days,
+        acts_per_page: 10,
         space_last_in_multispace: true,
-        closed_search_limit:    10,
-        paging_limit:           20,
+        closed_search_limit: 10,
+        paging_limit: 20,
 
-        non_createable_types:   [%w[signup setting set session bootswatch_skin customized_bootswatch_skin]], # FIXME
-        view_cache:             false,
-        rss_enabled:            false,
-        double_click:           :signed_in,
+        non_createable_types: [%w[signup setting set session bootswatch_skin customized_bootswatch_skin]], # FIXME
+        view_cache: false,
+        rss_enabled: false,
+        double_click: :signed_in,
 
-        encoding:                "utf-8",
-        request_logger:         false,
-        performance_logger:     false,
-        sql_comments:           true,
+        encoding: "utf-8",
+        request_logger: false,
+        performance_logger: false,
+        sql_comments: true,
 
-        file_storage:           :local,
-        file_buckets:           {},
-        file_default_bucket:    nil,
-        protocol_and_host:      nil,
+        file_storage: :local,
+        file_buckets: {},
+        file_default_bucket: nil,
+        protocol_and_host: nil,
 
-        rich_text_editor:       :tinymce,
+        rich_text_editor: :tinymce,
 
-        persistent_cache:       true,
-        prepopulate_cache:      false,
-        machine_refresh:        :cautious, # options: eager, cautious, never
-        compress_javascript:    true,
+        persistent_cache: true,
+        prepopulate_cache: false,
+        machine_refresh: :cautious, # options: eager, cautious, never
+        compress_javascript: true,
 
         allow_irreversible_admin_tasks: false,
-        raise_all_rendering_errors:     false,
-        rescue_all_in_controller:       true,
-        navbox_match_start_only:        true,
-        load_strategy:                  :eval
+        raise_all_rendering_errors: false,
+        rescue_all_in_controller: true,
+        navbox_match_start_only: true,
+
+        load_strategy: :eval
       }
     end
 
     def set_config config
       @@config = config
-      config.active_job.queue_adapter = :delayed_job #better place for this?
+      config.active_job.queue_adapter = :delayed_job # better place for this?
 
       add_lib_dirs_to_autoload_paths config
 
@@ -100,12 +110,27 @@ module Cardio
     end
 
     def add_lib_dirs_to_autoload_paths config
-      config.autoload_paths += Dir["#{gem_root}/lib/**/"]
-      config.autoload_paths += Dir["#{gem_root}/mod/*/lib/**/"]
-      config.autoload_paths += Dir["#{root}/mod/*/lib/**/"]
+      config.autoload_paths += Dir["#{gem_root}/lib"]
+      config.autoload_paths += Dir["#{gem_root}/mod/*/lib"]
+      config.watchable_dirs["#{gem_root}/mod/*/set"] = [:rb]
+
+      config.autoload_paths += Dir["#{root}/mod/*/lib"]
+      config.watchable_dirs["#{root}/mod/*/set"] = [:rb]
       gem_mod_paths.each do |_mod_name, mod_path|
-        config.autoload_paths += Dir["#{mod_path}/lib/**/"]
+        config.autoload_paths += Dir["#{mod_path}/lib"]
+        config.watchable_dirs["#{mod_path}/set"] = [:rb]
       end
+      # the watachable_dirs are processes in
+      # set_clear_dependencies_hook hook in the railties gem in finisher.rb
+
+      # TODO: move this to the right place in decko
+      config.autoload_paths += Dir["#{Decko.gem_root}/lib"]
+      # config.autoload_paths += Dir["#{gem_root}/lib/**/"]
+      # config.autoload_paths += Dir["#{gem_root}/mod/*/lib/**/"]
+      # config.autoload_paths += Dir["#{root}/mod/*/lib/**/"]
+      # gem_mod_paths.each do |_mod_name, mod_path|
+      #  config.autoload_paths += Dir["#{mod_path}/lib/**/"]
+      # end
     end
 
     # @return Hash with key mod names (without card-mod prefix) and values the
@@ -115,6 +140,7 @@ module Cardio
         Bundler.definition.specs.each_with_object({}) do |gem_spec, h|
           mod_name = mod_name_from_gem_spec gem_spec
           next unless mod_name
+
           h[mod_name] = gem_spec.full_gem_path
         end
     end

data/mod/account/set/abstract/accountable.rb

@@ -0,0 +1,49 @@
+def account
+  fetch :account, new: {}
+end
+
+def default_account_status
+  "active"
+end
+
+def current_account?
+  id && Auth.current_id == id
+end
+
+format :html do
+  def default_bridge_tab
+    card.current_account? ? :account_tab : super
+  end
+
+  view :account_tab do
+    bridge_pill_sections "Account" do
+      [["Settings", account_details_items],
+       ["Content", account_content_items]]
+    end
+  end
+
+  def show_account_tab?
+    card.account.real?
+  end
+
+  def account_formgroups
+    Auth.as_bot do
+      subformat(card.account)._render :content_formgroups, structure: true
+    end
+  end
+
+  def account_details_items
+    [
+      ["Email and Password", :account,
+       { path: { slot: { hide: %i[help_link bridge_link] } } }],
+      ["Roles", :roles,
+       { path:  { view: :content_with_edit_button } }],
+      ["Notifications", :follow]
+    ]
+  end
+
+  def account_content_items
+    [["Created", :created],
+     ["Edited", :edited]]
+  end
+end

data/mod/account/set/all/account.rb

@@ -1,11 +1,11 @@
 module ClassMethods
   def default_accounted_type_id
-    Card::UserID
+    UserID
   end
 end
 
 def account
-  fetch trait: :account
+  fetch :account
 end
 
 def parties
@@ -14,8 +14,8 @@ end
 
 def among? ok_ids
   ok_ids.any? do |ok_id|
-    ok_id == Card::AnyoneID ||
-      (ok_id == Card::AnyoneWithRoleID && all_enabled_roles.size > 1) ||
+    ok_id == AnyoneID ||
+      (ok_id == AnyoneWithRoleID && all_enabled_roles.size > 1) ||
       parties.member?(ok_id)
   end
 end
@@ -31,11 +31,11 @@ def read_rules
 end
 
 def fetch_read_rules
-  return [] if id == Card::WagnBotID # always_ok, so not needed
+  return [] if id == WagnBotID # always_ok, so not needed
 
-  ([Card::AnyoneID] + parties).each_with_object([]) do |party_id, rule_ids|
-    next unless self.class.read_rule_cache[party_id]
-    rule_ids.concat self.class.read_rule_cache[party_id]
+  ([AnyoneID] + parties).each_with_object([]) do |party_id, rule_ids|
+    next unless (cache = Card::Rule.read_rule_cache[party_id])
+    rule_ids.concat cache
   end
 end
 
@@ -51,11 +51,11 @@ ensure
 end
 
 def all_enabled_roles
-  @all_active_roles ||= (id == Card::AnonymousID ? [] : enabled_role_ids)
+  @all_active_roles ||= (id == AnonymousID ? [] : enabled_role_ids)
 end
 
 def all_roles
-  @all_roles ||= (id == Card::AnonymousID ? [] : fetch_roles)
+  @all_roles ||= (id == AnonymousID ? [] : fetch_roles)
 end
 
 def enabled_role_ids
@@ -63,18 +63,18 @@ def enabled_role_ids
     # workaround for broken migrations
     return fetch_roles unless Card::Codename.exists? :enabled_roles
 
-    role_trait = fetch(trait: :enabled_roles, new: { type_id: SessionID })
+    role_trait = fetch(:enabled_roles, new: { type_id: SessionID })
     role_trait.virtual? ? role_trait.item_ids : fetch_roles
   end
 end
 
 def fetch_roles
-  [Card::AnyoneSignedInID] + role_ids_from_roles_trait
+  [AnyoneSignedInID] + role_ids_from_roles_trait
 end
 
 def role_ids_from_roles_trait
   Auth.as_bot do
-    role_trait = fetch trait: :roles
+    role_trait = fetch :roles
     role_trait ? role_trait.item_ids : []
   end
 end