card 1.18.0 → 1.18.1

data/lib/card/set/event.rb

@@ -68,7 +68,8 @@ class Card
       def define_event_method event, call_method, _opts
         class_eval do
           define_method event do
-            # puts "#{name}:#{event}".green
+            # puts "#{name}:#{event}".red
+            # puts "#{Card::DirectorRegister.to_s}".green
             run_callbacks event do
               send call_method
             end

data/lib/card/set_pattern.rb

@@ -94,7 +94,8 @@ EOF
         if self.class.anchorless?
           self.class.pattern_code.camelize
         elsif anchor_codenames
-          "#{self.class.pattern_code.camelize}::#{anchor_codenames.map(&:to_s).map(&:camelize) * '::'}"
+          codenames = [self.class.pattern_code] + anchor_codenames.map(&:to_s)
+          codenames.map(&:camelize).join '::'
         end
       end
     end
@@ -108,7 +109,8 @@ EOF
     end
 
     def format_module_list klass
-      (hash = Card::Set.modules[:nonbase_format][klass]) && lookup_module_list(hash)
+      hash = Card::Set.modules[:nonbase_format][klass]
+      hash && lookup_module_list(hash)
     end
 
     def anchor_codenames

data/lib/card/spec_helper.rb

@@ -89,7 +89,13 @@ module Card::SpecHelper
     stage_sym = :"#{stage}_stage"
     $rspec_binding = binding
     add_test_event stage_sym, :in_stage_test, &event_block
-    opts[:trigger].call
+    trigger =
+      if opts[:trigger].is_a?(Symbol)
+        method(opts[:trigger])
+      else
+        opts[:trigger]
+      end
+    trigger.call
   ensure
     remove_test_event stage_sym, :in_stage_test
   end

data/lib/card/stage_director.rb

@@ -42,7 +42,10 @@ class Card
     def initialize card, opts={}, main=true
       @card = card
       @card.director = self
-      @card.prepare_for_phases
+      # for read actions there is no validation phase
+      # so we have to set the action here
+      @card.identify_action
+
       @stage = nil
       @running = false
       @parent = opts[:parent]
@@ -58,15 +61,22 @@ class Card
     end
 
     def unregister
+      Card::DirectorRegister.delete self
+    end
+
+    def delete
       @card.director = nil
-      @subdirectors = nil
+      @subdirectors.clear
       @stage = nil
       @action = nil
-      Card::DirectorRegister.delete self
+    end
+
+    def prepare_for_phases
+      @card.prepare_for_phases
+      @subdirectors.each(&:prepare_for_phases)
     end
 
     def validation_phase
-      @running = true
       run_single_stage :initialize
       run_single_stage :prepare_to_validate
       run_single_stage :validate
@@ -124,13 +134,26 @@ class Card
       end
     end
 
+    def to_s
+      str = @card.name.to_s.clone
+      if @subdirectors
+        subs = subdirectors.map(&:card)
+                 .map { |card| "  #{card.name}" }.join "\n"
+        str << "\n#{subs}"
+      end
+      str
+    end
+
     private
 
     def run_single_stage stage, &block
       # puts "#{@card.name}: #{stage} stage".red
       @stage = stage_index stage
       return if @card.errors.any? && @stage <= stage_index(:validate)
-
+      if stage == :initialize
+        @running ||= true
+        prepare_for_phases
+      end
       # in the store stage it can be necessary that
       # other subcards must be saved before we save this card
       if stage == :store
@@ -227,5 +250,10 @@ class Card
     def initialize card, opts={}
       super card, opts, false
     end
+
+    def delete
+      @parent.subdirectors.delete self if @parent
+      super
+    end
   end
 end

data/lib/card/subcards.rb

@@ -27,6 +27,9 @@ class Card
 
     def clear
       @keys.each do |key|
+        if (subcard = fetch_subcard key)
+          Card::DirectorRegister.delete subcard.director
+        end
         Card.cache.soft.delete key
       end
       @keys = ::Set.new
@@ -54,6 +57,10 @@ class Card
       key = absolutize_subcard_name(key).key unless @keys.include?(key)
       @keys.delete key
       removed_card = fetch_subcard key
+      if removed_card.current_action
+        removed_card.current_action.delete
+      end
+      Card::DirectorRegister.delete removed_card.director
       Card.cache.soft.delete key
       removed_card
     end
@@ -95,9 +102,10 @@ class Card
       end
     end
 
-    def rename old_name, _new_name
+    def rename old_name, new_name
       return unless @keys.include? old_name.to_name.key
-      # FIXME: something should happen here
+      @keys.delete old_name.to_name.key
+      @keys << new_name.to_name.key
     end
 
     def << value
@@ -223,7 +231,7 @@ class Card
     end
 
     def absolutize_subcard_name name
-      if @context_card.name =~ /^\+/
+      if @context_card.name =~ /^\+/ || name.blank?
         name.to_name
       else
         name.to_name.to_absolute_name(@context_card.name)

data/lib/card/subdirector_array.rb

@@ -14,6 +14,9 @@ class Card
     end
 
     def add card
+      if card.is_a? Card::StageDirector
+        card = card.card
+      end
       each do |dir|
         return dir if dir.card == card
       end
@@ -24,8 +27,18 @@ class Card
       dir
     end
 
+    alias_method :delete_director, :delete
+
     def delete card
-      delete_if { |dir| dir.card == card }
+      if card.is_a? Card::StageDirector
+        delete_director card
+      else
+        delete_if { |dir| dir.card == card }
+      end
+    end
+
+    def add_director dir
+      add dir.card
     end
   end
 end

data/lib/cardio.rb

@@ -92,14 +92,17 @@ module Cardio
       add_path 'db/migrate_deck_cards', root: root, with: 'db/migrate_cards'
       add_path 'db/seeds', with: 'db/seeds.rb'
 
-      add_path 'config/initializers',  glob: '**/*.rb'
+      add_path 'config/initializers', glob: '**/*.rb'
+      add_initializers root
     end
 
     def set_mod_paths
-      each_mod_path do |mod_path|
-        Dir.glob("#{mod_path}/*/initializers").each do |initializers_dir|
-          paths['config/initializers'] << initializers_dir
-        end
+      each_mod_path { |mod_path| add_initializers mod_path }
+    end
+
+    def add_initializers dir
+      Dir.glob("#{dir}/config/initializers").each do |initializers_dir|
+        paths['config/initializers'] << initializers_dir
       end
     end
 

data/mod/01_core/chunk/include.rb

@@ -2,7 +2,7 @@
 
 require_dependency File.expand_path('../reference', __FILE__)
 
-module Card::Chunk
+module Card::Content::Chunk
   class Include < Reference
     cattr_reader :options
     @@options = ::Set.new [
@@ -23,7 +23,7 @@ module Card::Chunk
     ]
     attr_reader :options
 
-    Card::Chunk.register_class(
+    Card::Content::Chunk.register_class(
       self, prefix_re: '\\{\\{',
             full_re:    /^\{\{([^\}]*)\}\}/,
             idx_char:  '{')

data/mod/01_core/chunk/link.rb

@@ -2,11 +2,11 @@
 
 require_dependency File.expand_path('../reference', __FILE__)
 
-module Card::Chunk
+module Card::Content::Chunk
   class Link < Reference
     attr_reader :link_text
     # Groups: $1, [$2]: [[$1]] or [[$1|$2]] or $3, $4: [$3][$4]
-    Card::Chunk.register_class self,
+    Card::Content::Chunk.register_class self,
                                prefix_re: '\\[',
                                full_re:   /^\[\[([^\]]+)\]\]/,
                                idx_char:  '['
@@ -78,7 +78,7 @@ module Card::Chunk
       replace_name_reference old_name, new_name
 
       if Card::Content === @link_text
-        @link_text.find_chunks(Card::Chunk::Reference).each do |chunk|
+        @link_text.find_chunks(Card::Content::Chunk::Reference).each do |chunk|
           chunk.replace_reference old_name, new_name
         end
       elsif old_name.to_name == @link_text

data/mod/01_core/chunk/literal.rb

@@ -1,21 +1,27 @@
 # -*- encoding : utf-8 -*-
 
-# These are basic chunks that have a pattern and can be protected.
-# They are used by rendering process to prevent wiki rendering
-# occuring within literal areas such as <code> and <pre> blocks
-# and within HTML tags.
-module Card::Chunk
-  class EscapedLiteral < Abstract
-    FULL_RE = { '[' => /^\\\[\[[^\]]*\]\]/, '{' => /^\\\{\{[^\}]*\}\}/ }.freeze
-    Card::Chunk.register_class self,       prefix_re: '\\\\(?:\\[\\[|\\{\\{)',
-                                           idx_char:  '\\'
+class Card
+  class Content
+    module Chunk
+      # These are basic chunks that have a pattern and can be protected.
+      # They are used by rendering process to prevent wiki rendering
+      # occuring within literal areas such as <code> and <pre> blocks
+      # and within HTML tags.
+      class EscapedLiteral < Abstract
+        FULL_RE = { '[' => /^\\\[\[[^\]]*\]\]/,
+                    '{' => /^\\\{\{[^\}]*\}\}/ }.freeze
+        Card::Content::Chunk.register_class self,
+                                            prefix_re: '\\\\(?:\\[\\[|\\{\\{)',
+                                            idx_char:  '\\'
 
-    def self.full_re prefix
-      re = FULL_RE[prefix[1, 1]]
-    end
+        def self.full_re prefix
+          FULL_RE[prefix[1, 1]]
+        end
 
-    def interpret match, _content
-      @process_chunk = match[0].sub(/^\\(.)/, '<span>\\1</span>')
+        def interpret match, _content
+          @process_chunk = match[0].sub(/^\\(.)/, '<span>\\1</span>')
+        end
+      end
     end
   end
 end

data/mod/01_core/chunk/query_reference.rb

@@ -2,7 +2,7 @@
 
 require_dependency File.expand_path('../reference', __FILE__)
 
-module Card::Chunk
+module Card::Content::Chunk
   # This should find +Alfred+ in expressions like
   # 1) {"name":"Alfred"}
   # 2a) {"name":["in","Alfred"]}
@@ -26,7 +26,7 @@ module Card::Chunk
       ).map(&:to_name)
     )
 
-    Card::Chunk.register_class(
+    Card::Content::Chunk.register_class(
       self, prefix_re: '(?<=[:,\\[])\\s*"',
             # we check for colon, comma or square bracket before a quote
             # we have to use a lookbehind, otherwise

data/mod/01_core/chunk/reference.rb

@@ -1,51 +1,60 @@
 # -*- encoding : utf-8 -*-
-module Card::Chunk
-  class Reference < Abstract
-    attr_accessor :referee_name, :name
+class Card
+  class Content
+    module Chunk
+      class Reference < Abstract
+        attr_accessor :referee_name, :name
 
-    def referee_name
-      return if name.nil?
+        def referee_name
+          return if name.nil?
+          @referee_name ||=
+            begin
+              rendered_name = render_obj(name)
+              ref_card = fetch_referee_card rendered_name
+              ref_card ? ref_card.cardname : rendered_name.to_name
+            end
+          @referee_name = @referee_name.to_absolute(card.cardname).to_name
+        end
+
+        def referee_card
+          @referee_card ||= referee_name && Card.fetch(referee_name)
+        end
+
+        # FIXME: if we need this, then it should be faster, using fetch_id
+        # def referee_id
+        #   referee_card and referee_card.id
+        # end
+
+        def replace_name_reference old_name, new_name
+          @referee_card = nil
+          @referee_name = nil
+          if name.is_a? Card::Content
+            name.find_chunks(Chunk::Reference).each do |chunk|
+              chunk.replace_reference old_name, new_name
+            end
+          else
+            @name = name.to_name.replace_part(old_name, new_name)
+          end
+        end
+
+        def render_obj raw
+          if format && raw.is_a?(Card::Content)
+            format.process_content raw
+          else
+            raw
+          end
+        end
 
-      @referee_name ||= begin
-        rendered_name = render_obj(name)
-        ref_card =
+        private
+
+        def fetch_referee_card rendered_name
           case rendered_name # FIXME: this should be standard fetch option.
           when /^\~(\d+)$/ # get by id
             Card.fetch Regexp.last_match(1).to_i
           when /^\:(\w+)$/ # get by codename
             Card.fetch Regexp.last_match(1).to_sym
           end
-        ref_card ? ref_card.cardname : rendered_name.to_name
-      end
-      @referee_name = @referee_name.to_absolute(card.cardname).to_name
-    end
-
-    def referee_card
-      @referee_card ||= referee_name && Card.fetch(referee_name)
-    end
-
-    # FIXME: if we need this, then it should be faster, using fetch_id
-    # def referee_id
-    #   referee_card and referee_card.id
-    # end
-
-    def replace_name_reference old_name, new_name
-      @referee_card = nil
-      @referee_name = nil
-      if Card::Content === name
-        name.find_chunks(Chunk::Reference).each do |chunk|
-          chunk.replace_reference old_name, new_name
         end
-      else
-        @name = name.to_name.replace_part(old_name, new_name)
-      end
-    end
-
-    def render_obj raw
-      if format && Card::Content === raw
-        format.process_content raw
-      else
-        raw
       end
     end
   end

data/mod/01_core/chunk/uri.rb

@@ -16,7 +16,7 @@ require 'uri'
 # I'm using a part of the [ISO 3166-1 Standard][iso3166] for country name suffixes.
 # The generic names are from www.bnoack.com/data/countrycode2.html)
 #   [iso3166]: http://geotags.com/iso3166/
-module Card::Chunk
+module Card::Content::Chunk
   class URI < Abstract
     SCHEMES = %w(irc http https ftp ssh git sftp file ldap ldaps mailto).freeze
 
@@ -25,9 +25,11 @@ module Card::Chunk
     attr_reader :uri, :link_text
     delegate :to, :scheme, :host, :port, :path, :query, :fragment, to: :uri
 
-    Card::Chunk.register_class self,       prefix_re: "(?:(?!#{REJECTED_PREFIX_RE})(?:#{SCHEMES * '|'})\\:)",
-                                           full_re:    /^#{::URI.regexp(SCHEMES)}/,
-                                           idx_char:  ':'
+    Card::Content::Chunk.register_class(
+      self, prefix_re: "(?:(?!#{REJECTED_PREFIX_RE})(?:#{SCHEMES * '|'})\\:)",
+            full_re: /^#{::URI.regexp(SCHEMES)}/,
+            idx_char: ':'
+    )
 
     class << self
       def full_match content, prefix
@@ -75,11 +77,12 @@ module Card::Chunk
     PREPEND_STR = 'mailto:'.freeze
     EMAIL = '[a-zA-Zd](?:[-a-zA-Zd]*[a-zA-Zd])?\\@'.freeze
 
-    Card::Chunk.register_class self,       prefix_re: "(?:(?!#{REJECTED_PREFIX_RE})#{EMAIL})\\b",
-                                           full_re:    /^#{::URI.regexp(SCHEMES)}/,
-                                           prepend_str: PREPEND_STR,
-                                           idx_char:  '@'
-
+    Card::Content::Chunk.register_class(
+      self, prefix_re: "(?:(?!#{REJECTED_PREFIX_RE})#{EMAIL})\\b",
+            full_re: /^#{::URI.regexp(SCHEMES)}/,
+            prepend_str: PREPEND_STR,
+            idx_char: '@'
+    )
     def interpret match, content
       super
       @text = @text.sub(/^mailto:/, '')  # this removes the prepended string from the unchanged match text
@@ -110,10 +113,11 @@ module Card::Chunk
     PREPEND_STR = 'http://'.freeze
     HOST = "(?:[a-zA-Z\d](?:[-a-zA-Z\d]*[a-zA-Z\d])?\\.)+#{TLDS}".freeze
 
-    Card::Chunk.register_class self,       prefix_re: "(?:(?!#{REJECTED_PREFIX_RE})#{HOST})\\b",
-                                           full_re:    /^#{::URI.regexp(SCHEMES)}/,
-                                           prepend_str: PREPEND_STR
-
+    Card::Content::Chunk.register_class(
+      self, prefix_re: "(?:(?!#{REJECTED_PREFIX_RE})#{HOST})\\b",
+            full_re: /^#{::URI.regexp(SCHEMES)}/,
+            prepend_str: PREPEND_STR
+    )
     def interpret match, content
       super
       @text = @text.sub(/^http:\/\//, '')  # this removes the prepended string from the unchanged match text