ahoy_matey 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb1cce9c5947f97e0a19216e9427447c769c580d
-  data.tar.gz: 736da048bedafb0038ae932c1f76993941d6e95a
+  metadata.gz: 8b95be84952b86c8d63b829a5f79706212be5c25
+  data.tar.gz: f187b36cf4fceedffea505d542cfcfe967933832
 SHA512:
-  metadata.gz: c05c1549e95925259447087b65a03351f29b82d99a47790e799f075bfceddafb49d5c20b5f4f20f0f5ac2469739749c56aec74dfa96b7a1f3a5d887a2091a79c
-  data.tar.gz: 62ee3cb9f38fdf312b7992bbb41df8ca5341f43743e308973ac71f57ad97a91d5c9225ee0364b165d6886da28613cce2125fc25a46014564e341ac5d41e3e70f
+  metadata.gz: f91f26c2cd6f80f792b74dfb3364eadd78a35c76f6894da57468ad8d981c05bc97796c9013f49d8a5acfbec1632e3310b4fa391588f6e21ad6d4b9b4c309ce3a
+  data.tar.gz: 18dc372e351d0ca497da3642befb01de577b3e5b426442a006150801a6be70ea8b8ff5c24f7bc52a6c248b7d2f428c7de03317154309d5b0e0982a80746f0925

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.2.1
+
+- Fixed `SystemStackError: stack level too deep` when used with `activerecord-session_store`
+
 ## 1.2.0
 
 - Added support for PostgreSQL `jsonb` column type

data/README.md

@@ -10,7 +10,7 @@ Works with any data store so you can easily scale.
 
 :postbox: To track emails, check out [Ahoy Email](https://github.com/ankane/ahoy_email).
 
-See [upgrade instructions](#upgrading) on how to move to 1.0.
+See [upgrade instructions](#100) on how to move to 1.0.
 
 ## Installation
 
@@ -31,13 +31,13 @@ And add the javascript file in `app/assets/javascripts/application.js` after jQu
 
 Ahoy supports a number of data stores out of the box.  You can start with one of them and customize as needed, or create your own store from scratch.
 
-- [PostgreSQL](#PostgreSQL)
-- [MySQL](#MySQL-or-SQLite)
-- [SQLite](#MySQL-or-SQLite)
-- [MongoDB](#MongoDB)
-- [Fluentd](#Fluentd)
-- [Logs](#Logs)
-- [Custom](#Custom)
+- [PostgreSQL](#postgresql)
+- [MySQL](#mysql-or-sqlite)
+- [SQLite](#mysql-or-sqlite)
+- [MongoDB](#mongodb)
+- [Fluentd](#fluentd)
+- [Logs](#logs)
+- [Custom](#custom)
 
 ### PostgreSQL
 
@@ -508,6 +508,26 @@ Use an array to pass multiple events at once.
 
 ## Upgrading
 
+### PostgreSQL 9.4 + JSONB
+
+```sh
+rails g migration change_properties_to_jsonb_on_ahoy_events
+```
+
+And add:
+
+```rb
+  def up
+    change_column :ahoy_events, :properties, :jsonb, using: "properties::jsonb"
+  end
+
+  def down
+    change_column :ahoy_events, :properties, :json
+  end
+```
+
+Note: This will lock the table while the migration is running.
+
 ### 1.0.0
 
 Add the following code to the end of `config/intializers/ahoy.rb`.

data/lib/ahoy.rb

@@ -1,4 +1,5 @@
 require "rails"
+require "active_support/core_ext"
 require "addressable/uri"
 require "browser"
 require "geocoder"
@@ -24,7 +25,6 @@ require "ahoy/stores/active_record_token_store"
 require "ahoy/stores/log_store"
 require "ahoy/stores/fluentd_store"
 require "ahoy/stores/mongoid_store"
-require "ahoy/logger_silencer"
 require "ahoy/engine"
 require "ahoy/warden" if defined?(Warden)
 
@@ -85,9 +85,16 @@ end
 ActionController::Base.send :include, Ahoy::Controller
 ActiveRecord::Base.send(:extend, Ahoy::Model) if defined?(ActiveRecord)
 
-Logger.send :include, Ahoy::LoggerSilencer
-
+# ensure logger silence will not be added by activerecord-session_store
+# otherwise, we get SystemStackError: stack level too deep
 begin
-  require "syslog/logger"
-  Syslog::Logger.send :include, Ahoy::LoggerSilencer
-rescue LoadError; end
+  require "active_record/session_store/extension/logger_silencer"
+rescue LoadError
+  require "ahoy/logger_silencer"
+  Logger.send :include, Ahoy::LoggerSilencer
+
+  begin
+    require "syslog/logger"
+    Syslog::Logger.send :include, Ahoy::LoggerSilencer
+  rescue LoadError; end
+end

data/lib/ahoy/version.rb

@@ -1,3 +1,3 @@
 module Ahoy
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/vendor/assets/javascripts/ahoy.js

@@ -20,7 +20,6 @@
   var queue = [];
   var canStringify = typeof(JSON) !== "undefined" && typeof(JSON.stringify) !== "undefined";
   var eventQueue = [];
-  var page = ahoy.page || window.location.pathname;
   var visitsUrl = ahoy.visitsUrl || "/ahoy/visits"
   var eventsUrl = ahoy.eventsUrl || "/ahoy/events"
 
@@ -123,13 +122,17 @@
     });
   }
 
+  function page() {
+    return ahoy.page || window.location.pathname;
+  }
+
   function eventProperties(e) {
     var $target = $(e.currentTarget);
     return {
       tag: $target.get(0).tagName.toLowerCase(),
       id: $target.attr("id"),
       "class": $target.attr("class"),
-      page: page,
+      page: page(),
       section: $target.closest("*[data-section]").data("section")
     };
   }
@@ -234,7 +237,7 @@
     var properties = {
       url: window.location.href,
       title: document.title,
-      page: page
+      page: page()
     };
     ahoy.track("$view", properties);
   };

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ahoy_matey
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-07 00:00:00.000000000 Z
+date: 2015-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -269,4 +269,3 @@ summary: Simple, powerful visit tracking for Rails
 test_files:
 - test/test_helper.rb
 - test/visit_properties_test.rb
-has_rdoc: