ga_events 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f618bcb8b6143f0b27f0635ba07f7a03bf43314
-  data.tar.gz: 243dbd6ab50485f12ef605804645f31a216b57c7
+  metadata.gz: e1146cf9971d12382e0aa793841cd4dd0cd76470
+  data.tar.gz: ff69c78fb46afe03a40685cf8f002c82161a3e27
 SHA512:
-  metadata.gz: 5f6d47efb06212449d9c5d73ef7b7a9dd7fc159ec96083791e161bccfba041e153442b3eef6d9c4cf785bf60a1d465e740b78158e4a2e14ed360ff8f07c8d65d
-  data.tar.gz: 72d65902c21450bcb1f6e2220d7d01680a3c1745bfdd38d57785831a5c93d8bc07536082a630b2d7f45049ad1a791cb27ca9699261df1afe2931b0bd2d1c0baa
+  metadata.gz: b30b861e9b436375c7615d3f3b1aee65163a38236943eaa71482fa1ff6a6ead43929bc8e50ee91532006344995d7809122e4737e0f900e46254583b20aef5049
+  data.tar.gz: 09e3a8b9a027f6cdeda57a5184a6d9b214edba3649bcdc6e666bf24f36d49d51b223a7c523234d47eb3b7c9a853ca77c4f92cbbdd42d54fc536430fe0a7b950d

data/.rubocop.yml

@@ -0,0 +1,40 @@
+AllCops:
+  TargetRubyVersion: 2.2
+  Exclude:
+    - 'vendor/bundle/**/*'
+  DisplayCopNames: true
+Rails:
+  Enabled: true
+Style/Encoding:
+  EnforcedStyle: when_needed
+  Enabled: true
+Style/AsciiComments:
+  Enabled: false
+Style/Documentation:
+  Enabled: false
+Metrics/MethodLength:
+  Enabled: false
+Style/MethodDefParentheses:
+  Enabled: false
+Style/MultilineOperationIndentation:
+  EnforcedStyle: aligned
+Style/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+Style/MultilineMethodDefinitionBraceLayout:
+  Enabled: true
+Style/MultilineHashBraceLayout:
+  Enabled: true
+Style/SignalException:
+  Enabled: false
+Metrics/ClassLength:
+  Enabled: false
+Lint/AssignmentInCondition:
+  Enabled: false
+Metrics/ParameterLists:
+  Enabled: false
+Style/MultilineBlockChain:
+  Enabled: false
+Style/CommentAnnotation:
+  Enabled: false
+Style/GuardClause:
+  Enabled: false

data/CHANGELOG.md

@@ -25,3 +25,11 @@ The format suggested at http://keepachangelog.com/ is used.
 
 ### Added
 - Support for turbolinks.
+
+## 1.4.0 - 2018-03-09
+
+### Fixed
+- Fixed turbolinks events. To prevent older events the be processed again after page
+  changes orchestrated by turbolinks, events are no longer processed via the
+  injected DOM node. (Because the node would be cached and the event already
+  processed.) Instead the the header-strategy is being used.

data/Gemfile

@@ -3,6 +3,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in ga_events.gemspec
 gemspec
 
+gem 'pry'
 gem 'rake'
 gem 'rspec', '~> 3.1.0'
-gem 'pry'
+gem 'rubocop', '~> 0.39.0', require: false

data/app/assets/javascripts/ga_events.js.coffee

@@ -50,12 +50,17 @@ class GaEvents.Event
     @may_flush = true
     @flush()
 
-    $(document).ajaxComplete (event, xhr) =>
+    process_xhr = (xhr) =>
       xhr_events = xhr.getResponseHeader @header_key
       @from_string xhr_events if xhr_events?
 
+    $(document).ajaxComplete((_, xhr) -> process_xhr(xhr))
+    $(document).on "turbolinks:request-end", (event) ->
+      xhr = event.originalEvent.data.xhr
+      process_xhr(xhr)
+
     @from_dom()
-    $(document).on "turbolinks:load", => @from_dom()
+
 
 class GaEvents.GoogleTagManagerAdapter
   constructor: (@event = "ga_event") ->

data/ga_events.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |gem|
   gem.homepage      = 'https://github.com/Nix-wie-weg/ga_events'
 
   gem.files         = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR)
-  gem.executables   = gem.files.grep(/^bin\//).map { |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(/^(test|spec|features)\//)
+  gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = 'ga_events'
   gem.require_paths = ['lib']
   gem.version       = GaEvents::VERSION

data/lib/ga_events/event.rb

@@ -1,5 +1,5 @@
 module GaEvents
-  class Event < Struct.new(:category, :action, :label, :value)
+  Event = Struct.new(:category, :action, :label, :value) do
     # Default values are set here, see README.md for details.
     def initialize(category = '-', action = '-', label = '-', value = 1)
       super

data/lib/ga_events/middleware.rb

@@ -16,11 +16,11 @@ module GaEvents
 
         # Can outgrow, headers might get too big
         serialized = GaEvents::List.to_s
-        if request.xhr?
+        if xhr_or_turbolinks?(request)
           # AJAX request
           headers['X-GA-Events'] = serialized
 
-        elsif (300..399).include?(status)
+        elsif redirect?(status)
           # 30x/redirect? Then add event list to flash to survive the redirect.
           add_events_to_flash(env, serialized)
 
@@ -74,5 +74,13 @@ module GaEvents
         headers.key?('Content-Type') &&
         headers['Content-Type'].include?('text/html')
     end
+
+    def redirect?(status)
+      (300..399).cover?(status)
+    end
+
+    def xhr_or_turbolinks?(request)
+      request.xhr? || request.env['HTTP_TURBOLINKS_REFERRER']
+    end
   end
 end

data/lib/ga_events/version.rb

@@ -1,3 +1,3 @@
 module GaEvents
-  VERSION = '1.3.1'
+  VERSION = '1.4.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ga_events
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Florian Dütsch
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-01 00:00:00.000000000 Z
+date: 2018-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -34,6 +34,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -69,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: This gem allows you to annotate events everywhere in the code of your Rails