diff --git a/CHANGELOG.md b/CHANGELOG.md
index e444877..4398e32 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,17 @@
+# 1.13.0
+
+* [ENHANCEMENT] hotwired/turbo support #160 (thx @wrozka)
+* [BUGFIX] Use leftmost match for gtm tag injection #156 (thx @yutoji)
+
+# 1.12.1
+
+* [ENHANCEMENT] Use local variables to prevent instance state #151 (thx @bumi)
+* [ENHANCEMENT] Make middleware thread safe #150 (thx @kspe)
+
+# 1.12.0
+
+* [ENHANCEMENT] Add support for Heap #147 (thx @mohanzhang)
+
# 1.11.2
* [ENHANCEMENT] Allows disabling the Google Analytics pageview send. Defaults to true #131 (thx @ChrisCoffey)
diff --git a/README.md b/README.md
index 469998a..e1b7927 100644
--- a/README.md
+++ b/README.md
@@ -615,6 +615,18 @@ config.middleware.use(Rack::Tracker) do
end
```
+### Heap
+
+[Heap](https://heap.io/). Heap has Projects (e.g. "Main") which have multiple
+Environments (e.g. "Production" or "Development"). `env_id` is therefore the numerical ID
+that represents the Environment. See Settings -> Projects -> Environments in your dashboard.
+
+```
+config.middleware.use(Rack::Tracker) do
+ handler :heap, env_id: 'HEAP_ID'
+end
+```
+
### Custom Handlers
Tough we give you handlers for a few tracking services right out of the box, you might
diff --git a/lib/rack/tracker.rb b/lib/rack/tracker.rb
index 2d3dc91..4e10d87 100644
--- a/lib/rack/tracker.rb
+++ b/lib/rack/tracker.rb
@@ -26,6 +26,7 @@
require "rack/tracker/bing/bing"
require "rack/tracker/hubspot/hubspot"
require "rack/tracker/drift/drift"
+require "rack/tracker/heap/heap"
module Rack
class Tracker
@@ -37,10 +38,14 @@ def initialize(app, &block)
end
def call(env)
- @status, @headers, @body = @app.call(env)
- return [@status, @headers, @body] unless html?
- response = Rack::Response.new([], @status, @headers)
+ dup._call(env)
+ end
+
+ def _call(env)
+ status, headers, body = @app.call(env)
+ return [status, headers, body] unless headers['Content-Type'] =~ /html/
+ response = Rack::Response.new([], status, headers)
env[EVENT_TRACKING_KEY] ||= {}
if session = env["rack.session"]
@@ -51,16 +56,14 @@ def call(env)
session[EVENT_TRACKING_KEY] = env[EVENT_TRACKING_KEY]
end
- @body.each { |fragment| response.write inject(env, fragment) }
- @body.close if @body.respond_to?(:close)
+ body.each { |fragment| response.write inject(env, fragment) }
+ body.close if body.respond_to?(:close)
response.finish
end
private
- def html?; @headers['Content-Type'] =~ /html/; end
-
def inject(env, response)
duplicated_response = response.dup
@handlers.each(env) do |handler|
diff --git a/lib/rack/tracker/google_analytics/template/google_analytics.erb b/lib/rack/tracker/google_analytics/template/google_analytics.erb
index 673a671..d6d9d7b 100644
--- a/lib/rack/tracker/google_analytics/template/google_analytics.erb
+++ b/lib/rack/tracker/google_analytics/template/google_analytics.erb
@@ -1,5 +1,5 @@
-
+<% end %>
diff --git a/lib/rack/tracker/google_global/google_global.rb b/lib/rack/tracker/google_global/google_global.rb
index 0631794..5ccb817 100644
--- a/lib/rack/tracker/google_global/google_global.rb
+++ b/lib/rack/tracker/google_global/google_global.rb
@@ -35,9 +35,7 @@ def events
end
def trackers
- options[:trackers].map { |tracker|
- tracker[:id].respond_to?(:call) ? tracker.merge(id: tracker[:id].call(env)) : tracker
- }.reject { |tracker| tracker[:id].nil? }
+ @_trackers ||= build_trackers
end
def set_options
@@ -46,6 +44,31 @@ def set_options
private
+ def build_trackers
+ options[:trackers].map(&method(:call_tracker)).reject(&method(:invalid_tracker?))
+ end
+
+ def call_tracker(tracker)
+ if tracker[:id].respond_to?(:call)
+ tracker.merge(id: tracker[:id].call(env))
+ else
+ tracker
+ end
+ end
+
+ def invalid_tracker?(tracker)
+ if tracker[:id].to_s.strip == ''
+ $stdout.puts <<~WARN
+ WARNING: One of the trackers specified for Rack::Tracker handler 'google_global' is empty.
+ Trackers: #{options[:trackers]}
+ WARN
+
+ true
+ else
+ false
+ end
+ end
+
def build_set_options
value = options[:set]
value.respond_to?(:call) ? value.call(env) : value
diff --git a/lib/rack/tracker/google_global/template/google_global.erb b/lib/rack/tracker/google_global/template/google_global.erb
index b6141a8..9103419 100644
--- a/lib/rack/tracker/google_global/template/google_global.erb
+++ b/lib/rack/tracker/google_global/template/google_global.erb
@@ -1,4 +1,4 @@
-<% if trackers %>
+<% if trackers.any? %>
- <% end %>
- <% end %>
-
+
+ <% if events.any? %>
+
+ <% end %>
+
+
diff --git a/lib/rack/tracker/version.rb b/lib/rack/tracker/version.rb
index 371b0c0..3cf2d99 100644
--- a/lib/rack/tracker/version.rb
+++ b/lib/rack/tracker/version.rb
@@ -1,5 +1,5 @@
module Rack
class Tracker
- VERSION = '1.11.2'
+ VERSION = '1.13.0'
end
end
diff --git a/spec/handler/google_tag_manager_spec.rb b/spec/handler/google_tag_manager_spec.rb
index ed1e147..d86568e 100644
--- a/spec/handler/google_tag_manager_spec.rb
+++ b/spec/handler/google_tag_manager_spec.rb
@@ -32,4 +32,27 @@ def env
end
end
+ describe '#inject' do
+ subject { handler_object.inject(example_response) }
+ let(:handler_object) { described_class.new(env, container: 'somebody') }
+
+ before do
+ allow(handler_object).to receive(:render_head).and_return('')
+ allow(handler_object).to receive(:render_body).and_return('')
+ end
+
+ context 'with one line html response' do
+ let(:example_response) { "" }
+
+ it 'will have render_head content in head tag' do
+ expect(subject).to match(%r{.*.*})
+ end
+
+ it 'will have render_body content in body tag' do
+ expect(subject).to match(%r{.*.*})
+ end
+
+ end
+ end
+
end
diff --git a/spec/handler/heap_spec.rb b/spec/handler/heap_spec.rb
new file mode 100644
index 0000000..7e48df4
--- /dev/null
+++ b/spec/handler/heap_spec.rb
@@ -0,0 +1,10 @@
+RSpec.describe Rack::Tracker::Heap do
+ def env
+ { foo: 'bar' }
+ end
+
+ it 'will be placed in the head' do
+ expect(described_class.position).to eq(:head)
+ expect(described_class.new(env).position).to eq(:head)
+ end
+end
diff --git a/spec/integration/google_global_integration_spec.rb b/spec/integration/google_global_integration_spec.rb
index 7079036..14df465 100644
--- a/spec/integration/google_global_integration_spec.rb
+++ b/spec/integration/google_global_integration_spec.rb
@@ -3,28 +3,39 @@
RSpec.describe "Google Global Integration Integration" do
before do
setup_app(action: :google_global) do |tracker|
- tracker.handler :google_global, trackers: [{ id: 'U-XXX-Y' }]
+ tracker.handler :google_global, tracker_options
end
visit '/'
end
- subject { page }
+ let(:tracker_options) { { trackers: [{ id: 'U-XXX-Y' }] } }
it "embeds the script tag with tracking event from the controller action" do
expect(page.find("head")).to have_content('U-XXX-Y')
end
describe 'adjust tracker position via options' do
- before do
- setup_app(action: :google_global) do |tracker|
- tracker.handler :google_global, trackers: [{ id: 'U-XXX-Y' }], position: :body
- end
- visit '/'
- end
+ let(:tracker_options) { { trackers: [{ id: 'U-XXX-Y' }], position: :body } }
it "will be placed in the specified tag" do
expect(page.find("head")).to_not have_content('U-XXX-Y')
expect(page.find("body")).to have_content('U-XXX-Y')
end
end
+
+ describe "handles empty tracker id" do
+ let(:tracker_options) { { trackers: [{ id: nil }, { id: "" }, { id: " " }] } }
+
+ it "does not inject scripts" do
+ expect(page.find("head")).to_not have_content("
-
+
+
welcome to metal#index
-
+