card 1.92.2 → 1.93.0

data/lib/card/set/format.rb

@@ -84,7 +84,7 @@ class Card
         self.views = Hash.new { |h, k| h[k] = {} }
 
         def view view, *args, &block
-          view = view.to_viewname.key.to_sym
+          #view = view.to_viewname.key.to_sym
           interpret_view_opts view, args[0] if block_given?
           view_method_block = view_block(view, args, &block)
           if async_view? args
@@ -108,7 +108,7 @@ class Card
           view_content = "#{view}_async_content"
           define_standard_view_method view_content, &block
           define_standard_view_method view do
-            "<card-view-placeholder data-url=#{path view: view_content}/>"
+            %(<card-view-placeholder data-url="#{path view: view_content}" />)
           end
         end
 

data/lib/card/set_pattern.rb

@@ -31,7 +31,7 @@ class Card
           end
 
           def register pattern_code, opts={}
-            if (self.pattern_id = Card::Codename[pattern_code])
+            if (self.pattern_id = Card::Codename.id(pattern_code))
               self.pattern_code = pattern_code
               Card.set_patterns.insert opts.delete(:index).to_i, self
               self.anchorless = !respond_to?(:anchor_name)
@@ -50,11 +50,11 @@ class Card
           end
 
           def pattern
-            Card.fetch(pattern_id, skip_modules: true).cardname
+            Card.fetch(pattern_id, skip_modules: true).name
           end
 
           def pattern_applies? card
-            junction_only? ? card.cardname.junction? : true
+            junction_only? ? card.name.junction? : true
           end
 
           def anchor_parts_count
@@ -110,7 +110,7 @@ class Card
         def anchor_codenames
           anchor_parts.map do |part|
             part_id = Card.fetch_id part
-            part_id && Card::Codename[part_id.to_i] || (return nil)
+            Card::Codename[part_id] || return
           end
         end
 

data/lib/card/subcards.rb

@@ -1,14 +1,5 @@
 # -*- encoding : utf-8 -*-
 
-# API to create/update/delete additional cards together with the main card.
-# The most common case is for fields but subcards don't have to be descendants.
-#
-# Subcards can be added as card objects or attribute hashes.
-#
-# Use the methods defined in core/set/all/subcards.rb
-# Example
-# Together with "my address" you want to create the subcards
-# "my address+name", "my address+street", etc.
 class Card
   def subcards
     @subcards ||= Subcards.new(self)
@@ -18,6 +9,15 @@ class Card
     subcards.clear
   end
 
+  # API to create/update/delete additional cards together with the main card.
+  # The most common case is for fields but subcards don't have to be descendants.
+  #
+  # Subcards can be added as card objects or attribute hashes.
+  #
+  # Use the methods defined in core/set/all/subcards.rb
+  # Example
+  # Together with "my address" you want to create the subcards
+  # "my address+name", "my address+street", etc.
   class Subcards
     attr_accessor :context_card, :keys
     def initialize context_card
@@ -54,7 +54,8 @@ class Card
     end
 
     def add_child name, args
-      add prepend_plus(name), args
+      name = name.is_a?(Symbol) ? name.cardname : name.to_name
+      add name.prepend_joint, args
     end
     alias_method :add_field, :add_child
 
@@ -62,11 +63,11 @@ class Card
       if name_or_card.is_a? Card
         remove name_or_card
       else
-        absolute_name = @context_card.cardname.field_name(name_or_card)
+        absolute_name = @context_card.name.field_name(name_or_card)
         if @keys.include? absolute_name.key
           remove absolute_name
         else
-          remove @context_card.cardname.relative_field_name(name_or_card)
+          remove @context_card.name.relative_field_name(name_or_card)
         end
       end
     end
@@ -205,26 +206,15 @@ class Card
       Card.fetch key, local_only: true, new: {}
     end
 
-    def prepend_plus name
-      case name
-      when Symbol
-        "+#{Card[name].name}"
-      when /^\+/
-        name
-      else
-        "+#{name}"
-      end
-    end
-
     def field_name_to_key name
       if @context_card.name =~ /^\+/
-        @context_card.cardname.relative_field_name(name).key
+        @context_card.name.relative_field_name(name).key
       else
-        absolute_key = @context_card.cardname.field_name(name).key
+        absolute_key = @context_card.name.field_name(name).key
         if @keys.include? absolute_key
           absolute_key
         else
-          @context_card.cardname.relative_field_name(name).key
+          @context_card.name.relative_field_name(name).key
         end
       end
     end
@@ -250,7 +240,7 @@ class Card
       attributes ||= {}
       absolute_name = absolutize_subcard_name name
       if absolute_name.field_of?(@context_card.name) &&
-         (absolute_name.parts.size - @context_card.cardname.parts.size) > 2
+         (absolute_name.parts.size - @context_card.name.parts.size) > 2
         left_card = new_by_attributes absolute_name.left
         new_by_card left_card, transact_in_stage: attributes[:transact_in_stage]
         left_card.subcards.new_by_attributes absolute_name, attributes
@@ -265,18 +255,15 @@ class Card
     end
 
     def absolutize_subcard_name name
-      name = Card.compose_mark name if name.is_a? Array
-      if @context_card.name =~ /^\+/ || name.blank?
-        name.to_name
-      else
-        name.to_name.absolute_name(@context_card.name)
-      end
+      name = Card::Name[name]
+      return name if @context_card.name.parts.first.blank?
+      name.absolute_name @context_card.name
     end
 
     def new_by_card card, opts={}
       card.supercard = @context_card
-      if !card.cardname.simple? &&
-         card.cardname.field_of?(@context_card.cardname)
+      if !card.name.simple? &&
+         card.name.field_of?(@context_card.name)
         card.superleft = @context_card
       end
       @keys << card.key

data/lib/card/tasks/card.rake

@@ -31,8 +31,7 @@ namespace :card do
 
   desc "add items of the export card to import data"
   task pull_export: :environment do
-    importer.pull "export", items_only: true,
-                                           remote: ENV["from"]
+    importer.pull "export", items_only: true, remote: ENV["from"]
   end
 
   desc "add a new card to import data"

data/lib/card/view.rb

@@ -18,8 +18,7 @@ class Card
 
     # @return [Symbol]
     def self.canonicalize view
-      return if view.blank? # error?
-      view.to_viewname.key.to_sym
+      view.present? ? view.to_sym : nil # error for no view?
     end
 
     # @param format [Card::Format]

data/lib/card/view/cache.rb

@@ -111,7 +111,7 @@ class Card
         end
 
         def caching?
-          @caching
+          !@caching.nil?
         end
 
         def caching voo

data/lib/card/view/cache_action.rb

@@ -35,7 +35,7 @@ class Card
 
       # @return [True/False]
       def cache_on?
-        Card.config.view_cache && format.view_caching?
+        Card.config.view_cache && format.class.view_caching?
       end
 
       # always skip all the magic

data/lib/card/view/options.rb

@@ -61,7 +61,7 @@ class Card
           @all_keys ||= keymap.each_with_object([]) { |(_k, v), a| a.push(*v) }
         end
 
-        # keys whose values can be set by Wagneers in card nests
+        # keys whose values can be set by Deckers in card nests
         # @return [Array]
         def carditect_keys
           @carditect_keys ||= ::Set.new(keymap[:both]) + keymap[:carditect]

data/lib/card/view/stub.rb

@@ -11,7 +11,7 @@ class Card
     module Stub
       # @return [String]
       def stub
-        "<card-view>#{stub_json}</card-view>".html_safe
+        "(stub)#{escape stub_json}(/stub)".html_safe
       end
 
       # @return [String] the stub_hash as JSON
@@ -19,6 +19,10 @@ class Card
         JSON.generate stub_hash
       end
 
+      def escape stub_json
+        stub_json.gsub '(', '_OParEN_'
+      end
+
       # @return [Hash]
       def stub_hash
         with_override mode: format.nest_mode,

data/lib/cardio.rb

@@ -68,17 +68,33 @@ module Cardio
     def set_config config
       @@config = 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["#{root}/mod/*/set/**/"]
+      add_lib_dirs_to_autoload_paths config
 
       default_configs.each_pair do |setting, value|
         set_default_value(config, setting, *value)
       end
     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/**/"]
+      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
+    #   full path to the mod
+    def gem_mod_paths
+      @gem_mods ||=
+        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
+
     def read_only?
       !ENV["DECKO_READ_ONLY"].nil?
     end
@@ -95,13 +111,15 @@ module Cardio
       add_path "tmp/set", root: root
       add_path "tmp/set_pattern", root: root
 
-      add_path "mod"
+      add_path "mod"        # add card gem's mod path
+      paths["mod"] << "mod" # add deck's mod path
 
-      set_db_paths
-      set_initializer_paths
+      add_db_paths
+      add_initializer_paths
+      add_mod_initializer_paths
     end
 
-    def set_db_paths
+    def add_db_paths
       add_path "db"
       add_path "db/migrate"
       add_path "db/migrate_core_cards"
@@ -109,32 +127,32 @@ module Cardio
       add_path "db/seeds.rb", with: "db/seeds.rb"
     end
 
-    def set_initializer_paths
+    def add_initializer_paths
       add_path "config/initializers", glob: "**/*.rb"
-      add_path "mod/config/initializers", glob: "**/*.rb"
       add_initializers root
     end
 
-    def set_mod_paths
+    def add_mod_initializer_paths
+      add_path "mod/config/initializers", glob: "**/*.rb"
       each_mod_path do |mod_path|
-        add_mod_initializers mod_path
-      end
-    end
-
-    def add_mod_initializers mod_path
-      Dir.glob("#{mod_path}/*/config/initializers").each do |initializers_dir|
-        paths["mod/config/initializers"] << initializers_dir
+        add_initializers mod_path, true
       end
     end
 
-    def add_initializers dir
+    def add_initializers dir, mod=false
       Dir.glob("#{dir}/config/initializers").each do |initializers_dir|
-        paths["config/initializers"] << initializers_dir
+        path_mark = mod ? "mod/config/initializers" : "config/initializers"
+        paths[path_mark] << initializers_dir
       end
     end
 
     def each_mod_path
-      paths["mod"].each do |mod_path|
+      paths["mod"].each do |mods_path|
+        Dir.glob("#{mods_path}/*").each do |single_mod_path|
+          yield single_mod_path
+        end
+      end
+      gem_mod_paths.each do |_mod_name, mod_path|
         yield mod_path
       end
     end
@@ -168,5 +186,15 @@ module Cardio
 
       list.flatten
     end
+
+    private
+
+    def mod_name_from_gem_spec gem_spec
+      if (m = gem_spec.name.match(/^card-mod-(.+)$/))
+        m[1]
+      else
+        gem_spec.metadata["card-mod"]
+      end
+    end
   end
 end

data/mod/Modfile

@@ -13,6 +13,7 @@ mod 'settings'
 mod 'notifications'
 mod 'developer'
 mod 'carrierwave'
+mod 'search'
 mod 'standard'
 mod 'account'
 mod 'bootstrap'

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

@@ -26,8 +26,8 @@ end
 
 def own_account?
   # card is +*account card of signed_in user.
-  cardname.part_names[0].key == Auth.as_card.key &&
-    cardname.part_names[1].key == Card[:account].key
+  name.part_names[0].key == Auth.as_card.key &&
+    name.part_names[1].key == Card[:account].key
 end
 
 def read_rules

data/mod/account/set/right/account.rb

@@ -1,3 +1,5 @@
+# -*- encoding : utf-8 -*-
+
 include All::Permissions::Accounts
 
 card_accessor :email
@@ -30,12 +32,12 @@ def validate_token! test_token
 end
 
 def refreshed_token # TODO: explain why needed
-  token_card.refresh(true).content
+  token_card.refresh(true).db_content
 end
 
 format do
   view :verify_url do
-    card_url path({ mark: card.cardname.left }.merge(token_path_opts))
+    card_url path({ mark: card.name.left }.merge(token_path_opts))
   end
 
   view :verify_days do

data/mod/account/set/right/email.rb

@@ -49,5 +49,5 @@ def ok_to_read
 end
 
 def own_email?
-  cardname.part_names[0].key == Auth.as_card.key
+  name.part_names[0].key == Auth.as_card.key
 end

data/mod/account/set/self/account_links.rb

@@ -2,7 +2,7 @@
 format :html do
   def item_links _args=nil
     %i[my_card invite sign_out sign_up sign_in].map do |link_view|
-      optional_render link_view
+      render link_view
     end
   end
 
@@ -36,7 +36,7 @@ format :html do
   end
 
   view :my_card, link_options { Auth.signed_in? } do
-    link_to_card Auth.current.cardname, nil, id: "my-card-link", class: nav_link_class("my-card")
+    link_to_card Auth.current.name, nil, id: "my-card-link", class: nav_link_class("my-card")
   end
 
   def account_link_text purpose

data/mod/account/set/self/signin.rb

@@ -29,8 +29,8 @@ format :html do
       card_form :update, recaptcha: :off do
         [
           hidden_signin_fields,
-          _optional_render_content_formgroup,
-          _optional_render_signin_buttons
+          _render_content_formgroup,
+          _render_signin_buttons
         ]
       end
     end
@@ -54,7 +54,7 @@ format :html do
 
   def signup_link
     text = I18n.t :or_sign_up, scope: "mod.account.set.self.signin"
-    subformat(Card[:account_links]).render :sign_up, title: text
+    subformat(Card[:account_links]).render! :sign_up, title: text
   end
 
   def reset_password_link

data/mod/account/spec/set/right/account_spec.rb

@@ -64,7 +64,7 @@ RSpec.describe Card::Set::Right::Account do
 
     it "contains link to verify account" do
       raw_source = @mail.parts[0].body.raw_source
-      ["/update/#{@account.left.cardname.url_key}",
+      ["/update/#{@account.left.name.url_key}",
        "token=#{@account.token}"].each do |url_part|
         expect(raw_source).to include(url_part)
       end
@@ -93,7 +93,7 @@ RSpec.describe Card::Set::Right::Account do
     it "contains password reset link" do
       raw_source = @mail.parts[0].body.raw_source
       token = @account.token_card.refresh(true).content
-      ["/update/#{@account.left.cardname.url_key}",
+      ["/update/#{@account.left.name.url_key}",
        "token=#{token}",
        "live_token=true",
        "event=reset_password"].each do |url_part|