4 files changed, 93 insertions, 9 deletions

diff --git a/lib/authentication.rb b/lib/authentication.rb
index a936589..4d8a5ae 100644
--- a/lib/authentication.rb
+++ b/lib/authentication.rb
@@ -31,7 +31,7 @@ module Authentication
     end
 
     def make_token
-      secure_digest(Time.now, (1..10).map{ rand.to_s })
+      SecureRandom.hex(20)
     end
   end # class methods
 
@@ -46,7 +46,6 @@ module Authentication
         include ModelInstanceMethods
         
         # Virtual attribute for the unencrypted password
-        attr_accessor :password
         validates_presence_of     :password,                   :if => :password_required?
         validates_presence_of     :password_confirmation,      :if => :password_required?
         validates_confirmation_of :password,                   :if => :password_required?
@@ -85,19 +84,22 @@ module Authentication
         self.class.password_digest(password, salt)
       end
       
-      def authenticated?(password)
+      def authenticate_legacy(password)
         crypted_password == encrypt(password)
       end
-      
+
       # before filter 
       def encrypt_password
         return if password.blank?
-        self.salt = self.class.make_token if new_record?
+        return if password_digest.present?
+
+        self.salt ||= self.class.make_token
         self.crypted_password = encrypt(password)
       end
+
       def password_required?
-        crypted_password.blank? || !password.blank?
+        (crypted_password.blank? && password_digest.blank?) || !password.blank?
       end
     end # instance methods
   end
-end
\ No newline at end of file
+end
diff --git a/lib/ccc_conventions.rb b/lib/ccc_conventions.rb
index 352dd3c..7ff5a3a 100644
--- a/lib/ccc_conventions.rb
+++ b/lib/ccc_conventions.rb
@@ -1,6 +1,7 @@
 module CccConventions
-  ERFA_PARENT_NAME       = "club/erfas"
-  CHAOSTREFF_PARENT_NAME = "club/chaostreffs"
+  TRASH_SLUG              = "trash"
+  ERFA_PARENT_NAME        = "club/erfas"
+  CHAOSTREFF_PARENT_NAME  = "club/chaostreffs"
   SITEMAP_COLLAPSED_PATHS = %w[updates club/erfas club/chaostreffs disclosure].freeze
 
   NODE_KINDS = {
diff --git a/lib/tasks/assets.rake b/lib/tasks/assets.rake
index 563dfad..9d4b048 100644
--- a/lib/tasks/assets.rake
+++ b/lib/tasks/assets.rake
@@ -16,4 +16,24 @@ namespace :assets do
       puts "Regenerated variants for Asset##{asset.id} (#{asset.name})"
     end
   end
+
+desc "One-shot: flag each live page's current first-by-position image as its headline"
+  task backfill_headline: :environment do
+    count = 0
+    page_ids = (Node.where.not(head_id: nil).pluck(:head_id) +
+                Node.where.not(draft_id: nil).pluck(:draft_id)).uniq
+
+    Page.where(id: page_ids).find_each do |page|
+      next if page.related_assets.where(headline: true).exists?
+
+      first_image = page.related_assets.joins(:asset).merge(Asset.images).order(:position).first
+      next unless first_image
+
+      first_image.update!(headline: true)
+      count += 1
+    end
+
+    puts "Flagged #{count} pages' current first image as headline."
+  end
+
 end
diff --git a/lib/tasks/node_actions.rake b/lib/tasks/node_actions.rake
new file mode 100644
index 0000000..fdd286c
--- /dev/null
+++ b/lib/tasks/node_actions.rake
@@ -0,0 +1,61 @@
+namespace :node_actions do
+  desc "Rebuild inferred NodeAction entries from existing revisions and " \
+       "node timestamps. Witnessed entries (inferred_from IS NULL) are " \
+       "never touched; previously inferred ones are deleted and " \
+       "regenerated, so the task is idempotent. Scope with NODE_ID=n."
+  task :backfill => :environment do
+    scope = Node.where.not(:parent_id => nil)
+    scope = scope.where(:id => ENV["NODE_ID"]) if ENV["NODE_ID"]
+
+    created = 0
+
+    ActiveRecord::Base.transaction do
+      stale = NodeAction.where.not(:inferred_from => nil)
+      stale = stale.where(:node_id => ENV["NODE_ID"]) if ENV["NODE_ID"]
+      puts "Removing #{stale.count} previously inferred entries"
+      stale.delete_all
+
+      witnessed_creates  = NodeAction.where(:action => "create",  :inferred_from => nil).pluck(:node_id).to_set
+      witnessed_promotes = NodeAction.where(:action => "publish", :inferred_from => nil).pluck(:page_id).to_set
+
+      scope.find_each do |node|
+        # Every page row except the current draft was once promoted to
+        # head. Autosaves never carry node_id, so they cannot appear.
+        revisions  = node.pages.to_a.reject { |page| page.id == node.draft_id }
+        first_page = node.pages.first
+
+        unless witnessed_creates.include?(node.id)
+          NodeAction.record!(
+            :node => node, :page => first_page, :user => first_page&.editor,
+            :action        => "create",
+            :occurred_at   => node.created_at,
+            :inferred_from => "from_node_created_at",
+            :title => first_page&.translations&.find_by(:locale => I18n.default_locale)&.title,
+            :path  => node.unique_name,
+            :human_readable_node_name =>
+              first_page&.translations&.find_by(:locale => I18n.default_locale)&.title)
+          created += 1
+        end
+
+        previous = nil
+        revisions.each do |page|
+          unless witnessed_promotes.include?(page.id)
+            diff = NodeAction.head_diff(previous, page)
+            NodeAction.record!(
+              :node => node, :page => page, :user => page.editor,
+              :action        => "publish",
+              :occurred_at   => page.updated_at,
+              :inferred_from => "from_page_revision",
+              :via           => "draft",
+              :human_readable_node_name => diff[:title]["to"],
+              **diff)
+            created += 1
+          end
+          previous = page
+        end
+      end
+    end
+
+    puts "Created #{created} inferred entries"
+  end
+end