event_tracker 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14869ca74719eb114deaf73ce4da6edd9685a7d8
-  data.tar.gz: 81d3f06adccf5a96fa3860382169c2cbd92db7d6
+  metadata.gz: 14863904566c527f6e6cc99504e2a2f1b235b673
+  data.tar.gz: c3e26bd651a4822289cc90dc727ceefc1ef912de
 SHA512:
-  metadata.gz: 5882e8505b278c934871e46e55516a36d3fc5b05bc45248b7462c6911f2f61b6c35d3644af7db114014f59563c013f31dc28ec52b7f3886e9fd3d86e0b60e784
-  data.tar.gz: 9c496b64dc3aae6c73bdbd8e034f57ac1fdd5ba95a0161f3cd62ac042ef209e43ac02a73bf51ecc574cf9a4ee5c49d10810a4207d19c1d8bcaf8b76d243ed24f
+  metadata.gz: 3a52515dd8cae29e29f9d2939e685b453ca11c621bcdc789fc13fb5a6b7522e6a4011b899d9ee784f2c002a58c22273bd66792e4a8af7c942be52bbc2bb8fa2a
+  data.tar.gz: 6e2eee88502a5bd53650944eb2f7708ffbe4be16eeb947f90051cf3f5e560676f05c2cca55066b9d874d2ca92853ddaf989bc302e77acffbaee27055a4cfeb4f

data/.travis.yml

@@ -0,0 +1,10 @@
+language: ruby
+cache: bundler
+sudo: false
+before_install: gem install bundler
+script: bundle exec rake
+gemfile:
+  - Gemfile
+  - gemfiles/Gemfile.rails-4.2.rb
+rvm:
+  - 2.3.1

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## v0.4.1
+- Fix for Rails 5 API mode [\#18](https://github.com/doorkeeper/event_tracker/pull/18)
+
 ## v0.4.0
 
 - Prevent XSS when tracking user supplied properties

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/doorkeeper/event_tracker.svg?branch=master)](https://travis-ci.org/doorkeeper/event_tracker)
+
 # Event Tracker
 
 Easy tracking using mixpanel, kissmetrics, or Google Analytics (universal analytics).

data/gemfiles/Gemfile.rails-4.2.rb

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gemspec path: "../"
+
+gem "rails", [">= 4.2.6", "< 5.0"]

data/lib/event_tracker.rb

@@ -108,7 +108,7 @@ module EventTracker
       ActiveSupport.on_load :action_controller do
         include ActionControllerExtension
         include HelperMethods
-        helper HelperMethods
+        helper HelperMethods if respond_to?(:helper)
       end
     end
   end

data/lib/event_tracker/version.rb

@@ -1,3 +1,3 @@
 module EventTracker
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/event_tracker_spec.rb

@@ -226,23 +226,35 @@ feature 'basic integration' do
     it { should include %Q{mixpanel.alias("jsmith@example.com")} }
   end
 
-  context "halting filter chain in a before_filter" do
-    background { visit "/before_filter" }
-    it_should_behave_like "init"
-  end
-
   class BeforeFilterController < ApplicationController
     around_filter :append_event_tracking_tags
     before_filter :halt_the_chain_and_render
 
     def index
-      render inline: "OK", layout: true
+      render inline: "ORIGINAL", layout: true
     end
 
     def halt_the_chain_and_render
-      render inline: "OK", layout: true and return
+      render inline: "HALTED", layout: true
     end
 
   end
 
+  context "halting filter chain in a before_filter" do
+    background { visit "/before_filter" }
+    it_should_behave_like "init"
+    it { expect(page.body).to_not include("ORIGINAL") }
+    it { expect(page.body).to include("HALTED") }
+  end
+
+  if Rails.version >= "5"
+    class ApiController < ActionController::API
+      def index
+        head :ok
+      end
+    end
+
+    background { visit "/api" }
+    it { expect(page).to have_http_status(:ok) }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: event_tracker
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Paul McMahon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-18 00:00:00.000000000 Z
+date: 2017-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -61,12 +61,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - event_tracker.gemspec
+- gemfiles/Gemfile.rails-4.2.rb
 - lib/event_tracker.rb
 - lib/event_tracker/integration.rb
 - lib/event_tracker/integration/base.rb
@@ -97,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Track using javascript from your controllers, even when redirecting
@@ -106,4 +108,3 @@ test_files:
 - spec/app/views/layouts/application.html.erb
 - spec/event_tracker_spec.rb
 - spec/spec_helper.rb
-has_rdoc: