Bind aggregates over scoped tags to their subtree

CccConventions::TAG_SCOPES maps "update" and "pressemitteilung" to /updates
and "disclosure" to /disclosure. Page.aggregate applies the mapping, so an
aggregate over one of those tags is bounded by its subtree regardless of what
the shortcode says. Tags stay unrestricted; positions are publish-gated.

Both RSS actions call Page.aggregate rather than repeating its tag join.

Empty feeds no longer crash: Atom falls back to the current time for the
required <updated>, and the optional dc:date is omitted.

3 files changed, 47 insertions, 14 deletions

diff --git a/test/controllers/content_controller_test.rb b/test/controllers/content_controller_test.rb
index 5bb02f3d..39fe276b 100644
--- a/test/controllers/content_controller_test.rb
+++ b/test/controllers/content_controller_test.rb
@@ -239,17 +239,16 @@ class ContentControllerTest < ActionController::TestCase
     end
 
     def fill_pages_with_content
-      d1 = find_or_create_draft(@first_child, @user1)
-      d1.title = "one"
-      d1.tag_list = "update"
-      d1.save
-      @first_child.publish_draft!
+      updates = Node.root.children.find_by(:slug => "updates") ||
+                Node.root.children.create!(:slug => "updates")
 
-      d2 = find_or_create_draft(@second_child, @user1)
-      d2.title = "two"
-      d2.tag_list = "update"
-      d2.save
-      @second_child.publish_draft!
+      [["one", "aggregated_one"], ["two", "aggregated_two"]].each do |title, slug|
+        node  = updates.children.create!(:slug => slug)
+        draft = find_or_create_draft(node, @user1)
+        draft.title = title
+        draft.tag_list = "update"
+        draft.save
+        node.publish_draft!
+      end
     end
-
 end
diff --git a/test/controllers/rss_controller_test.rb b/test/controllers/rss_controller_test.rb
index 3f4b4fbf..cf50903a 100644
--- a/test/controllers/rss_controller_test.rb
+++ b/test/controllers/rss_controller_test.rb
@@ -5,7 +5,9 @@ class RssControllerTest < ActionController::TestCase
   def setup
     @user = User.create :login => 'rsstest', :email => 'rsstest@example.com',
                         :password => 'foobar', :password_confirmation => 'foobar'
-    @node = Node.root.children.create! :slug => 'rss_test_node'
+    updates = Node.root.children.find_by(:slug => "updates") ||
+              Node.root.children.create!(:slug => "updates")
+    @node = updates.children.create! :slug => 'rss_test_node'
     draft = find_or_create_draft(@node, @user)
     draft.title = "RSS Update Article"
     draft.tag_list = "update"
@@ -31,4 +33,20 @@ class RssControllerTest < ActionController::TestCase
     assert assigns(:items).length <= 20
   end
 
+  test "the update feed excludes a page tagged update outside /updates" do
+    updates = Node.root.children.find_by(:slug => "updates")
+    inside  = updates.children.create!(:slug => "feed-inside")
+    outside = Node.root.children.create!(:slug => "feed-outside")
+
+    [inside, outside].each do |node|
+      node.reload.draft.update!(:title => node.slug, :tag_list => "update")
+      node.publish_draft!
+    end
+
+    get :updates, params: { :format => :xml }
+
+    assert_response :success
+    assert_includes     @response.body, "feed-inside"
+    assert_not_includes @response.body, "feed-outside"
+  end
 end
diff --git a/test/models/page_test.rb b/test/models/page_test.rb
index 98a00d21..395b6315 100644
--- a/test/models/page_test.rb
+++ b/test/models/page_test.rb
@@ -9,8 +9,9 @@ class PageTest < ActiveSupport::TestCase
   
   def test_aggregation
     # Create two nodes and move them beneath the root node
-    n1 = Node.root.children.create! :slug => "one"
-    n2 = Node.root.children.create! :slug => "two"
+    updates = Node.root.children.create! :slug => "updates"
+    n1 = updates.children.create! :slug => "one"
+    n2 = updates.children.create! :slug => "two"
     
     # get the drafts and assign a user to it
     assert_not_nil d1 = find_or_create_draft(n1, @user1)
@@ -409,4 +410,19 @@ class PageTest < ActiveSupport::TestCase
     page.reload
     assert page.update(:abstract => "still saveable")
   end
+
+  test "an aggregate over a scoped tag ignores pages outside that subtree" do
+    updates = Node.root.children.create!(:slug => "updates")
+    inside  = updates.children.create!(:slug => "inside-post")
+    outside = Node.root.children.create!(:slug => "outside-post")
+
+    [inside, outside].each do |node|
+      node.reload.draft.update!(:title => node.slug, :tag_list => "update")
+      node.publish_draft!
+    end
+
+    names = Page.aggregate({ :tags => "update" }).map { |p| p.node.unique_name }
+    assert_includes     names, "updates/inside-post"
+    assert_not_includes names, "outside-post"
+  end
 end