ymdp 0.2.5 → 0.2.6

Sign up to get free protection for your applications and to get access to all the features.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.2.5
1
+ 0.2.6
@@ -184,12 +184,21 @@ module YMDP
184
184
  @content = result
185
185
  layout = result
186
186
 
187
+ view_layout = "#{paths[:base_path]}\/app\/views\/layouts\/#{@view}.html"
187
188
  application_layout = "#{paths[:base_path]}\/app\/views\/layouts\/application.html"
188
- haml_layout = application_layout + ".haml"
189
+
190
+ haml_view_layout = view_layout + ".haml"
191
+ haml_application_layout = application_layout + ".haml"
192
+
193
+ if File.exists?(haml_view_layout)
194
+ layout_name = haml_view_layout
195
+ else
196
+ layout_name = haml_application_layout
197
+ end
189
198
 
190
- if File.exists?(haml_layout)
191
- template = File.read(haml_layout)
192
- layout = process_haml(template, haml_layout) do
199
+ if File.exists?(layout_name)
200
+ template = File.read(layout_name)
201
+ layout = process_haml(template, layout_name) do
193
202
  @content
194
203
  end
195
204
  end
data/ymdp.gemspec CHANGED
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{ymdp}
8
- s.version = "0.2.5"
8
+ s.version = "0.2.6"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Jeff Coleman"]
12
- s.date = %q{2011-01-14}
12
+ s.date = %q{2011-02-23}
13
13
  s.description = %q{Framework for developing applications in the Yahoo! Mail Development Platform.}
14
14
  s.email = %q{progressions@gmail.com}
15
15
  s.extra_rdoc_files = [
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ymdp
3
3
  version: !ruby/object:Gem::Version
4
- hash: 29
4
+ hash: 27
5
5
  prerelease: false
6
6
  segments:
7
7
  - 0
8
8
  - 2
9
- - 5
10
- version: 0.2.5
9
+ - 6
10
+ version: 0.2.6
11
11
  platform: ruby
12
12
  authors:
13
13
  - Jeff Coleman
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2011-01-14 00:00:00 -06:00
18
+ date: 2011-02-23 00:00:00 -06:00
19
19
  default_executable:
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency