oboe 1.3.1 → 1.3.2

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.
@@ -8,18 +8,15 @@ module Oboe
8
8
  return unless Oboe::Config.has_key?(:rum_id)
9
9
  if Oboe::Config.tracing?
10
10
  if request.xhr?
11
- header_tmpl = File.dirname(__FILE__) + '/helpers/rum/rum_ajax_header'
11
+ header_tmpl = File.read(File.dirname(__FILE__) + '/helpers/rum/rum_ajax_header.js.erb')
12
12
  else
13
- header_tmpl = File.dirname(__FILE__) + '/helpers/rum/rum_header'
14
- end
15
- if ::Rails::VERSION::MAJOR > 2
16
- render :file => header_tmpl, :formats => [:js]
17
- else
18
- render :file => header_tmpl + '.js.erb'
13
+ header_tmpl = File.read(File.dirname(__FILE__) + '/helpers/rum/rum_header.js.erb')
19
14
  end
15
+ return raw(ERB.new(header_tmpl).result)
20
16
  end
21
17
  rescue Exception => e
22
- logger.debug "oboe_rum_header: #{e.message}."
18
+ logger.warn "oboe_rum_header: #{e.message}." if defined?(logger)
19
+ return ""
23
20
  end
24
21
  end
25
22
 
@@ -27,15 +24,14 @@ module Oboe
27
24
  begin
28
25
  return unless Oboe::Config.has_key?(:rum_id)
29
26
  if Oboe::Config.tracing?
30
- footer_tmpl = File.dirname(__FILE__) + '/helpers/rum/rum_footer'
31
- if ::Rails::VERSION::MAJOR > 2
32
- render :file => footer_tmpl, :formats => [:js]
33
- else
34
- render :file => footer_tmpl + '.js.erb'
35
- end
27
+ # Even though the footer template is named xxxx.erb, there are no ERB tags in it so we'll
28
+ # skip that step for now
29
+ footer_tmpl = File.read(File.dirname(__FILE__) + '/helpers/rum/rum_footer.js.erb')
30
+ return raw(footer_tmpl)
36
31
  end
37
32
  rescue Exception => e
38
- logger.debug "oboe_rum_footer: #{e.message}."
33
+ logger.warn "oboe_rum_footer: #{e.message}." if defined?(logger)
34
+ return ""
39
35
  end
40
36
  end
41
37
  end # Helpers
@@ -2,7 +2,7 @@ module Oboe
2
2
  module Version
3
3
  MAJOR = 1
4
4
  MINOR = 3
5
- PATCH = 1
5
+ PATCH = 2
6
6
  BUILD = nil
7
7
 
8
8
  STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: oboe
3
3
  version: !ruby/object:Gem::Version
4
- hash: 25
4
+ hash: 31
5
5
  prerelease:
6
6
  segments:
7
7
  - 1
8
8
  - 3
9
- - 1
10
- version: 1.3.1
9
+ - 2
10
+ version: 1.3.2
11
11
  platform: ruby
12
12
  authors:
13
13
  - Tracelytics, Inc.