card 1.15.7 → 1.16.0

data/db/seed/test/fixtures/file1.txt

@@ -0,0 +1 @@
+file1

data/db/seed/test/fixtures/file2.txt

@@ -0,0 +1 @@
+file2

data/db/version_core_cards.txt

@@ -1 +1 @@
-20150528084659
+20150702130543

data/lib/card.rb

@@ -3,6 +3,14 @@
 Object.send :remove_const, :Card if Object.send(:const_defined?, :Card)
 
 class Card < ActiveRecord::Base
+
+  # attributes that ActiveJob can handle
+  def self.serializable_attr_accessor *args
+    self.serializable_attributes = args
+    attr_accessor *args
+  end
+
+
   require_dependency 'card/active_record_ext'
   require_dependency 'card/codename'
   require_dependency 'card/query'
@@ -19,30 +27,32 @@ class Card < ActiveRecord::Base
 
   has_many :references_from, :class_name => :Reference, :foreign_key => :referee_id
   has_many :references_to,   :class_name => :Reference, :foreign_key => :referer_id
-  has_many :acts, :order => :id
-  has_many :actions, :order => :id, :conditions=>{:draft => [nil,false]}
-  has_many :drafts, :order=>:id, :conditions=>{:draft=>true}, :class_name=> :Action
+  has_many :acts, -> { order :id }
+  has_many :actions, -> { where( :draft=>[nil,false]).order :id }
+  has_many :drafts, -> { where( :draft=>true ).order :id }, :class_name=> :Action
 
-  cache_attributes 'name', 'type_id' # review - still worth it in Rails 3?
-
-  cattr_accessor :set_patterns, :error_codes
+  cattr_accessor :set_patterns, :error_codes, :serializable_attributes
   @@set_patterns, @@error_codes = [], {}
 
-  attr_accessor :action, :supercard, :current_act, :current_action, 
+  serializable_attr_accessor :action, :supercard, :current_act, :current_action,
     :comment, :comment_author,    # obviated soon
     :update_referencers,          # wrong mechanism for this
-    :update_all_users,                  # if the above is wrong then this one too
-    :follower_stash, :remove_rule_stash,
+    :update_all_users,            # if the above is wrong then this one too
+    :remove_rule_stash,
     :last_action_id_before_edit
-    
-  define_callbacks :approve, :store, :extend
-  
+
+  attr_accessor :follower_stash
+
+  define_callbacks :approve, :store, :stored, :extend, :subsequent
+
   before_validation :approve
   around_save :store
   after_save :extend
-  
+
+
   TRACKED_FIELDS = %w(name type_id db_content trash)
 
   ActiveSupport.run_load_hooks(:card, self)
 end
 
+

data/lib/card/auth.rb

@@ -11,7 +11,7 @@ class Card
 
     class << self
 
-      # Authenticates a user by their login name and unencrypted password.  
+      # Authenticates a user by their login name and unencrypted password.
       def authenticate email, password
         accounted = Auth[ email ]
         if accounted and account = accounted.account and account.active?
@@ -40,7 +40,7 @@ class Card
           ]).first
         end
       end
-        
+
       def signin signin_id
         self.current_id = signin_id
         session[:user] = signin_id if session
@@ -51,7 +51,7 @@ class Card
       end
 
       def set_current_from_session
-        self.current_id = 
+        self.current_id =
           if session
             if card_id=session[:user] and Card.exists? card_id
               card_id
@@ -135,12 +135,12 @@ class Card
           @@simulating_setup_need or Card.cache.write( NEED_SETUP_KEY, (account_count < 3) ) # 3, because
         end
       end
-    
+
       def simulate_setup_need! mode=true
         @@simulating_setup_need = mode
         Card.cache.write NEED_SETUP_KEY, nil
       end
-    
+
 
       def always_ok?
         #warn Rails.logger.warn("aok? #{as_id}, #{as_id&&Card[as_id].id}")
@@ -171,7 +171,7 @@ class Card
       end
 
       private
-  
+
       def account_count
         as_bot { Card.count_by_wql :right=>Card[:account].name }
       end

data/lib/card/cache.rb

@@ -73,6 +73,21 @@ class Card
         end
       end
 
+      def obj_to_key obj
+        case obj
+        when Hash
+          obj.sort.map do |key, value|
+            "#{key}=>(#{obj_to_key(value)})"
+          end.join ","
+        when Array
+          obj.map do |value|
+            obj_to_key(value)
+          end.join ","
+        else
+          obj.to_s
+        end
+      end
+
       private
 
       def prepopulate
@@ -103,7 +118,7 @@ class Card
       self.system_prefix = opts[:prefix] || self.class.system_prefix(opts[:class])
       cache_by_class[klass] = self
     end
-    
+
 
     def system_prefix= system_prefix
       @system_prefix = system_prefix
@@ -125,11 +140,11 @@ class Card
         write_local key, @store.read(@prefix + key)
       end
     end
-    
+
     def read_local key
       @local[key]
     end
-    
+
     def write_variable key, variable, value
       key = @prefix + key
       if @store and object = @store.read(key)
@@ -157,7 +172,7 @@ class Card
         end
       end
     end
-    
+
     def fetch_local key
       read_local key or write_local key, yield
     end
@@ -190,10 +205,14 @@ class Card
       end
       @prefix = @system_prefix + @cache_id + "/"
     end
-    
+
     def reset_local
       @local = {}
     end
+
+    def exist? key
+      @local.has_key?(key) || @store.exist?(key)
+    end
   end
 end
 

data/lib/card/env.rb

@@ -5,40 +5,40 @@ class Card
     class << self
       def reset args={}
         @@env = { :main_name => nil }
-        
+
         if c = args[:controller]
           self[:controller] = c
           self[:session]    = c.request.session
-          self[:params]     = c.request.params
+          self[:params]     = c.params
           self[:ip]         = c.request.remote_ip
           self[:ajax]       = c.request.xhr? || c.request.params[:simulate_xhr]
           self[:host]       = Card.config.override_host     || c.request.env['HTTP_HOST']
           self[:protocol]   = Card.config.override_protocol || c.request.protocol
-        
+
         end
       end
-    
+
       def [] key
         @@env[key.to_sym]
       end
-    
+
       def []= key, value
         @@env[key.to_sym] = value
       end
-      
+
 
       def params
         self[:params] ||= {}
       end
-      
+
       def session
         self[:session] ||= {}
       end
-    
+
       def ajax?
         self[:ajax]
       end
-    
+
       def method_missing method_id, *args
         case args.length
         when 0 ; self[ method_id ]
@@ -47,6 +47,6 @@ class Card
         end
       end
     end
-  end  
+  end
   Env.reset
 end

data/lib/card/format.rb

@@ -146,6 +146,14 @@ class Card
       end
     end
 
+    def with_name_context name
+       old_context = @context_names
+       add_name_context name
+       result = yield
+       @context_names = old_context
+       result
+     end
+
     def main?
       @depth == 0
     end
@@ -197,7 +205,9 @@ class Card
         args = default_render_args view, args
         with_inclusion_mode view do
           Card.with_logging :view, :message=>view, :context=>card.name, :details=>args do
-            send "_view_#{ view }", args
+            Card::ViewCache.fetch(self, view, args) do
+              send "_view_#{ view }", args
+            end
           end
         end
       end
@@ -267,7 +277,11 @@ class Card
         Rails.logger.info "\nError rendering #{error_cardname} / #{view}: #{e.class} : #{e.message}"
         Card::Error.current = e
         card.notable_exception_raised
-        rendering_error e, view
+        if (debug = Card[:debugger]) && debug.content == 'on'
+          raise e
+        else
+          rendering_error e, view
+        end
       end
     end
 
@@ -387,15 +401,17 @@ class Card
 
     def prepare_nest opts
       @char_count ||= 0
-
       opts ||= {}
+
       case
-      when opts.has_key?( :comment )                            ; opts[:comment]   # as in commented code
-      when @mode == :closed && @char_count > Card.config.max_char_count   ; ''     # already out of view
-      when opts[:inc_name]=='_main' && !Env.ajax? && @depth==0  ; expand_main opts
-      else
-        nested_card = Card.fetch opts[:inc_name], :new=>new_inclusion_card_args(opts)
-        result = nest nested_card, opts
+      when opts.has_key?(:comment)                                       # commented nest
+        opts[:comment]
+      when @mode == :closed && @char_count > Card.config.max_char_count  # move on; content out of view
+        ''
+      when opts[:inc_name] == '_main' && show_layout? && @depth==0       # the main card within a layout
+        expand_main opts
+      else                                                               # standard nest
+        result = nest fetch_nested_card(opts), opts
         @char_count += result.length if @mode == :closed && result
         result
       end
@@ -462,7 +478,8 @@ class Card
       else
         view
       end
-      sub.render view, opts
+
+      sub.optional_render view, opts
       #end
     end
 
@@ -477,7 +494,7 @@ class Card
                                    # probably for blanks?  -- older/wiser efm
     end
 
-    def new_inclusion_card_args options
+    def fetch_nested_card options
       args = { :name=>options[:inc_name], :type=>options[:type], :supercard=>card }
       args.delete(:supercard) if options[:inc_name].strip.blank? # special case.  gets absolutized incorrectly. fix in smartname?
       if options[:inc_name] =~ /^_main\+/
@@ -488,7 +505,7 @@ class Card
       if content=get_inclusion_content(options[:inc_name])
         args[:content]=content
       end
-      args
+      Card.fetch options[:inc_name], :new=>args
     end
 
     def default_item_view

data/lib/card/log.rb

@@ -38,8 +38,7 @@ class Card::Log
 
 
   class Performance
-    # To enable logging add a performance_logger hash to your configuration and change the log_level to :wagn
-    # config options
+    # To enable logging add a performance_logger hash to your configuration
     #
     # Example:
     # config.performance_logger = {
@@ -47,6 +46,7 @@ class Card::Log
     #     :max_depth => 3,                               # show nested method calls only up to depth 3
     #     :details=> true,                                # show method arguments and sql
     #     :methods => [:event, :search, :fetch, :view],  # choose methods to log
+    #     :log_level => :info
     # }
     #
     # If you give :methods a hash you can log arbitrary methods. The syntax is as follows:
@@ -71,6 +71,7 @@ class Card::Log
 
     DEFAULT_CLASS           = Card
     DEFAULT_METHOD_TYPE     = :all
+    DEFAULT_LOG_LEVEL       = :info
     DEFAULT_METHOD_OPTIONS  = {
                                 :title   => :method_name,
                                 :message => 1,
@@ -111,6 +112,7 @@ class Card::Log
         @details   = args[:details]   || false
         @max_depth = args[:max_depth] || false
         @min_time  = args[:min_time]  || false
+        @log_level = args[:log_level] || DEFAULT_LOG_LEVEL
         @output    = args[:output]    || :text
         @enabled_methods = ::Set.new
         prepare_methods_for_logging args[:methods] if args[:methods]
@@ -194,7 +196,7 @@ class Card::Log
 
       def text_log
         @@log.each do |entry|
-          Rails.logger.wagn entry.to_s! if entry.valid
+          Rails.logger.send @log_level, entry.to_s! if entry.valid
         end
       end
 

data/lib/card/migration.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
- 
+
 class Card::Migration < ActiveRecord::Migration
   @type = :deck_cards
 
@@ -42,8 +42,10 @@ class Card::Migration < ActiveRecord::Migration
       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 assume_migrated_upto_version
@@ -51,12 +53,12 @@ class Card::Migration < ActiveRecord::Migration
         ActiveRecord::Schema.assume_migrated_upto_version schema, migration_paths
       end
     end
-    
+
     def data_path filename=nil
       path = migration_paths.first
       File.join( [ migration_paths.first, 'data', filename ].compact )
     end
-    
+
   end
 
   def contentedly &block
@@ -79,7 +81,7 @@ class Card::Migration < ActiveRecord::Migration
     merge_opts.reverse_merge! :output_file=>File.join(data_path,"unmerged_#{ filename }")
     Card.merge_list read_json(filename), merge_opts
   end
-  
+
   def read_json filename
     raw_json = File.read( data_path filename )
     json = JSON.parse raw_json
@@ -98,50 +100,24 @@ class Card::Migration < ActiveRecord::Migration
     Cardio.paths self.class.type
   end
 
-
   # Execute this migration in the named direction
   # copied from ActiveRecord to wrap "up" in "contentendly"
-  def migrate(direction)
-    return unless respond_to?(direction)
-
-    case direction
-    when :up   then announce "migrating"
-    when :down then announce "reverting"
-    end
-
-    time   = nil
-    ActiveRecord::Base.connection_pool.with_connection do |conn|
-      @connection = conn
-      if respond_to?(:change)
-        if direction == :down
-          recorder = CommandRecorder.new(@connection)
-          suppress_messages do
-            @connection = recorder
-            change
-          end
-          @connection = conn
-          time = Benchmark.measure {
-            self.revert {
-              recorder.inverse.each do |cmd, args|
-                send(cmd, *args)
-              end
-            }
-          }
-        else
-          time = Benchmark.measure { change }
-        end
+  def exec_migration(conn, direction)
+    @connection = conn
+    if respond_to?(:change)
+      if direction == :down
+        revert { change }
       else
-        time = Benchmark.measure { contentedly { send(direction) } }
+        change
       end
-      @connection = nil
-    end
-
-    case direction
-    when :up   then announce "migrated (%.4fs)" % time.real; write
-    when :down then announce "reverted (%.4fs)" % time.real; write
+    else
+      contentedly { send(direction) }
     end
+  ensure
+    @connection = nil
   end
 
+
   def down
     raise ActiveRecord::IrreversibleMigration
   end