pakada-dispatch 0.3.0 → 0.3.3

Sign up to get free protection for your applications and to get access to all the features.
@@ -13,11 +13,11 @@ class Pakada
13
13
  def initialize(env, options = {})
14
14
  @request = Rack::Request.new(env)
15
15
  @response = options[:response] || Rack::Response.new
16
- @options, @params = options, request.env["router.params"].dup
16
+ @options, @params = options, (request.env["router.params"] || {}).dup
17
17
  end
18
18
 
19
19
  def process(&block)
20
- instance_eval &block
20
+ catch(:finish) { instance_eval &block }
21
21
  self
22
22
  end
23
23
 
@@ -26,6 +26,10 @@ class Pakada
26
26
  end
27
27
 
28
28
  def not_found
29
+ if Pakada[:render]
30
+ response.write "404 Not Found" if options[:render]
31
+ options[:render] = false
32
+ end
29
33
  response.status = 404
30
34
  end
31
35
 
@@ -35,6 +39,10 @@ class Pakada
35
39
  end
36
40
 
37
41
  def access_denied
42
+ if Pakada[:render]
43
+ response.write "403 Access Denied" if options[:render]
44
+ options[:render] = false
45
+ end
38
46
  response.status = 403
39
47
  end
40
48
 
@@ -1,5 +1,5 @@
1
1
  class Pakada
2
2
  class Dispatch
3
- VERSION = "0.3.0"
3
+ VERSION = "0.3.3"
4
4
  end
5
5
  end
@@ -57,6 +57,12 @@ describe Pakada::Dispatch::Controller do
57
57
  it "returns the controller object" do
58
58
  ctrlr_obj.process(&block).should equal(ctrlr_obj)
59
59
  end
60
+
61
+ it "catches :finish" do
62
+ proc {
63
+ ctrlr_obj.process { throw :finish }
64
+ }.should_not throw_symbol(:finish)
65
+ end
60
66
  end
61
67
 
62
68
  context "#not_found" do
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: pakada-dispatch
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.0
4
+ version: 0.3.3
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2011-09-11 00:00:00.000000000Z
12
+ date: 2011-09-18 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: pakada
16
- requirement: &78613870 !ruby/object:Gem::Requirement
16
+ requirement: &81086540 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *78613870
24
+ version_requirements: *81086540
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: http_router
27
- requirement: &78613560 !ruby/object:Gem::Requirement
27
+ requirement: &81086230 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *78613560
35
+ version_requirements: *81086230
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: rack
38
- requirement: &78613140 !ruby/object:Gem::Requirement
38
+ requirement: &81085970 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *78613140
46
+ version_requirements: *81085970
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: rspec
49
- requirement: &78612570 !ruby/object:Gem::Requirement
49
+ requirement: &81080830 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *78612570
57
+ version_requirements: *81080830
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: yard
60
- requirement: &78612140 !ruby/object:Gem::Requirement
60
+ requirement: &81080460 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *78612140
68
+ version_requirements: *81080460
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: rdiscount
71
- requirement: &78587120 !ruby/object:Gem::Requirement
71
+ requirement: &81080100 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '0'
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *78587120
79
+ version_requirements: *81080100
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: pakada-render
82
- requirement: &78586770 !ruby/object:Gem::Requirement
82
+ requirement: &81079600 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
87
87
  version: '0'
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *78586770
90
+ version_requirements: *81079600
91
91
  description:
92
92
  email:
93
93
  - lars.gierth@gmail.com