ahoy_matey 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bfd98e74a3c8164034e720f074c623e461e197f
-  data.tar.gz: b91ab16168e6fa4301741c0a32a45107e28d46f6
+  metadata.gz: 901b2af03cc91c3ad7ccef91dedfd1514e452357
+  data.tar.gz: 83494b26ea230cf54836b3d67eb6efc88cbac45f
 SHA512:
-  metadata.gz: 7d0d3df7bb8e468751d299e7073d00924119d6e035ea436a1384f02785f462523473c58d5b11a649dd7db3e1bb5fc365ea67f62dbf3fa8151f9587d011b7f96a
-  data.tar.gz: f65476622c0be90b84619dd09bd9d5299a90507e46738e7f0fc7525d950e9ea0adcef385256f05203d27a633d3eac6dadf39b9016d255cec1f827e82636d6c80
+  metadata.gz: 1772c4ed5abe7395b6cf651f48ef05ec7454b3e30c80d9e54989407e8dd510fdba40f2ff827b5041dbe93fc22160eba8dc612fe780657bce4ba55bb5da6f50ce
+  data.tar.gz: a33c3b9ea6cb8e4ae7104085b392c7d0bd49ed1121eaef0eace1c9157f11098843236f66792c0138286e2e11c3ee41bb5d2ce97676428f1ef28f3b812e9cc269

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.2.2
+
+- Added `exclude_method` option
+- Added support for batch events
+- Fixed cookie encoding
+- Fixed `options` variable from being modified
+
 ## 0.2.1
 
 - Fixed IE 8 error

data/README.md

@@ -367,7 +367,15 @@ Use a different model for events
 Ahoy.subscribers << Ahoy::Subscribers::ActiveRecord.new(model: Event)
 ```
 
-Track bots [master]
+Exclude visits and events
+
+```ruby
+Ahoy.exclude_method = proc do |controller|
+  controller.request.ip == "192.168.1.1"
+end
+```
+
+Track bots
 
 ```ruby
 Ahoy.track_bots = true

data/app/controllers/ahoy/events_controller.rb

@@ -2,11 +2,17 @@ module Ahoy
   class EventsController < Ahoy::BaseController
 
     def create
-      options = {}
-      if params[:time] and (time = Time.at(params[:time].to_f) rescue nil) and (1.minute.ago..Time.now).cover?(time)
-        options[:time] = time
+      events = params[:name] ? [params] : ActiveSupport::JSON.decode(request.body.read)
+      events.each do |event|
+        options = {}
+        if event["time"] and (time = Time.at(event["time"].to_f) rescue nil) and (1.minute.ago..Time.now).cover?(time)
+          options[:time] = time
+        end
+        if event["id"]
+          options[:id] = event["id"]
+        end
+        ahoy.track event["name"], event["properties"], options
       end
-      ahoy.track params[:name], params[:properties], options
       render json: {}
     end
 

data/lib/ahoy/tracker.rb

@@ -6,24 +6,29 @@ module Ahoy
     end
 
     def track(name, properties = {}, options = {})
-      # publish to each subscriber
-      if @controller
-        options[:controller] ||= @controller
-        options[:user] ||= Ahoy.fetch_user(@controller)
-        if @controller.respond_to?(:current_visit)
-          options[:visit] ||= @controller.current_visit
+      if !(@controller and Ahoy.exclude_method and Ahoy.exclude_method.call(@controller))
+        # publish to each subscriber
+        options = options.dup
+        if @controller
+          options[:controller] ||= @controller
+          options[:user] ||= Ahoy.fetch_user(@controller)
+          if @controller.respond_to?(:current_visit)
+            options[:visit] ||= @controller.current_visit
+          end
         end
-      end
-      options[:time] ||= Time.zone.now
+        options[:time] ||= Time.zone.now
 
-      subscribers = Ahoy.subscribers
-      if subscribers.any?
-        subscribers.each do |subscriber|
-          subscriber.track(name, properties, options)
+        subscribers = Ahoy.subscribers
+        if subscribers.any?
+          subscribers.each do |subscriber|
+            subscriber.track(name, properties, options)
+          end
+        else
+          $stderr.puts "No subscribers"
         end
-      else
-        $stderr.puts "No subscribers"
       end
+
+      true
     end
 
   end

data/lib/ahoy/version.rb

@@ -1,3 +1,3 @@
 module Ahoy
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/ahoy_matey.rb

@@ -46,6 +46,8 @@ module Ahoy
     (controller.respond_to?(:current_user) && controller.current_user) || (controller.respond_to?(:current_resource_owner, true) && controller.send(:current_resource_owner)) || nil
   end
 
+  mattr_accessor :exclude_method
+
   mattr_accessor :subscribers
   self.subscribers = []
 

data/vendor/assets/javascripts/ahoy.js

@@ -27,7 +27,7 @@
     if (ahoy.domain) {
       cookieDomain = "; domain=" + ahoy.domain;
     }
-    document.cookie = name + "=" + value + expires + cookieDomain + "; path=/";
+    document.cookie = name + "=" + escape(value) + expires + cookieDomain + "; path=/";
   }
 
   function getCookie(name) {
@@ -40,7 +40,7 @@
         c = c.substring(1, c.length);
       }
       if (c.indexOf(nameEQ) === 0) {
-        return c.substring(nameEQ.length, c.length);
+        return unescape(c.substring(nameEQ.length, c.length));
       }
     }
     return null;
@@ -100,7 +100,7 @@
         $.ajax({
           type: "POST",
           url: "/ahoy/events",
-          data: JSON.stringify(event),
+          data: JSON.stringify([event]),
           contentType: "application/json; charset=utf-8",
           dataType: "json",
           success: function() {
@@ -218,7 +218,7 @@
     $(document).on("click", "a, button, input[type=submit]", function (e) {
       var $target = $(e.currentTarget);
       var properties = eventProperties(e);
-      properties.text = properties.tag == "input" ? $target.val() : $.trim($target.text());
+      properties.text = properties.tag == "input" ? $target.val() : $.trim($target.text().replace(/[\s\r\n]+/g, " "));
       properties.href = $target.attr("href");
       ahoy.track("$click", properties);
     });

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ahoy_matey
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-17 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable