card 1.15.1 → 1.15.2

data/db/version_core_cards.txt

@@ -1 +1 @@
-20150317162412
+20150510031118

data/lib/card/format.rb

@@ -6,7 +6,7 @@ class Card
     DEPRECATED_VIEWS = { :view=>:open, :card=>:open, :line=>:closed, :bare=>:core, :naked=>:core }
     INCLUSION_MODES  = { :closed=>:closed, :closed_content=>:closed, :edit=>:edit,
       :layout=>:layout, :new=>:edit, :setup=>:edit, :normal=>:normal, :template=>:template } #should be set in views
-    
+
     cattr_accessor :ajax_call, :registered
     [ :perms, :denial_views, :closed_views, :error_codes, :view_tags, :aliases ].each do |acc|
       cattr_accessor acc
@@ -15,14 +15,14 @@ class Card
 
     attr_reader :card, :root, :parent, :main_opts
     attr_accessor :form, :error_status, :inclusion_opts
-  
+
     class << self
       @@registered = []
 
       def register format
         @@registered << format.to_s
       end
-    
+
       def format_class_name format
         format = format.to_s
         format = '' if format == 'base'
@@ -30,7 +30,7 @@ class Card
         "#{ format.camelize }Format"
       end
 
-      
+
 
       def extract_class_vars view, opts
         return unless opts.present?
@@ -56,12 +56,12 @@ class Card
           self == klass ? super : klass.new( card, opts )
         end
       end
-    
+
       def tagged view, tag
         view and tag and view_tags = @@view_tags[view.to_sym] and view_tags[tag.to_sym]
       end
-      
-      
+
+
       def format_ancestry
         ancestry = [ self ]
         unless self == Card::Format
@@ -75,7 +75,7 @@ class Card
       end
     end
 
-    
+
     #~~~~~ INSTANCE METHODS
 
     def initialize card, opts={}
@@ -92,20 +92,20 @@ class Card
       include_set_format_modules
       self
     end
-    
-    def get_context_names      
+
+    def get_context_names
       case
       when @context_names
         part_keys = @card.cardname.part_names.map &:key
         @context_names.reject { |n| !part_keys.include? n.key }
       when params[:slot]
-        context_name_list = params[:slot][:name_context].to_s 
+        context_name_list = params[:slot][:name_context].to_s
         context_name_list.split(',').map &:to_name
       else
         []
       end
     end
-    
+
     def include_set_format_modules
       self.class.format_ancestry.reverse.each do |klass|
         card.set_format_modules( klass ).each do |m|
@@ -113,7 +113,7 @@ class Card
         end
       end
     end
-  
+
     def inclusion_defaults nested_card
       @inclusion_defaults ||= begin
         defaults = get_inclusion_defaults(nested_card).clone
@@ -121,19 +121,19 @@ class Card
         defaults
       end
     end
-    
+
     def get_inclusion_defaults nested_card
       { :view => :name }
     end
-    
+
     def params
       Env.params
     end
-    
+
     def controller
       Env[:controller] ||= CardController.new
     end
-    
+
     def session
       Env.session
     end
@@ -145,7 +145,7 @@ class Card
         @showname ||= card.cardname.to_show *@context_names
       end
     end
-  
+
     def main?
       @depth == 0
     end
@@ -169,14 +169,14 @@ class Card
 
     def method_missing method, *opts, &proc
       case method
-      when /(_)?(optional_)?render(_(\w+))?/  
-        view = $3 ? $4 : opts.shift      
-        args = opts[0] ? opts.shift.clone : {} 
+      when /(_)?(optional_)?render(_(\w+))?/
+        view = $3 ? $4 : opts.shift
+        args = opts[0] ? opts.shift.clone : {}
         args.merge!( :optional=>true, :default_visibility=>opts.shift) if $2
         args[ :skip_permissions ] = true if $1
-        render view, args           
+        render view, args
       when /^_view_(\w+)/
-        view = @current_view || $1 
+        view = @current_view || $1
         unsupported_view view
       else
         proc = proc { |*a| raw yield *a } if proc
@@ -188,12 +188,12 @@ class Card
     #
     # ---------- Rendering ------------
     #
-    
-    
+
+
 
     def render view, args={}
       unless args.delete(:optional) && !show_view?( view, args )
-        @current_view = view = ok_view canonicalize_view( view ), args       
+        @current_view = view = ok_view canonicalize_view( view ), args
         args = default_render_args view, args
         with_inclusion_mode view do
           Card.with_logging :view, :message=>view, :context=>card.name, :details=>args do
@@ -205,34 +205,34 @@ class Card
       rescue_view e, view
     end
 
-    
+
     def show_view? view, args
       default = args.delete(:default_visibility) || :show #FIXME - ugly
       view_key = canonicalize_view view
       api_option = args["optional_#{ view_key }".to_sym]
-      case 
+      case
       # args remove option
       when api_option == :always                   ; true
       when api_option == :never                    ; false
-      # wagneer's choice                           
+      # wagneer's choice
       when show_views( args ).member?( view_key )  ; true
       when hide_views( args ).member?( view_key )  ; false
-      # args override default                      
+      # args override default
       when api_option == :show                     ; true
       when api_option == :hide                     ; false
-      # default                                    
+      # default
       else                                         ; default==:show
       end
     end
-    
+
     def show_views args
       parse_view_visibility args[:show]
     end
-    
+
     def hide_views args
       parse_view_visibility args[:hide]
     end
-    
+
     def parse_view_visibility val
       case val
       when Array; val
@@ -241,7 +241,7 @@ class Card
       else raise Card::Error, "bad show/hide argument: #{val}"
       end.map{ |view| canonicalize_view view }
     end
-    
+
 
     def default_render_args view, a=nil
       args = case a
@@ -250,7 +250,7 @@ class Card
       when Array ; a[0].merge a[1]
       else       ; raise Card::Error, "bad render args: #{a}"
       end
-      
+
       view_key = canonicalize_view view
       default_method = "default_#{ view }_args"
       if respond_to? default_method
@@ -258,7 +258,7 @@ class Card
       end
       args
     end
-    
+
 
     def rescue_view e, view
       if Rails.env =~ /^cucumber|test$/
@@ -274,7 +274,7 @@ class Card
     def error_cardname
       card && card.name.present? ? card.name : 'unknown card'
     end
-  
+
     def unsupported_view view
       "view (#{view}) not supported for #{error_cardname}"
     end
@@ -321,9 +321,9 @@ class Card
         when args.delete(:skip_permissions)             # permission skipping specified in args
           view
         when !card.known? && !tagged(view, :unknown_ok) # handle unknown cards (where view not exempt)
-          view_for_unknown view, args  
+          view_for_unknown view, args
         else                                            # run explicit permission checks
-          permitted_view view, args    
+          permitted_view view, args
         end
 
       args[:denied_view] = view if approved_view != view
@@ -332,11 +332,11 @@ class Card
       end
       approved_view
     end
-  
+
     def tagged view, tag
       self.class.tagged view, tag
     end
-  
+
     def permitted_view view, args
       perms_required = @@perms[view] || :read
       args[:denied_task] =
@@ -345,21 +345,21 @@ class Card
         else
           [perms_required].flatten.find { |task| !ok? task }
         end
-      
+
       if args[:denied_task]
         @@denial_views[view] || :denial
       else
         view
       end
     end
-  
+
     def ok? task
       task = :create if task == :update && card.new_card?
       @ok ||= {}
       @ok[task] = card.ok? task if @ok[task].nil?
       @ok[task]
     end
-  
+
     def view_for_unknown view, args
       # note: overridden in HTML
       focal? ? :not_found : :missing
@@ -371,7 +371,7 @@ class Card
         DEPRECATED_VIEWS[view_key] || view_key
       end
     end
-    
+
     def with_inclusion_mode mode
       if switch_mode = INCLUSION_MODES[ mode ] and @mode != switch_mode
         old_mode, @mode = @mode, switch_mode
@@ -387,7 +387,7 @@ class Card
 
     def prepare_nest opts
       @char_count ||= 0
-      
+
       opts ||= {}
       case
       when opts.has_key?( :comment )                            ; opts[:comment]   # as in commented code
@@ -413,8 +413,8 @@ class Card
         result
       end
     end
-    
-    def legacy_main_opts_tweaks! opts 
+
+    def legacy_main_opts_tweaks! opts
       if val=params[:size] and val.present?
         opts[:size] = val.to_sym
       end
@@ -432,7 +432,7 @@ class Card
       #ActiveSupport::Notifications.instrument('card', message: "nest: #{nested_card.name}, #{opts}") do
       opts.delete_if { |k,v| v.nil? }
       opts.reverse_merge! inclusion_defaults(nested_card)
-    
+
       sub = nil
       if opts[:inc_name] =~ /^_(self)?$/
         sub = self
@@ -473,7 +473,7 @@ class Card
       if p = params['subcards'] and card_params = p[cardname.to_s]
         content = card_params['content']
       end
-      content if content.present?  # why is this necessary? - efm  
+      content if content.present?  # why is this necessary? - efm
                                    # probably for blanks?  -- older/wiser efm
     end
 
@@ -490,7 +490,7 @@ class Card
       end
       args
     end
-    
+
     def default_item_view
       :name
     end
@@ -503,7 +503,7 @@ class Card
     def add_class options, klass
       options[:class] = [ options[:class], klass ].flatten.compact * ' '
     end
-    
+
     module Location
       #
       # page_path    takes a Card::Name, adds the format and query string to url_key (site-absolute)
@@ -518,7 +518,7 @@ class Card
         query  = opts.present? ? "?#{opts.to_param}"         : ''
         card_path "#{action}#{title.to_name.url_key}#{format}#{query}"
       end
-      
+
       def card_path rel_path
         Rails.logger.warn "Pass only strings to card_path: #{rel_path.class}, #{rel_path}" unless String===rel_path
         if rel_path =~ /^\//
@@ -535,12 +535,12 @@ class Card
           "#{ Card::Env[:protocol] }#{ Card::Env[:host] }#{ card_path rel }"
         end
       end
-      
+
     end
     include Location
 
     def unique_id
-      "#{card.key}-#{Time.now.to_i}-#{rand(3)}" 
+      "#{card.key}-#{Time.now.to_i}-#{rand(3)}"
     end
 
     def format_date date, include_time = true

data/lib/cardio.rb

@@ -8,7 +8,7 @@ module Cardio
 
   ActiveSupport.on_load :card do
     if Card.count > 0
-      Card::Loader.load_mods 
+      Card::Loader.load_mods
     else
       Rails.logger.warn "empty database"
     end
@@ -20,7 +20,7 @@ module Cardio
     def cache
       @@cache ||= ::Rails.cache
     end
-    
+
     def set_config config
       @@config, @@root = config, config.root
 
@@ -51,7 +51,7 @@ module Cardio
       config.closed_search_limit   = 50
     end
 
-  
+
     def set_paths paths
       @@paths = paths
       add_path 'tmp/set', :root => root
@@ -64,13 +64,15 @@ 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'
+      paths['config/initializers'] << "#{gem_root}/mod/**{,/*/**}/initializers"
+      paths['config/initializers'] << "#{root}/mod/**{,/*/**}/initializers"
     end
 
     def root
       @@config.root
     end
-    
+
     def gem_root
       CARD_GEM_ROOT
     end

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

@@ -80,7 +80,7 @@ module Card::Chunk
       replace_name_reference old_name, new_name
       @text = "{{#{ [ @name.to_s, @opt_lists ].compact * '|' }}}"
     end
-    
+
     def explicit_view= view
       unless @options[:view] #could check to make sure it's not already the default...
         if @text =~ /\|/

data/mod/01_core/set/all/fetch.rb

@@ -3,7 +3,7 @@
 # A multipurpose retrieval operator that incorporates caching, "virtual" card retrieval
 
 module ClassMethods
-  
+
   # === fetch
   #
   # looks for cards in
@@ -18,15 +18,15 @@ module ClassMethods
   #     :skip_modules               Don't load Set modules
   #     :new => {  card opts }      Return a new card when not found
   #
-  
 
-  
-  
+
+
+
   def fetch mark, opts={}
     if String === mark
       case mark
       when /^\~(\d+)$/ # get by id
-        mark = $1.to_i 
+        mark = $1.to_i
       when /^\:(\w+)$/ # get by codename
         mark = $1.to_sym
       end
@@ -44,20 +44,20 @@ module ClassMethods
     else
       return card.renew(opts) if card and card.eager_renew?(opts)
       if !card or card.type_id==-1 && clean_cache_opts?(opts)       # new (or improved) card for cache
-        needs_caching = true  
+        needs_caching = true
         card = new_for_cache mark, opts
-      end  
+      end
     end
-  
+
     write_to_cache card if Card.cache && needs_caching
-  
+
     if card.new_card?
       if opts[:new]
         return card.renew(opts) if !clean_cache_opts? opts
       elsif opts[:skip_virtual]
         return
       else
-        card.include_set_modules unless opts[:skip_modules]  # need to load modules here to call the right virtual? method 
+        card.include_set_modules unless opts[:skip_modules]  # need to load modules here to call the right virtual? method
         return unless card.virtual?
       end
       card.name = mark.to_s if mark && mark.to_s != card.name
@@ -66,7 +66,7 @@ module ClassMethods
     card.include_set_modules unless opts[:skip_modules]
     card
   end
-  
+
   def fetch_id mark #should optimize this.  what if mark is int?  or codename?
     card = fetch mark, :skip_virtual=>true, :skip_modules=>true
     card and card.id
@@ -80,7 +80,7 @@ module ClassMethods
     card = fetch mark, :skip_virtual=>true, :skip_modules=>true
     card.present?
   end
-  
+
   def known? mark
     card = fetch mark, :skip_modules=>true
     card.present?
@@ -89,7 +89,7 @@ module ClassMethods
   def expire name
     #note: calling instance method breaks on dirty names
     key = name.to_name.key
-    if card = Card.cache.read( key ) 
+    if card = Card.cache.read( key )
       Card.cache.delete key
       Card.cache.delete "~#{card.id}" if card.id
     end
@@ -115,15 +115,15 @@ module ClassMethods
       Card.cache.write skey, h
     end
   end
-  
+
   def cache
     Card::Cache[Card]
   end
-  
+
   def fetch_from_cache cache_key
     Card.cache.read cache_key if Card.cache
   end
-  
+
   def fullname_from_name name, new_opts={}
     if new_opts and supercard = new_opts[:supercard]
       name.to_name.to_absolute_name supercard.name
@@ -131,32 +131,32 @@ module ClassMethods
       name.to_name
     end
   end
-  
+
   def fetch_from_cache_or_db mark, opts
-    needs_caching = false  
+    needs_caching = false
     mark_type = Integer===mark ? :id : :key
-    
+
     if mark_type == :key
       mark = fullname_from_name mark, opts[:new]
       val = mark.key
     else
       val = mark
     end
-    
+
     card = send( "fetch_from_cache_by_#{mark_type}", val ) || begin
       needs_caching = true
       send "find_by_#{mark_type}_and_trash", val, false
     end
-    
+
     [ card, mark, needs_caching ]
   end
-  
+
   def fetch_from_cache_by_id id
     if name = fetch_from_cache("~#{id}")
       fetch_from_cache name
     end
   end
-    
+
   def fetch_from_cache_by_key key
     fetch_from_cache key
   end
@@ -168,16 +168,16 @@ module ClassMethods
     # reinitialization later.  *** It should NEVER be seen elsewhere ***
     new new_args
   end
-  
+
   def clean_cache_opts? opts
     !opts[:skip_virtual] && !opts[:new].present?
   end
-  
+
   def write_to_cache card
     Card.cache.write card.key, card
     Card.cache.write "~#{card.id}", card.key if card.id and card.id != 0
-  end  
-  
+  end
+
 
 end