amalgam 2.1.1 → 2.1.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/app/views/amalgam/admin/_nav_bar.html.haml +1 -1
- data/config/locales/en.yml +2 -2
- data/config/locales/zh-CN.yml +1 -1
- data/lib/amalgam/template_finder.rb +5 -4
- data/lib/amalgam/version.rb +1 -1
- data/spec/app/views/test_pages/slug13/&1.html.erb +0 -0
- data/spec/app/views/test_pages/slug7/&2.html.erb +0 -0
- data/spec/app/views/test_pages/slug7/slug12/&1.html.erb +0 -0
- data/spec/dummy/config/routes.rb +1 -0
- data/spec/dummy/log/development.log +1227 -0
- data/spec/dummy/log/test.log +2878 -0
- data/spec/rule_spec.rb +11 -0
- metadata +7 -4
data/spec/rule_spec.rb
CHANGED
|
@@ -82,6 +82,9 @@ describe Amalgam::TemplateFinder::Rule do
|
|
|
82
82
|
|
|
83
83
|
@page10 = TestPage.new(:slug => 'slug11')
|
|
84
84
|
@page10_group1 = @page10.test_groups.new(:name => 'group10')
|
|
85
|
+
|
|
86
|
+
@page11 = @page6.children.new(:slug => 'slug12')
|
|
87
|
+
@page12 = @page6.children.new(:slug => 'slug13')
|
|
85
88
|
end
|
|
86
89
|
|
|
87
90
|
it "page with groups should has keys" do
|
|
@@ -123,6 +126,14 @@ describe Amalgam::TemplateFinder::Rule do
|
|
|
123
126
|
it "在没有任何规则满足的情况下，使用根目录的show文件" do
|
|
124
127
|
Amalgam::TemplateFinder::Rule.look_up([@page9]).should eq ["show"]
|
|
125
128
|
end
|
|
129
|
+
|
|
130
|
+
it "在存在嵌套slug或者group的情况下，内部slug或者group设定的level模板优先级高于外部" do
|
|
131
|
+
Amalgam::TemplateFinder::Rule.look_up([@page9,@page11,@page6]).should eq ["slug7","slug12","&1"]
|
|
132
|
+
end
|
|
133
|
+
|
|
134
|
+
it "如果存在并列的父节点和子节点的level模板，优先使用子节点的模板" do
|
|
135
|
+
Amalgam::TemplateFinder::Rule.look_up([@page9,@page12,@page6]).should eq ["slug13","&1"]
|
|
136
|
+
end
|
|
126
137
|
end
|
|
127
138
|
|
|
128
139
|
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: amalgam
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.1.
|
|
4
|
+
version: 2.1.2
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2013-01-
|
|
12
|
+
date: 2013-01-21 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: rails
|
|
@@ -485,6 +485,7 @@ files:
|
|
|
485
485
|
- spec/app/views/test_pages/default/&1.html.erb
|
|
486
486
|
- spec/app/views/test_pages/default/&2.html.erb
|
|
487
487
|
- spec/app/views/test_pages/show.html.erb
|
|
488
|
+
- spec/app/views/test_pages/slug13/&1.html.erb
|
|
488
489
|
- spec/app/views/test_pages/slug2/@group3.html.erb
|
|
489
490
|
- spec/app/views/test_pages/slug2/slug3@group3.html.erb
|
|
490
491
|
- spec/app/views/test_pages/slug2.html.erb
|
|
@@ -492,6 +493,8 @@ files:
|
|
|
492
493
|
- spec/app/views/test_pages/slug5/@group1.html.erb
|
|
493
494
|
- spec/app/views/test_pages/slug5/@group2/@group1.html.erb
|
|
494
495
|
- spec/app/views/test_pages/slug6/default.html.erb
|
|
496
|
+
- spec/app/views/test_pages/slug7/&2.html.erb
|
|
497
|
+
- spec/app/views/test_pages/slug7/slug12/&1.html.erb
|
|
495
498
|
- spec/content_persistence_spec.rb
|
|
496
499
|
- spec/dummy/app/assets/javascripts/application.js
|
|
497
500
|
- spec/dummy/app/assets/stylesheets/application.css
|
|
@@ -897,7 +900,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
|
897
900
|
version: '0'
|
|
898
901
|
segments:
|
|
899
902
|
- 0
|
|
900
|
-
hash:
|
|
903
|
+
hash: -10239737494206678
|
|
901
904
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
902
905
|
none: false
|
|
903
906
|
requirements:
|
|
@@ -906,7 +909,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
906
909
|
version: '0'
|
|
907
910
|
segments:
|
|
908
911
|
- 0
|
|
909
|
-
hash:
|
|
912
|
+
hash: -10239737494206678
|
|
910
913
|
requirements: []
|
|
911
914
|
rubyforge_project:
|
|
912
915
|
rubygems_version: 1.8.24
|