amalgam 2.1.1 → 2.1.2

data/spec/rule_spec.rb

@@ -82,6 +82,9 @@ describe Amalgam::TemplateFinder::Rule do
 
     @page10 = TestPage.new(:slug => 'slug11')
     @page10_group1 = @page10.test_groups.new(:name => 'group10')
+
+    @page11 = @page6.children.new(:slug => 'slug12')
+    @page12 = @page6.children.new(:slug => 'slug13')
   end
 
   it "page with groups should has keys" do
@@ -123,6 +126,14 @@ describe Amalgam::TemplateFinder::Rule do
   it "在没有任何规则满足的情况下，使用根目录的show文件" do
     Amalgam::TemplateFinder::Rule.look_up([@page9]).should eq ["show"]
   end
+
+  it "在存在嵌套slug或者group的情况下，内部slug或者group设定的level模板优先级高于外部" do
+    Amalgam::TemplateFinder::Rule.look_up([@page9,@page11,@page6]).should eq ["slug7","slug12","&1"]
+  end
+
+  it "如果存在并列的父节点和子节点的level模板，优先使用子节点的模板" do
+    Amalgam::TemplateFinder::Rule.look_up([@page9,@page12,@page6]).should eq ["slug13","&1"]
+  end
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amalgam
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-18 00:00:00.000000000 Z
+date: 2013-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -485,6 +485,7 @@ files:
 - spec/app/views/test_pages/default/&1.html.erb
 - spec/app/views/test_pages/default/&2.html.erb
 - spec/app/views/test_pages/show.html.erb
+- spec/app/views/test_pages/slug13/&1.html.erb
 - spec/app/views/test_pages/slug2/@group3.html.erb
 - spec/app/views/test_pages/slug2/slug3@group3.html.erb
 - spec/app/views/test_pages/slug2.html.erb
@@ -492,6 +493,8 @@ files:
 - spec/app/views/test_pages/slug5/@group1.html.erb
 - spec/app/views/test_pages/slug5/@group2/@group1.html.erb
 - spec/app/views/test_pages/slug6/default.html.erb
+- spec/app/views/test_pages/slug7/&2.html.erb
+- spec/app/views/test_pages/slug7/slug12/&1.html.erb
 - spec/content_persistence_spec.rb
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
@@ -897,7 +900,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2022917447638075263
+      hash: -10239737494206678
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -906,7 +909,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2022917447638075263
+      hash: -10239737494206678
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24