rack-tracker 0.4.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 439bc456139f78c2841496ef797246f9ba2921e7
-  data.tar.gz: b65c2cae25d00f858155af8279e0ee081752bb36
+  metadata.gz: 7565da578c5c506a95014ea972db7008e870e034
+  data.tar.gz: 4a735adf525fe516133d7c807472cc338d8b106b
 SHA512:
-  metadata.gz: b37b815033999eddcab5d748801ff3c93c3dca1c9de4dc1c8017656361c298c6f25476200103a37d0cc67d17f3cfc0d566f0671d44f2e41708e4f9711a9bc284
-  data.tar.gz: b3bd8ffc880617db5beb76b019f7fb239d4552be2a618d01f3834c5a73a155fda784ae5d74755615908d455ad48ce17d6af3457039428f6b202c8767ff2dbbea
+  metadata.gz: edae2548f40570b3068c4bcc9323fc869465add3be35d3fe856556a4702af888d1ebec860e9644e1df519b2bcc973d322accddb53bc23b5fc0712ef7d49d0930
+  data.tar.gz: cbfc180230a44535c9d40c48fe82c7f9e4300f68ece15849dacc5789f46f348ccf497da7eaba24173d5d3567247579153ef85b89cb95c206934a1ab53fa97423

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.0.0
+
+  * [BUGFIX] breaking API change: set zanox path extension #45 (thx @berlintam)
+  * [BUGFIX] Fix Google Analytics pageview command arguments #44 (thx @remiprev)
+
 # 0.4.2
 
   * [BUGFIX] proper page track when used with turbolink #40 (thx @remiprev @musaffa)

data/README.md

@@ -407,7 +407,7 @@ This is an example of a lead event:
 ```
 def show
   tracker do |t|
-    t.zanox :track, { order_i_d: 'DEFC-4321'}
+    t.zanox :lead, { order_i_d: 'DEFC-4321' }
   end
 end
 ```
@@ -417,7 +417,7 @@ This is an example of a sale event:
 ```
 def show
   tracker do |t|
-    t.zanox :track, { customer_i_d: '123456', order_i_d: 'DEFC-4321', currency_symbol: 'EUR', total_price: '150.00'}
+    t.zanox :sale, { customer_i_d: '123456', order_i_d: 'DEFC-4321', currency_symbol: 'EUR', total_price: '150.00' }
   end
 end
 ```

data/lib/rack/tracker/google_analytics/template/google_analytics.erb

@@ -36,6 +36,6 @@
   ga('ecommerce:send');
 <% end %>
 <% if tracker %>
-  ga('send', 'pageview', {'location': window.location.href});
+  ga('send', 'pageview', window.location.pathname + window.location.search);
 <% end %>
 </script>

data/lib/rack/tracker/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class Tracker
-    VERSION = '0.4.2'
+    VERSION = '1.0.0'
   end
 end

data/lib/rack/tracker/zanox/template/zanox.erb

@@ -14,13 +14,27 @@
 
 <% end %>
 
-<% tracking_events.each do |event| %>
 
-<script type="text/javascript" src="https://ad.zanox.com/ppl/?<%= options[:account_id] %>&mode=[[1]]&<%= event.write %>">
-</script>
+<% sale_events.each do |event| %>
+
+  <script type="text/javascript" src="https://ad.zanox.com/pps/?<%= options[:account_id] %>&mode=[[1]]&<%= event.write %>">
+  </script>
+
+  <noscript>
+  <img src="https://ad.zanox.com/pps/?<%= options[:account_id] %>&mode=[[2]]&<%= event.write %>" width="1" height="1" />
+  </noscript>
+
+<% end %>
 
-<noscript>
-<img src="https://ad.zanox.com/ppl/?<%= options[:account_id] %>&mode=[[2]]&<%= event.write %>" width="1" height="1" />
-</noscript>
+
+<% lead_events.each do |event| %>
+
+  <script type="text/javascript" src="https://ad.zanox.com/ppl/?<%= options[:account_id] %>&mode=[[1]]&<%= event.write %>">
+  </script>
+
+  <noscript>
+  <img src="https://ad.zanox.com/ppl/?<%= options[:account_id] %>&mode=[[2]]&<%= event.write %>" width="1" height="1" />
+  </noscript>
 
 <% end %>
+

data/lib/rack/tracker/zanox/zanox.rb

@@ -5,8 +5,17 @@ class Rack::Tracker::Zanox < Rack::Tracker::Handler
   class Mastertag < OpenStruct
   end
 
-  class Track < OpenStruct
+  class Lead < OpenStruct
     # Example: OrderID=[[DEFC-4321]]&CurrencySymbol=[[EUR]]&TotalPrice=[[23.40]]
+
+    def write
+      to_h.map do |k,v|
+        "#{k.to_s.camelize}=[[#{v}]]"
+      end.join('&')
+    end
+  end
+
+  class Sale < OpenStruct
     def write
       to_h.map do |k,v|
         "#{k.to_s.camelize}=[[#{v}]]"
@@ -22,8 +31,12 @@ class Rack::Tracker::Zanox < Rack::Tracker::Handler
     events.select{ |event| event.class.to_s.demodulize == 'Mastertag' }.first
   end
 
-  def tracking_events
-    events.select{ |event| event.class.to_s.demodulize == 'Track' }
+  def lead_events
+    events.select{ |event| event.class.to_s.demodulize == 'Lead' }
+  end
+
+  def sale_events
+    events.select{ |event| event.class.to_s.demodulize == 'Sale' }
   end
 
   def render

data/spec/handler/google_analytics_spec.rb

@@ -194,7 +194,7 @@ RSpec.describe Rack::Tracker::GoogleAnalytics do
 
     it "will show asyncronous tracker with cookieDomain" do
       expect(subject).to match(%r{ga\('create', 'somebody', {\"cookieDomain\":\"railslabs.com\"}\)})
-      expect(subject).to match(%r{ga\('send', 'pageview', {'location': window.location.href}\)})
+      expect(subject).to match(%r{ga\('send', 'pageview', window\.location\.pathname \+ window\.location\.search\)})
     end
   end
 
@@ -203,7 +203,7 @@ RSpec.describe Rack::Tracker::GoogleAnalytics do
 
     it "will show asyncronous tracker with userId" do
       expect(subject).to match(%r{ga\('create', 'somebody', {\"userId\":\"123\"}\)})
-      expect(subject).to match(%r{ga\('send', 'pageview', {'location': window.location.href}\)})
+      expect(subject).to match(%r{ga\('send', 'pageview', window\.location\.pathname \+ window\.location\.search\)})
     end
   end
 

data/spec/handler/zanox_spec.rb

@@ -1,6 +1,6 @@
 RSpec.describe Rack::Tracker::Zanox do
 
-  describe Rack::Tracker::Zanox::Track do
+  describe Rack::Tracker::Zanox::Sale do
 
     subject { described_class.new(order_i_d: 'DEFC-4321', currency_symbol: 'EUR', total_price: '150.00') }
 
@@ -18,7 +18,7 @@ RSpec.describe Rack::Tracker::Zanox do
     expect(described_class.new(env).position).to eq(:body)
   end
 
-  describe '#render a sale #tracking_event' do
+  describe '#render #sale_events' do
     context 'with events' do
       let(:env) {
         {
@@ -30,7 +30,7 @@ RSpec.describe Rack::Tracker::Zanox do
                 'OrderId' => 'DEFC-4321',
                 'CurrencySymbol' => 'EUR',
                 'TotalPrice' => '150.00',
-                'class_name' => 'Track'
+                'class_name' => 'Sale',
               }
             ]
           }
@@ -41,12 +41,12 @@ RSpec.describe Rack::Tracker::Zanox do
       let(:options) { { account_id: '123456H123456' } }
 
       it 'will display the correct tracking events' do
-        expect(subject).to include "https://ad.zanox.com/ppl/?123456H123456&mode=[[1]]&CustomerID=[[123456]]&OrderId=[[DEFC-4321]]&CurrencySymbol=[[EUR]]&TotalPrice=[[150.00]]"
+        expect(subject).to include "https://ad.zanox.com/pps/?123456H123456&mode=[[1]]&CustomerID=[[123456]]&OrderId=[[DEFC-4321]]&CurrencySymbol=[[EUR]]&TotalPrice=[[150.00]]"
       end
     end
   end
 
-  describe '#render a lead #tracking_event' do
+  describe '#render #lead_events' do
     context 'with events' do
       let(:env) {
         {
@@ -55,7 +55,7 @@ RSpec.describe Rack::Tracker::Zanox do
             [
               {
                 'OrderId' => 'DEFC-4321',
-                'class_name' => 'Track'
+                'class_name' => 'Lead'
               }
             ]
           }

data/spec/integration/zanox_integration_spec.rb

@@ -16,10 +16,11 @@ RSpec.describe "Zanox Integration" do
     expect(page.find("body")).to have_content "window._zx.push({\"id\": \"blurg567\"});"
   end
 
-  it 'should include the track event' do
-    expect(page).to have_xpath "//script[contains(@src,'12345H123456789&mode=[[1]]&CustomerID=[[123456]]&OrderID=[[DEFC-4321]]&CurrencySymbol=[[EUR]]&TotalPrice=[[150.00]]')]"
+  it 'should include the sale event' do
+    expect(page).to have_xpath "//script[contains(@src,'pps/?12345H123456789&mode=[[1]]&CustomerID=[[123456]]&OrderID=[[DEFC-4321]]&CurrencySymbol=[[EUR]]&TotalPrice=[[150.00]]')]"
   end
-end
-
-
 
+  it 'should include the lead event' do
+    expect(page).to have_xpath "//script[contains(@src,'ppl/?12345H123456789&mode=[[1]]&CustomerID=[[654321]]')]"
+  end
+end

data/spec/support/metal_controller.rb

@@ -78,7 +78,8 @@ class MetalController < ActionController::Metal
   def zanox
     tracker do |t|
       t.zanox :mastertag, { id: 'blurg567'}
-      t.zanox :track, { customer_i_d: '123456', order_i_d: 'DEFC-4321', currency_symbol: 'EUR', total_price: '150.00'}
+      t.zanox :sale, { customer_i_d: '123456', order_i_d: 'DEFC-4321', currency_symbol: 'EUR', total_price: '150.00' }
+      t.zanox :lead, { customer_i_d: '654321' }
     end
     render 'metal/index'
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-tracker
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Lars Brillert
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2015-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -228,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Tracking made easy