card 1.15.7 → 1.16.0

data/lib/card/name.rb

@@ -41,5 +41,17 @@ class Card
     def code
       Card::Codename[ Card.fetch_id self ]
     end
+
+
+    def is_a_field_of? context_name
+      if context_name.present?
+        # Do I still equal myself after I've been relativised in the context of context_name?
+        relative_name = self.to_show(*context_name.to_name.parts).to_name
+        absolute_name = self.to_absolute_name(context_name)
+        relative_name.key != absolute_name.key
+      else
+        self.s.match /^\s*\+/
+      end
+    end
   end
 end

data/lib/card/reference.rb

@@ -10,15 +10,15 @@ class Card::Reference < ActiveRecord::Base
   end
 
   class << self
-    
+
     def delete_all_from card
       delete_all :referer_id => card.id
     end
-    
+
     def delete_all_to card
       where( :referee_id => card.id ).update_all :present=>0, :referee_id => nil
     end
-    
+
     def update_existing_key card, name=nil
       key = (name || card.name).to_name.key
       where( :referee_key => key ).update_all :present => 1, :referee_id => card.id
@@ -39,25 +39,24 @@ class Card::Reference < ActiveRecord::Base
       delete_all_from card
       delete_all_to card
     end
-    
+
     def repair_missing_referees
-      #FIXME - should treat trashed cards as not existing
-      where( Card.where( :id=>arel_table[:referee_id], :trash=>false).exists.not ).update_all :referee_id=>nil
+      joins('LEFT JOIN cards ON card_references.referee_id = cards.id').where('(cards.id IS NULL OR cards.trash IS TRUE) AND referee_id IS NOT NULL').update_all :referee_id=>nil
     end
-    
+
     def delete_missing_referers
-      where( Card.where( :id=>arel_table[:referer_id], :trash=>false).exists.not ).delete_all
+      joins('LEFT JOIN cards ON card_references.referer_id = cards.id').where('cards.id IS NULL OR cards.trash IS TRUE').delete_all
     end
-    
+
     def repair_all
       delete_missing_referers
-      
+
       Card.where(:trash=>false).find_each do |card|
         Rails.logger.info "\nRepairing references for '#{card.name}' (id: #{card.id}) ... "
-        card.update_references 
+        card.update_references
       end
     end
-    
+
   end
 
 end

data/lib/card/set.rb

@@ -140,33 +140,86 @@ class Card
 
 
     def event event, opts={}, &final
+      perform_later =  (opts[:before] == :subsequent) || (opts[:after] == :subsequent)
+      final_method = "#{event}_without_callbacks" #should be private?
       opts[:on] = [:create, :update ] if opts[:on] == :save
 
       Card.define_callbacks event
 
       class_eval do
-        final_method = "#{event}_without_callbacks" #should be private?
         define_method final_method, &final
+      end
+
+      if perform_later
+        defer_method = "#{event}_perform_later"
+        define_event_perform_later_method event, defer_method
+        define_active_job event, final_method, opts[:queue_as]
+        define_event_method event, defer_method, opts
+      else
+        define_event_method event, final_method, opts
+      end
+      set_event_callbacks event, opts
+    end
+
+    def define_event_perform_later_method event, method_name
+      class_eval do
+        define_method method_name, proc {
+          s_attr = self.serializable_attributes.each_with_object({}) do |name, hash|
+                   value = self.instance_variable_get("@#{name}")
+                   hash[name] =
+                     if Symbol === value  # ActiveJob doesn't accept symbols as arguments
+                       { :value => value.to_s, :symbol => true }
+                     else
+                       { :value => value }
+                     end
+                end
+          Object.const_get(event.to_s.camelize).perform_later(self, s_attr)
+        }
+      end
+    end
 
+    def define_event_method event, call_method, opts
+      class_eval do
         define_method event do
           run_callbacks event do
             Card.with_logging :event, :message=>event, :context=>self.name, :details=>opts do
-              send final_method
+              send call_method
             end
           end
         end
       end
-
-      set_event_callbacks event, opts
     end
 
 
+    # creates an Active Job.
+    # The scheduled job gets the card object as argument and all serializable attributes of the card.
+    # (when the job is executed ActiveJob fetches the card from the database so all attributes get lost)
+    # @param name [String] the name for the ActiveJob child class
+    # @param final_method [String] the name of the card instance method to be queued
+    # @option queue [Symbol] (:default) the name of the queue
+    def define_active_job name, final_method, queue = :default
+      class_name = name.to_s.camelize
+      eval %{
+        class ::#{class_name} < ActiveJob::Base
+          queue_as #{queue}
+        end
+      }
+      Object.const_get(class_name).class_eval do
+       define_method :perform, proc { |card, attributes|
+          attributes.each do |name, args|
+            # symbols are not allowed so all symbols arrive here as strings
+            # convert strings that were symbols before back to symbols
+            value = args[:symbol] ? args[:value].to_sym : args[:value]
+            card.instance_variable_set("@#{name}", value )
+          end
+          card.send final_method
+      }
+      end
+    end
 
     #
     # ActiveCard support: accessing plus cards as attributes
     #
-
-
     def card_accessor *args
       options = args.extract_options!
       add_traits args, options.merge( :reader=>true, :writer=>true )

data/lib/card/simplecov_helper.rb

@@ -1,3 +1,7 @@
+def is_in_mod? file,mod_path
+  mod_msg = "below pulled from #{Rails.root}/mod/#{mod_path}/"
+  file.src.join("") =~ /#{mod_msg}/
+end
 def card_simplecov_filters
   add_filter 'spec/'
   add_filter '/config/'
@@ -15,7 +19,8 @@ def card_simplecov_filters
       src_file.filename =~ /mod\/#{mod}\// or 
         (
           src_file.filename =~ /tmp\// and
-          /\d+-(.+\.rb)/.match(src_file.filename) { |m| Dir["mod/#{mod}/**/#{m[1].gsub("-","/")}"].present? } 
+          /\d+-(.+\.rb)/.match(src_file.filename) { |m| Dir["mod/#{mod}/**/#{m[1].gsub("-","/")}"].present? } and
+          is_in_mod? src_file,mod
         )
     end
   end

data/lib/card/spec_helper.rb

@@ -2,7 +2,7 @@ module SpecHelper
 end
 module Card::SpecHelper
 
-  include ActionDispatch::Assertions::SelectorAssertions
+  include Rails::Dom::Testing::Assertions::SelectorAssertions
   #~~~~~~~~~  HELPER METHODS ~~~~~~~~~~~~~~~#
 
   def login_as user
@@ -19,7 +19,8 @@ module Card::SpecHelper
   end
 
   def assert_view_select(view_html, *args, &block)
-    node = HTML::Document.new(view_html).root
+    node = Nokogiri::HTML::Document.parse(view_html).root
+    #node = HTML::Document.new(view_html).root
     if block_given?
       assert_select node, *args, &block
     else

data/lib/card/view_cache.rb

@@ -0,0 +1,77 @@
+class Card
+  module ViewCache
+    class << self
+      SIZE = 500
+      LIMIT = 1000 # reduce cache size to SIZE if LIMIT is reached
+      CNT_KEY = 'view_cache_cnt'
+      FREQUENCY_KEY = 'view_cache_frequency'
+
+      def cache
+        Card::Cache[Card::ViewCache]
+      end
+
+      def increment_cnt
+        cache.write(CNT_KEY, count+1)
+      end
+
+      def count
+        cache.read(CNT_KEY) || 0
+      end
+
+      def reduce_cache
+        update_frequency do |freq|
+          cnts_with_key = freq.keys.map { |key| [freq[key], key] }
+          index = 1
+          SortedSet.new(cnts_with_key).each do |cnt, key|
+            if index < (LIMIT - SIZE)
+              cache.delete(key)
+              freq.delete(key)
+            else
+              freq[key] = 0
+            end
+            index += 1
+          end
+        end
+      end
+
+      def update_frequency
+        freq = cache.read(FREQUENCY_KEY) || {}
+        yield(freq)
+        cache.write(FREQUENCY_KEY, freq)
+      end
+
+      def fetch(format, view, args, &block)
+        if !Card.config.view_cache || !format.view_caching? || !format.main? ||  (view != :open && view != :content) || format.class != HtmlFormat
+          return block.call
+        end
+
+        roles = Card::Auth.current.all_roles.sort.join '_'
+        key = "view_#{view}_#{format.card.key}_args_#{Card::Cache.obj_to_key(args)}_roles_#{roles}"
+
+        if !cache.exist?(key)
+          increment_cnt
+          reduce_cache if count > LIMIT
+        end
+
+        update_frequency do |freq|
+          freq[key] ||= 0
+          freq[key] += 1
+        end
+
+        if Card.config.view_cache == 'debug'
+          if cache.exist? key
+            "fetched from view cache: #{cache.read key}"
+          else
+            "written to view cache: #{cache.fetch(key, &block)}"
+          end
+        else
+          cache.fetch(key, &block)
+        end
+      end
+
+      def reset hard=false
+        cache.reset hard
+      end
+    end
+  end
+end

data/lib/cardio.rb

@@ -28,28 +28,37 @@ module Cardio
       config.autoload_paths += Dir["#{gem_root}/lib/**/"]
       config.autoload_paths += Dir["#{root}/mod/*/lib/**/"]
 
-      config.read_only             = !!ENV['WAGN_READ_ONLY']
-      config.allow_inline_styles   = false
+      set_default_value config, :read_only,              !!ENV['WAGN_READ_ONLY']
+      set_default_value config, :allow_inline_styles,    false
 
-      config.recaptcha_public_key  = nil
-      config.recaptcha_private_key = nil
-      config.recaptcha_proxy       = nil
+      set_default_value config, :recaptcha_public_key,   nil
+      set_default_value config, :recaptcha_private_key,  nil
+      set_default_value config, :recaptcha_proxy,        nil
 
-      config.cache_store           = :file_store, 'tmp/cache'
-      config.override_host         = nil
-      config.override_protocol     = nil
+      set_default_value config, :cache_store,            :file_store, 'tmp/cache'
+      set_default_value config, :override_host,          nil
+      set_default_value config, :override_protocol,      nil
 
-      config.no_authentication     = false
-      config.files_web_path        = 'files'
+      set_default_value config, :no_authentication,      false
+      set_default_value config, :files_web_path,         'files'
 
-      config.max_char_count        = 200
-      config.max_depth             = 20
-      config.email_defaults        = nil
+      set_default_value config, :max_char_count,         200
+      set_default_value config, :max_depth,              20
+      set_default_value config, :email_defaults,         nil
 
-      config.token_expiry          = 2.days
-      config.revisions_per_page    = 10
-      config.space_last_in_multispace = true
-      config.closed_search_limit   = 50
+      set_default_value config, :token_expiry,           2.days
+      set_default_value config, :revisions_per_page,     10
+      set_default_value config, :space_last_in_multispace, true
+      set_default_value config, :closed_search_limit,    50
+
+      set_default_value config, :view_cache,             false
+    end
+
+    # In production mode set_config gets called twice.
+    # The second call overrides all deck config settings
+    # so don't change settings here if they already exist
+    def set_default_value config, setting, *value
+      config.send("#{setting}=", *value) unless config.respond_to? setting
     end
 
 
@@ -80,10 +89,8 @@ module Cardio
 
     def add_path path, options={}
       root = options.delete(:root) || gem_root
-      gem_path = File.join( root, path )
-      with = options.delete(:with)
-      with = with ? File.join(root, with) : gem_path
-      paths[path] = Rails::Paths::Path.new(paths, gem_path, with, options)
+      options[:with] = File.join(root, (options[:with] || path) )
+      paths.add path, options
     end
 
     def future_stamp
@@ -126,10 +133,11 @@ module Cardio
     def schema_mode type
       new_suffix = Cardio.schema_suffix type
       original_suffix = ActiveRecord::Base.table_name_suffix
-
       ActiveRecord::Base.table_name_suffix = new_suffix
+      ActiveRecord::SchemaMigration.reset_table_name
       yield
       ActiveRecord::Base.table_name_suffix = original_suffix
+      ActiveRecord::SchemaMigration.reset_table_name
     end
 
     def schema type=nil

data/mod/01_core/format/html_format.rb

@@ -6,12 +6,12 @@ class Card
   Format.register :html
   class HtmlFormat < Format
     include Diff
-  
+
     attr_accessor  :options_need_save, :start_time, :skip_autosave
 
     # builtin layouts allow for rescue / testing
     LAYOUTS = Loader.load_layouts.merge 'none' => '{{_main}}'
-  
+
     # helper methods for layout view
     def get_layout_content
       Auth.as_bot do
@@ -39,11 +39,11 @@ class Card
         "<h1>Unknown layout: #{name}</h1>Built-in Layouts: #{LAYOUTS.keys.join(', ')}"
       end
     end
-    
+
     def get_inclusion_defaults nested_card
       {:view => (nested_card.rule( :default_html_view ) || :titled) }
     end
-  
+
     def default_item_view
       :closed
     end
@@ -53,13 +53,13 @@ class Card
       when String; content
       when Array ; content.compact.join "\n"
       end
-    end  
+    end
 
     def html_escape_except_quotes s
       # to be used inside single quotes (makes for readable json attributes)
       s.to_s.gsub(/&/, "&amp;").gsub(/\'/, "&apos;").gsub(/>/, "&gt;").gsub(/</, "&lt;")
     end
-    
+
     #### --------------------  additional helpers ---------------- ###
 
     # session history helpers: we keep a history stack so that in the case of
@@ -100,7 +100,7 @@ class Card
         uri = path(uri) if Hash === uri
         session[:interrupted_action] = uri
       end
-  
+
       def interrupted_action
         session.delete :interrupted_action
       end
@@ -113,10 +113,18 @@ class Card
 
 
     def main?
-      if Env.ajax?
+      if show_layout?
+        @depth == 1 && @mainline #assumes layout includes {{_main}}
+      else
         @depth == 0 && params[:is_main]
+      end
+    end
+
+    def focal? # meaning the current card is the requested card
+      if show_layout?
+        main?
       else
-        @depth == 1 && @mainline #assumes layout includes {{_main}}
+        @depth == 0
       end
     end
   end

data/mod/01_core/layout/blank.html

@@ -1,5 +1,5 @@
 <!DOCTYPE HTML>
 <html>
-  <head> {{*head}} </head>
+  <head> {{*head|core}} </head>
   <body id="wagn"> {{_main}} </body>
 </html>

data/mod/01_core/layout/default.html

@@ -1,20 +1,10 @@
 <!DOCTYPE HTML>
 <html>
-  <head>
-    {{*head}}
-  </head>
-  
-  <body id="wagn">
-    <div id="menu">
-      [[/ | Home]]   [[/recent | Recent]]   {{*navbox}} {{*account links}}
-    </div>
-    
-    <div id="primary">
-      {{_main}}
-    </div>
-    
-    <div id="secondary">
-      {{*sidebar}}
-    </div>
+  <head>{{*head|core}}</head>
+  <body>
+    <header>{{*header|core}}</header>
+    <article>{{_main|open}}</article>
+    <aside>{{*sidebar|core}}</aside>
+    <footer>{{*footer|core}}</footer>
   </body>
 </html>