google-analytics-rails 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1026e04facb047892c44b293f01e87c63af110c
-  data.tar.gz: 052fff54d9f1dc5dcb2b9972764bfaac52492f18
+  metadata.gz: d9237482619d3cc567f0190f9279b949e45671bc
+  data.tar.gz: c32c4208d568145c4e6ca07f22f5fa0960e97824
 SHA512:
-  metadata.gz: 011c446e38f25ca1fdb7b1eb1079fd584fdca5d79b1ff6141d6943c24d8caf802772241f38af6a3a888db0e25180b8b162146104dbf64d8a0cbfb6f172b4aec0
-  data.tar.gz: c4b798ef8c48bff11a32a9c0f33f4830312fe84560fe0c72ac138abff89c212d83f4306cd03237f6c9c6f5e5708a0c624dfd728af93bab3e040e32f284b8708e
+  metadata.gz: '0960adf90b52e1bf2a4dc5e6f6c879d1ba98870acfcc4d781f4c1b7d78be189ababa7ab492be31199d7853708591790103c304ce61f38695f8e6386f2c62b8e8'
+  data.tar.gz: f77d3211e125e777488d5897a006651cc89151e2b7ac0467ddef1ec811d74c350991cc106985964a90b4af120f7d799b68427cc54c44273cc95a0284075e2381

data/.travis.yml

@@ -3,12 +3,12 @@ bundler_args: --without development
 before_install:
   - gem update bundler
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
   - 2.1
   - 2.2.1
   - 2.3.0
+  - 2.4.0
   - rbx-2
   - ruby-head
 matrix:
@@ -23,4 +23,4 @@ matrix:
     - rvm: jruby-head
     - rvm: rbx-2
     - rvm: ruby-head
-  fast_finish: true
+  fast_finish: true

data/CHANGELOG.markdown

@@ -1,3 +1,8 @@
+1.1.1
+=====
+
+* BUGFIX: https://github.com/bgarret/google-analytics-rails/issues/36
+
 1.1.0
 =====
 

data/README.markdown

@@ -9,7 +9,7 @@ Installation
 
 Add the following to your `Gemfile`:
 
-    gem 'google-analytics-rails', '1.1.0'
+    gem 'google-analytics-rails', '1.1.1'
 
 Then run:
 

data/lib/google-analytics/events/event_renderer.rb

@@ -11,23 +11,18 @@ module GoogleAnalytics
 
     def to_s
       if @event.class.name == 'GoogleAnalytics::Events::SetupAnalytics'
-        "ga('#{@event.action}',#{array_to_json([@event.name, *@event.params])});"
+        %{ga("#{@event.action}",#{array_to_json([@event.name, *@event.params])});}
       elsif @event.single_event?
-        "ga('#{@tracker_id ? [@tracker_id, @event.action].join('.') : @event.action}');"
+        %{ga("#{@tracker_id ? [@tracker_id, @event.action].join('.') : @event.action}");}
       else
-        "ga('#{@tracker_id ? [@tracker_id, @event.action].join('.') : @event.action}',#{array_to_json([@event.name, *@event.params])});"
+        %{ga("#{@tracker_id ? [@tracker_id, @event.action].join('.') : @event.action}",#{array_to_json([@event.name, *@event.params])});}
       end
     end
 
     private
 
     def array_to_json(array)
-      array.map {|string| string_to_json(string) } .join(',')
-    end
-
-    def string_to_json(string)
-      # replace double quotes with single ones
-      string.to_json.gsub(/^"/, "'").gsub(/"$/, "'")
+      array.map {|val| val.to_json } .join(',')
     end
   end
 end

data/lib/google-analytics/rails/view_helpers.rb

@@ -29,6 +29,9 @@ module GoogleAnalytics::Rails
   #       '11.99',          # total - required
   #       '1.29',           # tax
   #       '5'               # shipping
+  #       'San Jose',       # city
+  #       'California',     # state or province
+  #       'USA'             # country
   #     )
   #
   #     # add an item to the transaction

data/lib/google-analytics/version.rb

@@ -2,5 +2,5 @@
 
 module GoogleAnalytics
   # Gem version
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/test/async_tracking_queue_test.rb

@@ -11,10 +11,10 @@ class AsyncTrackingQueueTest < Test::Unit::TestCase
 (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
 m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
 })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-ga('send','event',1);
-ga('send','event',2);
-ga('t2.send','event',1);
-ga('t2.send','event',2);
+ga("send","event",1);
+ga("send","event",2);
+ga("t2.send","event",1);
+ga("t2.send","event",2);
 </script>
   JAVASCRIPT
 
@@ -37,10 +37,10 @@ ga('t2.send','event',2);
 #   VALID_DOUBLECLICK_SNIPPET = <<-JAVASCRIPT
 # <script type="text/javascript">
 # var _gaq = _gaq || [];
-# _gaq.push(['event1',1]);
-# _gaq.push(['event2',2]);
-# _gaq.push(['t2.event1',1]);
-# _gaq.push(['t2.event2',2]);
+# _gaq.push(["event1",1]);
+# _gaq.push(["event2",2]);
+# _gaq.push(["t2.event1",1]);
+# _gaq.push(["t2.event2",2]);
 # (function() {
 # var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
 # ga.src = ('https:' == document.location.protocol ? 'https://' : 'http://') + 'stats.g.doubleclick.net/dc.js';
@@ -70,10 +70,10 @@ ga('t2.send','event',2);
 (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
 m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
 })(window,document,'script','http://127.0.0.1/custom.js','ga');
-ga('send','event',1);
-ga('send','event',2);
-ga('t2.send','event',1);
-ga('t2.send','event',2);
+ga("send","event",1);
+ga("send","event",2);
+ga("t2.send","event",1);
+ga("t2.send","event",2);
 </script>
   JAVASCRIPT
 

data/test/event_collection_renderer_test.rb

@@ -8,7 +8,16 @@ class EventCollectionRendererTest < Test::Unit::TestCase
     event_collection << GA::Event.new('send', 'evt', '3')
 
     ecr = GA::EventCollectionRenderer.new(event_collection, nil)
-    assert_equal("ga('send','evt','1');\nga('send','evt','2');\nga('send','evt','3');", ecr.to_s)
+    assert_equal(%{ga("send","evt","1");\nga("send","evt","2");\nga("send","evt","3");}, ecr.to_s)
+  end
+
+  def test_event_collection_renderer_escapes_quotes
+    event_collection = GA::EventCollection.new
+    event_collection << GA::Event.new('send', 'evt', "foo'sbar")
+    event_collection << GA::Event.new('send', 'evt', "foo\"sbar")
+
+    ecr = GA::EventCollectionRenderer.new(event_collection, nil)
+    assert_equal(%{ga("send","evt","foo'sbar");\nga("send","evt","foo\\"sbar");}, ecr.to_s)
   end
 
   def test_event_collection_renderer_yield_proper_javascript_snippit_for_custom_tracker
@@ -18,6 +27,6 @@ class EventCollectionRendererTest < Test::Unit::TestCase
     event_collection << GA::Event.new('send', 'evt', 3)
 
     ecr = GA::EventCollectionRenderer.new(event_collection, 't2')
-    assert_equal("ga('t2.send','evt',1);\nga('t2.send','evt',2);\nga('t2.send','evt',3);", ecr.to_s)
+    assert_equal(%{ga("t2.send","evt",1);\nga("t2.send","evt",2);\nga("t2.send","evt",3);}, ecr.to_s)
   end
 end

data/test/event_renderer_test.rb

@@ -3,12 +3,12 @@ require 'test_helper'
 class EventRendererTest < Test::Unit::TestCase
   def test_event_renderer_yield_proper_javascript_snippit_for_default_tracker
     er = GA::EventRenderer.new(GA::Event.new('send', 'something', 1, 2, 3), nil)
-    assert_equal("ga('send','something',1,2,3);", er.to_s)
+    assert_equal(%{ga("send","something",1,2,3);}, er.to_s)
   end
 
   def test_event_renderer_yield_proper_javascript_snippit_for_custom_tracker
     er = GA::EventRenderer.new(GA::Event.new('send', 'something', 1, 2, 3), 't2')
-    assert_equal("ga('t2.send','something',1,2,3);", er.to_s)
+    assert_equal(%{ga("t2.send","something",1,2,3);}, er.to_s)
   end
 
   def test_event_renderer_yield_proper_javascript_snippit_for_custom_tracker_creation
@@ -19,10 +19,10 @@ class EventRendererTest < Test::Unit::TestCase
 
   def test_single_event_renderer_yield_proper_javascript_snippit_for_transaction_send
     er = GA::EventRenderer.new(GA::Events::Ecommerce::TrackTransaction.new, nil)
-    assert_equal("ga('ecommerce:send');", er.to_s)
+    assert_equal(%{ga("ecommerce:send");}, er.to_s)
   end
   def test_single_event_renderer_yield_proper_javascript_snippit_for_transaction_send_with_custom_tracker
     er = GA::EventRenderer.new(GA::Events::Ecommerce::TrackTransaction.new, 't2')
-    assert_equal("ga('t2.ecommerce:send');", er.to_s)
+    assert_equal(%{ga("t2.ecommerce:send");}, er.to_s)
   end
 end

data/test/rails/views_helper_test.rb

@@ -17,8 +17,8 @@ m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
 (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
 m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
 })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-ga('create','TEST','auto');
-ga('send','pageview');
+ga("create","TEST","auto");
+ga("send","pageview");
 </script>
   JAVASCRIPT
 
@@ -29,24 +29,24 @@ ga('send','pageview');
   def test_analytics_init_with_special_name
     str = analytics_init(:name => 't2').to_s
     assert(str.include?(VALID_JS_INCLUDE))
-    assert_match(/.+ga\('create','TEST',\{.+\}\);.+/m, str)
+    assert_match(/.+ga\("create","TEST",\{.+\}\);.+/m, str)
     assert_match(/.+"cookieDomain":"auto".+/m, str)
     assert_match(/.+"name":"t2".+/m, str)
-    assert_match(/.+ga\('t2.send','pageview'\);.+/m, str)
+    assert_match(/.+ga\("t2.send","pageview"\);.+/m, str)
   end
 
   def test_analytics_init_with_virtual_pageview
     str = analytics_init(:page => '/some/virtual/url').to_s
     assert(str.include?(VALID_JS_INCLUDE))
-    assert_match(/.+ga\('create','TEST','auto'\);.+/m, str)
-    assert_match(/.+ga\('send','pageview','\/some\/virtual\/url'\);.+/m, str)
+    assert_match(/.+ga\("create","TEST","auto"\);.+/m, str)
+    assert_match(/.+ga\("send","pageview","\/some\/virtual\/url"\);.+/m, str)
   end
 
   def test_analytics_init_with_virtual_pageview_and_custom_title
     str = analytics_init(:page => '/some/virtual/url', :title => 'Hello World').to_s
     assert(str.include?(VALID_JS_INCLUDE))
-    assert_match(/.+ga\('create','TEST','auto'\);.+/m, str)
-    assert_match(/.+ga\('send','pageview'.+/m, str)
+    assert_match(/.+ga\("create","TEST","auto"\);.+/m, str)
+    assert_match(/.+ga\("send","pageview".+/m, str)
     assert_match(/.+"page":"\/some\/virtual\/url".+/m, str)
     assert_match(/.+"title":"Hello World".+/m, str)
   end
@@ -54,77 +54,77 @@ ga('send','pageview');
   def test_analytics_init_with_custom_tracker
     str = analytics_init(:tracker => 'UA-CUSTOM-XX').to_s
     assert(str.include?(VALID_JS_INCLUDE))
-    assert_match(/.+ga\('create','UA-CUSTOM-XX','auto'\);.+/m, str)
-    assert_match(/.+ga\('send','pageview'\);.+/m, str)
+    assert_match(/.+ga\("create","UA-CUSTOM-XX","auto"\);.+/m, str)
+    assert_match(/.+ga\("send","pageview"\);.+/m, str)
   end
 
   def test_analytics_init_with_custom_domain
     str = analytics_init(:domain => 'example.com').to_s
     assert(str.include?(VALID_JS_INCLUDE))
-    assert_match(/.+ga\('create','TEST',\{"cookieDomain":"example.com"\}\);.+/m, str)
-    assert_match(/.+ga\('send','pageview'\);.+/m, str)
+    assert_match(/.+ga\("create","TEST",\{"cookieDomain":"example.com"\}\);.+/m, str)
+    assert_match(/.+ga\("send","pageview"\);.+/m, str)
   end
 
   def test_local_analytics_init
     str = analytics_init(:local => true).to_s
     assert(str.include?(VALID_JS_INCLUDE))
-    assert_match(/.+ga\('create','TEST',\{.+\}\);.+/m, str)
+    assert_match(/.+ga\("create","TEST",\{.+\}\);.+/m, str)
     assert_match(/.+"cookieDomain":"none".+/m, str)
     assert_match(/.+"allowLinker":true.+/m, str)
-    assert_match(/.+ga\('send','pageview'\);.+/m, str)
+    assert_match(/.+ga\("send","pageview"\);.+/m, str)
   end
 
   def test_analytics_init_with_anonymized_ip
     str = analytics_init(:anonymize => true).to_s
     assert(str.include?(VALID_JS_INCLUDE))
-    assert_match(/.+ga\('create','TEST','auto'\);.+/m, str)
-    assert_match(/.+ga\('set','anonymizeIp',true\);.+/m, str)
-    assert_match(/.+ga\('send','pageview'\);.+/m, str)
+    assert_match(/.+ga\("create","TEST","auto"\);.+/m, str)
+    assert_match(/.+ga\("set","anonymizeIp",true\);.+/m, str)
+    assert_match(/.+ga\("send","pageview"\);.+/m, str)
   end
 
   def test_analytics_init_with_link_attribution
     str = analytics_init(:enhanced_link_attribution => true).to_s
     assert(str.include?(VALID_JS_INCLUDE))
-    assert_match(/.+ga\('create','TEST','auto'\);.+/m, str)
-    assert_match(/.+ga\('require','linkid'\);.+/m, str)
-    assert_match(/.+ga\('send','pageview'\);.+/m, str)
+    assert_match(/.+ga\("create","TEST","auto"\);.+/m, str)
+    assert_match(/.+ga\("require","linkid"\);.+/m, str)
+    assert_match(/.+ga\("send","pageview"\);.+/m, str)
   end
 
   def test_analytics_init_with_events
     str = analytics_init(:add_events => GA::Events::SetAllowLinker.new(true)).to_s
     assert(str.include?(VALID_JS_INCLUDE))
-    assert_match(/.+ga\('create','TEST',\{.+\}\);.+/m, str)
+    assert_match(/.+ga\("create","TEST",\{.+\}\);.+/m, str)
     assert_match(/.+"cookieDomain":"auto".+/m, str)
     assert_match(/.+"allowLinker":true.+/m, str)
-    assert_match(/.+ga\('send','pageview'\);.+/m, str)
+    assert_match(/.+ga\("send","pageview"\);.+/m, str)
   end
 
   def test_analytics_init_with_samplerate_events
     str = analytics_init(:add_events => GA::Events::SetSiteSpeedSampleRate.new(5)).to_s
     assert(str.include?(VALID_JS_INCLUDE))
-    assert_match(/.+ga\('create','TEST',\{.+\}\);.+/m, str)
+    assert_match(/.+ga\("create","TEST",\{.+\}\);.+/m, str)
     assert_match(/.+"cookieDomain":"auto".+/m, str)
     assert_match(/.+"siteSpeedSampleRate":5.+/m, str)
-    assert_match(/.+ga\('send','pageview'\);.+/m, str)
+    assert_match(/.+ga\("send","pageview"\);.+/m, str)
   end
 
   def test_analytics_init_with_custom_vars
     str = analytics_init(:custom_vars => GA::Events::SetCustomVar.new(1, 'test', 'hoge',1)).to_s
     assert(str.include?(VALID_JS_INCLUDE))
-    assert_match(/.+ga\('create','TEST','auto'\);.+/m, str)
-    assert_match(/.+ga\('set','dimension1','hoge'\);.+/m, str)
-    assert_match(/.+ga\('send','pageview'\);.+/m, str)
+    assert_match(/.+ga\("create","TEST","auto"\);.+/m, str)
+    assert_match(/.+ga\("set","dimension1","hoge"\);.+/m, str)
+    assert_match(/.+ga\("send","pageview"\);.+/m, str)
   end
 
   def test_analytics_init_with_custom_dimension
     str = analytics_init(:custom_vars => GA::Events::SetCustomDimension.new(1, 'hoge')).to_s
     assert(str.include?(VALID_JS_INCLUDE))
-    assert_match(/.+ga\('create','TEST','auto'\);.+/m, str)
-    assert_match(/.+ga\('set','dimension1','hoge'\);.+/m, str)
-    assert_match(/.+ga\('send','pageview'\);.+/m, str)
+    assert_match(/.+ga\("create","TEST","auto"\);.+/m, str)
+    assert_match(/.+ga\("set","dimension1","hoge"\);.+/m, str)
+    assert_match(/.+ga\("send","pageview"\);.+/m, str)
   end
 
-  VALID_TRACK_EVENT = "ga('send','event','Videos','Play','Gone With the Wind',null);"
+  VALID_TRACK_EVENT = %{ga("send","event","Videos","Play","Gone With the Wind",null);}
 
   def test_analytics_track_event
     event = analytics_track_event("Videos", "Play", "Gone With the Wind")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-analytics-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Benoit Garret
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-27 00:00:00.000000000 Z
+date: 2017-07-07 00:00:00.000000000 Z
 dependencies: []
 description: Rails helpers to manage google analytics tracking
 email:
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Rails helpers to manage google analytics tracking