dryml 1.4.0.pre4 → 1.4.0.pre5

Sign up to get free protection for your applications and to get access to all the features.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.4.0.pre4
1
+ 1.4.0.pre5
data/lib/dryml.rb CHANGED
@@ -17,7 +17,7 @@ module Dryml
17
17
  VERSION = File.read(File.expand_path('../../VERSION', __FILE__)).strip
18
18
  @@root = Pathname.new File.expand_path('../..', __FILE__)
19
19
  def self.root; @@root; end
20
- EDIT_LINK_BASE = "https://github.com/tablatom/hobo_tree_table/edit/master/dryml"
20
+ EDIT_LINK_BASE = "https://github.com/tablatom/hobo/edit/master/dryml"
21
21
 
22
22
  class DrymlSyntaxError < RuntimeError; end
23
23
 
@@ -192,8 +192,7 @@ module Dryml
192
192
  private
193
193
 
194
194
  def taglibs_for(controller_path)
195
- ( taglibs_in_dir('application').unshift(APPLICATION_TAGLIB) +
196
- subsite_taglibs(controller_path) +
195
+ ( subsite_taglibs(controller_path) +
197
196
  ((controller_path.camelize+"Controller").constantize.try.included_taglibs||[])
198
197
  ).compact
199
198
  end
@@ -203,7 +202,7 @@ private
203
202
  subsite = parts.length >= 2 ? parts[0..-2].join('_') : "front"
204
203
  src = "taglibs/#{subsite}_site"
205
204
  Object.const_defined?(:Rails) && File.exists?("#{Rails.root}/app/views/#{src}.dryml") ?
206
- taglibs_in_dir("#{subsite}_site").unshift({ :src => src }) : []
205
+ taglibs_in_dir("#{subsite}_site").unshift({ :src => src }) : [APPLICATION_TAGLIB]
207
206
  end
208
207
 
209
208
  def taglibs_in_dir(dir_name)
@@ -284,6 +284,12 @@ module Dryml
284
284
  res.to_s
285
285
  end
286
286
 
287
+ def yield_output_buffer
288
+ res = nil
289
+ @view.with_output_buffer { res = yield }
290
+ res.to_s
291
+ end
292
+
287
293
 
288
294
  def new_object_context(new_this)
289
295
  new_context do
metadata CHANGED
@@ -2,7 +2,7 @@
2
2
  name: dryml
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease: 6
5
- version: 1.4.0.pre4
5
+ version: 1.4.0.pre5
6
6
  platform: ruby
7
7
  authors:
8
8
  - Tom Locke
@@ -10,7 +10,7 @@ autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
12
 
13
- date: 2012-03-28 00:00:00 Z
13
+ date: 2012-04-23 00:00:00 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: actionpack
@@ -31,7 +31,7 @@ dependencies:
31
31
  requirements:
32
32
  - - "="
33
33
  - !ruby/object:Gem::Version
34
- version: 1.4.0.pre4
34
+ version: 1.4.0.pre5
35
35
  type: :runtime
36
36
  version_requirements: *id002
37
37
  - !ruby/object:Gem::Dependency