prawnto_2 0.2.4.beta → 0.2.4

Sign up to get free protection for your applications and to get access to all the features.
@@ -13,7 +13,7 @@ module Prawnto
13
13
  end
14
14
 
15
15
  def set_headers
16
- unless defined?(ActionMailer) && defined?(ActionMailer::Base) && @controller.is_a?(ActionMailer::Base)
16
+ if not called_from_view_spec? and not called_from_mailer?
17
17
  set_pragma
18
18
  set_cache_control
19
19
  set_content_type
@@ -22,6 +22,14 @@ module Prawnto
22
22
  end
23
23
  end
24
24
 
25
+ def called_from_mailer?
26
+ defined?(ActionMailer) && defined?(ActionMailer::Base) && @controller.is_a?(ActionMailer::Base)
27
+ end
28
+
29
+ def called_from_view_spec?
30
+ defined?(ActionView::TestCase) && defined?(ActionView::TestCase::TestController) && @controller.is_a?(ActionView::TestCase::TestController)
31
+ end
32
+
25
33
  def ie_request?
26
34
  @controller.request.env['HTTP_USER_AGENT'] =~ /msie/i
27
35
  end
data/prawnto.gemspec CHANGED
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = "prawnto_2"
3
- s.version = '0.2.4.beta'
3
+ s.version = '0.2.4'
4
4
  s.author = ["Forrest"]
5
5
  s.email = ["development@forrestzeisler.com"]
6
6
  s.date = Time.now.utc.strftime("%Y-%m-%d")
metadata CHANGED
@@ -1,19 +1,19 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: prawnto_2
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.4.beta
5
- prerelease: 6
4
+ version: 0.2.4
5
+ prerelease:
6
6
  platform: ruby
7
7
  authors:
8
8
  - Forrest
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-02-28 00:00:00.000000000 Z
12
+ date: 2012-03-01 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
16
- requirement: &70333529399900 !ruby/object:Gem::Requirement
16
+ requirement: &70313753584500 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '3.1'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70333529399900
24
+ version_requirements: *70313753584500
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: prawn
27
- requirement: &70333529846720 !ruby/object:Gem::Requirement
27
+ requirement: &70313753584040 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
32
32
  version: 0.6.0
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70333529846720
35
+ version_requirements: *70313753584040
36
36
  description: Simple PDF generation using the prawn library.
37
37
  email:
38
38
  - development@forrestzeisler.com