ga_events 1.4.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d58cdb3aafef92d454bb79021d01ed65773e710d
-  data.tar.gz: 2b46d6a7bcb1906f68a95f100521c65644cfedc6
+SHA256:
+  metadata.gz: 8733925b29ae71da3da081d25679727857f92ee7bcb5390c72b97a87fc3c9b53
+  data.tar.gz: 67d86fd9ea6ced7564d851b40faa957d2138a92977a5d3197a2a6f7bdcdd7068
 SHA512:
-  metadata.gz: 8139269a9fa960a91f3fda4dd8bebc113fba30eaf84ecff627408aa446333e40e5d56a5eb792f71a588189c82d42d9c0d33c8a5524814530c407f4c87a11e123
-  data.tar.gz: 664f45cd5043f86e61608fd434e530dd71e4b0fdd4b14beff7a6f9adb3a6faffabc46c20048bb9b3466b0383b5726b360d5d126ef182754564f84495e6e4ec14
+  metadata.gz: 0ffaa24b43857c82f369e98861b82ddd99dca42bc88b97148d4a055210e0ed76b2f82961932e83e03b76264e091a7e698577b07a69cb2efef6d40b92616965c0
+  data.tar.gz: 59e2857a160797e12bfec180e10aadae8f66633e303cb9c41e739a77669ee03f2b13c22faea9f10df263e1d43f2eef172f6c5d03cbca90b7a9944597c8390a77

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg
+vendor

data/.rubocop.yml

@@ -1,13 +1,8 @@
 AllCops:
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.3
   Exclude:
     - 'vendor/bundle/**/*'
   DisplayCopNames: true
-Rails:
-  Enabled: true
-Style/Encoding:
-  EnforcedStyle: when_needed
-  Enabled: true
 Style/AsciiComments:
   Enabled: false
 Style/Documentation:
@@ -16,13 +11,13 @@ Metrics/MethodLength:
   Enabled: false
 Style/MethodDefParentheses:
   Enabled: false
-Style/MultilineOperationIndentation:
+Layout/MultilineOperationIndentation:
   EnforcedStyle: aligned
-Style/MultilineMethodCallIndentation:
+Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented
-Style/MultilineMethodDefinitionBraceLayout:
+Layout/MultilineMethodDefinitionBraceLayout:
   Enabled: true
-Style/MultilineHashBraceLayout:
+Layout/MultilineHashBraceLayout:
   Enabled: true
 Style/SignalException:
   Enabled: false
@@ -38,3 +33,5 @@ Style/CommentAnnotation:
   Enabled: false
 Style/GuardClause:
   Enabled: false
+Metrics/BlockLength:
+  Enabled: false

data/CHANGELOG.md

@@ -39,3 +39,12 @@ The format suggested at http://keepachangelog.com/ is used.
 ### Fixed
 - Ensure category, action and label do not include any umlauts or ß chars
 - Fixed an error where events are remaining after a redirect
+
+## 2.0.0 - 2018-04-03
+
+### Removed
+- Support for rubies < 2.3
+- Support for rails < 4.2
+
+### Added
+- Compatibility for Rails 5

data/Gemfile

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

data/README.md

@@ -13,8 +13,8 @@ pushes it to Google Analytics via ga.js or Google Tag Manager.
 
 ## Dependencies
 
-* Ruby >= 1.9
-* Rails 3.1 onwards
+* Ruby >= 2.3
+* Rails 4.2 onwards
 * jQuery
 
 ## Installation

data/Rakefile

@@ -1,7 +1,5 @@
-#!/usr/bin/env rake
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
+# frozen_string_literal: true
 
-RSpec::Core::RakeTask.new('spec')
+require 'bundler/gem_tasks'
 
 task default: :spec

data/ga_events.gemspec

@@ -1,5 +1,6 @@
-# encoding: utf-8
-require File.expand_path('../lib/ga_events/version', __FILE__)
+# frozen_string_literal: true
+
+require File.expand_path('lib/ga_events/version', __dir__)
 
 Gem::Specification.new do |gem|
   gem.authors       = ['Florian Dütsch', 'Sven Winkler']
@@ -25,5 +26,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.version       = GaEvents::VERSION
 
-  gem.add_dependency 'rails', '>= 3.1'
+  gem.add_dependency 'rails', '>= 4.2'
 end

data/lib/ga_events.rb

@@ -1 +1,3 @@
-%w(middleware engine event list version).each { |f| require "ga_events/#{f}" }
+# frozen_string_literal: true
+
+%w[middleware engine event list version].each { |f| require "ga_events/#{f}" }

data/lib/ga_events/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GaEvents
   class Engine < ::Rails::Engine
     config.app_middleware.use GaEvents::Middleware

data/lib/ga_events/event.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GaEvents
   Event = Struct.new(:category, :action, :label, :value) do
     # Default values are set here, see README.md for details.

data/lib/ga_events/list.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # NOTE: Collecting the events is thread-safe, but will cause problems in an
 #       asynchronous/evented environment.
 

data/lib/ga_events/middleware.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rack/utils'
 
 module GaEvents
@@ -35,33 +37,29 @@ module GaEvents
     private
 
     def init_event_list(env)
-      # Handle events stored in flash
-      # Parts borrowed from Rails:
-      # https://github.com/rails/rails/blob/v3.2.14/actionpack/lib/action_dispatch/middleware/flash.rb
-      flash = env['rack.session'] && env['rack.session']['flash']
-
-      # Fix for Rails 4
-      flash &&= flash['flashes'] if Rails::VERSION::MAJOR > 3
+      flash = env['rack.session'] && env['rack.session']['flash'] &&
+              env['rack.session']['flash']['flashes']
 
       # The key has to be removed from the flash here to ensure it does not
       # remain after the finished redirect. This copies the behaviour of the
       # "#use" and "#sweep" methods of the rails flash middleware:
       # https://github.com/rails/rails/blob/v3.2.14/actionpack/lib/action_dispatch/middleware/flash.rb#L220
-      GaEvents::List.init(flash && flash.delete('ga_events'))
+      GaEvents::List.init(flash&.delete('ga_events'))
     end
 
     def add_events_to_flash env, serialized_data
-      flash_hash = env[ActionDispatch::Flash::KEY]
-      flash_hash ||= ActionDispatch::Flash::FlashHash.new
-      flash_hash['ga_events'] = serialized_data
+      flash = env['rack.session'] && env['rack.session']['flash'] &&
+              env['rack.session']['flash']['flashes']
+
+      return unless flash
 
-      env[ActionDispatch::Flash::KEY] = flash_hash
+      flash['ga_events'] = serialized_data
     end
 
-    def normalize_response(r)
-      r = r.body if r.respond_to?(:body)
-      r = r.join if r.respond_to?(:join)
-      r
+    def normalize_response(response)
+      response = response.body if response.respond_to?(:body)
+      response = response.join if response.respond_to?(:join)
+      response
     end
 
     def inject_div(response, serialized_data)

data/lib/ga_events/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GaEvents
-  VERSION = '1.4.1'.freeze
+  VERSION = '2.0.0'
 end

data/spec/middleware_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe GaEvents::Middleware do

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/setup'
 require 'pry'
 require 'rspec'

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ga_events
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Florian Dütsch
 - Sven Winkler
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-04-09 00:00:00.000000000 Z
+date: 2020-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.2'
 description: Google Analytics' Event Tracking everywhere in your Rails app)
 email:
 - florian.duetsch@nix-wie-weg.de
@@ -54,7 +54,7 @@ files:
 homepage: https://github.com/Nix-wie-weg/ga_events
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -69,9 +69,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: This gem allows you to annotate events everywhere in the code of your Rails
   app. A rack middleware is automatically inserted into the stack. It transports the