ahoy_matey 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e7ae0f31293a7769778587395e0bd568e61f6f7
-  data.tar.gz: 8b941ee921205a3fd192b520934f7e57fb3ead7c
+  metadata.gz: 3ef1f6ecc94ec7e579782279c9187ec29be12393
+  data.tar.gz: 0515d97b0c1916bd94e057de85fb1a1ccb11f8d2
 SHA512:
-  metadata.gz: e6d0bae8709e973024253730e1a95479e6effefca95356b89d88e0019f69eefa2b7eeb8a3ea194e9ef75f80e3011dd64e021f4b82fbba0bc7adea1738e81a212
-  data.tar.gz: 04abbb97db3428069c283284b07168188e69e98babd8e95eb93245a49da42ea753b46b91aa32d1d5a0f0867dcc5438f4fc93b22681d927326a7b38a1c53c329e
+  metadata.gz: 7fb051cdca6fa1fe250094b03acf393e28c93c93df0a4ca9379fd6aa468478668be22f4cce72316ea5d9db20824d7ea700e627c5f2787f0b9ce24878d2736346
+  data.tar.gz: 00435c1bb0c2f83fec2eef2bf73d45c908269d793a5c18ebc3de39dd3286c13f33e390a8c83e3d3c05581602836c905be0740a21d381ec695a3bcc968dc584dd

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.4
+
+- Added `ahoy.ready()` and `ahoy.log()` for events
+
 ## 0.1.3
 
 - Supports `current_user` from `ApplicationController`

data/README.md

@@ -17,6 +17,8 @@ See which campaigns generate the most revenue effortlessly.
 Order.joins(:visit).group("utm_campaign").sum(:revenue)
 ```
 
+:seedling: To track events like page views, check out [Ahoy Events](https://github.com/ankane/ahoy_events).
+
 ## Installation
 
 Add this line to your application’s Gemfile:
@@ -210,6 +212,7 @@ var ahoy = {"platform": "Mobile Web"}
 
 ## TODO
 
+- track emails
 - simple dashboard
 - hook to store additional fields
 - turn off modules

data/app/controllers/ahoy/base_controller.rb

@@ -0,0 +1,21 @@
+module Ahoy
+  class BaseController < ApplicationController
+    # skip all filters
+    skip_filter *_process_action_callbacks.map(&:filter)
+
+    before_filter :halt_bots
+
+    protected
+
+    def browser
+      @browser ||= Browser.new(ua: request.user_agent)
+    end
+
+    def halt_bots
+      if browser.bot?
+        render json: {}
+      end
+    end
+
+  end
+end

data/app/controllers/ahoy/visits_controller.rb

@@ -1,9 +1,5 @@
 module Ahoy
-  class VisitsController < ApplicationController
-    # skip all filters
-    skip_filter *_process_action_callbacks.map(&:filter)
-
-    before_filter :halt_bots
+  class VisitsController < BaseController
 
     def create
       visit_token = generate_token
@@ -33,15 +29,5 @@ module Ahoy
       SecureRandom.urlsafe_base64(32).gsub(/[\-_]/, "").first(32)
     end
 
-    def browser
-      @browser ||= Browser.new(ua: request.user_agent)
-    end
-
-    def halt_bots
-      if browser.bot?
-        render json: {}
-      end
-    end
-
   end
 end

data/config/routes.rb

@@ -3,5 +3,7 @@ Rails.application.routes.draw do
 end
 
 Ahoy::Engine.routes.draw do
-  resources :visits, only: [:create]
+  scope module: "ahoy" do
+    resources :visits, only: [:create]
+  end
 end

data/lib/ahoy/controller.rb

@@ -8,8 +8,6 @@ module Ahoy
       end
     end
 
-    protected
-
     def current_visit
       visit_token = cookies[:ahoy_visit] || request.headers["Ahoy-Visit"]
       if visit_token

data/lib/ahoy/engine.rb

@@ -1,5 +1,4 @@
 module Ahoy
   class Engine < ::Rails::Engine
-    isolate_namespace Ahoy
   end
 end

data/lib/ahoy/version.rb

@@ -1,3 +1,3 @@
 module Ahoy
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/vendor/assets/javascripts/ahoy.js

@@ -8,6 +8,8 @@
   var visitToken, visitorToken;
   var visitTtl = 4 * 60; // 4 hours
   var visitorTtl = 2 * 365 * 24 * 60; // 2 years
+  var isReady = false;
+  var queue = [];
 
   // cookies
 
@@ -52,6 +54,14 @@
     }
   }
 
+  function setReady() {
+    var callback;
+    while (callback = queue.shift()) {
+      callback();
+    }
+    isReady = true;
+  }
+
   // main
 
   visitToken = getCookie("ahoy_visit");
@@ -60,6 +70,7 @@
   if (visitToken && visitorToken && visitToken != "test") {
     // TODO keep visit alive?
     log("Active visit");
+    setReady();
   } else {
     setCookie("ahoy_visit", "test", 1);
 
@@ -86,9 +97,11 @@
       $.post("/ahoy/visits", data, function(response) {
         setCookie("ahoy_visit", response.visit_token, visitTtl);
         setCookie("ahoy_visitor", response.visitor_token, visitorTtl);
+        setReady();
       }, "json");
     } else {
       log("Cookies disabled");
+      setReady();
     }
   }
 
@@ -107,5 +120,15 @@
     return true;
   };
 
+  ahoy.log = log;
+
+  ahoy.ready = function (callback) {
+    if (isReady) {
+      callback();
+    } else {
+      queue.push(callback);
+    }
+  };
+
   window.ahoy = ahoy;
 }(window));

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ahoy_matey
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-25 00:00:00.000000000 Z
+date: 2014-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -122,6 +122,7 @@ files:
 - README.md
 - Rakefile
 - ahoy_matey.gemspec
+- app/controllers/ahoy/base_controller.rb
 - app/controllers/ahoy/visits_controller.rb
 - config/routes.rb
 - lib/ahoy/controller.rb