rack-tracker 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f55df00d45fb101f47bca6a636ae7767a5fe4cfe
-  data.tar.gz: 32310d9a1103ac86809a3e374e7759de91a4c135
+  metadata.gz: c6f2b15cb4ac572305b8421779e956633f04f942
+  data.tar.gz: f9cc033dda73492645c530763bb629be4e505074
 SHA512:
-  metadata.gz: f4b01ad9bbfb3cd1df9e499492beb78bd80bc90fd20217714b6879bfc45009936c73734e0ccd9a03b9c3f29d1af889193ebec944fd13eefdb561cc0e99fe63b7
-  data.tar.gz: 27df0ea951b32d8db3d1e95bd5fd5a309fdce2327169a3606c6cf812bac0fbf3495b537f3d4a5f5b8dfa6e75b7e12f12a2f532596f66f5b77985e97ceee7ba9d
+  metadata.gz: 6dc9d9ffa1264d87885c58042f4dafd3362fac3b8d45e6986362ffc8c743fe7dce1ca16a60f80f7bd1255255d6ab7e5985e71a67637cb85ae452adeb3fe545b4
+  data.tar.gz: c4cca8ee9f40adc66b1b9e48497589af502c6a4513dcfe412da8cdc7cf764eaf160e3e890bf979b03890335ffeb81700a1abefb433784a27e64d8b0237f0d58c

data/README.md

@@ -48,8 +48,8 @@ To issue [Events](https://developers.google.com/analytics/devguides/collection/a
 
 ```ruby
   def show
-    tracker do
-      google_analytics category: 'button', action: 'click', label: 'nav-buttons', value: 'X'
+    tracker do |t|
+      t.google_analytics category: 'button', action: 'click', label: 'nav-buttons', value: 'X'
     end
   end
 ```
@@ -66,8 +66,8 @@ To track [Conversions](https://www.facebook.com/help/435189689870514) from the s
 
 ```ruby
   def show
-    tracker do
-      facebook '123456789', value: 1, currency: 'EUR'
+    tracker do |t|
+      t.facebook '123456789', value: 1, currency: 'EUR'
     end
   end
 ```

data/lib/rack/tracker.rb

@@ -27,19 +27,14 @@ module Rack
       return [@status, @headers, @body] unless html?
       response = Rack::Response.new([], @status, @headers)
 
-      env[EVENT_TRACKING_KEY] = {} unless env[EVENT_TRACKING_KEY]
+      env[EVENT_TRACKING_KEY] ||= {}
 
-      session = env["rack.session"]
-      if response.ok?
-        # Write out the events now
-
-        # Get any stored events from a redirection
-        stored_events = session.delete(EVENT_TRACKING_KEY) if session
+      if session = env["rack.session"]
+        env[EVENT_TRACKING_KEY].deep_merge!(session.delete(EVENT_TRACKING_KEY) || {}) { |key, old, new| Array.wrap(old) + Array.wrap(new) }
+      end
 
-        env[EVENT_TRACKING_KEY].deep_merge!(stored_events) { |key, old, new| Array.wrap(old) + Array.wrap(new) } unless stored_events.nil?
-      elsif response.redirection? && session
-        # Store the events until next time
-        env["rack.session"][EVENT_TRACKING_KEY] = env[EVENT_TRACKING_KEY]
+      if response.redirection? && session
+        session[EVENT_TRACKING_KEY] = env[EVENT_TRACKING_KEY]
       end
 
       @body.each { |fragment| response.write inject(env, fragment) }

data/lib/rack/tracker/controller.rb

@@ -2,9 +2,7 @@ module Rack
   class Tracker
     module Controller
       def tracker(&block)
-        if block_given?
-          Rack::Tracker::HandlerDelegator.new(env).instance_exec(&block)
-        end
+        yield(Rack::Tracker::HandlerDelegator.new(env)) if block_given?
       end
     end
   end

data/lib/rack/tracker/handler_delegator.rb

@@ -21,7 +21,7 @@ class Rack::Tracker::HandlerDelegator
 
   def write_event(event)
     if env.key?('tracker')
-      self.env = env['tracker'].deep_merge!(event)
+      self.env = env['tracker'].deep_merge!(event) { |key, old, new| Array.wrap(old) + Array.wrap(new) }
     else
       self.env['tracker'] = event
     end

data/lib/rack/tracker/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class Tracker
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/spec/support/metal_controller.rb

@@ -8,16 +8,16 @@ class MetalController < ActionController::Metal
   layout 'application'
 
   def index
-    tracker do
-      track_all_the_things like: 'no-one-else'
-      another_handler likes: 'you'
+    tracker do |t|
+      t.track_all_the_things like: 'no-one-else'
+      t.another_handler likes: 'you'
     end
     render "metal/index"
   end
 
   def facebook
-    tracker do
-      facebook 'conversion-event', { value: '1', currency: 'EUR' }
+    tracker do |t|
+      t.facebook 'conversion-event', { value: '1', currency: 'EUR' }
     end
     render "metal/index"
   end

data/spec/tracker/controller_spec.rb

@@ -8,8 +8,8 @@ class SomeController
   end
 
   def index
-    tracker do
-      google_analytics category: 'foo'
+    tracker do |t|
+      t.google_analytics category: 'foo'
     end
   end
 end

data/spec/tracker/tracker_spec.rb

@@ -35,6 +35,8 @@ RSpec.describe Rack::Tracker do
             [200, {'Content-Type' => 'application/xml'}, ['Xml here']]
           when '/redirect' then
             [302, {'Content-Type' => 'application/html', 'Location' => '/'}, ['<body>redirection</body>']]
+          when '/moved' then
+            [301, {'Content-Type' => 'application/html', 'Location' => '/redirect'}, ['<body>redirection</body>']]
           else
             [404, 'Nothing here']
         end
@@ -88,6 +90,12 @@ RSpec.describe Rack::Tracker do
       follow_redirect!
       expect(last_response.body).to include("alert('Keep this!');")
     end
+
+    it 'will keep the tracker attributes over multiple redirects' do
+      get '/moved', {}, { 'tracker' => { 'dummy' => 'Keep this twice!' } }
+      follow_redirect!
+      expect(last_response.body).to include("alert('Keep this twice!');")
+    end
   end
 
   describe 'when not html' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-tracker
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Lars Brillert
@@ -9,132 +9,132 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-27 00:00:00.000000000 Z
+date: 2014-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.4.1
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.5
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Don’t fool around with adding tracking partials to your app and concentrate
@@ -146,9 +146,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -191,12 +191,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []