deas 0.27.0 → 0.28.0

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.
Files changed (39) hide show
  1. data/lib/deas/logger.rb +10 -0
  2. data/lib/deas/redirect_proxy.rb +1 -1
  3. data/lib/deas/route.rb +10 -10
  4. data/lib/deas/route_proxy.rb +1 -1
  5. data/lib/deas/router.rb +1 -1
  6. data/lib/deas/runner.rb +12 -8
  7. data/lib/deas/server.rb +9 -2
  8. data/lib/deas/sinatra_app.rb +1 -0
  9. data/lib/deas/sinatra_runner.rb +15 -5
  10. data/lib/deas/template.rb +0 -4
  11. data/lib/deas/template_engine.rb +50 -0
  12. data/lib/deas/template_source.rb +74 -0
  13. data/lib/deas/test_runner.rb +7 -1
  14. data/lib/deas/version.rb +1 -1
  15. data/lib/deas/view_handler.rb +50 -44
  16. data/lib/deas.rb +1 -11
  17. data/test/support/fake_sinatra_call.rb +13 -10
  18. data/test/support/routes.rb +13 -21
  19. data/test/support/template.erb +1 -0
  20. data/test/support/template.json +1 -0
  21. data/test/support/test_template.test +0 -0
  22. data/test/support/view_handlers.rb +8 -0
  23. data/test/support/views/show.erb +1 -1
  24. data/test/system/rack_tests.rb +7 -5
  25. data/test/unit/error_handler_tests.rb +2 -1
  26. data/test/unit/logging_tests.rb +2 -1
  27. data/test/unit/route_tests.rb +16 -14
  28. data/test/unit/runner_tests.rb +7 -4
  29. data/test/unit/server_configuration_tests.rb +7 -4
  30. data/test/unit/server_tests.rb +6 -1
  31. data/test/unit/show_exceptions_tests.rb +2 -1
  32. data/test/unit/sinatra_app_tests.rb +16 -13
  33. data/test/unit/sinatra_runner_tests.rb +48 -0
  34. data/test/unit/template_engine_tests.rb +121 -0
  35. data/test/unit/template_source_tests.rb +221 -0
  36. data/test/unit/template_tests.rb +4 -12
  37. data/test/unit/test_runner_tests.rb +19 -7
  38. data/test/unit/view_handler_tests.rb +9 -2
  39. metadata +17 -4
@@ -26,12 +26,13 @@ class Deas::TestRunner
26
26
  setup do
27
27
  @params = { 'value' => '1' }
28
28
  @args = {
29
- :request => 'a-request',
30
- :response => 'a-response',
31
- :params => @params,
32
- :logger => 'a-logger',
33
- :router => 'a-router',
34
- :session => 'a-session'
29
+ :request => 'a-request',
30
+ :response => 'a-response',
31
+ :session => 'a-session',
32
+ :params => @params,
33
+ :logger => 'a-logger',
34
+ :router => 'a-router',
35
+ :template_source => 'a-source'
35
36
  }
36
37
 
37
38
  @norm_params_spy = Deas::Runner::NormalizedParamsSpy.new
@@ -47,10 +48,11 @@ class Deas::TestRunner
47
48
  should "super its standard args" do
48
49
  assert_equal 'a-request', subject.request
49
50
  assert_equal 'a-response', subject.response
51
+ assert_equal 'a-session', subject.session
50
52
  assert_equal @params, subject.params
51
53
  assert_equal 'a-logger', subject.logger
52
54
  assert_equal 'a-router', subject.router
53
- assert_equal 'a-session', subject.session
55
+ assert_equal 'a-source', subject.template_source
54
56
  end
55
57
 
56
58
  should "call to normalize its params" do
@@ -124,6 +126,16 @@ class Deas::TestRunner
124
126
  assert_equal 'some/template', value.template_name
125
127
  end
126
128
 
129
+ should "build partial args if partial is called" do
130
+ value = subject.partial 'some/partial', :some => 'locals'
131
+ assert_kind_of PartialArgs, value
132
+ [:template_name, :locals].each do |meth|
133
+ assert_respond_to meth, value
134
+ end
135
+ assert_equal 'some/partial', value.template_name
136
+ assert_equal({:some => 'locals'}, value.locals)
137
+ end
138
+
127
139
  should "build send file args if send file is called" do
128
140
  value = subject.send_file 'some/file/path'
129
141
  assert_kind_of SendFileArgs, value
@@ -1,8 +1,9 @@
1
1
  require 'assert'
2
- require 'test/support/view_handlers'
3
- require 'deas/test_helpers'
4
2
  require 'deas/view_handler'
5
3
 
4
+ require 'deas/test_helpers'
5
+ require 'test/support/view_handlers'
6
+
6
7
  module Deas::ViewHandler
7
8
 
8
9
  class UnitTests < Assert::Context
@@ -76,6 +77,12 @@ module Deas::ViewHandler
76
77
  assert_equal({ :some => :option }, render_args.options)
77
78
  end
78
79
 
80
+ should "render partial templates" do
81
+ partial_args = test_runner(PartialViewHandler).run
82
+ assert_equal "my_partial", partial_args.template_name
83
+ assert_equal({:some => 'locals'}, partial_args.locals)
84
+ end
85
+
79
86
  should "send files" do
80
87
  send_file_args = test_runner(SendFileViewHandler).run
81
88
  assert_equal "my_file.txt", send_file_args.file_path
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: 115
4
+ hash: 111
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
- - 27
8
+ - 28
9
9
  - 0
10
- version: 0.27.0
10
+ version: 0.28.0
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: 2014-11-05 00:00:00 Z
19
+ date: 2014-11-12 00:00:00 Z
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency
22
22
  requirement: &id001 !ruby/object:Gem::Requirement
@@ -136,6 +136,7 @@ files:
136
136
  - lib/deas/deas_runner.rb
137
137
  - lib/deas/error_handler.rb
138
138
  - lib/deas/exceptions.rb
139
+ - lib/deas/logger.rb
139
140
  - lib/deas/logging.rb
140
141
  - lib/deas/rack_request_fix.rb
141
142
  - lib/deas/redirect_proxy.rb
@@ -148,6 +149,8 @@ files:
148
149
  - lib/deas/sinatra_app.rb
149
150
  - lib/deas/sinatra_runner.rb
150
151
  - lib/deas/template.rb
152
+ - lib/deas/template_engine.rb
153
+ - lib/deas/template_source.rb
151
154
  - lib/deas/test_helpers.rb
152
155
  - lib/deas/test_runner.rb
153
156
  - lib/deas/url.rb
@@ -159,6 +162,9 @@ files:
159
162
  - test/support/fake_sinatra_call.rb
160
163
  - test/support/normalized_params_spy.rb
161
164
  - test/support/routes.rb
165
+ - test/support/template.erb
166
+ - test/support/template.json
167
+ - test/support/test_template.test
162
168
  - test/support/view_handlers.rb
163
169
  - test/support/views/_info.erb
164
170
  - test/support/views/haml_layout1.haml
@@ -190,6 +196,8 @@ files:
190
196
  - test/unit/show_exceptions_tests.rb
191
197
  - test/unit/sinatra_app_tests.rb
192
198
  - test/unit/sinatra_runner_tests.rb
199
+ - test/unit/template_engine_tests.rb
200
+ - test/unit/template_source_tests.rb
193
201
  - test/unit/template_tests.rb
194
202
  - test/unit/test_runner_tests.rb
195
203
  - test/unit/url_tests.rb
@@ -234,6 +242,9 @@ test_files:
234
242
  - test/support/fake_sinatra_call.rb
235
243
  - test/support/normalized_params_spy.rb
236
244
  - test/support/routes.rb
245
+ - test/support/template.erb
246
+ - test/support/template.json
247
+ - test/support/test_template.test
237
248
  - test/support/view_handlers.rb
238
249
  - test/support/views/_info.erb
239
250
  - test/support/views/haml_layout1.haml
@@ -265,6 +276,8 @@ test_files:
265
276
  - test/unit/show_exceptions_tests.rb
266
277
  - test/unit/sinatra_app_tests.rb
267
278
  - test/unit/sinatra_runner_tests.rb
279
+ - test/unit/template_engine_tests.rb
280
+ - test/unit/template_source_tests.rb
268
281
  - test/unit/template_tests.rb
269
282
  - test/unit/test_runner_tests.rb
270
283
  - test/unit/url_tests.rb