ahoy_matey 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9db513e48eea03c383990fb228564e252bebc5b
-  data.tar.gz: a05f03369e5777866a376d0e9c62989f74dfb4c0
+  metadata.gz: 2226bcc4712d1729f93cc68a4a01ac03eef2ee0a
+  data.tar.gz: fc0f05b5df70d3fddbb8f888bc7a136146b8cf47
 SHA512:
-  metadata.gz: 9cc1490028f6f3ab3565b8214ab67b29b35d50feed74c7a2ba171de1a5c765d5be3a1c1708fa14db440a350a429fa49b18e63119b4d3a6472866cadfc02e6eda
-  data.tar.gz: 693ce18cd49030035611bea317a931011c9d2ffd01c2ef5d77769b040bc88a1ebe06364ed2b864a21513c276aa2db8dad95e1e27d2d610c7ae44c3138d02e9eb
+  metadata.gz: f1d5a9cff762a21c7690eabea4100b842fa419fb1b0094117e4d0f34500c131a9738a8c83f4d52ec397f8c951bbd7a99f55b6a837acc99f227d2457d528495a8
+  data.tar.gz: 047ed1ac5af0529aa172640629ca4101dff2659cc21452b4adb4f4d5219b684eae535d40f2d55b56ff9d0a65d440853bcf7bdf750da054afe2c4c004170fe2dd

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.3.2
+
+- Fixed bot exclusion for visits
+- Fixed user method
+
 ## 0.3.1
 
 - Fixed visitor cookies when set on server

data/app/controllers/ahoy/visits_controller.rb

@@ -2,25 +2,7 @@ module Ahoy
   class VisitsController < BaseController
 
     def create
-      visit_token = params[:visit_token] || Ahoy.generate_id
-      visitor_token = params[:visitor_token] || Ahoy.generate_id
-
-      visit =
-        Ahoy.visit_model.new do |v|
-          v.visit_token = visit_token
-          v.visitor_token = visitor_token
-          v.ip = request.remote_ip if v.respond_to?(:ip=)
-          v.user_agent = request.user_agent if v.respond_to?(:user_agent=)
-          v.referrer = params[:referrer] if v.respond_to?(:referrer=)
-          v.landing_page = params[:landing_page] if v.respond_to?(:landing_page=)
-          v.user = Ahoy.fetch_user(self) if v.respond_to?(:user=)
-          v.platform = params[:platform] if v.respond_to?(:platform=)
-          v.app_version = params[:app_version] if v.respond_to?(:app_version=)
-          v.os_version = params[:os_version] if v.respond_to?(:os_version=)
-        end
-
-      visit.save!
-      render json: {visit_token: visit.visit_token, visitor_token: visit.visitor_token}
+      render json: ahoy.track_visit
     end
 
   end

data/lib/ahoy/tracker.rb

@@ -7,7 +7,7 @@ module Ahoy
     end
 
     def track(name, properties = {}, options = {})
-      if (Ahoy.track_bots or !bot?) and !exclude?
+      if track?
         # publish to each subscriber
         options = options.dup
         if @controller
@@ -39,8 +39,43 @@ module Ahoy
       true
     end
 
+    # not a public API - do not use
+    def track_visit
+      visit_token = params[:visit_token] || Ahoy.generate_id
+      visitor_token = params[:visitor_token] || Ahoy.generate_id
+
+      if track?
+        # TODO move to subscriber
+        visit =
+          Ahoy.visit_model.new do |v|
+            v.visit_token = visit_token
+            v.visitor_token = visitor_token
+            v.ip = request.remote_ip if v.respond_to?(:ip=)
+            v.user_agent = request.user_agent if v.respond_to?(:user_agent=)
+            v.referrer = params[:referrer] if v.respond_to?(:referrer=)
+            v.landing_page = params[:landing_page] if v.respond_to?(:landing_page=)
+            v.user = Ahoy.fetch_user(@controller) if v.respond_to?(:user=)
+            v.platform = params[:platform] if v.respond_to?(:platform=)
+            v.app_version = params[:app_version] if v.respond_to?(:app_version=)
+            v.os_version = params[:os_version] if v.respond_to?(:os_version=)
+          end
+
+        begin
+          visit.save!
+        rescue ActiveRecord::RecordNotUnique
+          # do nothing
+        end
+      end
+
+      {visit_token: visit_token, visitor_token: visitor_token}
+    end
+
     protected
 
+    def track?
+      (Ahoy.track_bots || !bot?) && !exclude?
+    end
+
     def bot?
       @bot ||= Browser.new(ua: @request.user_agent).bot?
     end
@@ -57,5 +92,13 @@ module Ahoy
       end
     end
 
+    def params
+      @controller.params
+    end
+
+    def request
+      @request
+    end
+
   end
 end

data/lib/ahoy/version.rb

@@ -1,3 +1,3 @@
 module Ahoy
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ahoy_matey
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-12 00:00:00.000000000 Z
+date: 2014-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable