card 1.99.1 → 1.99.2

data/lib/card/set/required_field.rb

@@ -1,64 +1,97 @@
 class Card
   module Set
     class RequiredField
-      attr_reader :parent_set, :field_set, :field
+      attr_reader :parent_set, :field, :options
 
-      def initialize parent_set, field
+      def initialize parent_set, field, options={}
         @parent_set = parent_set
-        @field_set = ensure_field_set parent_set, field
         @field = field
+        @options = options
       end
 
       def add
         create_parent_event
+        return unless field_events?
+
+        define_field_test
         create_field_events
       end
 
       def parent_event_name
-        [parent_set.underscore, "requires_field", field_set.underscore].join("__").to_sym
+        [parent_set.underscore, "requires_field", field].join("__").to_sym
       end
 
       def field_event_name action
-        [field_set.underscore, "required_by", parent_set.underscore, "on", action].join("__").to_sym
+        [field, "required_by", parent_set.underscore, "on", action].join("__").to_sym
       end
 
       private
 
-      def create_field_events
-        create_field_delete_event
-        create_field_rename_event
+      def define_field_test
+        return unless (test = event_test)
+        method_name = field_test_name
+        field_set.class_exec do
+          define_method method_name do
+            left.send test
+          end
+        end
       end
 
-      def create_field_delete_event
-        field_set.class_exec(self) do |required|
-          event required.field_event_name(:delete), :validate, on: :delete do
-            return if left&.trash || left&.singleton_class&.include?(required.parent_set)
+      def field_test_name
+        return unless event_test
+        "_when_left_#{event_test}".to_sym
+      end
 
-            errors.add required.field, "can't be deleted; required field of #{left.name}" # LOCALIZE
-          end
-        end
+      def event_test
+        return @event_test unless @event_test.nil?
+        test = options[:when]
+        @event_test = test&.is_a?(Symbol) ? test : false
       end
 
-      def create_field_rename_event
-        field_set.class_exec(self) do |required|
-          event required.field_event_name(:update), :validate,
-                on: :update, changing: :name do
-            return if superleft&.attribute_is_changing? :name
+      def field_set
+        @field_set ||= ensure_field_set parent_set, field
+      end
 
-            parent = Card.fetch(name_before_act.to_name.left)
-            return if !parent || parent&.singleton_class&.include?(required.parent_set)
+      # for now, we only support field events on type sets. That's because only type sets
+      # have fields that are set-addressable (via type plus right sets)
+      def field_events?
+        parent_set.type_set?
+      end
 
-            errors.add :name, "can't be renamed; required field of #{parent.name}" # LOCALIZE
+      def create_field_events
+        create_field_event :delete, "deleted", :trashed_left?
+        create_field_event :update, "renamed", :same_field?, changing: :name
+      end
+
+      def field_event_options action, extra_options
+        options = { on: action }.merge extra_options
+        options[:when] = field_test_name if event_test
+        options
+      end
+
+      def create_field_event action, action_verb, allow_test, extra_options={}
+        event_name = field_event_name action
+        event_options = field_event_options action, extra_options
+        field_set.class_exec(self) do |required|
+          event event_name, :validate, event_options  do
+            return if send allow_test
+
+            errors.add required.field, "can't be #{action_verb}; required field"
           end
         end
       end
 
       def create_parent_event
         parent_set.class_exec(self) do |required|
-          event required.parent_event_name, :validate, on: :create do
-            return if field?(required.field) || left&.type_id == CardtypeID
+          event required.parent_event_name, :validate,
+                required.options.merge(on: :create) do
+            return if field?(required.field) || left&.type_id == Card::CardtypeID
 
             # Without the Cardtype exemption, we can get errors on type plus right sets
+            # eg, if right/account has require_field :email, then when we're trying
+            # to create User+*account+*type_plus right rules, it fails, because
+            # User+*account doesn't have an +email field.
+            #
             # Need a better solution so we can require fields on cardtype+X cards, too.
 
             errors.add required.field, "required" # LOCALIZE
@@ -66,14 +99,15 @@ class Card
         end
       end
 
-      def ensure_field_set some_set, field
-        field_set = some_set.ensure_set { "Right::#{field.to_s.capitalize}" }
+      def ensure_field_set parent_set, field
+        field_set = parent_set.ensure_set { field_set_name parent_set, field }
         Card::Set.register_set field_set
         field_set
       end
+
+      def field_set_name parent_set, field
+        "TypePlusRight::#{parent_set.set_name_parts.last}::#{field.to_s.capitalize}"
+      end
     end
   end
 end
-
-
-

data/lib/card/set/trait.rb

@@ -18,8 +18,9 @@ class Card
       end
 
       def require_field *fields
+        options = fields.last.is_a?(Hash) ? fields.pop : {}
         fields.each do |field|
-          Card::Set::RequiredField.new(self, field).add
+          Card::Set::RequiredField.new(self, field, options).add
         end
       end
 
@@ -55,7 +56,7 @@ class Card
       def define_trait_card trait, opts
         define_method "#{trait}_card" do
           trait_var "@#{trait}_card" do
-            fetch trait: trait.to_sym, new: opts.clone
+            fetch trait.to_sym, new: opts.clone
           end
         end
       end

data/lib/card/set/type.rb

@@ -0,0 +1,46 @@
+class Card
+  module Set
+    class Type < Pattern::Base
+      def initialize card
+        super
+        # support type inheritance
+        @inherit_card = card unless module_key
+      end
+
+      def lookup_module_list modules_hash
+        lookup_key = module_key || inherited_key
+        modules_hash[lookup_key] if lookup_key
+      end
+
+      private
+
+      def inherited_key
+        if defined?(@inherited_key)
+          @inherited_key
+        else
+          @inherited_key = lookup_inherited_key
+        end
+      end
+
+      def lookup_inherited_key
+        return unless (card = @inherit_card)
+
+        @inherit_card = nil
+        return unless (type_code = default_type_code card)
+
+        mod_key = "Type::#{type_code.to_s.camelize}"
+        mod_key if mods_exist_for_key? mod_key
+      end
+
+      def default_type_code card
+        card.rule_card(:default)&.type_code
+      end
+
+      def mods_exist_for_key? mod_key
+        list_of_hashes = Card::Set.modules[:nonbase_format].values
+        list_of_hashes << Card::Set.modules[:nonbase]
+        list_of_hashes.any? { |h| h[mod_key] }
+      end
+    end
+  end
+end

data/lib/card/subcards.rb

@@ -11,10 +11,6 @@ class Card
   # Together with "my address" you want to create the subcards
   # "my address+name", "my address+street", etc.
   class Subcards
-    require_dependency "card/subcards/add"
-    require_dependency "card/subcards/remove"
-    require_dependency "card/subcards/relate"
-
     include Add
     include Remove
     include Relate

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
 

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

@@ -13,84 +13,95 @@ 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,
+
+        reload_sets: false,
+        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 +111,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 +141,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