card 1.16.4 → 1.16.5

data/db/version_core_cards.txt

@@ -1 +1 @@
-20150903130006
+20150910085603

data/lib/card.rb

@@ -26,13 +26,13 @@ class Card < ActiveRecord::Base
   require_dependency 'card/format'
   require_dependency 'card/exceptions'
   require_dependency 'card/auth'
-  require_dependency 'card/log'
   require_dependency 'card/loader'
   require_dependency 'card/content'
   require_dependency 'card/action'
   require_dependency 'card/act'
   require_dependency 'card/change'
   require_dependency 'card/reference'
+  require_dependency 'card/view_cache'
 
   has_many :references_from, :class_name => :Reference, :foreign_key => :referee_id
   has_many :references_to,   :class_name => :Reference, :foreign_key => :referer_id
@@ -54,7 +54,7 @@ class Card < ActiveRecord::Base
   attr_accessor :follower_stash
 
 
-  define_callbacks :prepare, :approve, :store, :stored, :extend, :subsequent, :select_action
+  define_callbacks :prepare, :approve, :store, :stored, :extend, :subsequent, :select_action, :show, :handle
 
   before_validation :prepare
   before_validation :approve
@@ -65,6 +65,7 @@ class Card < ActiveRecord::Base
   extend CarrierWave::Mount
   ActiveSupport.run_load_hooks(:card, self)
 
+
 end
 
 

data/lib/card/env.rb

@@ -1,4 +1,7 @@
+
+
 class Card
+  require 'card/location'
 
   # Card::Env can differ for each request; Card.config should not
   module Env
@@ -12,6 +15,7 @@ class Card
           self[:params]     = c.params
           self[:ip]         = c.request.remote_ip
           self[:ajax]       = c.request.xhr? || c.request.params[:simulate_xhr]
+          self[:html]       = [nil, 'html'].member?(c.params[:format])
           self[:host]       = Card.config.override_host     || c.request.env['HTTP_HOST']
           self[:protocol]   = Card.config.override_protocol || c.request.protocol
         end
@@ -34,11 +38,19 @@ class Card
         self[:session] ||= {}
       end
 
+      def success cardname=nil
+        self[:success] ||= Card::Success.new(cardname, params[:success])
+      end
+
 
       def ajax?
         self[:ajax]
       end
 
+      def html?
+        !self[:controller] || self[:html]
+      end
+
       def method_missing method_id, *args
         case args.length
         when 0 ; self[ method_id ]
@@ -47,6 +59,60 @@ class Card
         end
       end
     end
+
+    # session history helpers: we keep a history stack so that in the case of
+    # card removal we can crawl back up to the last un-removed location
+    module LocationHistory
+      #include Card::Location
+
+      def location_history
+        #warn "sess #{session.class}, #{session.object_id}"
+        session[:history] ||= [Card::Location.card_path('')]
+        if session[:history]
+          session[:history].shift if session[:history].size > 5
+          session[:history]
+        end
+      end
+
+      def save_location card
+        return if Env.ajax? || !Env.html? || !card.known? || (card.codename == 'signin')
+        discard_locations_for card
+        session[:previous_location] = Card::Location.card_path card.cardname.url_key
+        location_history.push previous_location
+      end
+
+      def previous_location
+        session[:previous_location] ||= location_history.last if location_history
+      end
+
+      def discard_locations_for(card)
+        # quoting necessary because cards have things like "+*" in the names..
+        session[:history] = location_history.reject do |loc|
+          if url_key = url_key_for_location(loc)
+            url_key.to_name.key == card.key
+          end
+        end.compact
+        session[:previous_location] = nil
+      end
+
+      def save_interrupted_action uri
+        session[:interrupted_action] = uri
+      end
+
+      def interrupted_action
+        session.delete :interrupted_action
+      end
+
+      def url_key_for_location(location)
+        location.match( /\/([^\/]*$)/ ) ? $1 : nil
+      end
+    end
+
+    extend LocationHistory
+
   end
+
+
+
   Env.reset
 end

data/lib/card/format.rb

@@ -2,6 +2,7 @@
 
 class Card
   class Format
+    include Card::Location
 
     DEPRECATED_VIEWS = { :view=>:open, :card=>:open, :line=>:closed, :bare=>:core, :naked=>:core }
     INCLUSION_MODES  = { :closed=>:closed, :closed_content=>:closed, :edit=>:edit,
@@ -202,10 +203,8 @@ class Card
         @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
-            Card::ViewCache.fetch(self, view, args) do
-              send "_view_#{ view }", args
-            end
+          Card::ViewCache.fetch(self, view, args) do
+            send "_view_#{ view }", args
           end
         end
       end
@@ -519,40 +518,6 @@ class Card
       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)
-      # card_path    makes a relative path site-absolute (if not already)
-      # card_url     makes it a full url (if not already)
-
-      # TESTME
-      def page_path title, opts={}
-        Rails.logger.warn "Pass only Card::Name to page_path #{title.class}, #{title}" unless Card::Name===title
-        format = opts[:format] ? ".#{opts.delete(:format)}"  : ''
-        action = opts[:action] ? "#{opts.delete(:action)}/" : ''
-        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 =~ /^\//
-          rel_path
-        else
-          "#{ Wagn.config.relative_url_root }/#{ rel_path }"
-        end
-      end
-
-      def card_url rel
-        if rel =~ /^https?\:/
-          rel
-        else
-          "#{ 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)}"

data/lib/card/loader.rb

@@ -21,10 +21,6 @@ class Card
         load_set_patterns
         load_formats
         load_sets
-
-        if Wagn.config.performance_logger
-          Card::Log::Performance.load_config Wagn.config.performance_logger
-        end
       end
 
       def load_chunks

data/lib/card/location.rb

@@ -0,0 +1,38 @@
+class Card
+
+  module Location
+    #
+    # page_path    takes a Card::Name, adds the format and query string to url_key (site-absolute)
+    # card_path    makes a relative path site-absolute (if not already)
+    # card_url     makes it a full url (if not already)
+
+    # TESTME
+    def page_path title, opts={}
+      Rails.logger.warn "Pass only Card::Name to page_path #{title.class}, #{title}" unless Card::Name===title
+      format = opts[:format] ? ".#{opts.delete(:format)}"  : ''
+      action = opts[:action] ? "#{opts.delete(:action)}/" : ''
+      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 =~ /^\//
+        rel_path
+      else
+        "#{ Card.config.relative_url_root }/#{ rel_path }"
+      end
+    end
+
+    def card_url rel
+      if rel =~ /^https?\:/
+        rel
+      else
+        "#{ Card::Env[:protocol] }#{ Card::Env[:host] }#{ card_path rel }"
+      end
+    end
+
+    extend Location
+  end
+
+end

data/lib/card/set.rb

@@ -182,9 +182,7 @@ class Card
       class_eval do
         define_method event do
           run_callbacks event do
-            Card.with_logging :event, :message=>event, :context=>self.name, :details=>opts do
-              send call_method
-            end
+            send call_method
           end
         end
       end

data/lib/card/success.rb

@@ -1,7 +1,6 @@
 class Card
   class Success
-    include Card::Format::Location
-    include Card::HtmlFormat::Location
+    include Card::Location
 
     attr_accessor :params, :redirect, :id, :name, :card, :name_context
 
@@ -87,7 +86,7 @@ class Card
     end
 
     def target name_context=@name_context
-      card(name_context) || ( @target == :previous ? previous_location : @target ) || Card.fetch(name_context)
+      card(name_context) || ( @target == :previous ? Card::Env.previous_location : @target ) || Card.fetch(name_context)
     end
 
     def []= key, value

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

@@ -60,56 +60,8 @@ class Card
       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
-    # card removal we can crawl back up to the last un-removed location
-
-    module Location
-      def location_history
-        #warn "sess #{session.class}, #{session.object_id}"
-        session[:history] ||= [card_path('')]
-        if session[:history]
-          session[:history].shift if session[:history].size > 5
-          session[:history]
-        end
-      end
-
-      def save_location
-        return if ajax? || !html? || !@card.known? || (@card.codename == 'signin')
-        discard_locations_for @card
-        @previous_location = card_path @card.cardname.url_key
-        location_history.push @previous_location
-      end
 
-      def previous_location
-        @previous_location ||= location_history.last if location_history
-      end
-
-      def discard_locations_for(card)
-        # quoting necessary because cards have things like "+*" in the names..
-        session[:history] = location_history.reject do |loc|
-          if url_key = url_key_for_location(loc)
-            url_key.to_name.key == card.key
-          end
-        end.compact
-        @previous_location = nil
-      end
 
-      def save_interrupted_action uri
-        uri = path(uri) if Hash === uri
-        session[:interrupted_action] = uri
-      end
-
-      def interrupted_action
-        session.delete :interrupted_action
-      end
-
-      def url_key_for_location(location)
-        location.match( /\/([^\/]*$)/ ) ? $1 : nil
-      end
-    end
-    include Location
 
 
     def main?

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

@@ -1,14 +1,16 @@
 
 module ClassMethods
-  def search spec
+  def search spec, &block
     query = ::Card::Query.new(spec)
-    Card.with_logging :search, :message=>spec, :details=>query.sql.strip do
-      results = query.run
-      if block_given? and Array===results
-        results.each { |result| yield result }
-      end
-      results
+    execute_query query, &block
+  end
+
+  def execute_query query
+    results = query.run
+    if block_given? and Array===results
+      results.each { |result| yield result }
     end
+    results
   end
 
   def count_by_wql(spec)

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

@@ -48,3 +48,8 @@ def include_set_modules
   end
   self
 end
+
+
+event :initialize_success_object, :before=>:handle do
+  Env[:success] = Success.new(cardname, Env.params[:success])
+end

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

@@ -0,0 +1,10 @@
+event :discard_deleted_locations, :after=>:store, :on=>:delete do
+  Env.discard_locations_for self
+  if success.target == self
+    success.target = :previous
+  end
+end
+
+event :save_current_location, :before=>:show, :on=>:read do
+  Env.save_location self
+end

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

@@ -91,6 +91,7 @@ end
 
 
 def extend
+
   run_callbacks :extend
   run_callbacks :subsequent
 rescue =>e
@@ -186,6 +187,6 @@ event :store_subcards, :after=>:store do
 end
 
 def success
-  Env[:success] ||= Card::Success.new(cardname)
+  Env.success(cardname)
 end
 

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

@@ -1,7 +1,5 @@
 
 
-
-
 RuleSQL = %{
   select rules.id as rule_id, settings.id as setting_id, sets.id as set_id, sets.left_id as anchor_id, sets.right_id as set_tag_id
   from cards rules

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

@@ -25,12 +25,12 @@ event :validate_delete, :before=>:approve, :on=>:delete do
   if !codename.blank?
     errors.add :delete, "#{name} is is a system card. (#{codename})"
   end
-  
+
   undeletable_all_rules_tags = %w{ default style layout create read update delete }
   if junction? and l=left and l.codename == 'all' and undeletable_all_rules_tags.member? right.codename
     errors.add :delete, "#{name} is an indestructible rule"
   end
-  
+
   if account && Card::Act.find_by_actor_id( self.id )
     errors.add :delete, "Edits have been made with #{name}'s user account.\nDeleting this card would mess up our history."
   end
@@ -48,3 +48,4 @@ event :validate_delete_children, :after=>:approve, :on=>:delete do
     end
   end
 end
+

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

@@ -7,6 +7,7 @@ module ClassMethods
     Card::Action.delete_cardless
     Card::Reference.repair_missing_referees
     Card::Reference.delete_missing_referers
+    Card.delete_tmp_files_of_cached_uploads
   end
 
   def delete_trashed_files #deletes any file not associated with a real card.
@@ -22,6 +23,17 @@ module ClassMethods
     end
   end
 
+  def delete_tmp_files_of_cached_uploads
+    actions = Card::Action.find_by_sql "SELECT * FROM card_actions
+      INNER JOIN cards ON card_actions.card_id = cards.id
+      WHERE cards.type_id IN (#{Card::FileID}, #{Card::ImageID}) AND card_actions.draft = true"
+    actions.each do |action|
+      if older_than_five_days? action.created_at && card = action.card # we don't want to delete uploads in progress
+        card.delete_files_for_action action
+      end
+    end
+  end
+
   def merge_list attribs, opts={}
     unmerged = []
     attribs.each do |row|