deas 0.13.0 → 0.13.1

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/lib/deas/template.rb CHANGED
@@ -18,7 +18,7 @@ module Deas
18
18
  def engine(template_name)
19
19
  return 'erb' if @sinatra_call.settings.views.nil?
20
20
 
21
- views_path = Pathname.new(@sinatra_call.settings.views)
21
+ views_path = Pathname.new(@options[:views] || @sinatra_call.settings.views)
22
22
  template = Dir.glob("#{views_path.join(template_name.to_s)}.*").first.to_s
23
23
  File.extname(template)[1..-1] || 'erb'
24
24
  end
data/lib/deas/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Deas
2
- VERSION = "0.13.0"
2
+ VERSION = "0.13.1"
3
3
  end
@@ -23,25 +23,25 @@ class Deas::Template
23
23
  end
24
24
 
25
25
  should "know a named template's render engine" do
26
- views_exist = FakeApp.new(:views => TEST_SUPPORT_ROOT.join('views'))
27
- template = Deas::Template.new(views_exist, 'whatever')
28
-
29
- assert_equal 'erb', template.engine('layout1')
30
- assert_equal 'haml', template.engine('haml_layout1')
31
- assert_equal 'other', template.engine('some.html.file')
32
- assert_equal 'engine', template.engine('some_file')
33
- assert_equal 'erb', template.engine('some_no_engine_extension')
34
- assert_equal 'erb', template.engine('does_not_exist')
35
-
36
- views_no_exist = FakeApp.new(:views => '/does/not/exist')
37
- template_no_exist = Deas::Template.new(views_no_exist, 'whatever')
38
-
39
- assert_equal 'erb', template_no_exist.engine('layout1')
40
- assert_equal 'erb', template_no_exist.engine('haml_layout1')
41
- assert_equal 'erb', template_no_exist.engine('some.html.file')
42
- assert_equal 'erb', template_no_exist.engine('some_file')
43
- assert_equal 'erb', template_no_exist.engine('some_no_engine_extension')
44
- assert_equal 'erb', template_no_exist.engine('does_not_exist')
26
+ fake_app = FakeApp.new(:views => TEST_SUPPORT_ROOT.join('views'))
27
+
28
+ views_exist = Deas::Template.new(fake_app, 'whatever')
29
+ assert_equal 'erb', views_exist.engine('layout1')
30
+ assert_equal 'haml', views_exist.engine('haml_layout1')
31
+ assert_equal 'other', views_exist.engine('some.html.file')
32
+ assert_equal 'engine', views_exist.engine('some_file')
33
+ assert_equal 'erb', views_exist.engine('some_no_engine_extension')
34
+ assert_equal 'erb', views_exist.engine('does_not_exist')
35
+
36
+ views_no_exist = Deas::Template.new(fake_app, 'whatever', {
37
+ :views => '/does/not/exist'
38
+ })
39
+ assert_equal 'erb', views_no_exist.engine('layout1')
40
+ assert_equal 'erb', views_no_exist.engine('haml_layout1')
41
+ assert_equal 'erb', views_no_exist.engine('some.html.file')
42
+ assert_equal 'erb', views_no_exist.engine('some_file')
43
+ assert_equal 'erb', views_no_exist.engine('some_no_engine_extension')
44
+ assert_equal 'erb', views_no_exist.engine('does_not_exist')
45
45
 
46
46
  end
47
47
 
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: deas
3
3
  version: !ruby/object:Gem::Version
4
- hash: 43
4
+ hash: 41
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 13
9
- - 0
10
- version: 0.13.0
9
+ - 1
10
+ version: 0.13.1
11
11
  platform: ruby
12
12
  authors:
13
13
  - Kelly Redding
@@ -16,7 +16,7 @@ autorequire:
16
16
  bindir: bin
17
17
  cert_chain: []
18
18
 
19
- date: 2013-05-22 00:00:00 Z
19
+ date: 2013-05-23 00:00:00 Z
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency
22
22
  name: ns-options