radiant-archive-extension 1.0.3 → 1.0.4

data/.gitignore

@@ -0,0 +1,2 @@
+tmp/*
+*.gem

data/app/models/archive_menu_renderer.rb

@@ -0,0 +1,23 @@
+module ArchiveMenuRenderer
+  def excluded_class_names
+    Array(ArchiveMenuRenderer.instance_variable_get(:@excluded_class_names))
+  end
+end
+
+module ArchiveDayIndexMenuRenderer
+  def add_child_disabled?
+    true
+  end
+end
+
+module ArchiveMonthIndexMenuRenderer
+  def add_child_disabled?
+    true
+  end
+end
+
+module ArchiveYearIndexMenuRenderer
+  def add_child_disabled?
+    true
+  end
+end

data/app/models/archive_page.rb

@@ -1,17 +1,17 @@
 class ArchivePage < Page
-  cattr_accessor :allowed_children
   cattr_accessor :single_use_children
   @@single_use_children = [ArchiveDayIndexPage, ArchiveMonthIndexPage, ArchiveYearIndexPage, FileNotFoundPage]
-  @@allowed_children = [self.default_child, *@@single_use_children]
   
-  def allowed_children
-    overlap = @@allowed_children & (existing_child_types - [default_child])
+  def set_allowed_children_cache
+    singles = self.class.single_use_children.map(&:name)
+    existing = existing_child_types.map(&:name)
+    all = allowed_children_lookup.map(&:name)
     
-    (@@allowed_children - overlap)
+    self.allowed_children_cache = (all - (singles & existing)).join(',')
   end
   
   def existing_child_types
-    children(:select => 'DISTINCT class_name, title, virtual', :order => nil).collect{|p| p.class }.uniq
+    children(:select => 'DISTINCT class_name, title, virtual', :order => nil).map(&:class_name).compact.map(&:constantize).uniq
   end
 
   description %{

data/archive_extension.rb

@@ -9,11 +9,10 @@ class ArchiveExtension < Radiant::Extension
   def activate
     # allow bootstrap
     if Page.table_exists?
+      ArchiveMenuRenderer # Initialize the class because it is lazily loaded
+      MenuRenderer.exclude 'ArchiveDayIndexPage', 'ArchiveMonthIndexPage', 'ArchiveYearIndexPage'
       Page.class_eval do
-        def allowed_children_with_archive
-          allowed_children_without_archive.reject { |p| p.name =~ /Archive(Day|Month|Year)IndexPage/ }
-        end
-        alias_method_chain :allowed_children, :archive
+        include PageChildrenCacheUpdates
       end
     end
   end

data/lib/page_children_cache_updates.rb

@@ -0,0 +1,41 @@
+module PageChildrenCacheUpdates
+  def self.included(base)
+    base.class_eval do
+      after_create :remove_from_parent_allowed_children_cache
+      after_destroy :add_to_parent_allowed_children_cache
+    end
+  end
+
+  private
+
+  def remove_from_parent_allowed_children_cache
+    if parent_allows_this_child_class? && class_is_single_use_for_parent?
+      parent.allowed_children_cache = parent_allowed_class_names.delete_if{|child| child == page_class_name }.join(',')
+      parent.save
+    end
+  end
+
+  def add_to_parent_allowed_children_cache
+    if class_is_single_use_for_parent? && !parent_allows_this_child_class?
+      parent.allowed_children_cache = (parent_allowed_class_names + [page_class_name]).uniq.join(',')
+      parent.save
+      true
+    end
+  end
+
+  def parent_allows_this_child_class?
+    parent? && parent.allowed_children_cache.to_s.split(',').include?(page_class_name)
+  end
+
+  def class_is_single_use_for_parent?
+    parent? && parent.class.respond_to?(:single_use_children) && parent.class.single_use_children.map(&:name).include?(page_class_name)
+  end
+
+  def parent_allowed_class_names
+    parent.allowed_children_cache.to_s.split(',')
+  end
+
+  def page_class_name
+    self.class_name.present? ? self.class_name : 'Page'
+  end
+end

data/lib/radiant-archive-extension/version.rb

@@ -1,3 +1,3 @@
 module RadiantArchiveExtension
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

data/radiant-archive-extension.gemspec

@@ -12,14 +12,19 @@ Gem::Specification.new do |s|
   s.summary     = %q{Archive for Radiant CMS}
   s.description = %q{Provides page types for news or blog archives.}
   
-  ignores = if File.exist?('.gitignore')
-    File.read('.gitignore').split("\n").inject([]) {|a,p| a + Dir[p] }
-  else
-    []
-  end
-  s.files         = Dir['**/*'] - ignores
-  s.test_files    = Dir['test/**/*','spec/**/*','features/**/*'] - ignores
-  # s.executables   = Dir['bin/*'] - ignores
+  ignoreable_commands = File.read('.gitignore').split("\n").delete_if{|line| line.match(/^##/) || line.empty? }
+  ignoreable_files = ignoreable_commands.collect{|line| 
+    if File.directory?(line)
+      line + "/**/*"
+    elsif File.file?(line)
+      line
+    end
+  }.compact
+  
+  s.files = Dir['**/*','.gitignore'] - Dir[*ignoreable_files]
+
+  s.test_files    = Dir['test/**/*','spec/**/*','features/**/*'] - Dir[*ignoreable_files]
+  
   s.require_paths = ["lib"]
   
 end

data/spec/models/archive_menu_renderer_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe ArchiveMenuRenderer do
+  context 'excluding classes from child list' do
+    it 'should be retrievable by the extended object' do
+      ArchiveMenuRenderer.instance_variable_set(:@excluded_class_names, ['SkippedPage'])
+      page = Object.new
+      page.extend ArchiveMenuRenderer
+      page.excluded_class_names.should include('SkippedPage')
+    end
+  end
+end
+
+describe ArchiveDayIndexMenuRenderer do
+  subject{
+    page = Object.new
+    page.extend ArchiveDayIndexMenuRenderer
+    page
+  }
+  its(:add_child_disabled?){ should be_true }
+end
+
+describe ArchiveMonthIndexMenuRenderer do
+  subject{
+    page = Object.new
+    page.extend ArchiveMonthIndexMenuRenderer
+    page
+  }
+  its(:add_child_disabled?){ should be_true }
+end
+
+describe ArchiveYearIndexMenuRenderer do
+  subject{
+    page = Object.new
+    page.extend ArchiveYearIndexMenuRenderer
+    page
+  }
+  its(:add_child_disabled?){ should be_true }
+end

data/spec/models/archive_page_spec.rb

@@ -34,23 +34,11 @@ describe ArchivePage do
   end
   
   its(:single_use_children){ should == [ArchiveDayIndexPage, ArchiveMonthIndexPage, ArchiveYearIndexPage, FileNotFoundPage]}
-  its(:allowed_children){ should == [Page, *ArchivePage.single_use_children]}
   
   describe '#existing_child_types' do
     it 'should return a unique array of classes of the page children' do
-      archive.existing_child_types.should == archive.children.all(:select => 'DISTINCT class_name, title, virtual').collect{|p| p.class }.uniq
+      archive.existing_child_types.should == archive.children(:select => 'DISTINCT class_name, title, virtual', :order => nil).map(&:class_name).compact.map(&:constantize).uniq
     end
   end
   
-  describe '#allowed_children' do
-    context 'when no children exist' do
-      subject{ ArchivePage.new }
-      its(:allowed_children){ should == ArchivePage.allowed_children }
-    end
-    it 'should remove any existing single_use_children from the allowed_children' do
-      existing_except_default = archive.existing_child_types - [archive.default_child]
-      used_allowed_children = ArchivePage.allowed_children & existing_except_default
-      archive.allowed_children.should == (ArchivePage.allowed_children - used_allowed_children)
-    end
-  end
 end

data/spec/models/page_spec.rb

@@ -1,6 +1,27 @@
 require File.expand_path("../../spec_helper", __FILE__)
 
 describe Page do
-  its(:default_child){ should == Page}
-  its(:allowed_children){ should == [Page, *Page.descendants.sort_by(&:name)].select(&:in_menu?).reject{|p| p.name =~ /Archive(Day|Month|Year)IndexPage/}}
+  context 'when the parent page has single_use_children' do
+    it 'should remove its class from the parent page allowed_children_cache after create' do
+      ArchivePage.stub!(:single_use_children).and_return([ArchiveDayIndexPage])
+      parent = ArchivePage.create!(:slug => 'archive', :title => 'archive',
+                          :breadcrumb => 'archive',
+                          :allowed_children_cache => 'Page,ArchiveDayIndexPage')
+      page = ArchiveDayIndexPage.new(:slug => 'day', :title => 'day', :breadcrumb => 'day')
+      page.parent = parent
+      page.save!
+      parent.allowed_children_cache.should_not include('ArchiveDayIndexPage')
+    end
+    it 'should add its class to the parent page allowed_children_cache after destroy' do
+      ArchivePage.stub!(:single_use_children).and_return([ArchiveDayIndexPage])
+      parent = ArchivePage.create!(:slug => 'archive', :title => 'archive',
+                          :breadcrumb => 'archive',
+                          :allowed_children_cache => 'Page,ArchiveDayIndexPage')
+      page = ArchiveDayIndexPage.new(:slug => 'day', :title => 'day', :breadcrumb => 'day')
+      page.parent = parent
+      page.save!
+      page.destroy
+      parent.allowed_children_cache.should include('ArchiveDayIndexPage')
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-archive-extension
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - Radiant CMS Dev Team
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-30 00:00:00 -05:00
-default_executable: 
+date: 2011-11-05 00:00:00 Z
 dependencies: []
 
 description: Provides page types for news or blog archives.
@@ -31,6 +30,7 @@ extra_rdoc_files: []
 files: 
 - app/models/archive_day_index_page.rb
 - app/models/archive_finder.rb
+- app/models/archive_menu_renderer.rb
 - app/models/archive_month_index_page.rb
 - app/models/archive_page.rb
 - app/models/archive_year_index_page.rb
@@ -46,22 +46,24 @@ files:
 - features/support/matchers.rb
 - features/support/paths.rb
 - lib/archive_index_tags_and_methods.rb
+- lib/page_children_cache_updates.rb
 - lib/radiant-archive-extension/version.rb
 - lib/radiant-archive-extension.rb
 - lib/tasks/archive_extension_tasks.rake
-- radiant-archive-extension-1.0.3.gem
+- radiant-archive-extension-1.0.4.gem
 - radiant-archive-extension.gemspec
 - Rakefile
 - README
 - spec/datasets/archive_dataset.rb
 - spec/models/archive_day_index_page_spec.rb
+- spec/models/archive_menu_renderer_spec.rb
 - spec/models/archive_month_index_page_spec.rb
 - spec/models/archive_page_spec.rb
 - spec/models/archive_year_index_page_spec.rb
 - spec/models/page_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: true
+- .gitignore
 homepage: http://radiantcms.org
 licenses: []
 
@@ -91,13 +93,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.9.3
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Archive for Radiant CMS
 test_files: 
 - spec/datasets/archive_dataset.rb
 - spec/models/archive_day_index_page_spec.rb
+- spec/models/archive_menu_renderer_spec.rb
 - spec/models/archive_month_index_page_spec.rb
 - spec/models/archive_page_spec.rb
 - spec/models/archive_year_index_page_spec.rb